diff --git a/.github/workflows/add-team-label.yml b/.github/workflows/add-team-label.yml
index c88854d105a3..6bc187c55822 100644
--- a/.github/workflows/add-team-label.yml
+++ b/.github/workflows/add-team-label.yml
@@ -10,8 +10,29 @@ jobs:
     name: Add team label
     if: ${{ !github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
     steps:
+      - name: Get planning token
+        id: planning-token
+        uses: MetaMask/github-tools/.github/actions/get-token@v1
+        with:
+          token-exchange-url: ${{ vars.TOKEN_EXCHANGE_URL }}
+          target-repository: MetaMask/MetaMask-planning
+          permissions: |
+            contents: read
+
+      - name: Get label token
+        id: label-token
+        uses: MetaMask/github-tools/.github/actions/get-token@v1
+        with:
+          token-exchange-url: ${{ vars.TOKEN_EXCHANGE_URL }}
+          permissions: |
+            contents: read
+            pull_requests: write
+
       - name: Add team label
         uses: MetaMask/github-tools/.github/actions/add-team-label@v1
         with:
-          team-label-token: ${{ secrets.TEAM_LABEL_TOKEN }}
+          planning-token: ${{ steps.planning-token.outputs.token }}
+          team-label-token: ${{ steps.label-token.outputs.token }}
diff --git a/.github/workflows/check-template-and-add-labels.yml b/.github/workflows/check-template-and-add-labels.yml
index 7d0c6b3e0f4b..bb8b3b5b767d 100644
--- a/.github/workflows/check-template-and-add-labels.yml
+++ b/.github/workflows/check-template-and-add-labels.yml
@@ -27,6 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [is-fork-pull-request]
     if: ${{ always() && github.event_name != 'merge_group' && (github.event_name == 'issues' || (github.event_name == 'pull_request_target' && needs.is-fork-pull-request.outputs.IS_FORK == 'false')) }}
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -46,9 +49,20 @@ jobs:
           retry_wait_seconds: 30
           command: cd .github/scripts && yarn --immutable
 
+      - name: Get access token
+        id: get-token
+        uses: MetaMask/github-tools/.github/actions/get-token@v1
+        continue-on-error: true
+        with:
+          token-exchange-url: ${{ vars.TOKEN_EXCHANGE_URL }}
+          permissions: |
+            issues: write
+            members: read
+            pull_requests: write
+
       - name: Check template and add labels
         id: check-template-and-add-labels
         env:
-          LABEL_TOKEN: ${{ secrets.LABEL_TOKEN }}
+          LABEL_TOKEN: ${{ steps.get-token.outputs.token || secrets.LABEL_TOKEN }}
         run: npm run check-template-and-add-labels
         working-directory: '.github/scripts'
diff --git a/.github/workflows/performance-test-runner.yml b/.github/workflows/performance-test-runner.yml
index e71746ef6e44..da7634200cf4 100644
--- a/.github/workflows/performance-test-runner.yml
+++ b/.github/workflows/performance-test-runner.yml
@@ -44,7 +44,12 @@ on:
         required: false
         type: string
         default: e2e
-        description: 'Build variant for app artifacts (e2e, rc, or exp)'
+        description: 'Deprecated for env; kept for workflow_call compatibility. Use feature_flags_environment for client-config API.'
+      feature_flags_environment:
+        required: false
+        type: string
+        default: rc
+        description: 'client-config API environment (rc, exp, test). Independent of BrowserStack build_variant.'
     secrets:
       BROWSERSTACK_USERNAME:
         required: true
@@ -58,6 +63,8 @@ on:
         required: true
       TEST_SRP_3:
         required: true
+      TEST_SRP_4:
+        required: true
       E2E_PASSWORD:
         required: true
       MM_SENTRY_DSN_TEST:
@@ -170,10 +177,10 @@ jobs:
           SENTRY_REAL_DSN="${{ secrets.MM_SENTRY_DSN }}"
           SELECTED_SENTRY_DSN=""
           SENTRY_ENVIRONMENT="github-actions-performance-e2e"
-          BUILD_VARIANT="${{ inputs.build_variant }}"
+          FEATURE_FLAGS_ENV="${{ inputs.feature_flags_environment }}"
 
-          if [[ "$BUILD_VARIANT" != "rc" && "$BUILD_VARIANT" != "exp" && "$BUILD_VARIANT" != "e2e" ]]; then
-            echo "❌ Invalid build_variant '$BUILD_VARIANT'. Expected 'e2e', 'rc', or 'exp'."
+          if [[ "$FEATURE_FLAGS_ENV" != "rc" && "$FEATURE_FLAGS_ENV" != "exp" && "$FEATURE_FLAGS_ENV" != "test" && "$FEATURE_FLAGS_ENV" != "dev" && "$FEATURE_FLAGS_ENV" != "prod" ]]; then
+            echo "❌ Invalid feature_flags_environment '$FEATURE_FLAGS_ENV'. Expected rc, exp, test, dev, or prod."
             exit 1
           fi
 
@@ -219,11 +226,12 @@ jobs:
             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 "TEST_SRP_4=${{ secrets.TEST_SRP_4 }}"
             echo "E2E_PASSWORD=${{ secrets.E2E_PASSWORD }}"
             echo "E2E_PERFORMANCE_SENTRY_DSN=$SELECTED_SENTRY_DSN"
             echo "E2E_PERFORMANCE_SENTRY_ENVIRONMENT=$SENTRY_ENVIRONMENT"
             echo "E2E_PERFORMANCE_SENTRY_RELEASE=${{ github.sha }}"
-            echo "E2E_PERFORMANCE_BUILD_VARIANT=$BUILD_VARIANT"
+            echo "E2E_PERFORMANCE_BUILD_VARIANT=$FEATURE_FLAGS_ENV"
             echo "DISABLE_VIDEO_DOWNLOAD=true"
           } >> "$GITHUB_ENV"
 
diff --git a/.github/workflows/run-performance-e2e.yml b/.github/workflows/run-performance-e2e.yml
index e9c282bc802c..f4ca6baa6954 100644
--- a/.github/workflows/run-performance-e2e.yml
+++ b/.github/workflows/run-performance-e2e.yml
@@ -72,7 +72,7 @@ on:
         required: false
         type: string
       build_variant:
-        description: 'Build variant (e2e = e2e environment, exp = experimental, rc = release)'
+        description: 'BrowserStack build profile (e2e = build-e2e, works on feature branches; rc = build-rc, release branches only; exp = experimental)'
         required: false
         type: string
         default: 'e2e'
@@ -97,6 +97,7 @@ env:
   TEST_SRP_1: ${{ secrets.TEST_SRP_1 }}
   TEST_SRP_2: ${{ secrets.TEST_SRP_2 }}
   TEST_SRP_3: ${{ secrets.TEST_SRP_3 }}
+  TEST_SRP_4: ${{ secrets.TEST_SRP_4 }}
   E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
   DISABLE_VIDEO_DOWNLOAD: true
 
@@ -216,6 +217,7 @@ jobs:
     uses: ./.github/workflows/build-ios-upload-to-browserstack.yml
     needs: [determine-branch-name]
     if: false # temporarily disabled — iOS tests not yet active
+    # if: (!inputs.browserstack_app_url_ios_onboarding && !inputs.browserstack_app_url_ios_imported_wallet)
     with:
       branch_name: ${{ needs.determine-branch-name.outputs.branch_name }}
       build_variant: ${{ inputs.build_variant || 'e2e' }}
@@ -259,6 +261,7 @@ jobs:
         determine-branch-name,
       ]
     if: false # temporarily disabled — Android only
+    # if: always() && !failure() && !cancelled() && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_onboarding != '' || needs.trigger-ios-dual-versions.outputs.without-srp-browserstack-url != '')
     with:
       platform: ios
       build_type: onboarding
@@ -322,6 +325,7 @@ jobs:
         determine-branch-name,
       ]
     if: false # temporarily disabled — Android only
+    # if: always() && !cancelled() && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_imported_wallet != '' || needs.trigger-ios-dual-versions.outputs.with-srp-browserstack-url != '')
     with:
       platform: ios
       build_type: imported-wallet
diff --git a/.github/workflows/triage-forwarder.yml b/.github/workflows/triage-forwarder.yml
index f137e5315fc2..779fe889eb9d 100644
--- a/.github/workflows/triage-forwarder.yml
+++ b/.github/workflows/triage-forwarder.yml
@@ -2,12 +2,12 @@ name: Triage Agent Forwarder
 
 on:
   issues:
-    types: [labeled]
+    types: [labeled, opened]
 
 jobs:
-  forward:
+  forward-labeled:
     runs-on: ubuntu-latest
-    if: github.event.label.name == 'ta-needs-triage'
+    if: github.event.action == 'labeled' && github.event.label.name == 'ta-needs-triage'
     permissions:
       id-token: write
     steps:
@@ -49,3 +49,46 @@ jobs:
               --arg action "${{ github.event.action }}" \
               --arg label "${{ github.event.label.name }}" \
               '{event_type: "triage-issue", client_payload: {repo_owner: $owner, repo_name: $name, issue_number: $number, event_action: $action, event_label_name: $label, trigger_mode: "label"}}')"
+
+  forward-opened:
+    runs-on: ubuntu-latest
+    if: github.event.action == 'opened'
+    permissions:
+      id-token: write
+    steps:
+      - name: Get OIDC Token
+        id: oidc
+        run: |
+          OIDC_TOKEN=$(curl -sSf -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" \
+            "${ACTIONS_ID_TOKEN_REQUEST_URL}&audience=api://token-exchange-service" | jq -r '.value')
+          echo "::add-mask::$OIDC_TOKEN"
+          echo "oidc_token=$OIDC_TOKEN" >> "$GITHUB_OUTPUT"
+
+      - name: Exchange for Installation Token
+        id: exchange
+        env:
+          OIDC_TOKEN: ${{ steps.oidc.outputs.oidc_token }}
+        run: |
+          RESPONSE=$(curl -sSf -X POST "${{ vars.TOKEN_EXCHANGE_URL }}/api/exchange/token" \
+            -H "Content-Type: application/json" \
+            -d "$(jq -cn \
+              --arg oidcToken "$OIDC_TOKEN" \
+              --arg targetRepo "MetaMask/triage-agent" \
+              '{oidcToken: $oidcToken, targetRepo: $targetRepo, requested_permissions: {contents: "write", metadata: "read"}}')")
+          TOKEN=$(echo "$RESPONSE" | jq -r '.token')
+          echo "::add-mask::$TOKEN"
+          echo "token=$TOKEN" >> "$GITHUB_OUTPUT"
+
+      - name: Dispatch to triage-agent
+        env:
+          TOKEN: ${{ steps.exchange.outputs.token }}
+        run: |
+          curl -sSf -X POST \
+            -H "Authorization: token $TOKEN" \
+            -H "Accept: application/vnd.github+json" \
+            "https://api.github.com/repos/MetaMask/triage-agent/dispatches" \
+            -d "$(jq -cn \
+              --arg owner "${{ github.repository_owner }}" \
+              --arg name "${{ github.event.repository.name }}" \
+              --arg number "${{ github.event.issue.number }}" \
+              '{event_type: "triage-issue", client_payload: {repo_owner: $owner, repo_name: $name, issue_number: $number, event_action: "opened", trigger_mode: "on_create"}}')"
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
index 7f1c7dbcbc39..c8fa81424c52 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.test.tsx
@@ -3552,6 +3552,172 @@ describe('PerpsMarketDetailsView', () => {
       expect(getAllByText('ETH-USD').length).toBeGreaterThanOrEqual(1);
     });
 
+    it('enriches market data when route maxLeverage is unformatted', async () => {
+      mockRouteParams.market = {
+        symbol: 'xyz:SPCX',
+        name: 'SPCX',
+        price: '$0.00',
+        change24h: '+$0.00',
+        change24hPercent: '+0.00%',
+        volume: '$0',
+        maxLeverage: '100',
+      };
+
+      mockUsePerpsMarketsImpl.mockImplementation(() => ({
+        markets: [
+          {
+            symbol: 'xyz:SPCX',
+            name: 'SPCX',
+            price: '$0.00',
+            change24h: '+$0.00',
+            change24hPercent: '+0.00%',
+            volume: '$0',
+            maxLeverage: '5x',
+            volumeNumber: 0,
+          },
+        ],
+        isLoading: false,
+        error: null,
+        refresh: jest.fn(),
+        isRefreshing: false,
+      }));
+
+      const { getByText, queryByText } = renderWithProvider(
+        <PerpsConnectionProvider>
+          <PerpsMarketDetailsView />
+        </PerpsConnectionProvider>,
+        {
+          state: initialState,
+        },
+      );
+
+      await waitFor(() => {
+        expect(getByText('5x')).toBeOnTheScreen();
+      });
+      expect(queryByText('100')).toBeNull();
+    });
+
+    it('passes enriched SPCX leverage defaults to order screen', async () => {
+      const { usePerpsMarketData } = jest.requireMock('../../hooks');
+      mockRouteParams.market = {
+        symbol: 'xyz:SPCX',
+        name: 'SPCX',
+        price: '$0.00',
+        change24h: '+$0.00',
+        change24hPercent: '+0.00%',
+        volume: '$0',
+        maxLeverage: '100',
+      };
+
+      mockUsePerpsMarketsImpl.mockImplementation(() => ({
+        markets: [
+          {
+            symbol: 'xyz:SPCX',
+            name: 'SPCX',
+            price: '$0.00',
+            change24h: '+$0.00',
+            change24hPercent: '+0.00%',
+            volume: '$0',
+            maxLeverage: '5x',
+            volumeNumber: 0,
+          },
+        ],
+        isLoading: false,
+        error: null,
+        refresh: jest.fn(),
+        isRefreshing: false,
+      }));
+      usePerpsMarketData.mockReturnValue({
+        marketData: { szDecimals: 2, maxLeverage: 5 },
+        isLoading: false,
+        error: null,
+        refetch: jest.fn(),
+      });
+
+      try {
+        const { getByTestId, getByText } = renderWithProvider(
+          <PerpsConnectionProvider>
+            <PerpsMarketDetailsView />
+          </PerpsConnectionProvider>,
+          {
+            state: initialState,
+          },
+        );
+
+        await waitFor(() => {
+          expect(getByText('5x')).toBeOnTheScreen();
+        });
+
+        await act(async () => {
+          fireEvent.press(
+            getByTestId(PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON),
+          );
+        });
+
+        expect(mockNavigateToOrder).toHaveBeenCalledWith(
+          expect.objectContaining({
+            asset: 'xyz:SPCX',
+            defaultMaxLeverage: 5,
+            defaultSzDecimals: 2,
+            direction: 'long',
+            source: 'perp_asset_screen',
+          }),
+        );
+      } finally {
+        usePerpsMarketData.mockReturnValue({
+          marketData: null,
+          isLoading: false,
+          error: null,
+          refetch: jest.fn(),
+        });
+      }
+    });
+
+    it('enriches unformatted route market without market source', async () => {
+      mockRouteParams.market = {
+        symbol: 'SPCX',
+        name: 'SPCX',
+        price: '$0.00',
+        change24h: '+$0.00',
+        change24hPercent: '+0.00%',
+        volume: '$0',
+        maxLeverage: '100',
+      };
+
+      mockUsePerpsMarketsImpl.mockImplementation(() => ({
+        markets: [
+          {
+            symbol: 'SPCX',
+            name: 'SPCX',
+            price: '$0.00',
+            change24h: '+$0.00',
+            change24hPercent: '+0.00%',
+            volume: '$0',
+            maxLeverage: '5x',
+            volumeNumber: 0,
+          },
+        ],
+        isLoading: false,
+        error: null,
+        refresh: jest.fn(),
+        isRefreshing: false,
+      }));
+
+      const { getByText, queryByText } = renderWithProvider(
+        <PerpsConnectionProvider>
+          <PerpsMarketDetailsView />
+        </PerpsConnectionProvider>,
+        {
+          state: initialState,
+        },
+      );
+
+      await waitFor(() => {
+        expect(getByText('5x')).toBeOnTheScreen();
+      });
+      expect(queryByText('100')).toBeNull();
+    });
+
     it('enriches market data from usePerpsMarkets when route has minimal data', async () => {
       // Route has minimal market data (no maxLeverage)
       mockRouteParams.market = {
diff --git a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
index 8fafbad9bd00..9ca184a9c135 100644
--- a/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketDetailsView/PerpsMarketDetailsView.tsx
@@ -1,9 +1,14 @@
 import {
   Box,
   Button as DSButton,
+  ButtonSemantic,
+  ButtonSemanticSeverity,
   ButtonVariant,
   ButtonSize as ButtonSizeRNDesignSystem,
   IconName,
+  Text,
+  TextColor,
+  TextVariant,
 } from '@metamask/design-system-react-native';
 import {
   useNavigation,
@@ -34,14 +39,7 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 import { useDispatch, useSelector } from 'react-redux';
 import { strings } from '../../../../../../locales/i18n';
 import { setPerpsChartPreferredCandlePeriod } from '../../../../../actions/settings';
-import ButtonSemantic, {
-  ButtonSemanticSeverity,
-} from '../../../../../component-library/components-temp/Buttons/ButtonSemantic';
 import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
-import Text, {
-  TextColor,
-  TextVariant,
-} from '../../../../../component-library/components/Texts/Text';
 import { useStyles } from '../../../../../component-library/hooks';
 import Routes from '../../../../../constants/navigation/Routes';
 import Engine from '../../../../../core/Engine';
@@ -203,8 +201,11 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
 
   // Get full market data from stream to ensure all fields (including maxLeverage) are available
   // This handles cases where navigation passes minimal market data (e.g., from Recent Activity)
-  // Skip fetching if routeMarket already has maxLeverage (performance optimization)
-  const needsEnrichment = !routeMarket?.maxLeverage;
+  // Skip fetching if routeMarket already has a formatted maxLeverage.
+  const hasFormattedMaxLeverage =
+    typeof routeMarket?.maxLeverage === 'string' &&
+    routeMarket.maxLeverage.endsWith('x');
+  const needsEnrichment = !hasFormattedMaxLeverage;
   const { markets } = usePerpsMarkets({ skipInitialFetch: !needsEnrichment });
   const market = useMemo(() => {
     // If route market already has all required fields, use it directly
@@ -1188,7 +1189,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
           style={styles.errorContainer}
           testID={PerpsMarketDetailsViewSelectorsIDs.ERROR}
         >
-          <Text variant={TextVariant.BodySM} color={TextColor.Error}>
+          <Text variant={TextVariant.BodySm} color={TextColor.ErrorDefault}>
             {strings('perps.market.details.error_message')}
           </Text>
         </View>
@@ -1410,7 +1411,7 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
           {/* Orders Section - Compact view (includes standalone TP/SL orders) */}
           {displayOrders.length > 0 && (
             <View style={styles.section}>
-              <Text variant={TextVariant.HeadingMD} style={styles.sectionTitle}>
+              <Text variant={TextVariant.HeadingMd} style={styles.sectionTitle}>
                 {strings('perps.market.orders')}
               </Text>
               {displayOrders.map((order, index) => (
@@ -1475,13 +1476,13 @@ const PerpsMarketDetailsView: React.FC<PerpsMarketDetailsViewProps> = () => {
           <View style={styles.section}>
             <Text
               style={styles.riskDisclaimer}
-              variant={TextVariant.BodyXS}
-              color={TextColor.Alternative}
+              variant={TextVariant.BodyXs}
+              color={TextColor.TextAlternative}
             >
               {strings('perps.risk_disclaimer', riskDisclaimerParams)}{' '}
               <Text
-                variant={TextVariant.BodyXS}
-                color={TextColor.Alternative}
+                variant={TextVariant.BodyXs}
+                color={TextColor.TextAlternative}
                 onPress={handleTradingViewPress}
               >
                 TradingView.
diff --git a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx
index 5f95cb686fc8..ba36ae276aa2 100644
--- a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.test.tsx
@@ -498,6 +498,11 @@ describe('PerpsMarketListView', () => {
   >;
   const { useRoute } = jest.requireMock('@react-navigation/native');
   const mockUseRoute = useRoute as jest.MockedFunction<typeof useRoute>;
+  const { usePerpsMarketListView } = jest.requireMock('../../hooks');
+  const mockUsePerpsMarketListView =
+    usePerpsMarketListView as jest.MockedFunction<
+      typeof usePerpsMarketListView
+    >;
 
   const mockMarketData: PerpsMarketData[] = [
     {
@@ -623,6 +628,26 @@ describe('PerpsMarketListView', () => {
       });
     });
 
+    it('passes default sort params from route to market list hook', () => {
+      mockUseRoute.mockReturnValue({
+        key: 'PerpsMarketListView-123',
+        name: 'PerpsMarketListView',
+        params: {
+          defaultSortOptionId: 'priceChange',
+          defaultSortDirection: 'asc',
+        },
+      });
+
+      renderWithProvider(<PerpsMarketListView />, { state: mockState });
+
+      expect(mockUsePerpsMarketListView).toHaveBeenCalledWith(
+        expect.objectContaining({
+          defaultSortOptionId: 'priceChange',
+          defaultSortDirection: 'asc',
+        }),
+      );
+    });
+
     it('renders interactive elements', async () => {
       renderWithProvider(<PerpsMarketListView />, { state: mockState });
 
@@ -717,6 +742,31 @@ describe('PerpsMarketListView', () => {
       expect(() => fireEvent.press(btcRows[0])).not.toThrow();
     });
 
+    it('navigates to SPCX details with market-list source when SPCX is pressed', () => {
+      const spcxMarket: PerpsMarketData = {
+        symbol: 'xyz:SPCX',
+        name: 'SPCX',
+        maxLeverage: '5x',
+        price: '$0.00',
+        change24h: '+$0.00',
+        change24hPercent: '+0.00%',
+        volume: '$0',
+        marketSource: 'xyz',
+      };
+      mockMarketDataForHook.length = 0;
+      mockMarketDataForHook.push(spcxMarket);
+
+      renderWithProvider(<PerpsMarketListView />, { state: mockState });
+
+      fireEvent.press(screen.getByTestId('market-row-xyz:SPCX'));
+
+      expect(mockNavigateToMarketDetails).toHaveBeenCalledWith(
+        spcxMarket,
+        'perp_markets',
+        undefined,
+      );
+    });
+
     it('carries route transactionActiveAbTests when a market opens market details', () => {
       const transactionActiveAbTests = [
         createActiveABTestAssignment(
@@ -824,12 +874,10 @@ describe('PerpsMarketListView', () => {
 
   describe('Edge Cases', () => {
     it('filters markets with whitespace-only query', async () => {
-      const { usePerpsMarketListView } = jest.requireMock('../../hooks');
-
       mockSearchQuery = '   ';
 
       // Mock to return empty results when search query is whitespace
-      usePerpsMarketListView.mockReturnValue({
+      mockUsePerpsMarketListView.mockReturnValue({
         markets: mockMarketData, // Whitespace is trimmed, so all markets show
         searchState: {
           searchQuery: '   ',
diff --git a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
index 28450e8ba191..ac344c2441a3 100644
--- a/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
+++ b/app/components/UI/Perps/Views/PerpsMarketListView/PerpsMarketListView.tsx
@@ -68,6 +68,7 @@ const PerpsMarketListView = ({
   const defaultMarketTypeFilter =
     route.params?.defaultMarketTypeFilter ?? 'all';
   const defaultSortOptionId = route.params?.defaultSortOptionId;
+  const defaultSortDirection = route.params?.defaultSortDirection;
   const transactionActiveAbTests = route.params?.transactionActiveAbTests;
 
   const fadeAnimation = useRef(new Animated.Value(0)).current;
@@ -87,6 +88,7 @@ const PerpsMarketListView = ({
     showWatchlistOnly,
     defaultMarketTypeFilter,
     defaultSortOptionId,
+    defaultSortDirection,
     showZeroVolume: __DEV__,
   });
 
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts b/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts
index cbaca4762505..cd9f4fa791ba 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarketListView.test.ts
@@ -327,6 +327,29 @@ describe('usePerpsMarketListView', () => {
       });
     });
 
+    it('defaultSortDirection overrides saved direction when provided', () => {
+      let selectorCallCount = 0;
+      mockUseSelector.mockImplementation(() => {
+        selectorCallCount++;
+        if (selectorCallCount % 2 === 1) {
+          return ['BTC'];
+        }
+        return { optionId: 'priceChange', direction: 'desc' };
+      });
+
+      renderHook(() =>
+        usePerpsMarketListView({
+          defaultSortOptionId: 'priceChange',
+          defaultSortDirection: 'asc',
+        }),
+      );
+
+      expect(mockUsePerpsSorting).toHaveBeenCalledWith({
+        initialOptionId: 'priceChange',
+        initialDirection: 'asc',
+      });
+    });
+
     it('preserves saved direction when defaultSortOptionId matches the saved option', () => {
       let selectorCallCount = 0;
       mockUseSelector.mockImplementation(() => {
diff --git a/app/components/UI/Perps/hooks/usePerpsMarketListView.ts b/app/components/UI/Perps/hooks/usePerpsMarketListView.ts
index 8eeb0afff5c1..5c9f9a63a244 100644
--- a/app/components/UI/Perps/hooks/usePerpsMarketListView.ts
+++ b/app/components/UI/Perps/hooks/usePerpsMarketListView.ts
@@ -39,6 +39,11 @@ interface UsePerpsMarketListViewParams {
    * @default undefined (falls back to saved user preference)
    */
   defaultSortOptionId?: SortOptionId;
+  /**
+   * Initial sort direction — overrides the persisted user preference when provided.
+   * @default undefined (falls back to saved user preference/default override behavior)
+   */
+  defaultSortDirection?: SortDirection;
   /**
    * Show markets with $0.00 volume
    * @default false
@@ -140,6 +145,7 @@ export const usePerpsMarketListView = ({
   showWatchlistOnly = false,
   defaultMarketTypeFilter = 'all',
   defaultSortOptionId,
+  defaultSortDirection,
   showZeroVolume = false,
 }: UsePerpsMarketListViewParams = {}): UsePerpsMarketListViewReturn => {
   // Fetch markets data
@@ -205,18 +211,21 @@ export const usePerpsMarketListView = ({
 
   // 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.
+  // preference. A route-provided direction also takes precedence so Explore can
+  // open the market list with the same ordering as the source section.
+  // Without an explicit direction, reset changed sort options to the default
+  // direction; otherwise carry the saved direction.
   const isOptionOverridden =
     defaultSortOptionId !== undefined &&
     defaultSortOptionId !== savedSortPreference.optionId;
   const sortingHook = usePerpsSorting({
     initialOptionId: (defaultSortOptionId ??
       savedSortPreference.optionId) as SortOptionId,
-    initialDirection: isOptionOverridden
-      ? MARKET_SORTING_CONFIG.DefaultDirection
-      : savedSortPreference.direction,
+    initialDirection:
+      defaultSortDirection ??
+      (isOptionOverridden
+        ? MARKET_SORTING_CONFIG.DefaultDirection
+        : savedSortPreference.direction),
   });
 
   // Wrap handleOptionChange to save preference to PerpsController
diff --git a/app/components/UI/Perps/types/navigation.ts b/app/components/UI/Perps/types/navigation.ts
index 909a3f5514e4..5e908b22e36d 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 SortDirection,
   type SortOptionId,
 } from '@metamask/perps-controller';
 import { PerpsTransaction } from './transactionHistory';
@@ -93,6 +94,7 @@ export interface PerpsNavigationParamList extends ParamListBase {
       | 'forex'
       | 'new';
     defaultSortOptionId?: SortOptionId;
+    defaultSortDirection?: SortDirection;
     fromHome?: boolean;
     button_clicked?: string;
     button_location?: string;
diff --git a/app/components/UI/Predict/Predict.testIds.ts b/app/components/UI/Predict/Predict.testIds.ts
index 551f7dd74f4b..ec93b602944d 100644
--- a/app/components/UI/Predict/Predict.testIds.ts
+++ b/app/components/UI/Predict/Predict.testIds.ts
@@ -54,6 +54,50 @@ export const PredictFeedSelectorsIDs = {
   PAGER: 'predict-feed-pager',
 } as const;
 
+// ========================================
+// PREDICT POSITIONS VIEW SELECTORS
+// ========================================
+
+export const PredictPositionsViewSelectorsIDs = {
+  AVAILABLE_BALANCE_LABEL: 'predict-positions-view-available-balance-label',
+  AVAILABLE_BALANCE_SKELETON:
+    'predict-positions-view-available-balance-skeleton',
+  AVAILABLE_BALANCE_VALUE: 'predict-positions-view-available-balance-value',
+  BACK_BUTTON: 'predict-positions-view-back-button',
+  CLAIM_CTA: 'predict-positions-view-claim-cta',
+  CONTAINER: 'predict-positions-view-container',
+  HEADER: 'predict-positions-view-header',
+  HISTORY_TAB: 'predict-positions-view-history-tab',
+  HISTORY_TAB_CONTENT: 'predict-positions-view-history-tab-content',
+  POSITIONS_TAB: 'predict-positions-view-positions-tab',
+  POSITIONS_TAB_CONTENT: 'predict-positions-view-positions-tab-content',
+  SUMMARY: 'predict-positions-view-summary',
+  SUMMARY_CARD: 'predict-positions-view-summary-card',
+  TABS: 'predict-positions-view-tabs',
+  UNREALIZED_PNL_LABEL: 'predict-positions-view-unrealized-pnl-label',
+  UNREALIZED_PNL_ROW: 'predict-positions-view-unrealized-pnl-row',
+  UNREALIZED_PNL_SKELETON: 'predict-positions-view-unrealized-pnl-skeleton',
+  UNREALIZED_PNL_VALUE: 'predict-positions-view-unrealized-pnl-value',
+} as const;
+
+export const PredictPositionsEmptySelectorsIDs = {
+  BROWSE_MARKETS_CTA: 'predict-positions-empty-browse-markets-cta',
+  CONTAINER: 'predict-positions-empty',
+  DESCRIPTION: 'predict-positions-empty-description',
+  ICON: 'predict-positions-empty-icon',
+} as const;
+
+export const PredictPositionsListSelectorsIDs = {
+  CONTAINER: 'predict-positions-list',
+  LOADING_STATE: 'predict-positions-list-loading-state',
+  OPEN_POSITIONS_LIST: 'predict-positions-list-open-positions',
+  SKELETON_ROW: 'predict-positions-list-skeleton-row',
+} as const;
+
+export const PredictPositionsHistoryListSelectorsIDs = {
+  CONTAINER: 'predict-positions-history-list',
+} as const;
+
 export const getPredictFeedSelector = {
   tab: (index: number) => `${PredictFeedSelectorsIDs.TABS}-tab-${index}`,
   tabPage: (key: string) => `predict-feed-tab-page-${key}`,
diff --git a/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx b/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx
index 2c85e7bb4334..2b10aa47c1d2 100644
--- a/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx
+++ b/app/components/UI/Predict/components/PredictActivity/PredictActivity.tsx
@@ -24,6 +24,7 @@ import { POLYGON_MAINNET_CHAIN_ID } from '../../providers/polymarket/constants';
 
 interface PredictActivityProps {
   item: PredictActivityItem;
+  containerStyle?: string;
 }
 
 const activityTitleByType: Record<PredictActivityType, string> = {
@@ -32,7 +33,10 @@ const activityTitleByType: Record<PredictActivityType, string> = {
   [PredictActivityType.CLAIM]: strings('predict.transactions.claim_title'),
 };
 
-const PredictActivity: React.FC<PredictActivityProps> = ({ item }) => {
+const PredictActivity: React.FC<PredictActivityProps> = ({
+  item,
+  containerStyle,
+}) => {
   const tw = useTailwind();
   const navigation = useNavigation();
   const { trackEvent, createEventBuilder } = useAnalytics();
@@ -75,7 +79,10 @@ const PredictActivity: React.FC<PredictActivityProps> = ({ item }) => {
   return (
     <TouchableOpacity
       onPress={handlePress}
-      style={tw.style('flex-row items-start justify-between w-full p-2')}
+      style={tw.style(
+        'flex-row items-start justify-between w-full p-2',
+        containerStyle,
+      )}
     >
       <Box twClassName="h-10 w-10 items-center justify-center rounded-full bg-muted mr-3 overflow-hidden mt-1">
         {item.icon ? (
diff --git a/app/components/UI/Predict/components/PredictPositionsEmpty/PredictPositionsEmpty.test.tsx b/app/components/UI/Predict/components/PredictPositionsEmpty/PredictPositionsEmpty.test.tsx
new file mode 100644
index 000000000000..a6665aecaf9f
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsEmpty/PredictPositionsEmpty.test.tsx
@@ -0,0 +1,87 @@
+import { StackActions, useNavigation } from '@react-navigation/native';
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import Routes from '../../../../../constants/navigation/Routes';
+import { PredictPositionsEmptySelectorsIDs } from '../../Predict.testIds';
+import PredictPositionsEmpty from './PredictPositionsEmpty';
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: jest.fn(),
+}));
+
+jest.mock('../../../../../images/predictions-dark.svg', () => {
+  const ReactLib = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+
+  return (props: Record<string, unknown>) =>
+    ReactLib.createElement(View, props);
+});
+
+jest.mock('../../../../../images/predictions-light.svg', () => {
+  const ReactLib = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+
+  return (props: Record<string, unknown>) =>
+    ReactLib.createElement(View, props);
+});
+
+const mockNavigation = {
+  canGoBack: jest.fn(),
+  dispatch: jest.fn(),
+  navigate: jest.fn(),
+};
+
+const mockUseNavigation = useNavigation as jest.Mock;
+
+describe('PredictPositionsEmpty', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockNavigation.canGoBack.mockReturnValue(true);
+    mockUseNavigation.mockReturnValue(mockNavigation);
+  });
+
+  it('renders the Positions empty state content', () => {
+    render(<PredictPositionsEmpty />);
+
+    expect(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.ICON),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByText(
+        'Your predictions will appear here, showing your stake and market movements',
+      ),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('Browse markets')).toBeOnTheScreen();
+  });
+
+  it('pops to the Predict market list when the stack can go back', () => {
+    render(<PredictPositionsEmpty />);
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.BROWSE_MARKETS_CTA),
+    );
+
+    expect(mockNavigation.dispatch).toHaveBeenCalledWith(
+      StackActions.popToTop(),
+    );
+    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+  });
+
+  it('navigates to the Predict market list when there is no stack to pop', () => {
+    mockNavigation.canGoBack.mockReturnValue(false);
+    render(<PredictPositionsEmpty />);
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.BROWSE_MARKETS_CTA),
+    );
+
+    expect(mockNavigation.dispatch).not.toHaveBeenCalled();
+    expect(mockNavigation.navigate).toHaveBeenCalledWith(
+      Routes.PREDICT.MARKET_LIST,
+    );
+  });
+});
diff --git a/app/components/UI/Predict/components/PredictPositionsEmpty/PredictPositionsEmpty.tsx b/app/components/UI/Predict/components/PredictPositionsEmpty/PredictPositionsEmpty.tsx
new file mode 100644
index 000000000000..e9eb36aa6a2a
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsEmpty/PredictPositionsEmpty.tsx
@@ -0,0 +1,83 @@
+import {
+  StackActions,
+  type NavigationProp,
+  useNavigation,
+} from '@react-navigation/native';
+import React, { useCallback } from 'react';
+import {
+  Box,
+  Button,
+  ButtonVariant,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import {
+  Theme,
+  useTailwind,
+  useTheme as useDesignSystemTheme,
+} from '@metamask/design-system-twrnc-preset';
+import { strings } from '../../../../../../locales/i18n';
+import Routes from '../../../../../constants/navigation/Routes';
+import PredictionsEmptyDarkIcon from '../../../../../images/predictions-dark.svg';
+import PredictionsEmptyLightIcon from '../../../../../images/predictions-light.svg';
+import { PredictPositionsEmptySelectorsIDs } from '../../Predict.testIds';
+import type { PredictNavigationParamList } from '../../types/navigation';
+
+interface PredictPositionsEmptyProps {
+  testID?: string;
+}
+
+const PredictPositionsEmpty = ({
+  testID = PredictPositionsEmptySelectorsIDs.CONTAINER,
+}: PredictPositionsEmptyProps) => {
+  const navigation =
+    useNavigation<NavigationProp<PredictNavigationParamList>>();
+  const tw = useTailwind();
+  const designSystemTheme = useDesignSystemTheme();
+  const EmptyIcon =
+    designSystemTheme === Theme.Dark
+      ? PredictionsEmptyDarkIcon
+      : PredictionsEmptyLightIcon;
+
+  const handleBrowseMarketsPress = useCallback(() => {
+    if (navigation.canGoBack()) {
+      navigation.dispatch(StackActions.popToTop());
+      return;
+    }
+
+    navigation.navigate(Routes.PREDICT.MARKET_LIST);
+  }, [navigation]);
+
+  return (
+    <Box
+      testID={testID}
+      style={tw.style('flex-1 items-center justify-center px-8 py-10')}
+    >
+      <Box
+        testID={PredictPositionsEmptySelectorsIDs.ICON}
+        style={tw.style('mb-4 h-[72px] w-[72px] items-center justify-center')}
+      >
+        <EmptyIcon name="predict-positions-empty" width={72} height={72} />
+      </Box>
+      <Text
+        variant={TextVariant.BodySm}
+        color={TextColor.TextAlternative}
+        testID={PredictPositionsEmptySelectorsIDs.DESCRIPTION}
+        style={tw.style('mb-4 max-w-[220px] text-center')}
+      >
+        {strings('predict.positions_empty.description')}
+      </Text>
+      <Button
+        variant={ButtonVariant.Secondary}
+        onPress={handleBrowseMarketsPress}
+        testID={PredictPositionsEmptySelectorsIDs.BROWSE_MARKETS_CTA}
+        twClassName="self-center"
+      >
+        {strings('predict.positions_empty.browse_markets')}
+      </Button>
+    </Box>
+  );
+};
+
+export default PredictPositionsEmpty;
diff --git a/app/components/UI/Predict/components/PredictPositionsEmpty/index.ts b/app/components/UI/Predict/components/PredictPositionsEmpty/index.ts
new file mode 100644
index 000000000000..b12bc067745a
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsEmpty/index.ts
@@ -0,0 +1 @@
+export { default } from './PredictPositionsEmpty';
diff --git a/app/components/UI/Predict/components/PredictPositionsHistoryList/PredictPositionsHistoryList.test.tsx b/app/components/UI/Predict/components/PredictPositionsHistoryList/PredictPositionsHistoryList.test.tsx
new file mode 100644
index 000000000000..2ab05f1b80bd
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsHistoryList/PredictPositionsHistoryList.test.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react-native';
+import {
+  PredictPositionsEmptySelectorsIDs,
+  PredictPositionsHistoryListSelectorsIDs,
+} from '../../Predict.testIds';
+import PredictPositionsHistoryList from './PredictPositionsHistoryList';
+
+jest.mock('../../views/PredictTransactionsView', () => {
+  const ReactLib = jest.requireActual('react');
+  const { Text, View } = jest.requireActual('react-native');
+
+  return function MockPredictTransactionsView({
+    emptyState,
+    isVisible,
+  }: {
+    emptyState: React.ReactNode;
+    isVisible: boolean;
+  }) {
+    return ReactLib.createElement(
+      View,
+      {
+        testID: 'mock-predict-transactions-view',
+      },
+      ReactLib.createElement(Text, null, `visible:${isVisible}`),
+      emptyState,
+    );
+  };
+});
+
+jest.mock('../PredictPositionsEmpty', () => {
+  const ReactLib = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const { PredictPositionsEmptySelectorsIDs: testIds } = jest.requireActual(
+    '../../Predict.testIds',
+  );
+
+  return function MockPredictPositionsEmpty() {
+    return ReactLib.createElement(View, { testID: testIds.CONTAINER });
+  };
+});
+
+describe('PredictPositionsHistoryList', () => {
+  it('wraps the transactions view with the shared empty state', () => {
+    render(<PredictPositionsHistoryList isVisible />);
+
+    expect(
+      screen.getByTestId(PredictPositionsHistoryListSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId('mock-predict-transactions-view'),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('passes the visible state to transaction history', () => {
+    render(<PredictPositionsHistoryList isVisible={false} />);
+
+    expect(screen.getByText('visible:false')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Predict/components/PredictPositionsHistoryList/PredictPositionsHistoryList.tsx b/app/components/UI/Predict/components/PredictPositionsHistoryList/PredictPositionsHistoryList.tsx
new file mode 100644
index 000000000000..2ce16b553251
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsHistoryList/PredictPositionsHistoryList.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Box } from '@metamask/design-system-react-native';
+import { PredictPositionsHistoryListSelectorsIDs } from '../../Predict.testIds';
+import PredictTransactionsView from '../../views/PredictTransactionsView';
+import PredictPositionsEmpty from '../PredictPositionsEmpty';
+
+interface PredictPositionsHistoryListProps {
+  isVisible: boolean;
+}
+
+const PredictPositionsHistoryList = ({
+  isVisible,
+}: PredictPositionsHistoryListProps) => (
+  <Box
+    twClassName="flex-1"
+    testID={PredictPositionsHistoryListSelectorsIDs.CONTAINER}
+  >
+    <PredictTransactionsView
+      emptyState={<PredictPositionsEmpty />}
+      isVisible={isVisible}
+      containerStyle="p-0"
+      activityContainerStyle="px-0"
+    />
+  </Box>
+);
+
+export default PredictPositionsHistoryList;
diff --git a/app/components/UI/Predict/components/PredictPositionsHistoryList/index.ts b/app/components/UI/Predict/components/PredictPositionsHistoryList/index.ts
new file mode 100644
index 000000000000..f2c06b4befa4
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsHistoryList/index.ts
@@ -0,0 +1 @@
+export { default } from './PredictPositionsHistoryList';
diff --git a/app/components/UI/Predict/components/PredictPositionsList/PredictPositionsList.test.tsx b/app/components/UI/Predict/components/PredictPositionsList/PredictPositionsList.test.tsx
new file mode 100644
index 000000000000..f9d9c68cf32b
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsList/PredictPositionsList.test.tsx
@@ -0,0 +1,277 @@
+import { useNavigation } from '@react-navigation/native';
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import Routes from '../../../../../constants/navigation/Routes';
+import { PredictEventValues } from '../../constants/eventNames';
+import type { PredictPortfolioModel } from '../../hooks/usePredictPortfolio';
+import {
+  PredictPositionsEmptySelectorsIDs,
+  PredictPositionsListSelectorsIDs,
+} from '../../Predict.testIds';
+import { PredictPosition, PredictPositionStatus } from '../../types';
+import PredictPositionsList from './PredictPositionsList';
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: jest.fn(),
+}));
+
+jest.mock('../PredictPositionsEmpty', () => {
+  const ReactLib = jest.requireActual('react');
+  const { View } = jest.requireActual('react-native');
+  const { PredictPositionsEmptySelectorsIDs: testIds } = jest.requireActual(
+    '../../Predict.testIds',
+  );
+
+  return function MockPredictPositionsEmpty() {
+    return ReactLib.createElement(View, { testID: testIds.CONTAINER });
+  };
+});
+
+jest.mock('../PredictPosition/PredictPosition', () => {
+  const ReactLib = jest.requireActual('react');
+  const { Pressable, Text } = jest.requireActual('react-native');
+
+  return function MockPredictPosition({
+    onPress,
+    position,
+    privacyMode,
+  }: {
+    onPress?: (position: { id: string }) => void;
+    position: { id: string; title: string };
+    privacyMode: boolean;
+  }) {
+    return ReactLib.createElement(
+      Pressable,
+      {
+        accessibilityLabel: `open-${position.id}`,
+        onPress: () => onPress?.(position),
+        testID: 'mock-position-card',
+      },
+      ReactLib.createElement(
+        Text,
+        null,
+        `open:${position.title}:${privacyMode ? 'private' : 'public'}`,
+      ),
+    );
+  };
+});
+
+const mockNavigation = {
+  navigate: jest.fn(),
+};
+
+const mockUseNavigation = useNavigation as jest.Mock;
+
+const createPosition = (
+  id: string,
+  overrides: Partial<PredictPosition> = {},
+): PredictPosition => ({
+  amount: 10,
+  avgPrice: 1,
+  cashPnl: 0,
+  claimable: false,
+  currentValue: 100,
+  endDate: '2026-01-01T00:00:00Z',
+  icon: 'https://example.com/icon.png',
+  id,
+  initialValue: 100,
+  marketId: `market-${id}`,
+  outcome: 'Yes',
+  outcomeId: `outcome-${id}`,
+  outcomeIndex: 0,
+  outcomeTokenId: `token-${id}`,
+  percentPnl: 0,
+  price: 1,
+  providerId: 'provider',
+  size: 10,
+  status: PredictPositionStatus.OPEN,
+  title: `Market ${id}`,
+  ...overrides,
+});
+
+const mockClaim = jest.fn();
+const createPortfolio = (
+  overrides: Partial<PredictPortfolioModel> = {},
+): PredictPortfolioModel => ({
+  accountStateError: null,
+  actionableClaimablePositions: [],
+  activePositions: [],
+  availableBalance: 0,
+  balanceError: null,
+  claim: mockClaim,
+  claimableAmount: 0,
+  claimablePositionCount: 0,
+  claimablePositions: [],
+  claimablePositionsError: null,
+  deposit: jest.fn(),
+  error: null,
+  hasClaimableWinnings: false,
+  isBalanceLoading: false,
+  isClaimPending: false,
+  isDepositPending: false,
+  isLoading: false,
+  isOpenPositionsLoading: false,
+  isPositionsLoading: false,
+  isRefreshing: false,
+  openPositionCount: 0,
+  openPositions: [],
+  openPositionsError: null,
+  openPositionsValue: 0,
+  portfolioValue: 0,
+  positionsBadgeCount: 0,
+  refetch: jest.fn(),
+  showPnlLine: false,
+  showUnrealizedPnl: false,
+  totalUnrealizedPnlAmount: 0,
+  totalUnrealizedPnlPercent: undefined,
+  walletType: undefined,
+  withdraw: jest.fn(),
+  withdrawTransaction: null,
+  ...overrides,
+});
+
+const renderList = ({
+  isPrivacyMode = false,
+  portfolio = createPortfolio(),
+}: {
+  isPrivacyMode?: boolean;
+  portfolio?: PredictPortfolioModel;
+} = {}) =>
+  render(
+    <PredictPositionsList
+      isPrivacyMode={isPrivacyMode}
+      portfolio={portfolio}
+    />,
+  );
+
+describe('PredictPositionsList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseNavigation.mockReturnValue(mockNavigation);
+  });
+
+  it('renders only open positions', () => {
+    const wonPosition = createPosition('won', {
+      claimable: true,
+      status: PredictPositionStatus.WON,
+      title: 'Won position',
+    });
+    const lostPosition = createPosition('lost', {
+      status: PredictPositionStatus.LOST,
+      title: 'Lost position',
+    });
+    const redeemablePosition = createPosition('redeemable', {
+      status: PredictPositionStatus.REDEEMABLE,
+      title: 'Redeemable position',
+    });
+    const openPosition = createPosition('open', {
+      title: 'Open position',
+    });
+
+    renderList({
+      portfolio: createPortfolio({
+        actionableClaimablePositions: [wonPosition],
+        openPositions: [
+          wonPosition,
+          lostPosition,
+          redeemablePosition,
+          openPosition,
+        ],
+      }),
+    });
+
+    expect(
+      screen.getByTestId(PredictPositionsListSelectorsIDs.OPEN_POSITIONS_LIST),
+    ).toBeOnTheScreen();
+
+    const cards = screen.getAllByTestId('mock-position-card');
+    expect(cards).toHaveLength(1);
+    expect(cards[0]).toHaveProp('accessibilityLabel', 'open-open');
+    expect(screen.queryByText('open:Won position:public')).toBeNull();
+    expect(screen.queryByText('open:Lost position:public')).toBeNull();
+    expect(screen.queryByText('open:Redeemable position:public')).toBeNull();
+  });
+
+  it('navigates to market details when a position is pressed', () => {
+    const openPosition = createPosition('open', {
+      marketId: 'market-open',
+    });
+
+    renderList({
+      portfolio: createPortfolio({
+        openPositions: [openPosition],
+      }),
+    });
+
+    fireEvent.press(screen.getByLabelText('open-open'));
+
+    expect(mockNavigation.navigate).toHaveBeenCalledWith(
+      Routes.PREDICT.MARKET_DETAILS,
+      {
+        entryPoint: PredictEventValues.ENTRY_POINT.HOMEPAGE_POSITIONS,
+        marketId: 'market-open',
+      },
+    );
+  });
+
+  it('renders the shared empty state when there are no positions', () => {
+    renderList();
+
+    expect(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      screen.queryByTestId(PredictPositionsListSelectorsIDs.CONTAINER),
+    ).toBeNull();
+  });
+
+  it('renders a loading state while positions are loading without cached positions', () => {
+    renderList({
+      portfolio: createPortfolio({
+        isOpenPositionsLoading: true,
+      }),
+    });
+
+    expect(
+      screen.getByTestId(PredictPositionsListSelectorsIDs.LOADING_STATE),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getAllByTestId(PredictPositionsListSelectorsIDs.SKELETON_ROW),
+    ).toHaveLength(3);
+    expect(
+      screen.queryByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeNull();
+  });
+
+  it('renders the empty state when only claimable positions are loading', () => {
+    renderList({
+      portfolio: createPortfolio({
+        isPositionsLoading: true,
+        isOpenPositionsLoading: false,
+      }),
+    });
+
+    expect(
+      screen.queryByTestId(PredictPositionsListSelectorsIDs.LOADING_STATE),
+    ).toBeNull();
+    expect(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+  });
+
+  it('passes privacy mode to rendered position rows', () => {
+    renderList({
+      isPrivacyMode: true,
+      portfolio: createPortfolio({
+        openPositions: [
+          createPosition('open', {
+            title: 'Open position',
+          }),
+        ],
+      }),
+    });
+
+    expect(screen.getByText('open:Open position:private')).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Predict/components/PredictPositionsList/PredictPositionsList.tsx b/app/components/UI/Predict/components/PredictPositionsList/PredictPositionsList.tsx
new file mode 100644
index 000000000000..b3c493c40597
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsList/PredictPositionsList.tsx
@@ -0,0 +1,103 @@
+import { type NavigationProp, useNavigation } from '@react-navigation/native';
+import React, { useCallback } from 'react';
+import { ScrollView } from 'react-native';
+import { Box } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
+import Routes from '../../../../../constants/navigation/Routes';
+import { PredictEventValues } from '../../constants/eventNames';
+import type { PredictPortfolioModel } from '../../hooks/usePredictPortfolio';
+import { PredictPositionsListSelectorsIDs } from '../../Predict.testIds';
+import { PredictPositionStatus, type PredictPosition } from '../../types';
+import type { PredictNavigationParamList } from '../../types/navigation';
+import PredictPositionItem from '../PredictPosition/PredictPosition';
+import PredictPositionsEmpty from '../PredictPositionsEmpty';
+
+const SKELETON_ROW_COUNT = 3;
+
+interface PredictPositionsListProps {
+  isPrivacyMode: boolean;
+  portfolio: PredictPortfolioModel;
+}
+
+const PredictPositionsListSkeleton = () => {
+  const tw = useTailwind();
+
+  return (
+    <Box
+      testID={PredictPositionsListSelectorsIDs.LOADING_STATE}
+      twClassName="gap-3 py-4"
+    >
+      {Array.from({ length: SKELETON_ROW_COUNT }, (_, index) => (
+        <Box
+          key={index}
+          testID={PredictPositionsListSelectorsIDs.SKELETON_ROW}
+          twClassName="flex-row items-start gap-4 py-2"
+        >
+          <Skeleton width={40} height={40} style={tw.style('rounded-full')} />
+          <Box twClassName="flex-1 gap-2">
+            <Skeleton width="100%" height={18} style={tw.style('rounded-md')} />
+            <Skeleton width="70%" height={16} style={tw.style('rounded-md')} />
+          </Box>
+          <Box twClassName="items-end gap-2">
+            <Skeleton width={64} height={18} style={tw.style('rounded-md')} />
+            <Skeleton width={48} height={16} style={tw.style('rounded-md')} />
+          </Box>
+        </Box>
+      ))}
+    </Box>
+  );
+};
+
+const PredictPositionsList = ({
+  isPrivacyMode,
+  portfolio,
+}: PredictPositionsListProps) => {
+  const navigation =
+    useNavigation<NavigationProp<PredictNavigationParamList>>();
+  const tw = useTailwind();
+  const openPositions = portfolio.openPositions.filter(
+    (position) => position.status === PredictPositionStatus.OPEN,
+  );
+  const hasPositions = openPositions.length > 0;
+
+  const handlePositionPress = useCallback(
+    (position: PredictPosition) => {
+      navigation.navigate(Routes.PREDICT.MARKET_DETAILS, {
+        marketId: position.marketId,
+        entryPoint: PredictEventValues.ENTRY_POINT.HOMEPAGE_POSITIONS,
+      });
+    },
+    [navigation],
+  );
+
+  if (portfolio.isOpenPositionsLoading && !hasPositions) {
+    return <PredictPositionsListSkeleton />;
+  }
+
+  if (!hasPositions) {
+    return <PredictPositionsEmpty />;
+  }
+
+  return (
+    <ScrollView
+      contentContainerStyle={tw.style('pb-8 pt-3')}
+      showsVerticalScrollIndicator={false}
+      style={tw.style('flex-1')}
+      testID={PredictPositionsListSelectorsIDs.CONTAINER}
+    >
+      <Box testID={PredictPositionsListSelectorsIDs.OPEN_POSITIONS_LIST}>
+        {openPositions.map((position) => (
+          <PredictPositionItem
+            key={`${position.outcomeId}:${position.outcomeIndex}`}
+            position={position}
+            onPress={handlePositionPress}
+            privacyMode={isPrivacyMode}
+          />
+        ))}
+      </Box>
+    </ScrollView>
+  );
+};
+
+export default PredictPositionsList;
diff --git a/app/components/UI/Predict/components/PredictPositionsList/index.ts b/app/components/UI/Predict/components/PredictPositionsList/index.ts
new file mode 100644
index 000000000000..9e5c8a64465d
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsList/index.ts
@@ -0,0 +1 @@
+export { default } from './PredictPositionsList';
diff --git a/app/components/UI/Predict/components/PredictPositionsViewHeader/PredictPositionsViewHeader.test.tsx b/app/components/UI/Predict/components/PredictPositionsViewHeader/PredictPositionsViewHeader.test.tsx
new file mode 100644
index 000000000000..a33272006f77
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsViewHeader/PredictPositionsViewHeader.test.tsx
@@ -0,0 +1,231 @@
+import React from 'react';
+import {
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react-native';
+import { useNavigation } from '@react-navigation/native';
+import { PredictEventValues } from '../../constants/eventNames';
+import type { PredictPortfolioModel } from '../../hooks/usePredictPortfolio';
+import { PredictPositionsViewSelectorsIDs } from '../../Predict.testIds';
+import PredictPositionsViewHeader from './PredictPositionsViewHeader';
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: jest.fn(),
+}));
+
+const mockExecuteGuardedAction = jest.fn();
+jest.mock('../../hooks/usePredictActionGuard', () => ({
+  usePredictActionGuard: () => ({
+    executeGuardedAction: mockExecuteGuardedAction,
+  }),
+}));
+
+const mockNavigation = {
+  navigate: jest.fn(),
+};
+
+const mockUseNavigation = useNavigation as jest.Mock;
+const mockClaim = jest.fn();
+
+const createPortfolio = (
+  overrides: Partial<PredictPortfolioModel> = {},
+): PredictPortfolioModel => ({
+  accountStateError: null,
+  actionableClaimablePositions: [],
+  activePositions: [],
+  availableBalance: 0,
+  balanceError: null,
+  claim: mockClaim,
+  claimableAmount: 0,
+  claimablePositionCount: 0,
+  claimablePositions: [],
+  claimablePositionsError: null,
+  deposit: jest.fn(),
+  error: null,
+  hasClaimableWinnings: false,
+  isBalanceLoading: false,
+  isClaimPending: false,
+  isDepositPending: false,
+  isLoading: false,
+  isOpenPositionsLoading: false,
+  isPositionsLoading: false,
+  isRefreshing: false,
+  openPositionCount: 0,
+  openPositions: [],
+  openPositionsError: null,
+  openPositionsValue: 0,
+  portfolioValue: 0,
+  positionsBadgeCount: 0,
+  refetch: jest.fn(),
+  showPnlLine: false,
+  showUnrealizedPnl: false,
+  totalUnrealizedPnlAmount: 0,
+  totalUnrealizedPnlPercent: undefined,
+  walletType: undefined,
+  withdraw: jest.fn(),
+  withdrawTransaction: null,
+  ...overrides,
+});
+
+const renderHeader = ({
+  isPrivacyMode = false,
+  portfolio = createPortfolio(),
+}: {
+  isPrivacyMode?: boolean;
+  portfolio?: PredictPortfolioModel;
+} = {}) =>
+  render(
+    <PredictPositionsViewHeader
+      isPrivacyMode={isPrivacyMode}
+      portfolio={portfolio}
+    />,
+  );
+
+describe('PredictPositionsViewHeader', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseNavigation.mockReturnValue(mockNavigation);
+    mockExecuteGuardedAction.mockImplementation(
+      async (action: () => void | Promise<void>) => {
+        await action();
+      },
+    );
+  });
+
+  it('always renders the available balance row for first-time zero state', () => {
+    renderHeader();
+
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.SUMMARY),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('Available balance')).toBeOnTheScreen();
+    expect(screen.getByText('$0.00')).toBeOnTheScreen();
+    expect(
+      screen.queryByTestId(PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_ROW),
+    ).toBeNull();
+    expect(
+      screen.queryByTestId(PredictPositionsViewSelectorsIDs.CLAIM_CTA),
+    ).toBeNull();
+  });
+
+  it('renders Unrealized P&L when the portfolio model says the line should show', () => {
+    renderHeader({
+      portfolio: createPortfolio({
+        availableBalance: 250,
+        showPnlLine: true,
+        showUnrealizedPnl: true,
+        totalUnrealizedPnlAmount: 46.35,
+        totalUnrealizedPnlPercent: 20.23,
+      }),
+    });
+
+    expect(screen.getByText('$250.00')).toBeOnTheScreen();
+    expect(screen.getByText('Unrealized P&L')).toBeOnTheScreen();
+    expect(screen.getByText('+$46.35 (+20.23%)')).toBeOnTheScreen();
+  });
+
+  it('renders a negative Unrealized P&L value', () => {
+    renderHeader({
+      portfolio: createPortfolio({
+        showPnlLine: true,
+        showUnrealizedPnl: true,
+        totalUnrealizedPnlAmount: -18.47,
+        totalUnrealizedPnlPercent: -2.1,
+      }),
+    });
+
+    expect(screen.getByText('-$18.47 (-2.1%)')).toBeOnTheScreen();
+  });
+
+  it('wraps claim CTA presses in the Predict action guard', async () => {
+    renderHeader({
+      portfolio: createPortfolio({
+        claimableAmount: 46.35,
+        hasClaimableWinnings: true,
+      }),
+    });
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.CLAIM_CTA),
+    );
+
+    expect(screen.getByText('Claim $46.35')).toBeOnTheScreen();
+    await waitFor(() => {
+      expect(mockExecuteGuardedAction).toHaveBeenCalledWith(
+        expect.any(Function),
+        { attemptedAction: PredictEventValues.ATTEMPTED_ACTION.CLAIM },
+      );
+    });
+    expect(mockClaim).toHaveBeenCalledTimes(1);
+  });
+
+  it('supports privacy mode with SensitiveText masking', () => {
+    renderHeader({
+      isPrivacyMode: true,
+      portfolio: createPortfolio({
+        availableBalance: 250,
+        showPnlLine: true,
+        showUnrealizedPnl: true,
+        totalUnrealizedPnlAmount: 46.35,
+        totalUnrealizedPnlPercent: 20.23,
+      }),
+    });
+
+    expect(screen.getByText('•••••••••')).toBeOnTheScreen();
+    expect(screen.getByText('••••••••••••')).toBeOnTheScreen();
+    expect(screen.queryByText('$250.00')).toBeNull();
+    expect(screen.queryByText('+$46.35 (+20.23%)')).toBeNull();
+  });
+
+  it('renders loading skeletons for balance and P&L rows', () => {
+    renderHeader({
+      portfolio: createPortfolio({
+        isBalanceLoading: true,
+        isOpenPositionsLoading: true,
+      }),
+    });
+
+    expect(
+      screen.getByTestId(
+        PredictPositionsViewSelectorsIDs.AVAILABLE_BALANCE_SKELETON,
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(
+        PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_SKELETON,
+      ),
+    ).toBeOnTheScreen();
+  });
+
+  it('does not render a P&L skeleton when only claimable positions are loading', () => {
+    renderHeader({
+      portfolio: createPortfolio({
+        isPositionsLoading: true,
+        isOpenPositionsLoading: false,
+      }),
+    });
+
+    expect(
+      screen.queryByTestId(PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_ROW),
+    ).toBeNull();
+    expect(
+      screen.queryByTestId(
+        PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_SKELETON,
+      ),
+    ).toBeNull();
+  });
+
+  it('renders fallback text for balance and P&L errors', () => {
+    renderHeader({
+      portfolio: createPortfolio({
+        balanceError: new Error('Balance failed'),
+        openPositionsError: new Error('Positions failed'),
+      }),
+    });
+
+    expect(screen.getAllByText('Unable to load')).toHaveLength(2);
+  });
+});
diff --git a/app/components/UI/Predict/components/PredictPositionsViewHeader/PredictPositionsViewHeader.tsx b/app/components/UI/Predict/components/PredictPositionsViewHeader/PredictPositionsViewHeader.tsx
new file mode 100644
index 000000000000..ac004b178c9b
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsViewHeader/PredictPositionsViewHeader.tsx
@@ -0,0 +1,189 @@
+import { type NavigationProp, useNavigation } from '@react-navigation/native';
+import React, { useCallback, useMemo } from 'react';
+import {
+  Box,
+  FontWeight,
+  SensitiveText,
+  SensitiveTextLength,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
+import { strings } from '../../../../../../locales/i18n';
+import { Skeleton } from '../../../../../component-library/components-temp/Skeleton';
+import { PredictEventValues } from '../../constants/eventNames';
+import { usePredictActionGuard } from '../../hooks/usePredictActionGuard';
+import type { PredictPortfolioModel } from '../../hooks/usePredictPortfolio';
+import { PredictPositionsViewSelectorsIDs } from '../../Predict.testIds';
+import type { PredictNavigationParamList } from '../../types/navigation';
+import {
+  formatPredictUnrealizedPnLStringParts,
+  formatPrice,
+} from '../../utils/format';
+import PredictClaimButton from '../PredictActionButtons/PredictClaimButton';
+
+interface PredictPositionsViewHeaderProps {
+  isPrivacyMode: boolean;
+  portfolio: PredictPortfolioModel;
+}
+
+const formatUnrealizedPnl = (amount: number, percent: number | undefined) => {
+  const parts = formatPredictUnrealizedPnLStringParts({
+    cashUpnl: amount,
+    percentUpnl: percent ?? 0,
+  });
+
+  if (percent === undefined) {
+    return parts.amount;
+  }
+
+  return strings('predict.unrealized_pnl_value', {
+    amount: parts.amount,
+    percent: parts.percent,
+  });
+};
+
+const PredictPositionsViewHeader = ({
+  isPrivacyMode,
+  portfolio,
+}: PredictPositionsViewHeaderProps) => {
+  const navigation =
+    useNavigation<NavigationProp<PredictNavigationParamList>>();
+  const tw = useTailwind();
+  const { claim } = portfolio;
+  const { executeGuardedAction } = usePredictActionGuard({ navigation });
+  const showUnrealizedPnlRow =
+    portfolio.showPnlLine ||
+    portfolio.isOpenPositionsLoading ||
+    Boolean(portfolio.openPositionsError);
+  const unrealizedPnlColor =
+    portfolio.totalUnrealizedPnlAmount >= 0
+      ? TextColor.SuccessDefault
+      : TextColor.ErrorDefault;
+  const unrealizedPnlValue = useMemo(
+    () =>
+      formatUnrealizedPnl(
+        portfolio.totalUnrealizedPnlAmount,
+        portfolio.totalUnrealizedPnlPercent,
+      ),
+    [portfolio.totalUnrealizedPnlAmount, portfolio.totalUnrealizedPnlPercent],
+  );
+
+  const handleClaimPress = useCallback(async () => {
+    await executeGuardedAction(
+      async () => {
+        await claim();
+      },
+      { attemptedAction: PredictEventValues.ATTEMPTED_ACTION.CLAIM },
+    );
+  }, [claim, executeGuardedAction]);
+
+  return (
+    <Box
+      twClassName="gap-3 py-4"
+      testID={PredictPositionsViewSelectorsIDs.SUMMARY}
+    >
+      <Box
+        style={tw.style('bg-muted rounded-xl', !showUnrealizedPnlRow && 'pb-0')}
+        testID={PredictPositionsViewSelectorsIDs.SUMMARY_CARD}
+      >
+        <Box twClassName="flex-row items-center justify-between px-4 py-3">
+          <Text
+            variant={TextVariant.BodyMd}
+            color={TextColor.TextAlternative}
+            testID={PredictPositionsViewSelectorsIDs.AVAILABLE_BALANCE_LABEL}
+          >
+            {strings('predict.available_balance')}
+          </Text>
+          {portfolio.isBalanceLoading ? (
+            <Skeleton
+              width={80}
+              height={20}
+              style={tw.style('rounded-md')}
+              testID={
+                PredictPositionsViewSelectorsIDs.AVAILABLE_BALANCE_SKELETON
+              }
+            />
+          ) : portfolio.balanceError ? (
+            <Text variant={TextVariant.BodyMd} color={TextColor.ErrorDefault}>
+              {strings('predict.unrealized_pnl_error')}
+            </Text>
+          ) : (
+            <SensitiveText
+              variant={TextVariant.BodyMd}
+              fontWeight={FontWeight.Medium}
+              color={TextColor.TextDefault}
+              isHidden={isPrivacyMode}
+              length={SensitiveTextLength.Medium}
+              testID={PredictPositionsViewSelectorsIDs.AVAILABLE_BALANCE_VALUE}
+            >
+              {formatPrice(portfolio.availableBalance, {
+                minimumDecimals: 2,
+                maximumDecimals: 2,
+              })}
+            </SensitiveText>
+          )}
+        </Box>
+
+        {showUnrealizedPnlRow && (
+          <>
+            <Box twClassName="h-px bg-default" />
+            <Box
+              twClassName="flex-row items-center justify-between px-4 py-3"
+              testID={PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_ROW}
+            >
+              <Text
+                variant={TextVariant.BodyMd}
+                color={TextColor.TextAlternative}
+                testID={PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_LABEL}
+              >
+                {strings('predict.unrealized_pnl_label')}
+              </Text>
+              {portfolio.isOpenPositionsLoading ? (
+                <Skeleton
+                  width={120}
+                  height={20}
+                  style={tw.style('rounded-md')}
+                  testID={
+                    PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_SKELETON
+                  }
+                />
+              ) : portfolio.openPositionsError ? (
+                <Text
+                  variant={TextVariant.BodyMd}
+                  color={TextColor.ErrorDefault}
+                >
+                  {strings('predict.unrealized_pnl_error')}
+                </Text>
+              ) : (
+                <SensitiveText
+                  variant={TextVariant.BodyMd}
+                  fontWeight={FontWeight.Medium}
+                  color={unrealizedPnlColor}
+                  isHidden={isPrivacyMode}
+                  length={SensitiveTextLength.Long}
+                  testID={PredictPositionsViewSelectorsIDs.UNREALIZED_PNL_VALUE}
+                >
+                  {unrealizedPnlValue}
+                </SensitiveText>
+              )}
+            </Box>
+          </>
+        )}
+      </Box>
+
+      {portfolio.hasClaimableWinnings && (
+        <PredictClaimButton
+          amount={portfolio.claimableAmount}
+          onPress={handleClaimPress}
+          isLoading={portfolio.isClaimPending}
+          isHidden={isPrivacyMode}
+          testID={PredictPositionsViewSelectorsIDs.CLAIM_CTA}
+        />
+      )}
+    </Box>
+  );
+};
+
+export default PredictPositionsViewHeader;
diff --git a/app/components/UI/Predict/components/PredictPositionsViewHeader/index.ts b/app/components/UI/Predict/components/PredictPositionsViewHeader/index.ts
new file mode 100644
index 000000000000..b7e83a9fc4ea
--- /dev/null
+++ b/app/components/UI/Predict/components/PredictPositionsViewHeader/index.ts
@@ -0,0 +1 @@
+export { default } from './PredictPositionsViewHeader';
diff --git a/app/components/UI/Predict/controllers/PredictController.test.ts b/app/components/UI/Predict/controllers/PredictController.test.ts
index 4f10afde7574..8b9af13a7e27 100644
--- a/app/components/UI/Predict/controllers/PredictController.test.ts
+++ b/app/components/UI/Predict/controllers/PredictController.test.ts
@@ -4492,6 +4492,39 @@ describe('PredictController', () => {
     });
   });
 
+  describe('clearPendingClaim', () => {
+    it('clears pending claim from state', () => {
+      withController(({ controller }) => {
+        const address = '0x1234567890123456789012345678901234567890';
+
+        controller.updateStateForTesting((state) => {
+          state.pendingClaims = {
+            [address]: 'batch-id-123',
+          };
+        });
+
+        expect(controller.state.pendingClaims[address]).toBe('batch-id-123');
+
+        controller.clearPendingClaim();
+
+        expect(controller.state.pendingClaims[address]).toBe(undefined);
+      });
+    });
+
+    it('handles clearing empty pending claim state', () => {
+      withController(({ controller }) => {
+        controller.updateStateForTesting((state) => {
+          state.pendingClaims = {};
+        });
+
+        expect(() => controller.clearPendingClaim()).not.toThrow();
+
+        const address = '0x1234567890123456789012345678901234567890';
+        expect(controller.state.pendingClaims[address]).toBe(undefined);
+      });
+    });
+  });
+
   describe('deposit transaction event handlers', () => {
     // Deposit transaction status updates are now handled by usePredictDepositToasts hook
     // rather than the controller's event handlers
diff --git a/app/components/UI/Predict/controllers/PredictController.ts b/app/components/UI/Predict/controllers/PredictController.ts
index 27c96b6fbf7a..02339a28ff99 100644
--- a/app/components/UI/Predict/controllers/PredictController.ts
+++ b/app/components/UI/Predict/controllers/PredictController.ts
@@ -2209,6 +2209,11 @@ export class PredictController extends BaseController<
     this.clearPendingDepositForAddress({ address: selectedAddress });
   }
 
+  public clearPendingClaim(): void {
+    const selectedAddress = this.getSigner().address;
+    this.clearPendingClaimForAddress({ address: selectedAddress });
+  }
+
   private clearPendingDepositForAddress({
     address,
   }: {
diff --git a/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts b/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts
index 4f2b2b81e73a..94e39224f843 100644
--- a/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictPortfolio.test.ts
@@ -308,6 +308,24 @@ describe('usePredictPortfolio', () => {
     const { result } = renderHook(() => usePredictPortfolio());
 
     expect(result.current.isLoading).toBe(true);
+    expect(result.current.isOpenPositionsLoading).toBe(true);
+    expect(result.current.isPositionsLoading).toBe(true);
+  });
+
+  it('keeps open-position loading separate from claimable-position loading', () => {
+    mockUsePredictPositions.mockImplementation(
+      ({ claimable }: { claimable?: boolean }) =>
+        createQuery<PredictPosition[]>({
+          data: [],
+          isLoading: Boolean(claimable),
+        }),
+    );
+
+    const { result } = renderHook(() => usePredictPortfolio());
+
+    expect(result.current.isLoading).toBe(true);
+    expect(result.current.isOpenPositionsLoading).toBe(false);
+    expect(result.current.isPositionsLoading).toBe(true);
   });
 
   it('aggregates loading, error, and refetch state', async () => {
diff --git a/app/components/UI/Predict/hooks/usePredictPortfolio.ts b/app/components/UI/Predict/hooks/usePredictPortfolio.ts
index 11335448e227..def4f4336d7a 100644
--- a/app/components/UI/Predict/hooks/usePredictPortfolio.ts
+++ b/app/components/UI/Predict/hooks/usePredictPortfolio.ts
@@ -35,6 +35,7 @@ export interface PredictPortfolioModel {
   isClaimPending: boolean;
   isDepositPending: boolean;
   isLoading: boolean;
+  isOpenPositionsLoading: boolean;
   isPositionsLoading: boolean;
   isRefreshing: boolean;
   openPositionCount: number;
@@ -143,8 +144,9 @@ export function usePredictPortfolio(): PredictPortfolioModel {
   const openPositionCount = openPositions.length;
   const claimablePositionCount = actionableClaimablePositions.length;
   const positionsBadgeCount = openPositionCount + claimablePositionCount;
+  const isOpenPositionsLoading = activePositionsQuery.isLoading;
   const isPositionsLoading =
-    activePositionsQuery.isLoading || claimablePositionsQuery.isLoading;
+    isOpenPositionsLoading || claimablePositionsQuery.isLoading;
   const showUnrealizedPnl =
     Math.abs(totalUnrealizedPnlAmount) >= PNL_DISPLAY_THRESHOLD;
 
@@ -184,6 +186,7 @@ export function usePredictPortfolio(): PredictPortfolioModel {
     isClaimPending,
     isDepositPending,
     isLoading: isBalanceLoading || isPositionsLoading,
+    isOpenPositionsLoading,
     isPositionsLoading,
     isRefreshing:
       isBalanceRefetching ||
diff --git a/app/components/UI/Predict/routes/index.test.tsx b/app/components/UI/Predict/routes/index.test.tsx
index 749c0d8d6d3a..c40d7e422542 100644
--- a/app/components/UI/Predict/routes/index.test.tsx
+++ b/app/components/UI/Predict/routes/index.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, act } from '@testing-library/react-native';
+import { render, screen, act, waitFor } from '@testing-library/react-native';
 import {
   NavigationContainer,
   NavigationContainerRef,
@@ -8,19 +8,25 @@ import Routes from '../../../../constants/navigation/Routes';
 import PredictScreenStack, { PredictModalStack } from './index';
 
 let mockPayWithAnyTokenEnabled = false;
+let mockPredictPortfolioEnabled = true;
 
 const mockSelectPredictWithAnyTokenEnabledFlag = jest.fn(
   () => mockPayWithAnyTokenEnabled,
 );
+const mockSelectPredictPortfolioEnabledFlag = jest.fn(
+  () => mockPredictPortfolioEnabled,
+);
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(() => mockPayWithAnyTokenEnabled),
+  useSelector: jest.fn((selector: (state: unknown) => unknown) => selector({})),
 }));
 
 jest.mock('../selectors/featureFlags', () => ({
   selectPredictWithAnyTokenEnabledFlag: () =>
     mockSelectPredictWithAnyTokenEnabledFlag(),
+  selectPredictPortfolioEnabledFlag: () =>
+    mockSelectPredictPortfolioEnabledFlag(),
 }));
 
 jest.mock('../contexts', () => {
@@ -53,6 +59,11 @@ jest.mock('../views/PredictMarketDetails', () => {
   return () => <View testID="predict-market-details" />;
 });
 
+jest.mock('../views/PredictPositionsView', () => {
+  const { View } = jest.requireActual('react-native');
+  return () => <View testID="predict-positions-view" />;
+});
+
 jest.mock('../views/PredictBuyPreview/PredictBuyPreview', () => {
   const { View } = jest.requireActual('react-native');
   return () => <View testID="predict-buy-preview" />;
@@ -123,6 +134,7 @@ describe('PredictScreenStack', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockPayWithAnyTokenEnabled = false;
+    mockPredictPortfolioEnabled = true;
     navigationRef = React.createRef();
   });
 
@@ -158,6 +170,33 @@ describe('PredictScreenStack', () => {
     expect(screen.getByTestId('predict-world-cup')).toBeOnTheScreen();
   });
 
+  it('navigates to POSITIONS screen when portfolio flag is enabled', async () => {
+    mockPredictPortfolioEnabled = true;
+    renderWithNavigation(<PredictScreenStack />);
+
+    await act(async () => {
+      navigationRef.current?.navigate(Routes.PREDICT.POSITIONS);
+    });
+
+    expect(screen.getByTestId('predict-positions-view')).toBeOnTheScreen();
+  });
+
+  it('returns to market list when POSITIONS screen is disabled', async () => {
+    mockPredictPortfolioEnabled = false;
+    renderWithNavigation(<PredictScreenStack />);
+
+    await act(async () => {
+      navigationRef.current?.navigate(Routes.PREDICT.POSITIONS);
+    });
+
+    await waitFor(() => {
+      expect(navigationRef.current?.getCurrentRoute()?.name).toBe(
+        Routes.PREDICT.MARKET_LIST,
+      );
+    });
+    expect(screen.queryByTestId('predict-positions-view')).toBeNull();
+  });
+
   it('navigates to BUY_PREVIEW with PredictBuyPreview when payWithAnyToken is off', async () => {
     mockPayWithAnyTokenEnabled = false;
 
diff --git a/app/components/UI/Predict/routes/index.tsx b/app/components/UI/Predict/routes/index.tsx
index ccab9aaaee2e..adc40f402736 100644
--- a/app/components/UI/Predict/routes/index.tsx
+++ b/app/components/UI/Predict/routes/index.tsx
@@ -1,5 +1,6 @@
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import React from 'react';
+import { NavigationProp, useNavigation } from '@react-navigation/native';
+import React, { useEffect } from 'react';
 import { strings } from '../../../../../locales/i18n';
 import Routes from '../../../../constants/navigation/Routes';
 import {
@@ -16,6 +17,7 @@ import PredictActivityDetail from '../components/PredictActivityDetail/PredictAc
 import { PredictNavigationParamList } from '../types/navigation';
 import PredictAddFundsModal from '../views/PredictAddFundsModal/PredictAddFundsModal';
 import PredictFeed from '../views/PredictFeed';
+import PredictPositionsView from '../views/PredictPositionsView';
 import PredictWorldCup from '../views/PredictWorldCup';
 import PredictGTMModal from '../components/PredictGTMModal';
 import { useSelector } from 'react-redux';
@@ -23,11 +25,41 @@ import { PredictPreviewSheetProvider } from '../contexts';
 import PredictBuyPreview from '../views/PredictBuyPreview/PredictBuyPreview';
 import PredictBuyWithAnyToken from '../views/PredictBuyWithAnyToken';
 import PredictSellPreview from '../views/PredictSellPreview/PredictSellPreview';
-import { selectPredictWithAnyTokenEnabledFlag } from '../selectors/featureFlags';
+import {
+  selectPredictPortfolioEnabledFlag,
+  selectPredictWithAnyTokenEnabledFlag,
+} from '../selectors/featureFlags';
 
 const Stack = createNativeStackNavigator<PredictNavigationParamList>();
 const ModalStack = createNativeStackNavigator<PredictNavigationParamList>();
 
+const PredictPositionsRoute = () => {
+  const navigation =
+    useNavigation<NavigationProp<PredictNavigationParamList>>();
+  const predictPortfolioEnabled = useSelector(
+    selectPredictPortfolioEnabledFlag,
+  );
+
+  useEffect(() => {
+    if (predictPortfolioEnabled) {
+      return;
+    }
+
+    if (navigation.canGoBack()) {
+      navigation.goBack();
+      return;
+    }
+
+    navigation.navigate(Routes.PREDICT.MARKET_LIST);
+  }, [navigation, predictPortfolioEnabled]);
+
+  if (!predictPortfolioEnabled) {
+    return null;
+  }
+
+  return <PredictPositionsView />;
+};
+
 const PredictModalStack = () => {
   const emptyNavHeaderOptions = useEmptyNavHeaderForConfirmations();
 
@@ -97,6 +129,11 @@ const PredictScreenStack = () => {
           component={PredictWorldCup}
         />
 
+        <Stack.Screen
+          name={Routes.PREDICT.POSITIONS}
+          component={PredictPositionsRoute}
+        />
+
         <Stack.Screen
           name={Routes.PREDICT.MODALS.BUY_PREVIEW}
           component={BuyPreviewComponent}
diff --git a/app/components/UI/Predict/types/navigation.ts b/app/components/UI/Predict/types/navigation.ts
index 0cc4a0ae7392..a45b14dcdd86 100644
--- a/app/components/UI/Predict/types/navigation.ts
+++ b/app/components/UI/Predict/types/navigation.ts
@@ -66,6 +66,13 @@ export interface PredictActivityDetailParams {
   activity: PredictActivityItem;
 }
 
+export type PredictPositionsTabKey = 'positions' | 'history';
+
+/** Predict Positions screen parameters */
+export interface PredictPositionsParams {
+  initialTab?: PredictPositionsTabKey;
+}
+
 /** Predict add funds modal parameters */
 export interface PredictAddFundsModalParams {
   /** When true, deposit() is called immediately on mount — skipping the explanation UI. */
@@ -122,6 +129,7 @@ export interface PredictNavigationParamList extends ParamListBase {
   Predict: undefined;
   PredictMarketList: PredictMarketListParams;
   PredictMarketDetails: PredictMarketDetailsParams;
+  PredictPositions: PredictPositionsParams | undefined;
   PredictWorldCup: PredictWorldCupParams | undefined;
   PredictSellPreview: PredictSellPreviewParams;
   PredictBuyPreview: PredictBuyPreviewParams;
diff --git a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx
new file mode 100644
index 000000000000..c3d81060ec1e
--- /dev/null
+++ b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.test.tsx
@@ -0,0 +1,240 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import Routes from '../../../../../constants/navigation/Routes';
+import type { PredictPortfolioModel } from '../../hooks/usePredictPortfolio';
+import {
+  PredictPositionsEmptySelectorsIDs,
+  PredictPositionsHistoryListSelectorsIDs,
+  PredictPositionsViewSelectorsIDs,
+} from '../../Predict.testIds';
+import PredictPositionsView from './PredictPositionsView';
+
+jest.mock('react-native-reanimated', () => {
+  const Reanimated = jest.requireActual('react-native-reanimated/mock');
+  Reanimated.default.createAnimatedComponent = (
+    Component: React.ComponentType,
+  ) => Component;
+  return Reanimated;
+});
+
+jest.mock('@react-navigation/native', () => ({
+  ...jest.requireActual('@react-navigation/native'),
+  useNavigation: jest.fn(),
+  useRoute: jest.fn(),
+}));
+
+const mockUsePredictPortfolio = jest.fn();
+jest.mock('../../hooks/usePredictPortfolio', () => ({
+  usePredictPortfolio: () => mockUsePredictPortfolio(),
+}));
+
+jest.mock('../../hooks/usePredictActionGuard', () => ({
+  usePredictActionGuard: () => ({
+    executeGuardedAction: (action: () => void | Promise<void>) => action(),
+  }),
+}));
+
+jest.mock('../../components/PredictPositionsHistoryList', () => {
+  const ReactLib = jest.requireActual('react');
+  const { Text, View } = jest.requireActual('react-native');
+  const { PredictPositionsHistoryListSelectorsIDs: testIds } =
+    jest.requireActual('../../Predict.testIds');
+
+  return function MockPredictPositionsHistoryList({
+    isVisible,
+  }: {
+    isVisible: boolean;
+  }) {
+    return ReactLib.createElement(
+      View,
+      { testID: testIds.CONTAINER },
+      ReactLib.createElement(Text, null, `history-visible:${isVisible}`),
+    );
+  };
+});
+
+let mockPrivacyMode = false;
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(() => mockPrivacyMode),
+}));
+
+const mockNavigation = {
+  canGoBack: jest.fn(),
+  goBack: jest.fn(),
+  navigate: jest.fn(),
+};
+
+const mockUseNavigation = useNavigation as jest.Mock;
+const mockUseRoute = useRoute as jest.Mock;
+const mockClaim = jest.fn();
+
+const createPortfolio = (
+  overrides: Partial<PredictPortfolioModel> = {},
+): PredictPortfolioModel => ({
+  accountStateError: null,
+  actionableClaimablePositions: [],
+  activePositions: [],
+  availableBalance: 0,
+  balanceError: null,
+  claim: mockClaim,
+  claimableAmount: 0,
+  claimablePositionCount: 0,
+  claimablePositions: [],
+  claimablePositionsError: null,
+  deposit: jest.fn(),
+  error: null,
+  hasClaimableWinnings: false,
+  isBalanceLoading: false,
+  isClaimPending: false,
+  isDepositPending: false,
+  isLoading: false,
+  isOpenPositionsLoading: false,
+  isPositionsLoading: false,
+  isRefreshing: false,
+  openPositionCount: 0,
+  openPositions: [],
+  openPositionsError: null,
+  openPositionsValue: 0,
+  portfolioValue: 0,
+  positionsBadgeCount: 0,
+  refetch: jest.fn(),
+  showPnlLine: false,
+  showUnrealizedPnl: false,
+  totalUnrealizedPnlAmount: 0,
+  totalUnrealizedPnlPercent: undefined,
+  walletType: undefined,
+  withdraw: jest.fn(),
+  withdrawTransaction: null,
+  ...overrides,
+});
+
+const renderScreen = (initialTab?: 'positions' | 'history') => {
+  mockUseRoute.mockReturnValue({
+    params: initialTab ? { initialTab } : undefined,
+  });
+
+  return render(<PredictPositionsView />);
+};
+
+const getMountedByTestId = (testID: string) =>
+  screen.UNSAFE_getByProps({ testID });
+
+const getMountedHistoryVisibilityText = (isVisible: boolean) =>
+  screen.UNSAFE_getByProps({ children: `history-visible:${isVisible}` });
+
+describe('PredictPositionsView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockPrivacyMode = false;
+    mockNavigation.canGoBack.mockReturnValue(true);
+    mockUseNavigation.mockReturnValue(mockNavigation);
+    mockUsePredictPortfolio.mockReturnValue(createPortfolio());
+  });
+
+  it('renders the fixed header, summary placeholder, tabs, and positions tab by default', () => {
+    renderScreen();
+
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.HEADER),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.SUMMARY),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('$0.00')).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.TABS),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.POSITIONS_TAB),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('Active positions')).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(
+        PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT,
+      ),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(
+      getMountedByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT),
+    ).toBeTruthy();
+    expect(getMountedHistoryVisibilityText(false)).toBeTruthy();
+  });
+
+  it('uses the initial history tab from route params', () => {
+    renderScreen('history');
+
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsHistoryListSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('history-visible:true')).toBeOnTheScreen();
+    expect(
+      getMountedByTestId(
+        PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT,
+      ),
+    ).toBeTruthy();
+  });
+
+  it('switches between Positions and History tabs', () => {
+    renderScreen();
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
+    );
+
+    expect(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT),
+    ).toBeOnTheScreen();
+    expect(
+      screen.getByTestId(PredictPositionsHistoryListSelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('history-visible:true')).toBeOnTheScreen();
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.POSITIONS_TAB),
+    );
+
+    expect(
+      screen.getByTestId(
+        PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT,
+      ),
+    ).toBeOnTheScreen();
+    expect(getMountedHistoryVisibilityText(false)).toBeTruthy();
+  });
+
+  it('navigates back when the back button is pressed and the stack can go back', () => {
+    renderScreen();
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.BACK_BUTTON),
+    );
+
+    expect(mockNavigation.goBack).toHaveBeenCalledTimes(1);
+    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+  });
+
+  it('returns to the Predict market list when the stack cannot go back', () => {
+    mockNavigation.canGoBack.mockReturnValue(false);
+    renderScreen();
+
+    fireEvent.press(
+      screen.getByTestId(PredictPositionsViewSelectorsIDs.BACK_BUTTON),
+    );
+
+    expect(mockNavigation.goBack).not.toHaveBeenCalled();
+    expect(mockNavigation.navigate).toHaveBeenCalledWith(
+      Routes.PREDICT.MARKET_LIST,
+    );
+  });
+});
diff --git a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.tsx b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.tsx
new file mode 100644
index 000000000000..4b1a368db7ef
--- /dev/null
+++ b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.tsx
@@ -0,0 +1,196 @@
+import {
+  type NavigationProp,
+  type RouteProp,
+  useNavigation,
+  useRoute,
+} from '@react-navigation/native';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Pressable } from 'react-native';
+import { useSelector } from 'react-redux';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import {
+  Box,
+  FontWeight,
+  HeaderStandard,
+  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 { selectPrivacyMode } from '../../../../../selectors/preferencesController';
+import PredictPositionsHistoryList from '../../components/PredictPositionsHistoryList';
+import PredictPositionsList from '../../components/PredictPositionsList';
+import PredictPositionsViewHeader from '../../components/PredictPositionsViewHeader';
+import { usePredictPortfolio } from '../../hooks/usePredictPortfolio';
+import { PredictPositionsViewSelectorsIDs } from '../../Predict.testIds';
+import type {
+  PredictNavigationParamList,
+  PredictPositionsTabKey,
+} from '../../types/navigation';
+
+interface PredictPositionsTabItem {
+  key: PredictPositionsTabKey;
+  label: string;
+  testID: string;
+}
+
+interface PredictPositionsTabsProps {
+  activeTab: PredictPositionsTabKey;
+  onTabPress: (tab: PredictPositionsTabKey) => void;
+  tabs: PredictPositionsTabItem[];
+}
+
+const PredictPositionsTabs = ({
+  activeTab,
+  onTabPress,
+  tabs,
+}: PredictPositionsTabsProps) => {
+  const tw = useTailwind();
+
+  return (
+    <Box twClassName="flex-row" testID={PredictPositionsViewSelectorsIDs.TABS}>
+      {tabs.map((tab) => {
+        const isActive = tab.key === activeTab;
+
+        return (
+          <Pressable
+            key={tab.key}
+            accessibilityRole="tab"
+            accessibilityState={{ selected: isActive }}
+            onPress={() => onTabPress(tab.key)}
+            style={tw.style('flex-1')}
+            testID={tab.testID}
+          >
+            <Box twClassName="items-center gap-3">
+              <Text
+                variant={TextVariant.BodyMd}
+                fontWeight={isActive ? FontWeight.Bold : FontWeight.Regular}
+                twClassName={isActive ? 'text-default' : 'text-alternative'}
+              >
+                {tab.label}
+              </Text>
+              <Box
+                twClassName={`h-0.5 w-full ${
+                  isActive ? 'bg-icon-default' : 'bg-transparent'
+                }`}
+              />
+            </Box>
+          </Pressable>
+        );
+      })}
+    </Box>
+  );
+};
+
+const PredictPositionsView = () => {
+  const navigation =
+    useNavigation<NavigationProp<PredictNavigationParamList>>();
+  const route =
+    useRoute<RouteProp<PredictNavigationParamList, 'PredictPositions'>>();
+  const tw = useTailwind();
+  const portfolio = usePredictPortfolio();
+  const privacyMode = useSelector(selectPrivacyMode);
+  const [activeTab, setActiveTab] = useState<PredictPositionsTabKey>(
+    route.params?.initialTab ?? 'positions',
+  );
+
+  const tabs = useMemo<PredictPositionsTabItem[]>(
+    () => [
+      {
+        key: 'positions',
+        label: strings('predict.tabs.active_positions'),
+        testID: PredictPositionsViewSelectorsIDs.POSITIONS_TAB,
+      },
+      {
+        key: 'history',
+        label: strings('predict.tabs.history'),
+        testID: PredictPositionsViewSelectorsIDs.HISTORY_TAB,
+      },
+    ],
+    [],
+  );
+
+  useEffect(() => {
+    setActiveTab(route.params?.initialTab ?? 'positions');
+  }, [route.params?.initialTab]);
+
+  const handleBackPress = useCallback(() => {
+    if (navigation.canGoBack()) {
+      navigation.goBack();
+      return;
+    }
+
+    navigation.navigate(Routes.PREDICT.MARKET_LIST);
+  }, [navigation]);
+
+  const handleTabPress = useCallback((tab: PredictPositionsTabKey) => {
+    setActiveTab(tab);
+  }, []);
+
+  const isPositionsTabActive = activeTab === 'positions';
+  const isHistoryTabActive = activeTab === 'history';
+
+  return (
+    <SafeAreaView
+      style={tw.style('flex-1 bg-default')}
+      edges={['left', 'right', 'bottom']}
+      testID={PredictPositionsViewSelectorsIDs.CONTAINER}
+    >
+      <Box twClassName="flex-1">
+        <Box testID={PredictPositionsViewSelectorsIDs.HEADER}>
+          <HeaderStandard
+            title={strings('predict.tabs.positions')}
+            onBack={handleBackPress}
+            backButtonProps={{
+              testID: PredictPositionsViewSelectorsIDs.BACK_BUTTON,
+            }}
+            includesTopInset
+          />
+        </Box>
+
+        <Box twClassName="px-4">
+          <PredictPositionsViewHeader
+            isPrivacyMode={Boolean(privacyMode)}
+            portfolio={portfolio}
+          />
+          <PredictPositionsTabs
+            tabs={tabs}
+            activeTab={activeTab}
+            onTabPress={handleTabPress}
+          />
+        </Box>
+
+        <Box twClassName="flex-1 px-4">
+          <Box
+            accessibilityElementsHidden={!isPositionsTabActive}
+            importantForAccessibility={
+              isPositionsTabActive ? 'auto' : 'no-hide-descendants'
+            }
+            pointerEvents={isPositionsTabActive ? 'auto' : 'none'}
+            style={tw.style('flex-1', !isPositionsTabActive && 'hidden')}
+            testID={PredictPositionsViewSelectorsIDs.POSITIONS_TAB_CONTENT}
+          >
+            <PredictPositionsList
+              isPrivacyMode={Boolean(privacyMode)}
+              portfolio={portfolio}
+            />
+          </Box>
+          <Box
+            accessibilityElementsHidden={!isHistoryTabActive}
+            importantForAccessibility={
+              isHistoryTabActive ? 'auto' : 'no-hide-descendants'
+            }
+            pointerEvents={isHistoryTabActive ? 'auto' : 'none'}
+            style={tw.style('flex-1', !isHistoryTabActive && 'hidden')}
+            testID={PredictPositionsViewSelectorsIDs.HISTORY_TAB_CONTENT}
+          >
+            <PredictPositionsHistoryList isVisible={isHistoryTabActive} />
+          </Box>
+        </Box>
+      </Box>
+    </SafeAreaView>
+  );
+};
+
+export default PredictPositionsView;
diff --git a/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx
new file mode 100644
index 000000000000..cc19ed63cea1
--- /dev/null
+++ b/app/components/UI/Predict/views/PredictPositionsView/PredictPositionsView.view.test.tsx
@@ -0,0 +1,228 @@
+/**
+ * Component view tests for PredictPositionsView.
+ *
+ * Run with: yarn jest -c jest.config.view.js PredictPositionsView.view.test --runInBand --silent --coverage=false
+ */
+import '../../../../../../tests/component-view/mocks';
+import Engine from '../../../../../../app/core/Engine';
+import {
+  renderPredictPositionsView,
+  renderPredictPositionsViewWithRoutes,
+} from '../../../../../../tests/component-view/renderers/predictPositions';
+import { getRouteProbeTestId } from '../../../../../../tests/component-view/render';
+import { fireEvent, waitFor } from '@testing-library/react-native';
+import Routes from '../../../../../constants/navigation/Routes';
+import {
+  PredictPositionSelectorsIDs,
+  PredictPositionsEmptySelectorsIDs,
+  PredictPositionsViewSelectorsIDs,
+} from '../../Predict.testIds';
+import {
+  PredictActivity,
+  PredictPosition,
+  PredictPositionStatus,
+} from '../../types';
+import { PredictEventValues } from '../../constants/eventNames';
+
+const createPosition = (
+  id: string,
+  overrides: Partial<PredictPosition> = {},
+): PredictPosition => ({
+  amount: 10,
+  avgPrice: 1,
+  cashPnl: 0,
+  claimable: false,
+  currentValue: 20,
+  endDate: '2026-01-01T00:00:00Z',
+  icon: 'https://example.com/icon.png',
+  id,
+  initialValue: 20,
+  marketId: `market-${id}`,
+  outcome: 'Yes',
+  outcomeId: `outcome-${id}`,
+  outcomeIndex: 0,
+  outcomeTokenId: `token-${id}`,
+  percentPnl: 0,
+  price: 1,
+  providerId: 'polymarket',
+  size: 10,
+  status: PredictPositionStatus.OPEN,
+  title: `Market ${id}`,
+  ...overrides,
+});
+
+const OPEN_GAIN_POSITION = createPosition('france', {
+  currentValue: 24,
+  initialValue: 20,
+  percentPnl: 20,
+  title: 'Will France win the 2026 FIFA World Cup?',
+});
+
+const OPEN_LOSS_POSITION = createPosition('europe', {
+  currentValue: 9,
+  initialValue: 10,
+  percentPnl: -10,
+  title: 'Will Europe win the 2026 FIFA World Cup?',
+});
+
+const CLAIMABLE_POSITION = createPosition('claimable', {
+  claimable: true,
+  currentValue: 4.5,
+  initialValue: 3,
+  percentPnl: 50,
+  status: PredictPositionStatus.WON,
+  title: 'Will Finland win Eurovision?',
+});
+
+const CLOSED_LOST_POSITION = createPosition('lost', {
+  currentValue: 0,
+  initialValue: 1,
+  percentPnl: -100,
+  status: PredictPositionStatus.LOST,
+  title: 'Bitcoin Up or Down on May 1?',
+});
+
+const ACTIVITY: PredictActivity = {
+  id: 'activity-1',
+  providerId: 'polymarket',
+  title: 'Prediction lost',
+  outcome: 'USA',
+  icon: 'https://example.com/activity.png',
+  entry: {
+    type: 'buy',
+    amount: 40,
+    price: 0.4,
+    timestamp: Math.floor(Date.now() / 1000),
+    marketId: 'history-market',
+    outcomeId: 'history-outcome',
+    outcomeTokenId: 1,
+  },
+};
+
+const mockPredictData = ({
+  activity = [],
+  balance = 0,
+  positions = [],
+}: {
+  activity?: PredictActivity[];
+  balance?: number;
+  positions?: PredictPosition[];
+}) => {
+  (Engine.context.PredictController.getActivity as jest.Mock).mockResolvedValue(
+    activity,
+  );
+  (Engine.context.PredictController.getBalance as jest.Mock).mockResolvedValue(
+    balance,
+  );
+  (
+    Engine.context.PredictController.getPositions as jest.Mock
+  ).mockResolvedValue(positions);
+};
+
+describe('PredictPositionsView component view', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockPredictData({});
+  });
+
+  it('shows active positions with rewards after portfolio data loads', async () => {
+    mockPredictData({
+      balance: 250,
+      positions: [OPEN_GAIN_POSITION, CLAIMABLE_POSITION, CLOSED_LOST_POSITION],
+    });
+    const { findByText, findByTestId, queryByText } =
+      renderPredictPositionsView();
+
+    expect(await findByText(OPEN_GAIN_POSITION.title)).toBeOnTheScreen();
+
+    expect(await findByText('$250.00')).toBeOnTheScreen();
+    expect(await findByText('+$4.00 (+20%)')).toBeOnTheScreen();
+    expect(await findByText('Claim $4.50')).toBeOnTheScreen();
+    expect(
+      await findByTestId(PredictPositionSelectorsIDs.CURRENT_POSITION_CARD),
+    ).toBeOnTheScreen();
+    expect(queryByText(CLAIMABLE_POSITION.title)).not.toBeOnTheScreen();
+    expect(queryByText(CLOSED_LOST_POSITION.title)).not.toBeOnTheScreen();
+  });
+
+  it('shows active positions without rewards when there are no claimable winnings', async () => {
+    mockPredictData({
+      balance: 100,
+      positions: [OPEN_LOSS_POSITION],
+    });
+    const { findByText, queryByTestId } = renderPredictPositionsView();
+
+    expect(await findByText(OPEN_LOSS_POSITION.title)).toBeOnTheScreen();
+
+    expect(await findByText('$100.00')).toBeOnTheScreen();
+    expect(await findByText('-$1.00 (-10%)')).toBeOnTheScreen();
+    expect(
+      queryByTestId(PredictPositionsViewSelectorsIDs.CLAIM_CTA),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('navigates from the active empty state back to browse markets', async () => {
+    mockPredictData({});
+    const { findByTestId } = renderPredictPositionsViewWithRoutes({
+      extraRoutes: [{ name: Routes.PREDICT.MARKET_LIST }],
+    });
+
+    expect(
+      await findByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(
+      await findByTestId(PredictPositionsEmptySelectorsIDs.BROWSE_MARKETS_CTA),
+    );
+
+    expect(
+      await findByTestId(getRouteProbeTestId(Routes.PREDICT.MARKET_LIST)),
+    ).toBeOnTheScreen();
+  });
+
+  it('switches to history and renders activity through the history wrapper', async () => {
+    const trackActivityViewedSpy = jest.spyOn(
+      Engine.context.PredictController,
+      'trackActivityViewed',
+    );
+    mockPredictData({
+      activity: [ACTIVITY],
+      positions: [OPEN_GAIN_POSITION],
+    });
+    const { findByText, findByTestId } = renderPredictPositionsView();
+
+    expect(await findByText(OPEN_GAIN_POSITION.title)).toBeOnTheScreen();
+
+    fireEvent.press(
+      await findByTestId(PredictPositionsViewSelectorsIDs.HISTORY_TAB),
+    );
+
+    expect(await findByText('Predicted')).toBeOnTheScreen();
+    expect(await findByText(ACTIVITY.title as string)).toBeOnTheScreen();
+    await waitFor(() => {
+      expect(trackActivityViewedSpy).toHaveBeenCalledWith({
+        activityType: PredictEventValues.ACTIVITY_TYPE.ACTIVITY_LIST,
+      });
+    });
+  });
+
+  it('uses the shared empty state for empty history and navigates to browse markets', async () => {
+    mockPredictData({});
+    const { findByTestId } = renderPredictPositionsViewWithRoutes({
+      initialParams: { initialTab: 'history' },
+      extraRoutes: [{ name: Routes.PREDICT.MARKET_LIST }],
+    });
+
+    expect(
+      await findByTestId(PredictPositionsEmptySelectorsIDs.CONTAINER),
+    ).toBeOnTheScreen();
+
+    fireEvent.press(
+      await findByTestId(PredictPositionsEmptySelectorsIDs.BROWSE_MARKETS_CTA),
+    );
+
+    expect(
+      await findByTestId(getRouteProbeTestId(Routes.PREDICT.MARKET_LIST)),
+    ).toBeOnTheScreen();
+  });
+});
diff --git a/app/components/UI/Predict/views/PredictPositionsView/index.tsx b/app/components/UI/Predict/views/PredictPositionsView/index.tsx
new file mode 100644
index 000000000000..f60468fe27c3
--- /dev/null
+++ b/app/components/UI/Predict/views/PredictPositionsView/index.tsx
@@ -0,0 +1 @@
+export { default } from './PredictPositionsView';
diff --git a/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.test.tsx b/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.test.tsx
index 3a4117e6692c..57603943a042 100644
--- a/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.test.tsx
+++ b/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { SectionList } from 'react-native';
+import { SectionList, Text } from 'react-native';
 import { act, render, screen, fireEvent } from '@testing-library/react-native';
 import PredictTransactionsView from './PredictTransactionsView';
 import { PredictActivityType } from '../../types';
@@ -126,6 +126,24 @@ describe('PredictTransactionsView', () => {
     expect(screen.getByText('No recent activity')).toBeOnTheScreen();
   });
 
+  it('displays a custom empty state when provided', () => {
+    (usePredictActivity as jest.Mock).mockReturnValueOnce(
+      createUsePredictActivityValue({
+        data: [],
+        isLoading: false,
+      }),
+    );
+
+    render(
+      <PredictTransactionsView
+        emptyState={<Text testID="custom-empty-state">Custom empty</Text>}
+      />,
+    );
+
+    expect(screen.getByTestId('custom-empty-state')).toBeOnTheScreen();
+    expect(screen.queryByText('No recent activity')).toBeNull();
+  });
+
   it('displays all activity items from the activity list', () => {
     const mockTimestamp = Math.floor(Date.now() / 1000);
     (usePredictActivity as jest.Mock).mockReturnValueOnce(
diff --git a/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.tsx b/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.tsx
index cca1a0b2937e..cbee77e2eac5 100644
--- a/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.tsx
+++ b/app/components/UI/Predict/views/PredictTransactionsView/PredictTransactionsView.tsx
@@ -1,5 +1,10 @@
 import React, { useMemo, useEffect, useCallback } from 'react';
-import { ActivityIndicator, SectionList } from 'react-native';
+import {
+  ActivityIndicator,
+  SectionList,
+  ViewStyle,
+  StyleProp,
+} from 'react-native';
 import { Box, Text, TextVariant } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import PredictActivity from '../../components/PredictActivity/PredictActivity';
@@ -14,9 +19,12 @@ import { usePredictMeasurement } from '../../hooks/usePredictMeasurement';
 import { TabEmptyState } from '../../../../../component-library/components-temp/TabEmptyState';
 import { PREDICT_TRANSACTIONS_VIEW_TEST_IDS } from './PredictTransactionsView.testIds';
 interface PredictTransactionsViewProps {
+  emptyState?: React.ReactNode;
   transactions?: unknown[];
   tabLabel?: string;
   isVisible?: boolean;
+  containerStyle?: string;
+  activityContainerStyle?: string;
 }
 
 interface ActivitySection {
@@ -60,7 +68,10 @@ const getDateGroupLabel = (
 };
 
 const PredictTransactionsView: React.FC<PredictTransactionsViewProps> = ({
+  emptyState,
   isVisible,
+  containerStyle,
+  activityContainerStyle,
 }) => {
   const tw = useTailwind();
   const {
@@ -245,10 +256,10 @@ const PredictTransactionsView: React.FC<PredictTransactionsViewProps> = ({
   const renderItem = useCallback(
     ({ item }: { item: PredictActivityItem }) => (
       <Box twClassName="py-1">
-        <PredictActivity item={item} />
+        <PredictActivity item={item} containerStyle={activityContainerStyle} />
       </Box>
     ),
-    [],
+    [activityContainerStyle],
   );
 
   const keyExtractor = useCallback((item: PredictActivityItem) => item.id, []);
@@ -263,18 +274,20 @@ const PredictTransactionsView: React.FC<PredictTransactionsViewProps> = ({
       />
     </Box>
   ) : sections.length === 0 ? (
-    <Box twClassName="items-center justify-center py-10">
-      <TabEmptyState
-        description={strings('predict.transactions.no_transactions')}
-      />
-    </Box>
+    (emptyState ?? (
+      <Box twClassName="items-center justify-center py-10">
+        <TabEmptyState
+          description={strings('predict.transactions.no_transactions')}
+        />
+      </Box>
+    ))
   ) : (
     <SectionList<PredictActivityItem, ActivitySection>
       sections={sections}
       keyExtractor={keyExtractor}
       renderItem={renderItem}
       renderSectionHeader={renderSectionHeader}
-      contentContainerStyle={tw.style('p-2')}
+      contentContainerStyle={tw.style('p-2', containerStyle)}
       showsVerticalScrollIndicator={false}
       style={tw.style('flex-1')}
       stickySectionHeadersEnabled
diff --git a/app/components/UI/SecurityTrust/utils/securityUtils.test.ts b/app/components/UI/SecurityTrust/utils/securityUtils.test.ts
index 0ed51e7a9bfe..065c8faaad45 100644
--- a/app/components/UI/SecurityTrust/utils/securityUtils.test.ts
+++ b/app/components/UI/SecurityTrust/utils/securityUtils.test.ts
@@ -399,6 +399,58 @@ describe('securityUtils', () => {
     });
   });
 
+  describe('getSheetDescription in getResultTypeConfig', () => {
+    it('returns risky description with symbol for Warning type', () => {
+      const config = getResultTypeConfig('Warning');
+      const { getSheetDescription } = config;
+      expect(getSheetDescription?.('ETH')).toBe(
+        strings('security_trust.risky_token_description', { symbol: 'ETH' }),
+      );
+    });
+
+    it('returns risky description without symbol for Warning type', () => {
+      const config = getResultTypeConfig('Warning');
+      const { getSheetDescription } = config;
+      expect(getSheetDescription?.('')).toBe(
+        strings('security_trust.risky_token_description_no_symbol'),
+      );
+    });
+
+    it('returns risky description without symbol when undefined for Warning type', () => {
+      const config = getResultTypeConfig('Warning');
+      const { getSheetDescription } = config;
+      expect(getSheetDescription?.(undefined)).toBe(
+        strings('security_trust.risky_token_description_no_symbol'),
+      );
+    });
+
+    it('returns malicious sheet description with symbol for Malicious type', () => {
+      const config = getResultTypeConfig('Malicious');
+      const { getSheetDescription } = config;
+      expect(getSheetDescription?.('SCAM')).toBe(
+        strings('security_trust.malicious_token_sheet_description', {
+          symbol: 'SCAM',
+        }),
+      );
+    });
+
+    it('returns malicious sheet description without symbol for Malicious type', () => {
+      const config = getResultTypeConfig('Malicious');
+      const { getSheetDescription } = config;
+      expect(getSheetDescription?.('')).toBe(
+        strings('security_trust.malicious_token_sheet_description_no_symbol'),
+      );
+    });
+
+    it('returns malicious sheet description without symbol when undefined for Malicious type', () => {
+      const config = getResultTypeConfig('Malicious');
+      const { getSheetDescription } = config;
+      expect(getSheetDescription?.(undefined)).toBe(
+        strings('security_trust.malicious_token_sheet_description_no_symbol'),
+      );
+    });
+  });
+
   describe('badge property in getResultTypeConfig', () => {
     it('returns badge config for Verified result type', () => {
       const config = getResultTypeConfig('Verified');
diff --git a/app/components/UI/SecurityTrust/utils/securityUtils.ts b/app/components/UI/SecurityTrust/utils/securityUtils.ts
index 8c901d39176c..ea5d9d77f1a9 100644
--- a/app/components/UI/SecurityTrust/utils/securityUtils.ts
+++ b/app/components/UI/SecurityTrust/utils/securityUtils.ts
@@ -32,7 +32,7 @@ export interface ResultTypeConfig {
   /** Title for bottom sheet display */
   sheetTitle?: string;
   /** Description for bottom sheet display (may include token symbol placeholder) */
-  getSheetDescription?: (tokenSymbol: string) => string;
+  getSheetDescription?: (tokenSymbol: string | undefined) => string;
 }
 
 export const getResultTypeConfig = (
@@ -88,7 +88,9 @@ export const getResultTypeConfig = (
         },
         sheetTitle: strings('security_trust.risky_token_title'),
         getSheetDescription: (symbol) =>
-          strings('security_trust.risky_token_description', { symbol }),
+          symbol
+            ? strings('security_trust.risky_token_description', { symbol })
+            : strings('security_trust.risky_token_description_no_symbol'),
       };
     case 'Malicious':
       return {
@@ -108,9 +110,13 @@ export const getResultTypeConfig = (
         },
         sheetTitle: strings('security_trust.malicious_token_title'),
         getSheetDescription: (symbol) =>
-          strings('security_trust.malicious_token_sheet_description', {
-            symbol,
-          }),
+          symbol
+            ? strings('security_trust.malicious_token_sheet_description', {
+                symbol,
+              })
+            : strings(
+                'security_trust.malicious_token_sheet_description_no_symbol',
+              ),
       };
     default:
       return {
diff --git a/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.test.tsx b/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.test.tsx
index 91f9a861fa6f..219dbc895fc3 100644
--- a/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.test.tsx
+++ b/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.test.tsx
@@ -95,6 +95,14 @@ describe('SitesSearchFooter', () => {
       expect(getByTestId('trending-search-footer-url-link')).toBeOnTheScreen();
     });
 
+    it('detects localhost URLs', () => {
+      const { getByTestId } = render(
+        <SitesSearchFooter searchQuery="http://localhost:8000" />,
+      );
+
+      expect(getByTestId('trending-search-footer-url-link')).toBeOnTheScreen();
+    });
+
     it('detects URLs with path', () => {
       const { getByTestId } = render(
         <SitesSearchFooter searchQuery="metamask.io/portfolio" />,
diff --git a/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.tsx b/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.tsx
index fcf3fce7f545..724c8ac18cd3 100644
--- a/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.tsx
+++ b/app/components/UI/Sites/components/SitesSearchFooter/SitesSearchFooter.tsx
@@ -15,6 +15,7 @@ import Routes from '../../../../../constants/navigation/Routes';
 import { selectSearchEngine } from '../../../../../reducers/browser/selectors';
 import { SEARCH_ENGINE_URLS, SearchEngine } from '../../../../../util/browser';
 import AppConstants from '../../../../../core/AppConstants';
+import isUrlFn from 'is-url';
 
 // TODO: @MetaMask/design-system-engineers
 // Use the concrete Box component props here instead of BoxProps.
@@ -39,11 +40,14 @@ export interface SitesSearchFooterProps {
   containerStyle?: BoxComponentProps['style'];
 }
 
+// Note: This regex intentionally does not require a fully valid URL
+const URL_REGEX = /^(https?:\/\/)?[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+([/?].*)?$/;
+
 /**
  * Checks if a string looks like a URL
  */
 function looksLikeUrl(str: string): boolean {
-  return /^(https?:\/\/)?[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)+([/?].*)?$/.test(str);
+  return isUrlFn(str) || URL_REGEX.test(str);
 }
 
 export const useSearchFooterBrowserNavigation = () => {
diff --git a/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx b/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
index 7b06ad6450b9..c3c0ec972724 100644
--- a/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
+++ b/app/components/UI/TokenDetails/components/AssetOverviewContent.tsx
@@ -248,6 +248,7 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
   const navigation = useNavigation();
   const resetNavigationLockRef = useRef<(() => void) | null>(null);
   const { isTokenTradingOpen, isStockToken } = useRWAToken();
+
   const { trackEvent, createEventBuilder } = useAnalytics();
   const tronNativeToken = isTronNativeToken(token) ? token : null;
 
@@ -397,11 +398,13 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
         icon: displayIcon,
         iconColor: displayIconColor,
         title: securityConfig.sheetTitle,
-        description: securityConfig.getSheetDescription(token.symbol),
+        description: securityConfig.getSheetDescription(
+          token.symbol || token.name,
+        ),
         source: 'badge',
         severity: securityData.resultType,
         tokenAddress: token.address,
-        tokenSymbol: token.symbol,
+        tokenSymbol: token.symbol || token.name,
         chainId: token.chainId,
         features: securityData.features,
       },
@@ -410,6 +413,7 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
     securityData,
     securityConfig,
     token.symbol,
+    token.name,
     token.address,
     token.chainId,
     navigation,
@@ -581,6 +585,22 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
     Boolean(marketInsightsCaip19Id) &&
     (Boolean(marketInsightsReport) || isMarketInsightsLoading);
 
+  const tokenDisplaySymbol = token.symbol || token.name;
+  const securityBadgeDescription = (() => {
+    if (securityData?.resultType === 'Malicious') {
+      return tokenDisplaySymbol
+        ? strings('security_trust.malicious_token_description', {
+            symbol: tokenDisplaySymbol,
+          })
+        : strings('security_trust.malicious_token_description_no_symbol');
+    }
+    return tokenDisplaySymbol
+      ? strings('security_trust.suspicious_token_description', {
+          symbol: tokenDisplaySymbol,
+        })
+      : strings('security_trust.suspicious_token_description_no_symbol');
+  })();
+
   return (
     <Box twClassName="pt-[2px]" testID={TokenOverviewSelectorsIDs.CONTAINER}>
       {token.hasBalanceError ? (
@@ -613,15 +633,7 @@ const AssetOverviewContent: React.FC<AssetOverviewContentProps> = ({
                     ? strings('security_trust.malicious_token_title')
                     : undefined
                 }
-                description={
-                  securityData.resultType === 'Malicious'
-                    ? strings('security_trust.malicious_token_description', {
-                        symbol: token.symbol,
-                      })
-                    : strings('security_trust.suspicious_token_description', {
-                        symbol: token.symbol,
-                      })
-                }
+                description={securityBadgeDescription}
                 className="mx-4 mb-3 gap-4"
                 onPress={handleSecurityBadgePress}
               />
diff --git a/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.test.tsx b/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.test.tsx
index 8b63c83c7828..e0205166a39d 100644
--- a/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.test.tsx
+++ b/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.test.tsx
@@ -325,6 +325,25 @@ describe('SecurityBadgeBottomSheet', () => {
       expect(getByText(bannerText)).toBeOnTheScreen();
     });
 
+    it('renders malicious banner with no_symbol fallback when tokenSymbol is empty', () => {
+      mockUseRouteImpl = jest.fn(() => ({
+        params: {
+          ...mockRouteParams,
+          severity: 'Malicious',
+          tokenSymbol: '',
+          description: 'This should not appear',
+        },
+      }));
+
+      const { getByText, queryByText } = render(<SecurityBadgeBottomSheet />);
+
+      const bannerText = strings(
+        'security_trust.malicious_token_banner_description_no_symbol',
+      );
+      expect(getByText(bannerText)).toBeOnTheScreen();
+      expect(queryByText('This should not appear')).not.toBeOnTheScreen();
+    });
+
     it('does not render malicious banner for Warning severity', () => {
       mockUseRouteImpl = jest.fn(() => ({
         params: {
diff --git a/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.tsx b/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.tsx
index e1a5944d5b89..a9fea37eff9f 100644
--- a/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.tsx
+++ b/app/components/UI/TokenDetails/components/SecurityBadgeBottomSheet.tsx
@@ -208,12 +208,16 @@ const SecurityBadgeBottomSheet = () => {
                 titleFontWeight={FontWeight.Bold}
                 testID="security-banner-malicious"
                 className="mb-1 mt-3 gap-4"
-                description={strings(
-                  'security_trust.malicious_token_banner_description',
-                  {
-                    symbol: tokenSymbol,
-                  },
-                )}
+                description={
+                  tokenSymbol
+                    ? strings(
+                        'security_trust.malicious_token_banner_description',
+                        { symbol: tokenSymbol },
+                      )
+                    : strings(
+                        'security_trust.malicious_token_banner_description_no_symbol',
+                      )
+                }
               />
             )}
           </Box>
diff --git a/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.test.tsx b/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.test.tsx
index 06f3b0813e97..694987b23557 100644
--- a/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.test.tsx
+++ b/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.test.tsx
@@ -509,6 +509,67 @@ describe('TokenDetailsStickyFooter', () => {
     });
   });
 
+  describe('security interception - token.symbol fallback to token.name', () => {
+    it('passes token.name as tokenSymbol when symbol is missing', () => {
+      const tokenWithoutSymbol = {
+        ...mockToken,
+        symbol: '',
+        name: 'FakeToken',
+      } as unknown as TokenDetailsRouteParams;
+
+      const maliciousSecurityData = {
+        resultType: 'Malicious',
+        features: [],
+      } as unknown as TokenSecurityData;
+
+      const { getByText } = render(
+        <TokenDetailsStickyFooter
+          {...defaultProps}
+          token={tokenWithoutSymbol}
+          securityData={maliciousSecurityData}
+        />,
+      );
+
+      fireEvent.press(getByText('Buy'));
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          params: expect.objectContaining({
+            tokenSymbol: 'FakeToken',
+            description: expect.any(String),
+          }),
+        }),
+      );
+    });
+
+    it('passes token.symbol as tokenSymbol when symbol is present', () => {
+      const warningSecurityData = {
+        resultType: 'Warning',
+        features: [],
+      } as unknown as TokenSecurityData;
+
+      const { getByText } = render(
+        <TokenDetailsStickyFooter
+          {...defaultProps}
+          securityData={warningSecurityData}
+        />,
+      );
+
+      fireEvent.press(getByText('Buy'));
+
+      expect(mockNavigate).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          params: expect.objectContaining({
+            tokenSymbol: 'ETH',
+            description: expect.any(String),
+          }),
+        }),
+      );
+    });
+  });
+
   describe('RWA geo-restriction', () => {
     it('blocks the buy action when token is a geo-restricted stock', () => {
       mockIsStockToken.mockReturnValue(true);
diff --git a/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx b/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx
index fc6cb1bf5039..b1e0e39ba05e 100644
--- a/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx
+++ b/app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx
@@ -215,12 +215,12 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
           icon: config.icon,
           iconColor: config.iconColor,
           title: config.sheetTitle,
-          description: config.getSheetDescription(token.symbol),
+          description: config.getSheetDescription(token.symbol || token.name),
           onProceed: action,
           source,
           severity: securityData?.resultType,
           tokenAddress: token.address,
-          tokenSymbol: token.symbol,
+          tokenSymbol: token.symbol || token.name,
           chainId: token.chainId,
           features: securityData?.features,
         },
@@ -231,6 +231,7 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
       navigation,
       securityData,
       token.symbol,
+      token.name,
       token.address,
       token.chainId,
     ],
diff --git a/app/components/UI/WalletHomeOnboardingSteps/fundRampPriorityAssets.test.ts b/app/components/UI/WalletHomeOnboardingSteps/fundRampPriorityAssets.test.ts
new file mode 100644
index 000000000000..2ebdc665e836
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/fundRampPriorityAssets.test.ts
@@ -0,0 +1,49 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import {
+  createMainnetEthBuyabilityToken,
+  createMainnetMusdBuyabilityToken,
+  MAINNET_ETH_RAMP_ASSET_ID,
+  MAINNET_MUSD_RAMP_ASSET_ID,
+  MAINNET_MUSD_TOKEN_ADDRESS,
+  WALLET_HOME_ONBOARDING_FUND_RAMP_PRIORITY,
+} from './fundRampPriorityAssets';
+import { getTokenBuyabilityKey } from '../Ramp/hooks/useTokenBuyability';
+
+describe('fundRampPriorityAssets', () => {
+  it('defines mainnet mUSD and ETH asset ids', () => {
+    expect(MAINNET_MUSD_RAMP_ASSET_ID).toBe(
+      'eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA',
+    );
+    expect(MAINNET_ETH_RAMP_ASSET_ID).toBe('eip155:1/slip44:60');
+  });
+
+  it('orders mUSD before ETH in the priority list', () => {
+    expect(
+      WALLET_HOME_ONBOARDING_FUND_RAMP_PRIORITY.map((c) => c.assetId),
+    ).toEqual([MAINNET_MUSD_RAMP_ASSET_ID, MAINNET_ETH_RAMP_ASSET_ID]);
+  });
+
+  it('builds distinct buyability token keys for mUSD and ETH', () => {
+    const musdKey = getTokenBuyabilityKey(createMainnetMusdBuyabilityToken());
+    const ethKey = getTokenBuyabilityKey(createMainnetEthBuyabilityToken());
+
+    expect(musdKey).not.toBe(ethKey);
+    expect(musdKey).toContain('eip155:1');
+    expect(ethKey).toContain('eip155:1');
+  });
+
+  it('uses mainnet hex chain id and erc20 address for mUSD buyability stub', () => {
+    const musdToken = createMainnetMusdBuyabilityToken();
+
+    expect(musdToken.chainId).toBe(CHAIN_IDS.MAINNET);
+    expect(musdToken.isNative).toBe(false);
+    expect(musdToken.address).toBe(MAINNET_MUSD_TOKEN_ADDRESS);
+  });
+
+  it('marks ETH buyability stub as native on mainnet', () => {
+    const ethToken = createMainnetEthBuyabilityToken();
+
+    expect(ethToken.chainId).toBe(CHAIN_IDS.MAINNET);
+    expect(ethToken.isNative).toBe(true);
+  });
+});
diff --git a/app/components/UI/WalletHomeOnboardingSteps/fundRampPriorityAssets.ts b/app/components/UI/WalletHomeOnboardingSteps/fundRampPriorityAssets.ts
new file mode 100644
index 000000000000..30440d4701e2
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/fundRampPriorityAssets.ts
@@ -0,0 +1,87 @@
+import { CHAIN_IDS } from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
+import { TokenI } from '../Tokens/types';
+
+/** Native mainnet ETH CAIP-19 asset id for unified ramp buy flows. */
+export const MAINNET_ETH_RAMP_ASSET_ID = 'eip155:1/slip44:60';
+
+/** Mainnet mUSD CAIP-19 asset id (TMCU-681 fund-step preselection). */
+export const MAINNET_MUSD_RAMP_ASSET_ID =
+  'eip155:1/erc20:0xacA92E438df0B2401fF60dA7E4337B687a2435DA';
+
+/** mUSD contract address on mainnet (same on supported ramp chains). */
+export const MAINNET_MUSD_TOKEN_ADDRESS: Hex =
+  '0xaca92e438df0b2401ff60da7e4337b687a2435da';
+
+const MUSD_SYMBOL = 'mUSD';
+const MUSD_NAME = 'MetaMask USD';
+const MUSD_DECIMALS = 6;
+
+export interface WalletHomeOnboardingFundRampPriorityCandidate {
+  assetId: string;
+  token: TokenI;
+}
+
+const EMPTY_TOKEN_IMAGE = '';
+
+function createBuyabilityTokenStub(
+  overrides: Pick<
+    TokenI,
+    'address' | 'chainId' | 'symbol' | 'name' | 'decimals'
+  > &
+    Partial<Pick<TokenI, 'isNative' | 'isETH'>>,
+): TokenI {
+  return {
+    address: overrides.address,
+    chainId: overrides.chainId,
+    symbol: overrides.symbol,
+    name: overrides.name,
+    decimals: overrides.decimals,
+    image: EMPTY_TOKEN_IMAGE,
+    logo: undefined,
+    balance: '0',
+    isETH: overrides.isETH ?? false,
+    isNative: overrides.isNative ?? false,
+  };
+}
+
+/**
+ * Minimal {@link TokenI} for ramp buyability checks on mainnet mUSD.
+ */
+export function createMainnetMusdBuyabilityToken(): TokenI {
+  return createBuyabilityTokenStub({
+    address: MAINNET_MUSD_TOKEN_ADDRESS,
+    chainId: CHAIN_IDS.MAINNET,
+    symbol: MUSD_SYMBOL,
+    name: MUSD_NAME,
+    decimals: MUSD_DECIMALS,
+  });
+}
+
+/**
+ * Minimal {@link TokenI} for ramp buyability checks on mainnet native ETH.
+ */
+export function createMainnetEthBuyabilityToken(): TokenI {
+  return createBuyabilityTokenStub({
+    address: '0x0000000000000000000000000000000000000000',
+    chainId: CHAIN_IDS.MAINNET,
+    symbol: 'ETH',
+    name: 'Ethereum',
+    decimals: 18,
+    isETH: true,
+    isNative: true,
+  });
+}
+
+/** Fund-step ramp asset priority: mainnet mUSD, then mainnet native ETH. */
+export const WALLET_HOME_ONBOARDING_FUND_RAMP_PRIORITY: WalletHomeOnboardingFundRampPriorityCandidate[] =
+  [
+    {
+      assetId: MAINNET_MUSD_RAMP_ASSET_ID,
+      token: createMainnetMusdBuyabilityToken(),
+    },
+    {
+      assetId: MAINNET_ETH_RAMP_ASSET_ID,
+      token: createMainnetEthBuyabilityToken(),
+    },
+  ];
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts
index fb9695dce564..4a2e45549970 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.test.ts
@@ -2,6 +2,13 @@ import { renderHook, act } from '@testing-library/react-native';
 import { MetaMetricsEvents } from '../../../core/Analytics';
 import { ActionLocation } from '../../../util/analytics/actionButtonTracking';
 import { useWalletHomeOnboardingChecklistFundPress } from './useWalletHomeOnboardingChecklistFundPress';
+import { MAINNET_MUSD_RAMP_ASSET_ID } from './fundRampPriorityAssets';
+
+const mockUseWalletHomeOnboardingFundRampIntent = jest.fn();
+jest.mock('./useWalletHomeOnboardingFundRampIntent', () => ({
+  useWalletHomeOnboardingFundRampIntent: () =>
+    mockUseWalletHomeOnboardingFundRampIntent(),
+}));
 
 const mockTrackEvent = jest.fn();
 const mockAddProperties = jest.fn().mockReturnThis();
@@ -64,6 +71,10 @@ describe('useWalletHomeOnboardingChecklistFundPress', () => {
     mockUseRampsButtonClickData.mockReturnValue(defaultButtonClickData);
     mockUseRampsUnifiedV1Enabled.mockReturnValue(false);
     mockUseRampsUnifiedV2Enabled.mockReturnValue(false);
+    mockUseWalletHomeOnboardingFundRampIntent.mockReturnValue({
+      rampIntent: undefined,
+      isLoading: false,
+    });
   });
 
   it('fires RAMPS_BUTTON_CLICKED with location onboarding_checklist then calls goToBuy', () => {
@@ -89,7 +100,26 @@ describe('useWalletHomeOnboardingChecklistFundPress', () => {
       order_count: 2,
     });
     expect(mockTrackEvent).toHaveBeenCalledWith({ event: 'built' });
-    expect(goToBuy).toHaveBeenCalledTimes(1);
+    expect(goToBuy).toHaveBeenCalledWith(undefined);
+  });
+
+  it('passes resolved ramp intent to goToBuy when available', () => {
+    mockUseWalletHomeOnboardingFundRampIntent.mockReturnValue({
+      rampIntent: { assetId: MAINNET_MUSD_RAMP_ASSET_ID },
+      isLoading: false,
+    });
+
+    const { result } = renderHook(() =>
+      useWalletHomeOnboardingChecklistFundPress(goToBuy),
+    );
+
+    act(() => {
+      result.current();
+    });
+
+    expect(goToBuy).toHaveBeenCalledWith({
+      assetId: MAINNET_MUSD_RAMP_ASSET_ID,
+    });
   });
 
   it('uses UNIFIED_BUY_2 ramp_type when V2 unified is enabled', () => {
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts
index 648a51ecdec4..95ad67a30cf0 100644
--- a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingChecklistFundPress.ts
@@ -8,6 +8,7 @@ import useRampsUnifiedV1Enabled from '../Ramp/hooks/useRampsUnifiedV1Enabled';
 import useRampsUnifiedV2Enabled from '../Ramp/hooks/useRampsUnifiedV2Enabled';
 import { useRampsButtonClickData } from '../Ramp/hooks/useRampsButtonClickData';
 import { walletHomeOnboardingPrimaryLabelForStep } from './walletHomeOnboardingStepsStrings';
+import { useWalletHomeOnboardingFundRampIntent } from './useWalletHomeOnboardingFundRampIntent';
 
 type GoToBuyFromRampNavigation = ReturnType<
   typeof import('../Ramp/hooks/useRampNavigation').useRampNavigation
@@ -25,6 +26,7 @@ export function useWalletHomeOnboardingChecklistFundPress(
   const rampUnifiedV1Enabled = useRampsUnifiedV1Enabled();
   const isV2UnifiedEnabled = useRampsUnifiedV2Enabled();
   const region = useSelector(getDetectedGeolocation);
+  const { rampIntent } = useWalletHomeOnboardingFundRampIntent();
 
   return useCallback(() => {
     const rampType = isV2UnifiedEnabled
@@ -48,7 +50,7 @@ export function useWalletHomeOnboardingChecklistFundPress(
         .build(),
     );
 
-    goToBuy();
+    goToBuy(rampIntent);
   }, [
     buttonClickData.is_authenticated,
     buttonClickData.order_count,
@@ -57,6 +59,7 @@ export function useWalletHomeOnboardingChecklistFundPress(
     createEventBuilder,
     goToBuy,
     isV2UnifiedEnabled,
+    rampIntent,
     rampUnifiedV1Enabled,
     region,
     trackEvent,
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingFundRampIntent.test.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingFundRampIntent.test.ts
new file mode 100644
index 000000000000..1ba79269f9c2
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingFundRampIntent.test.ts
@@ -0,0 +1,104 @@
+import { renderHook } from '@testing-library/react-native';
+import {
+  createMainnetEthBuyabilityToken,
+  createMainnetMusdBuyabilityToken,
+  MAINNET_ETH_RAMP_ASSET_ID,
+  MAINNET_MUSD_RAMP_ASSET_ID,
+} from './fundRampPriorityAssets';
+import { useWalletHomeOnboardingFundRampIntent } from './useWalletHomeOnboardingFundRampIntent';
+import {
+  getTokenBuyabilityKey,
+  useTokensBuyability,
+} from '../Ramp/hooks/useTokenBuyability';
+
+jest.mock('../Ramp/hooks/useTokenBuyability', () => {
+  const actual = jest.requireActual('../Ramp/hooks/useTokenBuyability');
+  return {
+    ...actual,
+    useTokensBuyability: jest.fn(),
+  };
+});
+
+const mockUseTokensBuyability = useTokensBuyability as jest.MockedFunction<
+  typeof useTokensBuyability
+>;
+
+describe('useWalletHomeOnboardingFundRampIntent', () => {
+  const musdKey = getTokenBuyabilityKey(createMainnetMusdBuyabilityToken());
+  const ethKey = getTokenBuyabilityKey(createMainnetEthBuyabilityToken());
+
+  const setBuyability = (
+    buyabilityByTokenKey: Record<string, boolean> = {},
+    isLoading = false,
+  ) => {
+    mockUseTokensBuyability.mockReturnValue({
+      buyabilityByTokenKey,
+      isLoading,
+    });
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setBuyability({
+      [musdKey]: true,
+      [ethKey]: true,
+    });
+  });
+
+  it('returns undefined rampIntent while buyability is loading', () => {
+    setBuyability({}, true);
+
+    const { result } = renderHook(() =>
+      useWalletHomeOnboardingFundRampIntent(),
+    );
+
+    expect(result.current.isLoading).toBe(true);
+    expect(result.current.rampIntent).toBeUndefined();
+  });
+
+  it('returns mUSD asset id when mainnet mUSD is buyable', () => {
+    setBuyability({ [musdKey]: true, [ethKey]: false });
+
+    const { result } = renderHook(() =>
+      useWalletHomeOnboardingFundRampIntent(),
+    );
+
+    expect(result.current.rampIntent).toEqual({
+      assetId: MAINNET_MUSD_RAMP_ASSET_ID,
+    });
+  });
+
+  it('returns ETH asset id when mUSD is not buyable but ETH is', () => {
+    setBuyability({ [musdKey]: false, [ethKey]: true });
+
+    const { result } = renderHook(() =>
+      useWalletHomeOnboardingFundRampIntent(),
+    );
+
+    expect(result.current.rampIntent).toEqual({
+      assetId: MAINNET_ETH_RAMP_ASSET_ID,
+    });
+  });
+
+  it('prefers mUSD when both mUSD and ETH are buyable', () => {
+    setBuyability({ [musdKey]: true, [ethKey]: true });
+
+    const { result } = renderHook(() =>
+      useWalletHomeOnboardingFundRampIntent(),
+    );
+
+    expect(result.current.rampIntent).toEqual({
+      assetId: MAINNET_MUSD_RAMP_ASSET_ID,
+    });
+  });
+
+  it('returns undefined rampIntent when neither asset is buyable', () => {
+    setBuyability({ [musdKey]: false, [ethKey]: false });
+
+    const { result } = renderHook(() =>
+      useWalletHomeOnboardingFundRampIntent(),
+    );
+
+    expect(result.current.rampIntent).toBeUndefined();
+  });
+});
diff --git a/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingFundRampIntent.ts b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingFundRampIntent.ts
new file mode 100644
index 000000000000..8e9baa5dc38e
--- /dev/null
+++ b/app/components/UI/WalletHomeOnboardingSteps/useWalletHomeOnboardingFundRampIntent.ts
@@ -0,0 +1,45 @@
+import { useMemo } from 'react';
+import type { RampIntent } from '../Ramp/types';
+import {
+  getTokenBuyabilityKey,
+  useTokensBuyability,
+} from '../Ramp/hooks/useTokenBuyability';
+import { WALLET_HOME_ONBOARDING_FUND_RAMP_PRIORITY } from './fundRampPriorityAssets';
+
+export interface UseWalletHomeOnboardingFundRampIntentResult {
+  rampIntent: RampIntent | undefined;
+  isLoading: boolean;
+}
+
+/**
+ * Resolves the ramp buy intent for the wallet home onboarding fund step (TMCU-681).
+ * Prefers mainnet mUSD when buyable, otherwise mainnet ETH; undefined while loading
+ * or when neither asset is supported for the user's region.
+ */
+export function useWalletHomeOnboardingFundRampIntent(): UseWalletHomeOnboardingFundRampIntentResult {
+  const priorityTokens = useMemo(
+    () =>
+      WALLET_HOME_ONBOARDING_FUND_RAMP_PRIORITY.map(
+        (candidate) => candidate.token,
+      ),
+    [],
+  );
+
+  const { buyabilityByTokenKey, isLoading } =
+    useTokensBuyability(priorityTokens);
+
+  const rampIntent = useMemo((): RampIntent | undefined => {
+    if (isLoading) {
+      return undefined;
+    }
+
+    const selected = WALLET_HOME_ONBOARDING_FUND_RAMP_PRIORITY.find(
+      (candidate) =>
+        buyabilityByTokenKey[getTokenBuyabilityKey(candidate.token)] === true,
+    );
+
+    return selected ? { assetId: selected.assetId } : undefined;
+  }, [buyabilityByTokenKey, isLoading]);
+
+  return { rampIntent, isLoading };
+}
diff --git a/app/components/UI/WhatsHappening/WhatsHappeningSection.test.tsx b/app/components/UI/WhatsHappening/WhatsHappeningSection.test.tsx
index 590ad35fb825..774b93d96287 100644
--- a/app/components/UI/WhatsHappening/WhatsHappeningSection.test.tsx
+++ b/app/components/UI/WhatsHappening/WhatsHappeningSection.test.tsx
@@ -95,6 +95,20 @@ describe('WhatsHappeningSection', () => {
     ).toBeNull();
   });
 
+  it('renders null (not ErrorState) when items are empty but there is no error', () => {
+    mockUseWhatsHappening.mockReturnValue({
+      items: [],
+      isLoading: false,
+      error: null,
+      refresh: jest.fn(),
+    });
+    renderWithProvider(<WhatsHappeningSection {...defaultProps} />);
+    expect(screen.queryByText(/unable to load/i)).toBeNull();
+    expect(
+      screen.queryByTestId(WhatsHappeningSelectorsIDs.CAROUSEL),
+    ).toBeNull();
+  });
+
   it('renders skeleton cards while loading', () => {
     mockUseWhatsHappening.mockReturnValue({
       items: [],
diff --git a/app/components/UI/WhatsHappening/components/WhatsHappeningAssetPill.tsx b/app/components/UI/WhatsHappening/components/WhatsHappeningAssetPill.tsx
index 5caf37d85833..38fcd0fcb938 100644
--- a/app/components/UI/WhatsHappening/components/WhatsHappeningAssetPill.tsx
+++ b/app/components/UI/WhatsHappening/components/WhatsHappeningAssetPill.tsx
@@ -94,7 +94,11 @@ const WhatsHappeningAssetPill: React.FC<WhatsHappeningAssetPillProps> = ({
       paddingVertical={1}
       twClassName="rounded-full"
     >
-      <RelatedAssetAvatar name={asset.name} image={image} size={AVATAR_SIZE} />
+      <RelatedAssetAvatar
+        name={asset.name || asset.symbol}
+        image={image}
+        size={AVATAR_SIZE}
+      />
       <Text
         variant={TextVariant.BodyXs}
         fontWeight={FontWeight.Medium}
diff --git a/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.test.tsx b/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.test.tsx
index b0cc12847fcc..e00233fe5f02 100644
--- a/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.test.tsx
+++ b/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.test.tsx
@@ -148,6 +148,23 @@ describe('WhatsHappeningAssetSlider', () => {
     expect(screen.getByText('+1.23%')).toBeOnTheScreen();
   });
 
+  it('renders pills for perps assets that have no sourceAssetId', () => {
+    const assetWithoutSourceId = {
+      symbol: 'SOL',
+      name: 'Solana',
+      caip19: [],
+      hlPerpsMarket: ['SOL'],
+      // sourceAssetId intentionally absent
+    };
+    renderWithProvider(
+      <WhatsHappeningAssetSlider
+        {...sharedProps}
+        assets={[assetWithoutSourceId]}
+      />,
+    );
+    expect(screen.getByText('SOL')).toBeOnTheScreen();
+  });
+
   it('shows negative change in red and hides change text when undefined', () => {
     mockUseWhatsHappeningAssetPrices.mockReturnValue({
       perpsPriceBySymbol: {
diff --git a/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.tsx b/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.tsx
index e7389835f679..94b6088612b2 100644
--- a/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.tsx
+++ b/app/components/UI/WhatsHappening/components/WhatsHappeningAssetSlider.tsx
@@ -40,9 +40,9 @@ const WhatsHappeningAssetSlider: React.FC<WhatsHappeningAssetSliderProps> = ({
       contentContainerStyle={tw.style('flex-row gap-2 mt-2')}
       nestedScrollEnabled
     >
-      {perpsAssets.map((asset) => (
+      {perpsAssets.map((asset, index) => (
         <WhatsHappeningAssetPill
-          key={asset.sourceAssetId}
+          key={`${asset.symbol}-${index}`}
           asset={asset}
           perpsPriceEntry={perpsPriceBySymbol[asset.hlPerpsMarket?.[0] ?? '']}
           item={item}
diff --git a/app/components/UI/WhatsHappening/hooks/useWhatsHappening.test.ts b/app/components/UI/WhatsHappening/hooks/useWhatsHappening.test.ts
index 06357a27ca32..9373d059a9ba 100644
--- a/app/components/UI/WhatsHappening/hooks/useWhatsHappening.test.ts
+++ b/app/components/UI/WhatsHappening/hooks/useWhatsHappening.test.ts
@@ -157,4 +157,46 @@ describe('useWhatsHappening', () => {
 
     await waitFor(() => expect(result.current.items).toHaveLength(2));
   });
+
+  it('returns items and no error when an asset is missing sourceAssetId and name', async () => {
+    const assetWithoutOptionalFields = {
+      symbol: 'ETH',
+      caip19: ['eip155:1/slip44:60'],
+      // sourceAssetId intentionally absent
+      // name intentionally absent
+    };
+    mockFetchMarketOverview.mockResolvedValue({
+      ...mockOverview,
+      trends: [
+        {
+          ...mockTrend,
+          relatedAssets: [assetWithoutOptionalFields],
+        },
+      ],
+    });
+
+    const { result } = renderHook(() => useWhatsHappening());
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+    expect(result.current.items).toHaveLength(1);
+    expect(result.current.error).toBeNull();
+    expect(result.current.items[0].relatedAssets[0].symbol).toBe('ETH');
+    expect(
+      result.current.items[0].relatedAssets[0].sourceAssetId,
+    ).toBeUndefined();
+    expect(result.current.items[0].relatedAssets[0].name).toBeUndefined();
+  });
+
+  it('returns empty items and no error when API returns overview with empty trends', async () => {
+    mockFetchMarketOverview.mockResolvedValue({
+      ...mockOverview,
+      trends: [],
+    });
+
+    const { result } = renderHook(() => useWhatsHappening());
+    await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+    expect(result.current.items).toHaveLength(0);
+    expect(result.current.error).toBeNull();
+  });
 });
diff --git a/app/components/Views/AccountBackupStep1/index.js b/app/components/Views/AccountBackupStep1/index.js
index 50c75b039298..98a15390f755 100644
--- a/app/components/Views/AccountBackupStep1/index.js
+++ b/app/components/Views/AccountBackupStep1/index.js
@@ -37,7 +37,7 @@ import { MetricsEventBuilder } from '../../../core/Analytics/MetricsEventBuilder
 import SRPDesignLight from '../../../images/secure_wallet_light.png';
 import SRPDesignDark from '../../../images/secure_wallet_dark.png';
 import { CommonActions, useNavigation } from '@react-navigation/native';
-import { useMetrics } from '../../hooks/useMetrics';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import {
   AccountType,
   ONBOARDING_SUCCESS_FLOW,
@@ -48,7 +48,7 @@ import { AppThemeKey } from '../../../util/theme/models';
 const AccountBackupStep1 = (props) => {
   const [hasFunds, setHasFunds] = useState(false);
   const { themeAppearance } = useTheme();
-  const { isEnabled: isMetricsEnabled } = useMetrics();
+  const { isEnabled: isAnalyticsEnabled } = useAnalytics();
   const tw = useTailwind();
 
   const track = (event, properties) => {
@@ -100,7 +100,7 @@ const AccountBackupStep1 = (props) => {
     endTrace({ name: TraceName.OnboardingNewSrpCreateWallet });
     endTrace({ name: TraceName.OnboardingJourneyOverall });
 
-    if (isMetricsEnabled()) {
+    if (isAnalyticsEnabled()) {
       navigation.dispatch(resetAction);
     } else {
       navigation.navigate('OptinMetrics', {
diff --git a/app/components/Views/AccountBackupStep1/index.test.tsx b/app/components/Views/AccountBackupStep1/index.test.tsx
index b1bb0bc1ff56..86ac14eebe53 100644
--- a/app/components/Views/AccountBackupStep1/index.test.tsx
+++ b/app/components/Views/AccountBackupStep1/index.test.tsx
@@ -15,6 +15,8 @@ import { InteractionManager, Platform } from 'react-native';
 import { AccountType } from '../../../constants/onboarding';
 import SRPDesignDark from '../../../images/secure_wallet_dark.png';
 import SRPDesignLight from '../../../images/secure_wallet_light.png';
+import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
+import { createMockUseAnalyticsHook } from '../../../util/test/analyticsMock';
 
 // Use fake timers to resolve reanimated issues.
 jest.useFakeTimers();
@@ -32,18 +34,9 @@ jest.mock('../../../store/storage-wrapper', () => ({
   getItem: jest.fn(),
 }));
 
-const mockIsEnabled = jest.fn().mockReturnValue(true);
+const mockIsAnalyticsEnabled = jest.fn().mockReturnValue(true);
 
-jest.mock('../../hooks/useMetrics', () => {
-  const actualUseMetrics = jest.requireActual('../../hooks/useMetrics');
-  return {
-    ...actualUseMetrics,
-    useMetrics: jest.fn().mockReturnValue({
-      ...actualUseMetrics.useMetrics,
-      isEnabled: () => mockIsEnabled(),
-    }),
-  };
-});
+jest.mock('../../hooks/useAnalytics/useAnalytics');
 
 // Mock useTheme hook - default to dark theme
 const mockUseTheme = jest.fn().mockReturnValue({
@@ -106,6 +99,15 @@ jest.doMock('react-native', () => {
 });
 
 describe('AccountBackupStep1', () => {
+  beforeEach(() => {
+    mockIsAnalyticsEnabled.mockReturnValue(true);
+    jest
+      .mocked(useAnalytics)
+      .mockReturnValue(
+        createMockUseAnalyticsHook({ isEnabled: mockIsAnalyticsEnabled }),
+      );
+  });
+
   afterEach(() => {
     jest.useFakeTimers({ legacyFakeTimers: true });
     jest.clearAllMocks();
@@ -339,7 +341,7 @@ describe('AccountBackupStep1', () => {
     });
 
     it('handle skip when metrics is disabled', async () => {
-      mockIsEnabled.mockReturnValue(false);
+      mockIsAnalyticsEnabled.mockReturnValue(false);
       (Engine.hasFunds as jest.Mock).mockReturnValue(false);
       (StorageWrapper.getItem as jest.Mock).mockResolvedValue(null);
 
@@ -377,7 +379,7 @@ describe('AccountBackupStep1', () => {
     });
 
     it('handle secure now button to goNext step when metrics is disabled', async () => {
-      mockIsEnabled.mockReturnValue(false);
+      mockIsAnalyticsEnabled.mockReturnValue(false);
       (Engine.hasFunds as jest.Mock).mockReturnValue(false);
       (StorageWrapper.getItem as jest.Mock).mockResolvedValue(null);
 
diff --git a/app/components/Views/ChoosePassword/index.test.tsx b/app/components/Views/ChoosePassword/index.test.tsx
index 64f97a883672..baa05fb3a484 100644
--- a/app/components/Views/ChoosePassword/index.test.tsx
+++ b/app/components/Views/ChoosePassword/index.test.tsx
@@ -232,7 +232,6 @@ const mockMetrics = {
   trackEvent: mockTrackEvent,
   enable: mockEnable,
   identify: jest.fn().mockResolvedValue(undefined),
-  addTraitsToUser: jest.fn().mockResolvedValue(undefined),
   createEventBuilder: jest.fn(() => ({
     addProperties: jest.fn().mockReturnThis(),
     build: jest.fn(() => ({ name: 'Analytics Preference Selected' })),
@@ -710,7 +709,7 @@ describe('ChoosePassword', () => {
           ],
         });
         expect(mockTrackEvent).toHaveBeenCalled();
-        expect(mockMetrics.addTraitsToUser).toHaveBeenCalled();
+        expect(mockMetrics.identify).toHaveBeenCalled();
       });
 
       mockNewWalletAndKeychain.mockRestore();
@@ -1029,7 +1028,7 @@ describe('ChoosePassword', () => {
         expect(mockNewWalletAndKeychain).toHaveBeenCalledTimes(1);
         expect(spyUpdateMarketingOptInStatus).toHaveBeenCalledWith(true);
         expect(mockTrackEvent).toHaveBeenCalled();
-        expect(mockMetrics.addTraitsToUser).toHaveBeenCalled();
+        expect(mockMetrics.identify).toHaveBeenCalled();
       });
 
       mockNewWalletAndKeychain.mockRestore();
@@ -1066,7 +1065,7 @@ describe('ChoosePassword', () => {
         expect(mockNewWalletAndKeychain).toHaveBeenCalledTimes(1);
         expect(spyUpdateMarketingOptInStatus).toHaveBeenCalledWith(false);
         expect(mockTrackEvent).toHaveBeenCalled();
-        expect(mockMetrics.addTraitsToUser).toHaveBeenCalled();
+        expect(mockMetrics.identify).toHaveBeenCalled();
       });
 
       mockNewWalletAndKeychain.mockRestore();
diff --git a/app/components/Views/ChoosePassword/index.tsx b/app/components/Views/ChoosePassword/index.tsx
index 6014541d70f9..3ffe569a4105 100644
--- a/app/components/Views/ChoosePassword/index.tsx
+++ b/app/components/Views/ChoosePassword/index.tsx
@@ -350,7 +350,7 @@ const ChoosePassword = () => {
               .build(),
           );
 
-          await metrics.addTraitsToUser({
+          await metrics.identify({
             ...generateDeviceAnalyticsMetaData(),
             ...generateUserSettingsAnalyticsMetaData(),
           });
diff --git a/app/components/Views/Homepage/Sections/Perpetuals/PerpsSectionMain.tsx b/app/components/Views/Homepage/Sections/Perpetuals/PerpsSectionMain.tsx
index 0de689d05ad4..a2eba4299dd0 100644
--- a/app/components/Views/Homepage/Sections/Perpetuals/PerpsSectionMain.tsx
+++ b/app/components/Views/Homepage/Sections/Perpetuals/PerpsSectionMain.tsx
@@ -376,29 +376,29 @@ const PerpsSectionMain = forwardRef<SectionRefreshHandle, PerpsSectionProps>(
               />
             )}
           </Box>
-          {showSkeleton || pendingTrending ? (
+          {showSkeleton || pendingTrending || hasItems ? (
             <SectionRow>
-              <PerpsPositionSkeleton />
-            </SectionRow>
-          ) : hasItems ? (
-            <SectionRow>
-              <Box testID="homepage-perps-positions">
-                {displayPositions.map((position) => (
-                  <PerpsCard
-                    key={position.symbol}
-                    position={position}
-                    onPress={() => handlePositionPress(position)}
-                    testID={`perps-position-row-${position.symbol}`}
-                  />
-                ))}
-                {displayOrders.map((order) => (
-                  <PerpsCard
-                    key={order.orderId}
-                    order={order}
-                    testID={`perps-order-row-${order.orderId}`}
-                  />
-                ))}
-              </Box>
+              {showSkeleton || pendingTrending ? (
+                <PerpsPositionSkeleton />
+              ) : (
+                <Box testID="homepage-perps-positions">
+                  {displayPositions.map((position) => (
+                    <PerpsCard
+                      key={position.symbol}
+                      position={position}
+                      onPress={() => handlePositionPress(position)}
+                      testID={`perps-position-row-${position.symbol}`}
+                    />
+                  ))}
+                  {displayOrders.map((order) => (
+                    <PerpsCard
+                      key={order.orderId}
+                      order={order}
+                      testID={`perps-order-row-${order.orderId}`}
+                    />
+                  ))}
+                </Box>
+              )}
             </SectionRow>
           ) : shouldShowPillsEmptyState ? (
             <PerpsPillsRail
diff --git a/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsPillsRail.tsx b/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsPillsRail.tsx
index bd7cedb79d76..652cb9fde36c 100644
--- a/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsPillsRail.tsx
+++ b/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsPillsRail.tsx
@@ -18,7 +18,7 @@ const PerpsPillsRail = ({
   <PillScrollList<PerpsFeedItem>
     data={data}
     isLoading={isLoading}
-    wrapperTwClassName="bg-transparent"
+    wrapperTwClassName="bg-transparent py-3"
     renderItem={(item) => (
       <PerpsPillItem item={item} onNavigateToMarketDetails={onPressMarket} />
     )}
diff --git a/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsTrendingCarousel.tsx b/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsTrendingCarousel.tsx
index 9dd8f94728be..f41cc3ca1afc 100644
--- a/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsTrendingCarousel.tsx
+++ b/app/components/Views/Homepage/Sections/Perpetuals/components/PerpsTrendingCarousel.tsx
@@ -30,7 +30,7 @@ const PerpsTrendingCarousel = ({
     <ScrollView
       horizontal
       showsHorizontalScrollIndicator={false}
-      contentContainerStyle={tw.style('px-4 gap-2.5')}
+      contentContainerStyle={tw.style('px-4 gap-2.5 py-3')}
       testID="homepage-trending-perps-carousel"
     >
       {markets.map((market) => (
diff --git a/app/components/Views/Homepage/Sections/Predictions/components/HomepagePredictTrendingCarousel.tsx b/app/components/Views/Homepage/Sections/Predictions/components/HomepagePredictTrendingCarousel.tsx
index 527fe15a3dcf..0acc051ce24b 100644
--- a/app/components/Views/Homepage/Sections/Predictions/components/HomepagePredictTrendingCarousel.tsx
+++ b/app/components/Views/Homepage/Sections/Predictions/components/HomepagePredictTrendingCarousel.tsx
@@ -53,7 +53,7 @@ const HomepagePredictTrendingCarousel = ({
       <ScrollView
         horizontal
         showsHorizontalScrollIndicator={false}
-        contentContainerStyle={tw.style('px-4 gap-3')}
+        contentContainerStyle={tw.style('px-4 gap-3 py-3')}
       >
         {isLoadingMarkets ? (
           CAROUSEL_SKELETON_KEYS.map((key) => (
diff --git a/app/components/Views/Homepage/Sections/Tokens/TokensSection.tsx b/app/components/Views/Homepage/Sections/Tokens/TokensSection.tsx
index 1f50976e7621..0149066bb1ed 100644
--- a/app/components/Views/Homepage/Sections/Tokens/TokensSection.tsx
+++ b/app/components/Views/Homepage/Sections/Tokens/TokensSection.tsx
@@ -239,45 +239,47 @@ const TokensSectionMain = forwardRef<SectionRefreshHandle, TokensSectionProps>(
     }
 
     return (
-      <View ref={sectionViewRef} onLayout={onLayout} style={styles.sectionGap}>
-        <SectionHeader
-          title={title}
-          onPress={handleViewAllTokens}
-          testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens')}
-        />
-        {showTokensError ? (
-          <ErrorState
-            title={strings('homepage.error.unable_to_load', {
-              section: title.toLowerCase(),
-            })}
-            onRetry={handleTokensRetry}
+      <View ref={sectionViewRef} onLayout={onLayout}>
+        <View style={styles.sectionGap}>
+          <SectionHeader
+            title={title}
+            onPress={handleViewAllTokens}
+            testID={WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens')}
           />
-        ) : isZeroBalanceAccount ? (
-          <SectionRow>
-            <PopularTokensList
-              ref={popularTokensListRef}
-              onError={setHasTokensError}
+          {showTokensError ? (
+            <ErrorState
+              title={strings('homepage.error.unable_to_load', {
+                section: title.toLowerCase(),
+              })}
+              onRetry={handleTokensRetry}
             />
-          </SectionRow>
-        ) : (
-          <SectionRow>
-            {displayTokenKeys.length === 0 && sortedTokenKeys.length === 0 ? (
-              <TokenListSkeleton count={MAX_TOKENS_DISPLAYED} />
-            ) : (
-              displayTokenKeys.map((tokenKey, index) => (
-                <TokenListItem
-                  key={`${tokenKey.chainId}-${tokenKey.address}-${tokenKey.isStaked ? 'staked' : 'unstaked'}-${index}`}
-                  assetKey={tokenKey}
-                  showRemoveMenu={showRemoveMenu}
-                  setShowScamWarningModal={setShowScamWarningModal}
-                  privacyMode={privacyMode}
-                  showPercentageChange
-                  shouldShowTokenListItemCta={shouldShowTokenListItemCta}
-                />
-              ))
-            )}
-          </SectionRow>
-        )}
+          ) : isZeroBalanceAccount ? (
+            <SectionRow>
+              <PopularTokensList
+                ref={popularTokensListRef}
+                onError={setHasTokensError}
+              />
+            </SectionRow>
+          ) : (
+            <SectionRow>
+              {displayTokenKeys.length === 0 && sortedTokenKeys.length === 0 ? (
+                <TokenListSkeleton count={MAX_TOKENS_DISPLAYED} />
+              ) : (
+                displayTokenKeys.map((tokenKey, index) => (
+                  <TokenListItem
+                    key={`${tokenKey.chainId}-${tokenKey.address}-${tokenKey.isStaked ? 'staked' : 'unstaked'}-${index}`}
+                    assetKey={tokenKey}
+                    showRemoveMenu={showRemoveMenu}
+                    setShowScamWarningModal={setShowScamWarningModal}
+                    privacyMode={privacyMode}
+                    showPercentageChange
+                    shouldShowTokenListItemCta={shouldShowTokenListItemCta}
+                  />
+                ))
+              )}
+            </SectionRow>
+          )}
+        </View>
         <ScamWarningModal
           showScamWarningModal={showScamWarningModal}
           setShowScamWarningModal={setShowScamWarningModal}
diff --git a/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx b/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx
index dc6de9c91f95..e33c02d3d905 100644
--- a/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx
+++ b/app/components/Views/Homepage/Sections/TopTraders/TopTradersSection.tsx
@@ -185,7 +185,7 @@ const TopTradersSection = forwardRef<
         <ScrollView
           horizontal
           showsHorizontalScrollIndicator={false}
-          contentContainerStyle={tw.style('px-4 gap-3 pb-2')}
+          contentContainerStyle={tw.style('px-4 gap-3 py-3')}
           testID="homepage-top-traders-carousel"
         >
           {showSkeletons
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.test.tsx
index 4944c7dd37be..ab8aaf09b83f 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.test.tsx
@@ -4,81 +4,31 @@ import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import QuickBuyBanners from './QuickBuyBanners';
 
 jest.mock('../../../../../../../locales/i18n', () => ({
-  strings: (key: string, params?: Record<string, string>) => {
-    if (!params) return key;
-    return Object.entries(params).reduce(
-      (acc, [k, v]) => acc.replace(`{{${k}}}`, String(v)),
-      `${key}:{{${Object.keys(params).join(',')}}}`,
-    );
-  },
+  strings: (key: string) => key,
 }));
 
-const renderBanners = (
-  overrides: Partial<React.ComponentProps<typeof QuickBuyBanners>> = {},
-) =>
-  renderWithProvider(
-    <QuickBuyBanners
-      isHardwareSolanaBlocked={false}
-      isPriceImpactError={false}
-      isPriceImpactWarning={false}
-      formattedPriceImpact="-"
-      {...overrides}
-    />,
-  );
-
 describe('QuickBuyBanners', () => {
   it('renders nothing when no warnings are active', () => {
-    const { toJSON } = renderBanners();
+    const { toJSON } = renderWithProvider(
+      <QuickBuyBanners isHardwareSolanaBlocked={false} />,
+    );
     expect(toJSON()).toBeNull();
   });
 
   it('renders the hardware-wallet + Solana banner when blocked', () => {
-    renderBanners({ isHardwareSolanaBlocked: true });
+    renderWithProvider(<QuickBuyBanners isHardwareSolanaBlocked />);
     expect(
       screen.getByText('bridge.hardware_wallet_not_supported_solana'),
     ).toBeOnTheScreen();
   });
 
-  it('renders the price-impact error banner with formatted percentage', () => {
-    renderBanners({
-      isPriceImpactError: true,
-      formattedPriceImpact: '30.00%',
-    });
-
+  it('does not render price-impact banners (handled by modal and pill)', () => {
+    renderWithProvider(<QuickBuyBanners isHardwareSolanaBlocked={false} />);
     expect(
-      screen.getByText('bridge.price_impact_error_title'),
-    ).toBeOnTheScreen();
+      screen.queryByText('bridge.price_impact_error_title'),
+    ).not.toBeOnTheScreen();
     expect(
-      screen.getByText(/bridge\.price_impact_error_description.*30\.00%/),
-    ).toBeOnTheScreen();
-  });
-
-  it('renders the price-impact warning banner with formatted percentage', () => {
-    renderBanners({
-      isPriceImpactWarning: true,
-      formattedPriceImpact: '7.50%',
-    });
-
-    expect(
-      screen.getByText('bridge.price_impact_warning_title'),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByText(/bridge\.price_impact_warning_description.*7\.50%/),
-    ).toBeOnTheScreen();
-  });
-
-  it('stacks multiple banners when several conditions fire', () => {
-    renderBanners({
-      isHardwareSolanaBlocked: true,
-      isPriceImpactWarning: true,
-      formattedPriceImpact: '7.50%',
-    });
-
-    expect(
-      screen.getByText('bridge.hardware_wallet_not_supported_solana'),
-    ).toBeOnTheScreen();
-    expect(
-      screen.getByText('bridge.price_impact_warning_title'),
-    ).toBeOnTheScreen();
+      screen.queryByText('bridge.price_impact_warning_title'),
+    ).not.toBeOnTheScreen();
   });
 });
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.tsx
index f162056eb9b8..d245aecf6701 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyBanners.tsx
@@ -1,27 +1,19 @@
 import React from 'react';
-import { Box } from '@metamask/design-system-react-native';
-import BannerAlert from '../../../../../../component-library/components/Banners/Banner/variants/BannerAlert';
-import { BannerAlertSeverity } from '../../../../../../component-library/components/Banners/Banner/variants/BannerAlert/BannerAlert.types';
+import {
+  BannerAlert,
+  BannerAlertSeverity,
+  Box,
+} from '@metamask/design-system-react-native';
 import { strings } from '../../../../../../../locales/i18n';
 
 export interface QuickBuyBannersProps {
   isHardwareSolanaBlocked: boolean;
-  isPriceImpactError: boolean;
-  isPriceImpactWarning: boolean;
-  formattedPriceImpact: string;
 }
 
 const QuickBuyBanners: React.FC<QuickBuyBannersProps> = ({
   isHardwareSolanaBlocked,
-  isPriceImpactError,
-  isPriceImpactWarning,
-  formattedPriceImpact,
 }) => {
-  if (
-    !isHardwareSolanaBlocked &&
-    !isPriceImpactError &&
-    !isPriceImpactWarning
-  ) {
+  if (!isHardwareSolanaBlocked) {
     return null;
   }
 
@@ -29,30 +21,10 @@ const QuickBuyBanners: React.FC<QuickBuyBannersProps> = ({
     <Box twClassName="px-4" gap={3}>
       {isHardwareSolanaBlocked && (
         <BannerAlert
-          severity={BannerAlertSeverity.Error}
+          severity={BannerAlertSeverity.Danger}
           description={strings('bridge.hardware_wallet_not_supported_solana')}
         />
       )}
-
-      {isPriceImpactError && (
-        <BannerAlert
-          severity={BannerAlertSeverity.Error}
-          title={strings('bridge.price_impact_error_title')}
-          description={strings('bridge.price_impact_error_description', {
-            priceImpact: formattedPriceImpact,
-          })}
-        />
-      )}
-
-      {isPriceImpactWarning && (
-        <BannerAlert
-          severity={BannerAlertSeverity.Warning}
-          title={strings('bridge.price_impact_warning_title')}
-          description={strings('bridge.price_impact_warning_description', {
-            priceImpact: formattedPriceImpact,
-          })}
-        />
-      )}
     </Box>
   );
 };
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.test.tsx
new file mode 100644
index 000000000000..4127bec6f485
--- /dev/null
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.test.tsx
@@ -0,0 +1,235 @@
+import React, { useContext } from 'react';
+import { act, render } from '@testing-library/react-native';
+import { TextColor } from '@metamask/design-system-react-native';
+import {
+  QuickBuyContext,
+  QuickBuyProvider,
+  type QuickBuyContextValue,
+} from './QuickBuyContext';
+import {
+  useQuickBuyController,
+  type UseQuickBuyControllerResult,
+} from './hooks/useQuickBuyController';
+import type { QuickBuyFeatures, QuickBuyTarget } from './types';
+
+jest.mock('./hooks/useQuickBuyController', () => ({
+  useQuickBuyController: jest.fn(),
+}));
+
+const mockTarget: QuickBuyTarget = {
+  tokenAddress: '0x1234567890123456789012345678901234567890',
+  tokenSymbol: 'PEPE',
+  tokenName: 'Pepe',
+  chain: 'base',
+};
+
+const featuresWithModal: QuickBuyFeatures = {
+  tradeModes: ['buy'],
+  quoteDetails: false,
+  selectQuote: false,
+  payWithSheet: true,
+  highPriceImpactModal: true,
+  fiatCryptoToggle: true,
+};
+
+const featuresWithoutModal: QuickBuyFeatures = {
+  ...featuresWithModal,
+  highPriceImpactModal: false,
+};
+
+const buildController = (
+  overrides: Partial<UseQuickBuyControllerResult> = {},
+): UseQuickBuyControllerResult => ({
+  hiddenInputRef: { current: null } as never,
+  activeQuote: undefined,
+  destToken: undefined,
+  isSetupLoading: false,
+  isUnsupportedChain: false,
+  sourceToken: undefined,
+  sourceChainId: '0x1',
+  sourceTokenOptions: [],
+  selectedSourceToken: undefined,
+  isSourcePickerOpen: false,
+  setIsSourcePickerOpen: jest.fn(),
+  setSelectedSourceToken: jest.fn(),
+  currentCurrency: 'USD',
+  amountDisplayMode: 'fiat',
+  usdAmount: '',
+  sliderPercent: 0,
+  maxSpendUsd: 0,
+  formattedExchangeRate: undefined,
+  metamaskFeePercent: 0,
+  estimatedReceiveAmount: undefined,
+  sourceBalanceFiat: '$0.00',
+  sourceBalanceDisplay: undefined,
+  formattedNetworkFee: '-',
+  formattedSlippage: '-',
+  formattedMinimumReceived: '-',
+  formattedMinimumReceivedFiat: undefined,
+  formattedPriceImpact: '-',
+  formattedRate: undefined,
+  totalAmountUsd: '$0',
+  isQuoteLoading: false,
+  isSubmittingTx: false,
+  isTotalLoading: false,
+  sortedQuotes: [],
+  selectedQuoteRequestId: undefined,
+  setSelectedQuoteRequestId: jest.fn(),
+  quotesLastFetchedAt: null,
+  refreshCount: 0,
+  quoteRefreshRateMs: 30000,
+  maxRefreshCount: 5,
+  refetchQuotes: jest.fn(),
+  isHardwareSolanaBlocked: false,
+  priceImpactViewData: {
+    textColor: TextColor.TextAlternative,
+    icon: undefined,
+    title: 'bridge.price_impact_info_title',
+    description: 'bridge.price_impact_info_description',
+  },
+  isPriceImpactError: false,
+  buttonError: null,
+  hasValidAmount: false,
+  isConfirmDisabled: false,
+  confirmButtonState: 'idle',
+  getButtonLabel: () => 'Buy',
+  handleClose: jest.fn(),
+  handleSliderChange: jest.fn(),
+  handleAmountAreaPress: jest.fn(),
+  handleAmountChange: jest.fn(),
+  handleToggleAmountDisplay: jest.fn(),
+  handleSelectSourceToken: jest.fn(),
+  handleConfirm: jest.fn().mockResolvedValue(undefined),
+  ...overrides,
+});
+
+/**
+ * Renders a QuickBuyProvider and exposes the context value via a ref so tests
+ * can inspect or invoke context methods directly.
+ */
+function renderProvider(
+  features: QuickBuyFeatures,
+  setActiveScreen: jest.Mock = jest.fn(),
+) {
+  const contextRef: { current: QuickBuyContextValue } = {
+    current: null as never,
+  };
+
+  const Consumer = () => {
+    contextRef.current = useContext(QuickBuyContext) as never;
+    return null;
+  };
+
+  render(
+    <QuickBuyProvider
+      target={mockTarget}
+      onClose={jest.fn()}
+      features={features}
+      activeScreen="amount"
+      setActiveScreen={setActiveScreen}
+    >
+      <Consumer />
+    </QuickBuyProvider>,
+  );
+
+  return contextRef;
+}
+
+describe('QuickBuyProvider — handleBuy', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls handleConfirm directly when there is no price impact error', async () => {
+    const handleConfirm = jest.fn().mockResolvedValue(undefined);
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isPriceImpactError: false, handleConfirm }),
+    );
+
+    const setActiveScreen = jest.fn();
+    const ctx = renderProvider(featuresWithModal, setActiveScreen);
+
+    await act(async () => {
+      await ctx.current.handleBuy();
+    });
+
+    expect(handleConfirm).toHaveBeenCalledTimes(1);
+    expect(setActiveScreen).not.toHaveBeenCalled();
+  });
+
+  it('navigates to priceImpactConfirm when isPriceImpactError=true and highPriceImpactModal=true', async () => {
+    const handleConfirm = jest.fn();
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isPriceImpactError: true, handleConfirm }),
+    );
+
+    const setActiveScreen = jest.fn();
+    const ctx = renderProvider(featuresWithModal, setActiveScreen);
+
+    await act(async () => {
+      await ctx.current.handleBuy();
+    });
+
+    expect(setActiveScreen).toHaveBeenCalledWith('priceImpactConfirm');
+    expect(handleConfirm).not.toHaveBeenCalled();
+  });
+
+  it('does not navigate and does not confirm when isPriceImpactError=true and highPriceImpactModal=false', async () => {
+    const handleConfirm = jest.fn();
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isPriceImpactError: true, handleConfirm }),
+    );
+
+    const setActiveScreen = jest.fn();
+    const ctx = renderProvider(featuresWithoutModal, setActiveScreen);
+
+    await act(async () => {
+      await ctx.current.handleBuy();
+    });
+
+    expect(setActiveScreen).not.toHaveBeenCalled();
+    expect(handleConfirm).not.toHaveBeenCalled();
+  });
+});
+
+describe('QuickBuyProvider — isConfirmDisabled', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('is false when controller says false and there is no price impact error', () => {
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isConfirmDisabled: false, isPriceImpactError: false }),
+    );
+
+    const ctx = renderProvider(featuresWithModal);
+    expect(ctx.current.isConfirmDisabled).toBe(false);
+  });
+
+  it('is true when isPriceImpactError=true and highPriceImpactModal=false', () => {
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isConfirmDisabled: false, isPriceImpactError: true }),
+    );
+
+    const ctx = renderProvider(featuresWithoutModal);
+    expect(ctx.current.isConfirmDisabled).toBe(true);
+  });
+
+  it('is false (modal handles it) when isPriceImpactError=true and highPriceImpactModal=true', () => {
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isConfirmDisabled: false, isPriceImpactError: true }),
+    );
+
+    const ctx = renderProvider(featuresWithModal);
+    expect(ctx.current.isConfirmDisabled).toBe(false);
+  });
+
+  it('respects the controller isConfirmDisabled flag independently', () => {
+    (useQuickBuyController as jest.Mock).mockReturnValue(
+      buildController({ isConfirmDisabled: true, isPriceImpactError: false }),
+    );
+
+    const ctx = renderProvider(featuresWithModal);
+    expect(ctx.current.isConfirmDisabled).toBe(true);
+  });
+});
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.tsx
index bdbeb1a4da66..bd4c9bc51890 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyContext.tsx
@@ -1,4 +1,4 @@
-import React, { createContext } from 'react';
+import React, { createContext, useCallback } from 'react';
 import {
   useQuickBuyController,
   type UseQuickBuyControllerResult,
@@ -17,6 +17,13 @@ export interface QuickBuyContextValue extends UseQuickBuyControllerResult {
   onClose: () => void;
   activeScreen: QuickBuyScreen;
   setActiveScreen: React.Dispatch<React.SetStateAction<QuickBuyScreen>>;
+  /**
+   * Called by the Buy button. When the high-price-impact modal feature is
+   * enabled and the active quote exceeds the error threshold, this navigates
+   * to the `priceImpactConfirm` screen instead of submitting immediately.
+   * Otherwise it delegates directly to `handleConfirm`.
+   */
+  handleBuy: () => Promise<void>;
 }
 
 export const QuickBuyContext = createContext<QuickBuyContextValue | null>(null);
@@ -41,15 +48,40 @@ export const QuickBuyProvider: React.FC<QuickBuyProviderProps> = ({
   children,
 }) => {
   const controller = useQuickBuyController(target, onClose, analyticsContext);
+  const { isPriceImpactError, handleConfirm } = controller;
+
+  const handleBuy = useCallback(async () => {
+    if (isPriceImpactError) {
+      // We guard here to ensure no high-impact trade ever silently proceeds.
+      if (features.highPriceImpactModal) {
+        setActiveScreen('priceImpactConfirm');
+      }
+      return;
+    }
+    await handleConfirm();
+  }, [
+    features.highPriceImpactModal,
+    isPriceImpactError,
+    handleConfirm,
+    setActiveScreen,
+  ]);
+
+  // When the modal feature is off the button must be disabled for any
+  // high-impact quote, since there is no other safeguard in place.
+  const isConfirmDisabled =
+    controller.isConfirmDisabled ||
+    (isPriceImpactError && !features.highPriceImpactModal);
 
   const value: QuickBuyContextValue = {
     ...controller,
+    isConfirmDisabled,
     target,
     features,
     analyticsContext,
     onClose,
     activeScreen,
     setActiveScreen,
+    handleBuy,
   };
 
   return (
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.test.tsx
index 6db59dfa942e..d35a55a75e73 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react-native';
+import { StyleSheet } from 'react-native';
 import type { BridgeToken } from '../../../../../UI/Bridge/types';
 import QuickBuyPayWithScreen from './QuickBuyPayWithScreen';
 import { useQuickBuyContext } from './useQuickBuyContext';
@@ -169,4 +170,13 @@ describe('QuickBuyPayWithScreen', () => {
     expect(screen.getByTestId(getRowTestId(usdcToken))).toBeOnTheScreen();
     expect(screen.getByTestId(getRowTestId(usdtToken))).toBeOnTheScreen();
   });
+
+  it('fills the available height so the token list scrolls within a fixed area', () => {
+    render(<QuickBuyPayWithScreen />);
+
+    const scrollView = screen.getByTestId('quick-buy-pay-with-scroll');
+    const flattenedStyle = StyleSheet.flatten(scrollView.props.style);
+
+    expect(flattenedStyle.flexGrow).toBe(1);
+  });
 });
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.tsx
index fec0721f8f59..e748de67ab3b 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPayWithScreen.tsx
@@ -4,10 +4,12 @@ import {
   BottomSheetHeader,
   Box,
   BoxAlignItems,
+  BoxJustifyContent,
   Text,
   TextColor,
   TextVariant,
 } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import { strings } from '../../../../../../../locales/i18n';
 import QuickBuyPayWithChainFilter from './components/QuickBuyPayWithChainFilter';
 import QuickBuyPayWithRow from './components/QuickBuyPayWithRow';
@@ -16,6 +18,7 @@ import { getTokenKey } from './sourceTokenCandidates';
 import { useQuickBuyContext } from './useQuickBuyContext';
 
 const QuickBuyPayWithScreen: React.FC = () => {
+  const tw = useTailwind();
   const {
     sourceTokenOptions,
     selectedSourceToken,
@@ -84,7 +87,11 @@ const QuickBuyPayWithScreen: React.FC = () => {
       </BottomSheetHeader>
 
       {sourceTokenOptions.length === 0 ? (
-        <Box twClassName="px-4 py-8" alignItems={BoxAlignItems.Center}>
+        <Box
+          twClassName="flex-1 px-4 py-8"
+          alignItems={BoxAlignItems.Center}
+          justifyContent={BoxJustifyContent.Center}
+        >
           <Text variant={TextVariant.BodyMd} color={TextColor.TextAlternative}>
             {strings('social_leaderboard.quick_buy.pay_with_no_tokens')}
           </Text>
@@ -100,7 +107,11 @@ const QuickBuyPayWithScreen: React.FC = () => {
           ) : null}
 
           {filteredTokens.length === 0 ? (
-            <Box twClassName="px-4 py-8" alignItems={BoxAlignItems.Center}>
+            <Box
+              twClassName="flex-1 px-4 py-8"
+              alignItems={BoxAlignItems.Center}
+              justifyContent={BoxJustifyContent.Center}
+            >
               <Text
                 variant={TextVariant.BodyMd}
                 color={TextColor.TextAlternative}
@@ -110,6 +121,7 @@ const QuickBuyPayWithScreen: React.FC = () => {
             </Box>
           ) : (
             <GestureHandlerScrollView
+              style={tw.style('flex-1')}
               keyboardShouldPersistTaps="handled"
               showsVerticalScrollIndicator={false}
               testID="quick-buy-pay-with-scroll"
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPriceImpactConfirmScreen.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPriceImpactConfirmScreen.test.tsx
new file mode 100644
index 000000000000..d57f8df37a22
--- /dev/null
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPriceImpactConfirmScreen.test.tsx
@@ -0,0 +1,201 @@
+import React from 'react';
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react-native';
+import QuickBuyPriceImpactConfirmScreen from './QuickBuyPriceImpactConfirmScreen';
+import { useQuickBuyContext } from './useQuickBuyContext';
+
+jest.mock('./useQuickBuyContext', () => ({
+  useQuickBuyContext: jest.fn(),
+}));
+
+jest.mock(
+  '../../../../../UI/Bridge/components/PriceImpactModal/PriceImpactHeader',
+  () => ({
+    PriceImpactHeader: jest.fn(
+      ({ onClose, content }: { onClose: () => void; content: string }) => {
+        const { View, TouchableOpacity, Text } =
+          jest.requireActual('react-native');
+        return (
+          <View testID="price-impact-header">
+            <Text testID="price-impact-header-content">{content}</Text>
+            <TouchableOpacity
+              testID="price-impact-header-close"
+              onPress={onClose}
+            >
+              <Text>Close</Text>
+            </TouchableOpacity>
+          </View>
+        );
+      },
+    ),
+  }),
+);
+
+jest.mock(
+  '../../../../../UI/Bridge/components/PriceImpactModal/PriceImpactFooter',
+  () => ({
+    PriceImpactFooter: jest.fn(
+      ({
+        onConfirm,
+        onCancel,
+        loading,
+      }: {
+        type: string;
+        onConfirm: () => void;
+        onCancel: () => Promise<void>;
+        loading: boolean;
+      }) => {
+        const { View, TouchableOpacity, Text } =
+          jest.requireActual('react-native');
+        return (
+          <View testID="price-impact-footer">
+            <TouchableOpacity testID="footer-cancel" onPress={onConfirm}>
+              <Text>Cancel</Text>
+            </TouchableOpacity>
+            <TouchableOpacity
+              testID="footer-proceed"
+              onPress={onCancel}
+              disabled={loading}
+            >
+              <Text>Proceed</Text>
+            </TouchableOpacity>
+          </View>
+        );
+      },
+    ),
+  }),
+);
+
+jest.mock('../../../../../UI/Bridge/hooks/usePriceImpactFiat', () => ({
+  usePriceImpactFiat: jest.fn(),
+}));
+
+import { usePriceImpactFiat } from '../../../../../UI/Bridge/hooks/usePriceImpactFiat';
+
+const buildContext = (overrides = {}) => ({
+  activeQuote: undefined as unknown,
+  formattedPriceImpact: '25.00%',
+  setActiveScreen: jest.fn(),
+  handleConfirm: jest.fn(),
+  isSubmittingTx: false,
+  ...overrides,
+});
+
+describe('QuickBuyPriceImpactConfirmScreen', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useQuickBuyContext as jest.Mock).mockReturnValue(buildContext());
+    (usePriceImpactFiat as jest.Mock).mockReturnValue(undefined);
+  });
+
+  it('renders the header with the error title', () => {
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    expect(screen.getByTestId('price-impact-header-content')).toHaveTextContent(
+      'bridge.price_impact_error_title',
+    );
+  });
+
+  it('renders the description text with formatted price impact', () => {
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    expect(screen.getByTestId('price-impact-description')).toBeOnTheScreen();
+  });
+
+  it('shows the fiat loss banner when fiat value is available', () => {
+    (usePriceImpactFiat as jest.Mock).mockReturnValue('$19,997.62');
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    expect(screen.getByTestId('price-impact-fiat-banner')).toBeOnTheScreen();
+    expect(screen.getByTestId('price-impact-fiat-text')).toBeOnTheScreen();
+  });
+
+  it('hides the fiat loss banner when fiat value is unavailable', () => {
+    (usePriceImpactFiat as jest.Mock).mockReturnValue(undefined);
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    expect(
+      screen.queryByTestId('price-impact-fiat-banner'),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('calls setActiveScreen("amount") when the close/cancel button is pressed', () => {
+    const setActiveScreen = jest.fn();
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({ setActiveScreen }),
+    );
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    fireEvent.press(screen.getByTestId('price-impact-header-close'));
+    expect(setActiveScreen).toHaveBeenCalledWith('amount');
+  });
+
+  it('calls setActiveScreen("amount") when the footer Cancel button is pressed', () => {
+    const setActiveScreen = jest.fn();
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({ setActiveScreen }),
+    );
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    fireEvent.press(screen.getByTestId('footer-cancel'));
+    expect(setActiveScreen).toHaveBeenCalledWith('amount');
+  });
+
+  it('calls handleConfirm when the footer Proceed button is pressed', async () => {
+    const handleConfirm = jest.fn().mockResolvedValue(undefined);
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({ handleConfirm }),
+    );
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    fireEvent.press(screen.getByTestId('footer-proceed'));
+    await waitFor(() => expect(handleConfirm).toHaveBeenCalledTimes(1));
+  });
+
+  it('passes loading=true to the footer while handleConfirm is in-flight', async () => {
+    let resolveConfirm!: () => void;
+    const handleConfirm = jest.fn(
+      () =>
+        new Promise<void>((res) => {
+          resolveConfirm = res;
+        }),
+    );
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({ handleConfirm }),
+    );
+
+    const { PriceImpactFooter } = jest.requireMock(
+      '../../../../../UI/Bridge/components/PriceImpactModal/PriceImpactFooter',
+    ) as { PriceImpactFooter: jest.Mock };
+
+    render(<QuickBuyPriceImpactConfirmScreen />);
+    fireEvent.press(screen.getByTestId('footer-proceed'));
+
+    await waitFor(() => {
+      const lastCall = PriceImpactFooter.mock.calls.at(-1)?.[0];
+      expect(lastCall?.loading).toBe(true);
+    });
+
+    await act(async () => {
+      resolveConfirm();
+    });
+
+    await waitFor(() => {
+      const lastCall = PriceImpactFooter.mock.calls.at(-1)?.[0];
+      expect(lastCall?.loading).toBe(false);
+    });
+  });
+
+  it('passes loading=true to the footer when isSubmittingTx is true', () => {
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({ isSubmittingTx: true }),
+    );
+
+    const { PriceImpactFooter } = jest.requireMock(
+      '../../../../../UI/Bridge/components/PriceImpactModal/PriceImpactFooter',
+    ) as { PriceImpactFooter: jest.Mock };
+
+    render(<QuickBuyPriceImpactConfirmScreen />);
+
+    const lastCall = PriceImpactFooter.mock.calls.at(-1)?.[0];
+    expect(lastCall?.loading).toBe(true);
+  });
+});
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPriceImpactConfirmScreen.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPriceImpactConfirmScreen.tsx
new file mode 100644
index 000000000000..81a207745281
--- /dev/null
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyPriceImpactConfirmScreen.tsx
@@ -0,0 +1,106 @@
+import React, { useCallback, useState } from 'react';
+import {
+  Box,
+  BoxAlignItems,
+  BoxFlexDirection,
+  Icon,
+  IconColor,
+  IconName,
+  IconSize,
+  Text,
+  TextColor,
+  TextVariant,
+} from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../../locales/i18n';
+import { PriceImpactHeader } from '../../../../../UI/Bridge/components/PriceImpactModal/PriceImpactHeader';
+import { PriceImpactFooter } from '../../../../../UI/Bridge/components/PriceImpactModal/PriceImpactFooter';
+import { PriceImpactModalType } from '../../../../../UI/Bridge/components/PriceImpactModal/constants';
+import { usePriceImpactFiat } from '../../../../../UI/Bridge/hooks/usePriceImpactFiat';
+import { useQuickBuyContext } from './useQuickBuyContext';
+
+// This screen is only ever mounted at the error case for high-price-impact swaps
+const QuickBuyPriceImpactConfirmScreen: React.FC = () => {
+  const {
+    activeQuote,
+    formattedPriceImpact,
+    setActiveScreen,
+    handleConfirm,
+    isSubmittingTx,
+  } = useQuickBuyContext();
+
+  const [loading, setLoading] = useState(false);
+
+  const formattedPriceImpactFiat = usePriceImpactFiat(activeQuote);
+
+  const handleClose = useCallback(() => {
+    setActiveScreen('amount');
+  }, [setActiveScreen]);
+
+  const handleProceed = useCallback(async () => {
+    setLoading(true);
+    try {
+      await handleConfirm();
+    } finally {
+      setLoading(false);
+    }
+  }, [handleConfirm]);
+
+  return (
+    <>
+      <PriceImpactHeader
+        onClose={handleClose}
+        iconName={IconName.Warning}
+        iconColor={IconColor.ErrorDefault}
+        content="bridge.price_impact_error_title"
+      />
+
+      <Box twClassName="px-4 py-2" gap={4}>
+        <Text
+          variant={TextVariant.BodyMd}
+          color={TextColor.TextAlternative}
+          twClassName="text-center"
+          testID="price-impact-description"
+        >
+          {strings('bridge.price_impact_error_description', {
+            priceImpact: formattedPriceImpact ?? '0%',
+          })}
+        </Text>
+
+        {formattedPriceImpactFiat && (
+          <Box
+            twClassName="bg-error-muted rounded-2xl pl-6 pr-4 py-3"
+            flexDirection={BoxFlexDirection.Row}
+            alignItems={BoxAlignItems.Center}
+            gap={4}
+            testID="price-impact-fiat-banner"
+          >
+            <Icon
+              name={IconName.Warning}
+              size={IconSize.Md}
+              color={IconColor.ErrorDefault}
+            />
+            <Text
+              variant={TextVariant.BodyMd}
+              color={TextColor.ErrorDefault}
+              twClassName="flex-1"
+              testID="price-impact-fiat-text"
+            >
+              {strings('bridge.price_impact_fiat_alert', {
+                priceImpactFiat: formattedPriceImpactFiat,
+              })}
+            </Text>
+          </Box>
+        )}
+      </Box>
+
+      <PriceImpactFooter
+        type={PriceImpactModalType.Execution}
+        onCancel={handleProceed}
+        onConfirm={handleClose}
+        loading={loading || isSubmittingTx}
+      />
+    </>
+  );
+};
+
+export default QuickBuyPriceImpactConfirmScreen;
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.test.tsx
index edb91dc9c57c..9ca8ece26378 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.test.tsx
@@ -92,6 +92,8 @@ const buildContext = (overrides = {}) => ({
   formattedMinimumReceived: '0.99 ETH',
   formattedMinimumReceivedFiat: '$3,200',
   formattedRate: '1 USDC = 0.0003 ETH',
+  formattedPriceImpact: '-',
+  isPriceImpactError: false,
   quotesLastFetchedAt: Date.now(),
   quoteRefreshRateMs: 30000,
   onClose: jest.fn(),
@@ -170,4 +172,28 @@ describe('QuickBuyQuoteDetailsScreen', () => {
       screen.queryByTestId('quick-buy-get-new-quote'),
     ).not.toBeOnTheScreen();
   });
+
+  it('does not render the price impact row when isPriceImpactError is false', () => {
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({ isPriceImpactError: false }),
+    );
+    render(<QuickBuyQuoteDetailsScreen />);
+    expect(
+      screen.queryByText('bridge.price_impact_info_title'),
+    ).not.toBeOnTheScreen();
+  });
+
+  it('renders the price impact row with formatted value when isPriceImpactError is true', () => {
+    (useQuickBuyContext as jest.Mock).mockReturnValue(
+      buildContext({
+        isPriceImpactError: true,
+        formattedPriceImpact: '25.00%',
+      }),
+    );
+    render(<QuickBuyQuoteDetailsScreen />);
+    expect(
+      screen.getByText('bridge.price_impact_info_title'),
+    ).toBeOnTheScreen();
+    expect(screen.getByText('25.00%')).toBeOnTheScreen();
+  });
 });
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.tsx
index c4b969910538..62529f9fab03 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyQuoteDetailsScreen.tsx
@@ -3,7 +3,10 @@ import {
   Box,
   BoxAlignItems,
   BoxFlexDirection,
+  Icon,
+  IconColor,
   IconName,
+  IconSize,
   Text,
   TextColor,
   TextVariant,
@@ -36,6 +39,8 @@ const QuickBuyQuoteDetailsScreen: React.FC = () => {
     formattedMinimumReceived,
     formattedMinimumReceivedFiat,
     formattedRate,
+    formattedPriceImpact,
+    isPriceImpactError,
     quotesLastFetchedAt,
     quoteRefreshRateMs,
     onClose,
@@ -125,6 +130,33 @@ const QuickBuyQuoteDetailsScreen: React.FC = () => {
           }
         />
 
+        {isPriceImpactError && (
+          <QuickBuyQuoteDetailRow
+            label={strings('bridge.price_impact_info_title')}
+            tooltipTitle={strings('bridge.price_impact_info_title')}
+            tooltipContent={strings('bridge.price_impact_info_description')}
+            value={
+              <Box
+                flexDirection={BoxFlexDirection.Row}
+                alignItems={BoxAlignItems.Center}
+                gap={1}
+              >
+                <Icon
+                  name={IconName.Warning}
+                  size={IconSize.Sm}
+                  color={IconColor.ErrorDefault}
+                />
+                <Text
+                  variant={TextVariant.BodyMd}
+                  color={TextColor.ErrorDefault}
+                >
+                  {formattedPriceImpact}
+                </Text>
+              </Box>
+            }
+          />
+        )}
+
         <QuickBuyQuoteDetailRow
           label={strings('social_leaderboard.quick_buy.minimum_received')}
           tooltipTitle={strings('bridge.minimum_received_tooltip_title')}
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.test.tsx
index 5f8f1f950006..afbb7e9784ec 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { act, screen } from '@testing-library/react-native';
+import { act, fireEvent, screen } from '@testing-library/react-native';
+import { StyleSheet } from 'react-native';
 import { TextColor } from '@metamask/design-system-react-native';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import QuickBuyRoot from './QuickBuyRoot';
@@ -90,6 +91,20 @@ jest.mock('./components/QuickBuyActionFooter', () => {
   };
 });
 
+jest.mock('./QuickBuyPriceImpactConfirmScreen', () => {
+  const ReactMock = jest.requireActual('react');
+  const { Text } = jest.requireActual('react-native');
+  return {
+    __esModule: true,
+    default: () =>
+      ReactMock.createElement(
+        Text,
+        { testID: 'mock-price-impact-confirm' },
+        'price-impact-confirm',
+      ),
+  };
+});
+
 jest.mock('./QuickBuyBottomSheetSkeleton', () => {
   const ReactMock = jest.requireActual('react');
   const { Text } = jest.requireActual('react-native');
@@ -234,6 +249,36 @@ describe('QuickBuyRoot', () => {
     expect(screen.getByTestId('mock-action-footer')).toBeOnTheScreen();
   });
 
+  it('renders the price impact confirm screen via the children override', () => {
+    const MockPriceImpactConfirmScreen = () => {
+      const React2 = jest.requireActual('react');
+      const { Text: RNText } = jest.requireActual('react-native');
+      return React2.createElement(
+        RNText,
+        { testID: 'mock-price-impact-confirm' },
+        'price-impact-confirm',
+      );
+    };
+
+    renderWithProvider(
+      <QuickBuyRoot
+        isVisible
+        target={positionToQuickBuyTarget(createPosition())}
+        features={TOP_TRADERS_QUICK_BUY_FEATURES}
+        onClose={jest.fn()}
+      >
+        <MockPriceImpactConfirmScreen />
+      </QuickBuyRoot>,
+    );
+
+    act(() => {
+      storedOnOpenCallback?.();
+    });
+
+    // children override is rendered regardless of activeScreen value
+    expect(screen.getByTestId('mock-price-impact-confirm')).toBeOnTheScreen();
+  });
+
   it('shows unsupported chain message without amount flow', () => {
     (useQuickBuyController as jest.Mock).mockReturnValue(
       buildHookResult({ isUnsupportedChain: true }),
@@ -257,6 +302,85 @@ describe('QuickBuyRoot', () => {
     ).toBeOnTheScreen();
     expect(screen.queryByTestId('mock-amount-section')).not.toBeOnTheScreen();
   });
+
+  it('renders nothing when isVisible is false', () => {
+    const { toJSON } = renderWithProvider(
+      <QuickBuyRoot
+        isVisible={false}
+        target={positionToQuickBuyTarget(createPosition())}
+        features={TOP_TRADERS_QUICK_BUY_FEATURES}
+        onClose={jest.fn()}
+      />,
+    );
+    expect(toJSON()).toBeNull();
+  });
+
+  it('renders nothing when target is null', () => {
+    const { toJSON } = renderWithProvider(
+      <QuickBuyRoot
+        isVisible
+        target={null}
+        features={TOP_TRADERS_QUICK_BUY_FEATURES}
+        onClose={jest.fn()}
+      />,
+    );
+    expect(toJSON()).toBeNull();
+  });
+
+  it('locks the content container height after the first layout', () => {
+    renderWithProvider(
+      <QuickBuyRoot
+        isVisible
+        target={positionToQuickBuyTarget(createPosition())}
+        features={TOP_TRADERS_QUICK_BUY_FEATURES}
+        onClose={jest.fn()}
+      />,
+    );
+    act(() => {
+      storedOnOpenCallback?.();
+    });
+
+    const container = screen.getByTestId('quick-buy-content-container');
+    act(() => {
+      fireEvent(container, 'layout', {
+        nativeEvent: { layout: { height: 480 } },
+      });
+    });
+
+    expect(StyleSheet.flatten(container.props.style)).toMatchObject({
+      height: 480,
+    });
+  });
+
+  it('keeps the locked height when a later layout reports a different height', () => {
+    renderWithProvider(
+      <QuickBuyRoot
+        isVisible
+        target={positionToQuickBuyTarget(createPosition())}
+        features={TOP_TRADERS_QUICK_BUY_FEATURES}
+        onClose={jest.fn()}
+      />,
+    );
+    act(() => {
+      storedOnOpenCallback?.();
+    });
+
+    const container = screen.getByTestId('quick-buy-content-container');
+    act(() => {
+      fireEvent(container, 'layout', {
+        nativeEvent: { layout: { height: 480 } },
+      });
+    });
+    act(() => {
+      fireEvent(container, 'layout', {
+        nativeEvent: { layout: { height: 300 } },
+      });
+    });
+
+    expect(StyleSheet.flatten(container.props.style)).toMatchObject({
+      height: 480,
+    });
+  });
 });
 
 describe('useQuickBuyContext guard', () => {
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx
index 6975feea18e4..0cc707d95754 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/QuickBuyRoot.tsx
@@ -1,15 +1,18 @@
 import {
   BottomSheet,
   type BottomSheetRef,
+  Box,
 } from '@metamask/design-system-react-native';
 import { useTailwind } from '@metamask/design-system-twrnc-preset';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import type { LayoutChangeEvent } from 'react-native';
 import { ScrollView as GestureHandlerScrollView } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
 import { useSelector } from 'react-redux';
 import { selectIsSubmittingTx } from '../../../../../../core/redux/slices/bridge';
 import QuickBuyAmountScreen from './QuickBuyAmountScreen';
 import QuickBuyPayWithScreen from './QuickBuyPayWithScreen';
+import QuickBuyPriceImpactConfirmScreen from './QuickBuyPriceImpactConfirmScreen';
 import QuickBuyQuoteDetailsScreen from './QuickBuyQuoteDetailsScreen';
 import QuickBuySelectQuoteScreen from './QuickBuySelectQuoteScreen';
 import { QuickBuyProvider } from './QuickBuyContext';
@@ -45,6 +48,8 @@ function renderActiveScreen(
       return <QuickBuyQuoteDetailsScreen />;
     case 'selectQuote':
       return <QuickBuySelectQuoteScreen />;
+    case 'priceImpactConfirm':
+      return <QuickBuyPriceImpactConfirmScreen />;
     case 'amount':
     default:
       return <QuickBuyAmountScreen />;
@@ -70,6 +75,7 @@ const QuickBuyRootInner: React.FC<QuickBuyRootInnerProps> = ({
   const bottomSheetRef = useRef<BottomSheetRef>(null);
   const [isContentReady, setIsContentReady] = useState(false);
   const [activeScreen, setActiveScreen] = useState<QuickBuyScreen>('amount');
+  const [lockedHeight, setLockedHeight] = useState<number | null>(null);
   const isSubmittingTx = useSelector(selectIsSubmittingTx);
   const surfaceClass = useElevatedSurface();
 
@@ -79,6 +85,19 @@ const QuickBuyRootInner: React.FC<QuickBuyRootInnerProps> = ({
     });
   }, []);
 
+  const handleContentLayout = useCallback(
+    (event: LayoutChangeEvent) => {
+      if (lockedHeight !== null) {
+        return;
+      }
+      const { height } = event.nativeEvent.layout;
+      if (height > 0) {
+        setLockedHeight(height);
+      }
+    },
+    [lockedHeight],
+  );
+
   return (
     <BottomSheet
       ref={bottomSheetRef}
@@ -95,7 +114,13 @@ const QuickBuyRootInner: React.FC<QuickBuyRootInnerProps> = ({
           activeScreen={activeScreen}
           setActiveScreen={setActiveScreen}
         >
-          {renderActiveScreen(activeScreen, children)}
+          <Box
+            testID="quick-buy-content-container"
+            onLayout={handleContentLayout}
+            style={lockedHeight !== null ? { height: lockedHeight } : undefined}
+          >
+            {renderActiveScreen(activeScreen, children)}
+          </Box>
         </QuickBuyProvider>
       ) : (
         <AnimatedScrollView
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyActionFooter.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyActionFooter.tsx
index bbeb0167620d..5439d8a9839a 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyActionFooter.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyActionFooter.tsx
@@ -35,12 +35,9 @@ const QuickBuyActionFooter: React.FC = () => {
     getButtonLabel,
     hasValidAmount,
     isConfirmDisabled,
-    handleConfirm,
+    handleBuy,
     metamaskFeePercent,
     isHardwareSolanaBlocked,
-    isPriceImpactError,
-    priceImpactViewData,
-    formattedPriceImpact,
     sourceToken,
     sourceChainId,
     sourceBalanceFiat,
@@ -48,9 +45,6 @@ const QuickBuyActionFooter: React.FC = () => {
     setActiveScreen,
   } = useQuickBuyContext();
 
-  const isPriceImpactWarning =
-    !isPriceImpactError && !!priceImpactViewData.icon;
-
   const networkImage = sourceChainId
     ? getNetworkImageSource({ chainId: sourceChainId })
     : undefined;
@@ -128,19 +122,14 @@ const QuickBuyActionFooter: React.FC = () => {
         </TouchableOpacity>
       </Box>
 
-      <QuickBuyBanners
-        isHardwareSolanaBlocked={isHardwareSolanaBlocked}
-        isPriceImpactError={isPriceImpactError}
-        isPriceImpactWarning={isPriceImpactWarning}
-        formattedPriceImpact={formattedPriceImpact}
-      />
+      <QuickBuyBanners isHardwareSolanaBlocked={isHardwareSolanaBlocked} />
 
       <QuickBuyConfirmButton
         state={confirmButtonState}
         label={getButtonLabel()}
         hasValidAmount={hasValidAmount}
         isDisabled={isConfirmDisabled}
-        onPress={handleConfirm}
+        onPress={handleBuy}
         testID="quick-buy-confirm-button"
       />
 
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.test.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.test.tsx
index 584faac15433..bdcc994934db 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.test.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.test.tsx
@@ -2,13 +2,17 @@ import React from 'react';
 import { fireEvent, render, screen } from '@testing-library/react-native';
 import QuickBuyRateTag from './QuickBuyRateTag';
 
+jest.mock('../../../../../../../../locales/i18n', () => ({
+  strings: (key: string) => key,
+}));
+
 describe('QuickBuyRateTag', () => {
-  it('renders nothing when label is undefined', () => {
+  it('renders nothing when label is undefined and isHighPriceImpact is false', () => {
     render(<QuickBuyRateTag label={undefined} />);
     expect(screen.queryByTestId('quick-buy-rate-tag')).not.toBeOnTheScreen();
   });
 
-  it('renders nothing when label is empty', () => {
+  it('renders nothing when label is empty and isHighPriceImpact is false', () => {
     render(<QuickBuyRateTag label="" />);
     expect(screen.queryByTestId('quick-buy-rate-tag')).not.toBeOnTheScreen();
   });
@@ -35,4 +39,43 @@ describe('QuickBuyRateTag', () => {
     fireEvent.press(screen.getByTestId('quick-buy-rate-tag-pressable'));
     expect(onPress).toHaveBeenCalledTimes(1);
   });
+
+  describe('isHighPriceImpact variant', () => {
+    it('renders even when label is undefined', () => {
+      render(
+        <QuickBuyRateTag
+          label={undefined}
+          isHighPriceImpact
+          onPress={jest.fn()}
+        />,
+      );
+      expect(screen.getByTestId('quick-buy-rate-tag')).toBeOnTheScreen();
+    });
+
+    it('shows the bridge.price_impact_warning_title i18n key as text', () => {
+      render(
+        <QuickBuyRateTag
+          label="1 ETH = 1000 USDC"
+          isHighPriceImpact
+          onPress={jest.fn()}
+        />,
+      );
+      expect(
+        screen.getByText('bridge.price_impact_warning_title'),
+      ).toBeOnTheScreen();
+    });
+
+    it('still calls onPress when the pill is tapped', () => {
+      const onPress = jest.fn();
+      render(
+        <QuickBuyRateTag
+          label="1 ETH = 1000 USDC"
+          isHighPriceImpact
+          onPress={onPress}
+        />,
+      );
+      fireEvent.press(screen.getByTestId('quick-buy-rate-tag-pressable'));
+      expect(onPress).toHaveBeenCalledTimes(1);
+    });
+  });
 });
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.tsx
index a5dcfaa2008a..3553ee12b726 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyRateTag.tsx
@@ -12,17 +12,32 @@ import {
   IconName,
   IconSize,
 } from '@metamask/design-system-react-native';
+import { strings } from '../../../../../../../../locales/i18n';
 
 interface QuickBuyRateTagProps {
   label: string | undefined;
   onPress?: () => void;
+  isHighPriceImpact?: boolean;
 }
 
 const QuickBuyRateTag: React.FC<QuickBuyRateTagProps> = ({
   label,
   onPress,
+  isHighPriceImpact = false,
 }) => {
-  if (!label) return null;
+  if (!label && !isHighPriceImpact) return null;
+
+  const displayLabel = isHighPriceImpact
+    ? strings('bridge.price_impact_warning_title')
+    : label;
+
+  const textColor = isHighPriceImpact
+    ? TextColor.ErrorDefault
+    : TextColor.TextAlternative;
+
+  const iconColor = isHighPriceImpact
+    ? IconColor.ErrorDefault
+    : IconColor.IconAlternative;
 
   const content = (
     <Box
@@ -30,20 +45,20 @@ const QuickBuyRateTag: React.FC<QuickBuyRateTagProps> = ({
       alignItems={BoxAlignItems.Center}
       gap={1}
     >
-      <Text variant={TextVariant.BodySm} color={TextColor.TextAlternative}>
-        {label}
+      <Text variant={TextVariant.BodySm} color={textColor}>
+        {displayLabel}
       </Text>
-      <Icon
-        name={IconName.ArrowRight}
-        size={IconSize.Sm}
-        color={IconColor.IconAlternative}
-      />
+      <Icon name={IconName.ArrowRight} size={IconSize.Sm} color={iconColor} />
     </Box>
   );
 
   return (
     <Box
-      twClassName="rounded-full bg-muted px-3 py-1"
+      twClassName={
+        isHighPriceImpact
+          ? 'rounded-full bg-error-muted px-3 py-1'
+          : 'rounded-full bg-muted px-3 py-1'
+      }
       testID="quick-buy-rate-tag"
     >
       {onPress ? (
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyToolbar.tsx b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyToolbar.tsx
index b3acba28f9e8..fb53a0c4a710 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyToolbar.tsx
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/components/QuickBuyToolbar.tsx
@@ -13,8 +13,12 @@ import QuickBuyRateTag from './QuickBuyRateTag';
 import { useQuickBuyContext } from '../useQuickBuyContext';
 
 const QuickBuyToolbar: React.FC = () => {
-  const { formattedRate, formattedExchangeRate, setActiveScreen } =
-    useQuickBuyContext();
+  const {
+    formattedRate,
+    formattedExchangeRate,
+    setActiveScreen,
+    isPriceImpactError,
+  } = useQuickBuyContext();
 
   // Prefer the quote-derived rate (available once a quote is fetched),
   // fall back to the price-metadata rate for the pre-quote state.
@@ -39,6 +43,7 @@ const QuickBuyToolbar: React.FC = () => {
       <QuickBuyRateTag
         label={rateLabel}
         onPress={() => setActiveScreen('quoteDetails')}
+        isHighPriceImpact={isPriceImpactError}
       />
     </Box>
   );
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/features.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/features.ts
index 965180819b59..193a625a893f 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/features.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/features.ts
@@ -6,6 +6,6 @@ export const TOP_TRADERS_QUICK_BUY_FEATURES: QuickBuyFeatures = {
   quoteDetails: false,
   selectQuote: false,
   payWithSheet: true,
-  highPriceImpactModal: false,
+  highPriceImpactModal: true,
   fiatCryptoToggle: true,
 };
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts
index e450ea5e5f3b..f2b28904e14c 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts
@@ -764,7 +764,6 @@ export function useQuickBuyController(
     isSubmittingTx ||
     hasError ||
     isHardwareSolanaBlocked ||
-    isPriceImpactError ||
     !walletAddress;
 
   const isTotalLoading =
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/types.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/types.ts
index 35fcbc247429..66a6640ad5d5 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/types.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/types.ts
@@ -19,7 +19,8 @@ export type QuickBuyScreen =
   | 'amount'
   | 'quoteDetails'
   | 'selectQuote'
-  | 'payWith';
+  | 'payWith'
+  | 'priceImpactConfirm';
 
 /** Feature flags for optional flow pieces (enabled per consumer). */
 export interface QuickBuyFeatures {
diff --git a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts
index ac26a6f0d280..8f67a10fdbce 100644
--- a/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts
+++ b/app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/useQuickBuyController.test.ts
@@ -909,12 +909,12 @@ describe('useQuickBuyController', () => {
       isHardwareAccount.mockReturnValue(false);
     });
 
-    it('is disabled when the price impact exceeds the error threshold', () => {
-      (useQuickBuyQuotes as jest.Mock).mockImplementation(() => ({
-        activeQuote: {
-          quote: { priceData: { priceImpact: '0.30' } },
-        },
-        destTokenAmount: '1',
+    it('sets isPriceImpactError when price impact exceeds error threshold, but does NOT disable the button (intercept handled by context)', () => {
+      // Use the same settle cycle as the hardware-Solana test so that
+      // settledSourceTokenAmountRef is properly updated and isPendingQuoteRefresh = false.
+      const quoteState: UseQuickBuyQuotesResult = {
+        activeQuote: undefined,
+        destTokenAmount: undefined,
         isQuoteLoading: false,
         isNoQuotesAvailable: false,
         quoteFetchError: null,
@@ -926,13 +926,14 @@ describe('useQuickBuyController', () => {
         quoteRefreshRateMs: 30000,
         maxRefreshCount: 5,
         refetchQuotes: jest.fn(),
-      }));
+      };
+      (useQuickBuyQuotes as jest.Mock).mockImplementation(() => quoteState);
 
       const props = {
         target: positionToQuickBuyTarget(createPosition()),
         onClose: jest.fn(),
       };
-      const { result } = renderHook(
+      const { result, rerender } = renderHook(
         ({ target, onClose }) => useQuickBuyController(target, onClose),
         { initialProps: props },
       );
@@ -941,8 +942,22 @@ describe('useQuickBuyController', () => {
         result.current.handleAmountChange('20');
       });
 
+      // Simulate quote loading cycle so settledSourceTokenAmountRef is settled.
+      quoteState.isQuoteLoading = true;
+      rerender(props);
+      quoteState.isQuoteLoading = false;
+      // Inject a high-price-impact active quote.
+      quoteState.activeQuote = {
+        ...createActiveQuote(),
+        quote: { priceData: { priceImpact: '0.30' } },
+      } as never;
+      rerender(props);
+      rerender(props);
+
       expect(result.current.isPriceImpactError).toBe(true);
-      expect(result.current.isConfirmDisabled).toBe(true);
+      // The Buy button is ENABLED at error tier — the intercept lives in
+      // QuickBuyContext.handleBuy which routes to priceImpactConfirm instead.
+      expect(result.current.isConfirmDisabled).toBe(false);
     });
   });
 
diff --git a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
index 70aa1145ab32..08e39ab63044 100644
--- a/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
+++ b/app/components/Views/TradeWalletActions/TradeWalletActions.tsx
@@ -277,6 +277,8 @@ function TradeWalletActions() {
       {visible && (
         <Animated.View exiting={exitingWithNavigateBack}>
           <MaskedView
+            // iOS: MaskedView otherwise intercepts touches and ActionListItem onPress never fires (Android is unaffected).
+            pointerEvents="box-none"
             maskElement={
               <View style={tw.style('flex-1 bg-transparent px-4')}>
                 <View style={tw.style('flex-1 bg-black')} />
diff --git a/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts
index 0ff8db5e422a..1a7aec078c51 100644
--- a/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts
+++ b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.test.ts
@@ -64,12 +64,9 @@ describe('navigateToPerpsMarketList', () => {
       navigate,
     } as unknown as NavigationProp<PerpsNavigationParamList>;
 
-    navigateToPerpsMarketList(
-      navigation,
-      'all',
-      'priceChange',
-      PERPS_EVENT_VALUE.SOURCE.HOME_SECTION,
-    );
+    navigateToPerpsMarketList(navigation, 'all', 'priceChange', {
+      source: PERPS_EVENT_VALUE.SOURCE.HOME_SECTION,
+    });
 
     expect(navigate).toHaveBeenCalledWith(
       Routes.PERPS.ROOT,
@@ -88,12 +85,9 @@ describe('navigateToPerpsMarketList', () => {
       navigate,
     } as unknown as NavigationProp<PerpsNavigationParamList>;
 
-    navigateToPerpsMarketList(
-      navigation,
-      'all',
-      undefined,
-      PERPS_EVENT_VALUE.SOURCE.HOME_SECTION,
-    );
+    navigateToPerpsMarketList(navigation, 'all', undefined, {
+      source: PERPS_EVENT_VALUE.SOURCE.HOME_SECTION,
+    });
 
     expect(navigate).toHaveBeenCalledWith(Routes.PERPS.ROOT, {
       screen: Routes.PERPS.MARKET_LIST,
@@ -103,4 +97,24 @@ describe('navigateToPerpsMarketList', () => {
       },
     });
   });
+
+  it('passes a custom sort direction', () => {
+    const navigate = jest.fn();
+    const navigation = {
+      navigate,
+    } as unknown as NavigationProp<PerpsNavigationParamList>;
+
+    navigateToPerpsMarketList(navigation, 'all', 'priceChange', {
+      sortDirection: 'asc',
+    });
+
+    expect(navigate).toHaveBeenCalledWith(
+      Routes.PERPS.ROOT,
+      expect.objectContaining({
+        params: expect.objectContaining({
+          defaultSortDirection: 'asc',
+        }),
+      }),
+    );
+  });
 });
diff --git a/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts
index ebfdd182dc8b..9b9d3e60ad9a 100644
--- a/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts
+++ b/app/components/Views/TrendingView/feeds/perps/perpsNavigation.ts
@@ -1,6 +1,7 @@
 import { NavigationProp } from '@react-navigation/native';
 import {
   PERPS_EVENT_VALUE,
+  type SortDirection,
   type SortOptionId,
 } from '@metamask/perps-controller';
 import type { PerpsNavigationParamList } from '../../../../UI/Perps/types/navigation';
@@ -9,12 +10,20 @@ import Routes from '../../../../../constants/navigation/Routes';
 type PerpsNavigationSource =
   (typeof PERPS_EVENT_VALUE.SOURCE)[keyof typeof PERPS_EVENT_VALUE.SOURCE];
 
+interface NavigateToPerpsMarketListOptions {
+  source?: PerpsNavigationSource;
+  sortDirection?: SortDirection;
+}
+
 /** 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,
-  source: PerpsNavigationSource = PERPS_EVENT_VALUE.SOURCE.EXPLORE,
+  {
+    source = PERPS_EVENT_VALUE.SOURCE.EXPLORE,
+    sortDirection,
+  }: NavigateToPerpsMarketListOptions = {},
 ): void => {
   navigation.navigate(Routes.PERPS.ROOT, {
     screen: Routes.PERPS.MARKET_LIST,
@@ -22,6 +31,9 @@ export const navigateToPerpsMarketList = (
       defaultMarketTypeFilter: filter,
       source,
       ...(sortOptionId !== undefined && { defaultSortOptionId: sortOptionId }),
+      ...(sortDirection !== undefined && {
+        defaultSortDirection: sortDirection,
+      }),
     },
   });
 };
diff --git a/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts
index 8e2408a3202a..558fb2bb06bb 100644
--- a/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts
+++ b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.test.ts
@@ -10,7 +10,11 @@
 
 import { renderHook } from '@testing-library/react-hooks';
 import type { PerpsMarketData } from '@metamask/perps-controller';
-import { usePerpsFeed, PERPS_VARIANT_SORT_OPTION } from './usePerpsFeed';
+import {
+  filterAndSortByPriceChangeDirection,
+  usePerpsFeed,
+  PERPS_VARIANT_SORT_OPTION,
+} from './usePerpsFeed';
 
 // ---------------------------------------------------------------------------
 // Core dependency mocks
@@ -140,6 +144,36 @@ describe('usePerpsFeed', () => {
     });
   });
 
+  describe('price-change mover filtering', () => {
+    it('filters gainers to positive price changes sorted descending', () => {
+      const markets = [
+        makeMarket('LOSER', '-3', 100),
+        makeMarket('HIGH_GAINER', '5', 50),
+        makeMarket('LOW_GAINER', '1', 75),
+      ];
+
+      expect(
+        filterAndSortByPriceChangeDirection(markets, 'gainers').map(
+          (market) => market.symbol,
+        ),
+      ).toEqual(['HIGH_GAINER', 'LOW_GAINER']);
+    });
+
+    it('filters losers to negative price changes sorted ascending', () => {
+      const markets = [
+        makeMarket('GAINER', '3', 100),
+        makeMarket('SMALL_LOSER', '-1', 50),
+        makeMarket('BIG_LOSER', '-7', 75),
+      ];
+
+      expect(
+        filterAndSortByPriceChangeDirection(markets, 'losers').map(
+          (market) => market.symbol,
+        ),
+      ).toEqual(['BIG_LOSER', 'SMALL_LOSER']);
+    });
+  });
+
   describe('query path', () => {
     it('preserves Fuse.js relevance order for non-macro variants', () => {
       const markets = [
diff --git a/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts
index e5fc7caa5d6b..d2abc6458670 100644
--- a/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts
+++ b/app/components/Views/TrendingView/feeds/perps/usePerpsFeed.ts
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';
 import {
   filterMarketsByQuery,
   type PerpsMarketData,
+  type SortDirection,
   type SortOptionId,
 } from '@metamask/perps-controller';
 import { usePerpsMarkets } from '../../../../UI/Perps/hooks';
@@ -22,6 +23,7 @@ export type { PerpsFeedItem } from '../../../../UI/Perps/types/perpsFeedTypes';
 const EMPTY_WATCHLIST_SYMBOLS: string[] = [];
 
 export type PerpsVariant = 'all' | 'crypto' | 'rwa' | 'macro';
+export type PerpsPriceChangeDirection = 'gainers' | 'losers';
 
 interface UsePerpsFeedOptions {
   /** @default 'all' */
@@ -57,6 +59,14 @@ export const PERPS_VARIANT_SORT_OPTION: Record<PerpsVariant, SortOptionId> = {
   macro: 'volume',
 };
 
+export const PERPS_PRICE_CHANGE_SORT_DIRECTION: Record<
+  PerpsPriceChangeDirection,
+  SortDirection
+> = {
+  gainers: 'desc',
+  losers: 'asc',
+};
+
 const sortByVolumeDesc = (a: PerpsMarketData, b: PerpsMarketData) => {
   const av = (a as PerpsMarketDataWithVolumeNumber).volumeNumber ?? 0;
   const bv = (b as PerpsMarketDataWithVolumeNumber).volumeNumber ?? 0;
@@ -66,6 +76,9 @@ const sortByVolumeDesc = (a: PerpsMarketData, b: PerpsMarketData) => {
 const sortByChange24hDesc = (a: PerpsMarketData, b: PerpsMarketData) =>
   (parseFloat(b.change24hPercent) || 0) - (parseFloat(a.change24hPercent) || 0);
 
+const sortByChange24hAsc = (a: PerpsMarketData, b: PerpsMarketData) =>
+  (parseFloat(a.change24hPercent) || 0) - (parseFloat(b.change24hPercent) || 0);
+
 /** Maps each SortOptionId to the comparator used inside the feed. */
 const SORT_FNS: Record<
   SortOptionId,
@@ -101,6 +114,22 @@ const filterByVariant = (
   }
 };
 
+export const filterAndSortByPriceChangeDirection = (
+  markets: PerpsMarketData[],
+  priceChangeDirection: PerpsPriceChangeDirection,
+) => {
+  switch (priceChangeDirection) {
+    case 'gainers':
+      return markets
+        .filter((market) => parseFloat(market.change24hPercent) > 0)
+        .sort(sortByChange24hDesc);
+    case 'losers':
+      return markets
+        .filter((market) => parseFloat(market.change24hPercent) < 0)
+        .sort(sortByChange24hAsc);
+  }
+};
+
 /**
  * Perps markets feed. Returns enriched items (market + optional sparkline +
  * watchlist flag) so consumers don't have to stitch data themselves.
diff --git a/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts
index 14985935efd1..af4f33d431e8 100644
--- a/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts
+++ b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.test.ts
@@ -1,13 +1,15 @@
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 import Routes from '../../../../../constants/navigation/Routes';
 import { PredictEventValues } from '../../../../UI/Predict/constants/eventNames';
+import { PREDICT_WORLD_CUP_TAB_KEYS } from '../../../../UI/Predict/constants/worldCupTabs';
 import {
   navigateToExplorePredictionsList,
+  navigateToExploreWorldCupPredictions,
   navigateToPredictionsList,
 } from './predictionsNavigation';
 
 describe('navigateToPredictionsList', () => {
-  it('navigates with an explicit entryPoint and no tab for trending variant', () => {
+  it('navigates with an explicit entryPoint and trending tab for trending variant', () => {
     const navigate = jest.fn();
     const navigation = { navigate } as unknown as AppNavigationProp;
 
@@ -19,7 +21,10 @@ describe('navigateToPredictionsList', () => {
 
     expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
-      params: { entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE },
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        tab: 'trending',
+      },
     });
   });
 
@@ -73,7 +78,10 @@ describe('navigateToPredictionsList', () => {
 
     expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
-      params: { entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED },
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.PREDICT_FEED,
+        tab: 'trending',
+      },
     });
   });
 
@@ -85,7 +93,27 @@ describe('navigateToPredictionsList', () => {
 
     expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
       screen: Routes.PREDICT.MARKET_LIST,
-      params: { entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE },
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        tab: 'trending',
+      },
+    });
+  });
+});
+
+describe('navigateToExploreWorldCupPredictions', () => {
+  it('navigates to the dedicated World Cup screen', () => {
+    const navigate = jest.fn();
+    const navigation = { navigate } as unknown as AppNavigationProp;
+
+    navigateToExploreWorldCupPredictions(navigation);
+
+    expect(navigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.WORLD_CUP,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        initialTab: PREDICT_WORLD_CUP_TAB_KEYS.ALL,
+      },
     });
   });
 });
diff --git a/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts
index 0d46f15377d1..19c8fa933c56 100644
--- a/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts
+++ b/app/components/Views/TrendingView/feeds/predictions/predictionsNavigation.ts
@@ -1,11 +1,12 @@
 import type { AppNavigationProp } from '../../../../../core/NavigationService/types';
 import Routes from '../../../../../constants/navigation/Routes';
 import { PredictEventValues } from '../../../../UI/Predict/constants/eventNames';
+import { PREDICT_WORLD_CUP_TAB_KEYS } from '../../../../UI/Predict/constants/worldCupTabs';
 import type { PredictEntryPoint } from '../../../../UI/Predict/types/navigation';
 import type { PredictionsVariant } from './usePredictionsFeed';
 
-const VARIANT_TO_TAB: Record<PredictionsVariant, string | undefined> = {
-  trending: undefined,
+const VARIANT_TO_TAB: Record<PredictionsVariant, string> = {
+  trending: 'trending',
   sports: 'sports',
   crypto: 'crypto',
   politics: 'politics',
@@ -22,7 +23,7 @@ export const navigateToPredictionsList = (
     screen: Routes.PREDICT.MARKET_LIST,
     params: {
       entryPoint,
-      ...(tab && { tab }),
+      tab,
     },
   });
 };
@@ -38,3 +39,16 @@ export const navigateToExplorePredictionsList = (
     PredictEventValues.ENTRY_POINT.EXPLORE,
   );
 };
+
+/** Navigate from Explore World Cup prediction sections to the dedicated Predict World Cup screen. */
+export const navigateToExploreWorldCupPredictions = (
+  navigation: AppNavigationProp,
+): void => {
+  navigation.navigate(Routes.PREDICT.ROOT, {
+    screen: Routes.PREDICT.WORLD_CUP,
+    params: {
+      entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+      initialTab: PREDICT_WORLD_CUP_TAB_KEYS.ALL,
+    },
+  });
+};
diff --git a/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts b/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts
index 580996410015..7cbc88c5d99c 100644
--- a/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts
+++ b/app/components/Views/TrendingView/feeds/predictions/usePredictionsFeed.ts
@@ -13,6 +13,7 @@ interface UsePredictionsFeedOptions {
   variant?: PredictionsVariant;
   query?: string;
   refresh?: RefreshConfig;
+  enabled?: boolean;
   /**
    * Number of markets to fetch per page. Applies to both the no-query trending
    * fetch and the search fetch. Defaults to 6 for home-tab previews.
@@ -36,23 +37,24 @@ export const usePredictionsFeed = ({
   variant = 'trending',
   query,
   refresh,
+  enabled = true,
   pageSize = 6,
 }: UsePredictionsFeedOptions = {}): UsePredictionsFeedResult => {
   const hasQuery = Boolean(query?.trim());
   const feed = usePredictMarketData({
     category: variant,
     pageSize,
-    enabled: !hasQuery,
+    enabled: enabled && !hasQuery,
   });
   const search = usePredictSearchMarketData({
     q: query ?? '',
     pageSize,
-    enabled: hasQuery,
+    enabled: enabled && hasQuery,
   });
 
   const activeResult = hasQuery ? search : feed;
 
-  useFeedRefresh(refresh, activeResult.refetch);
+  useFeedRefresh(enabled ? refresh : undefined, activeResult.refetch);
 
   // When a search query is active, results are already server-ranked by
   // relevance — skip Fuse re-ranking to preserve server order across pages.
diff --git a/app/components/Views/TrendingView/feeds/predictions/useWorldCupPredictionsFeed.ts b/app/components/Views/TrendingView/feeds/predictions/useWorldCupPredictionsFeed.ts
new file mode 100644
index 000000000000..88eb2e8fd5c9
--- /dev/null
+++ b/app/components/Views/TrendingView/feeds/predictions/useWorldCupPredictionsFeed.ts
@@ -0,0 +1,50 @@
+import { useSelector } from 'react-redux';
+import {
+  selectPredictWorldCupConfig,
+  selectPredictWorldCupScreenEnabledFlag,
+} from '../../../../UI/Predict/selectors/featureFlags';
+import { PREDICT_WORLD_CUP_TAB_KEYS } from '../../../../UI/Predict/constants/worldCupTabs';
+import { usePredictWorldCupMarkets } from '../../../../UI/Predict/hooks/usePredictWorldCup';
+import { useFeedRefresh } from '../../hooks/useFeedRefresh';
+import type { RefreshConfig } from '../../hooks/useExploreRefresh';
+import type { UsePredictionsFeedResult } from './usePredictionsFeed';
+
+interface UseWorldCupPredictionsFeedOptions {
+  enabled?: boolean;
+  refresh?: RefreshConfig;
+  pageSize?: number;
+}
+
+export interface UseWorldCupPredictionsFeedResult
+  extends UsePredictionsFeedResult {
+  isEnabled: boolean;
+}
+
+export const useWorldCupPredictionsFeed = ({
+  enabled = true,
+  refresh,
+  pageSize = 6,
+}: UseWorldCupPredictionsFeedOptions = {}): UseWorldCupPredictionsFeedResult => {
+  const config = useSelector(selectPredictWorldCupConfig);
+  const isScreenEnabled = useSelector(selectPredictWorldCupScreenEnabledFlag);
+  const isEnabled = enabled && isScreenEnabled;
+
+  const worldCupMarkets = usePredictWorldCupMarkets({
+    tabKey: PREDICT_WORLD_CUP_TAB_KEYS.ALL,
+    config,
+    enabled: isEnabled,
+    pageSize,
+  });
+
+  useFeedRefresh(isEnabled ? refresh : undefined, worldCupMarkets.refetch);
+
+  return {
+    data: worldCupMarkets.marketData,
+    isLoading: worldCupMarkets.isFetching,
+    refetch: worldCupMarkets.refetch,
+    fetchMore: worldCupMarkets.fetchMore,
+    isFetchingMore: worldCupMarkets.isFetchingMore,
+    hasMore: worldCupMarkets.hasMore,
+    isEnabled,
+  };
+};
diff --git a/app/components/Views/TrendingView/tabs/NowTab.test.tsx b/app/components/Views/TrendingView/tabs/NowTab.test.tsx
index 45c730e4dfe3..c4d86bc2abfe 100644
--- a/app/components/Views/TrendingView/tabs/NowTab.test.tsx
+++ b/app/components/Views/TrendingView/tabs/NowTab.test.tsx
@@ -50,16 +50,34 @@ const mockUsePerpsFeed = jest.fn(() => ({
 }));
 
 jest.mock('../feeds/perps/usePerpsFeed', () => ({
+  ...jest.requireActual('../feeds/perps/usePerpsFeed'),
   usePerpsFeed: () => mockUsePerpsFeed(),
 }));
 
+jest.mock('../feeds/perps/PerpsPillItem', () => {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { createElement } = require('react');
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { Text } = require('react-native');
+  return {
+    __esModule: true,
+    default: ({ item }: { item: { market: { symbol: string } } }) =>
+      createElement(
+        Text,
+        { testID: `perps-pill-${item.market.symbol}` },
+        item.market.symbol,
+      ),
+  };
+});
+
 const mockNavigateToPerpsMarketList = jest.fn();
 jest.mock('../feeds/perps/perpsNavigation', () => ({
   navigateToPerpsMarketList: (
     nav: unknown,
     filter: unknown,
     sortOptionId: unknown,
-  ) => mockNavigateToPerpsMarketList(nav, filter, sortOptionId),
+    options: unknown,
+  ) => mockNavigateToPerpsMarketList(nav, filter, sortOptionId, options),
 }));
 
 interface MockPredictionMarket {
@@ -77,6 +95,18 @@ jest.mock('../feeds/predictions/usePredictionsFeed', () => ({
   usePredictionsFeed: () => mockUsePredictionsFeed(),
 }));
 
+const mockUseWorldCupPredictionsFeed = jest.fn<
+  { data: MockPredictionMarket[]; isLoading: boolean; isEnabled: boolean },
+  []
+>(() => ({
+  data: [],
+  isLoading: false,
+  isEnabled: false,
+}));
+jest.mock('../feeds/predictions/useWorldCupPredictionsFeed', () => ({
+  useWorldCupPredictionsFeed: () => mockUseWorldCupPredictionsFeed(),
+}));
+
 jest.mock('../feeds/predictions/PredictionRowItem', () => {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   const { createElement } = require('react');
@@ -139,6 +169,7 @@ import NowTab from './NowTab';
 import type { RefreshConfig } from '../hooks/useExploreRefresh';
 import { useTokensFeed } from '../feeds/tokens/useTokensFeed';
 import Routes from '../../../../constants/navigation/Routes';
+import { PredictEventValues } from '../../../UI/Predict/constants/eventNames';
 
 const defaultRefresh: RefreshConfig = { trigger: 0, silentRefresh: true };
 const defaultTabProps = {
@@ -216,6 +247,11 @@ beforeEach(() => {
     defaultSortOptionId: 'priceChange' as const,
   });
   mockUsePredictionsFeed.mockReturnValue({ data: [], isLoading: false });
+  mockUseWorldCupPredictionsFeed.mockReturnValue({
+    data: [],
+    isLoading: false,
+    isEnabled: false,
+  });
   mockWhatsHappeningImpl.mockReturnValue(null);
 });
 
@@ -351,10 +387,10 @@ describe('NowTab — Perps Movers "View All" navigation', () => {
     mockWhatsHappeningImpl.mockReturnValue(null);
   });
 
-  it('calls navigateToPerpsMarketList with "all" filter and the defaultSortOptionId from usePerpsFeed', () => {
+  it('calls navigateToPerpsMarketList with "all" filter, price change sort, and gainers direction by default', () => {
     // Return one market so PerpsBlock does not bail out with an early null return.
     mockUsePerpsFeed.mockReturnValue({
-      data: [{ market: { symbol: 'BTC' } }] as never,
+      data: [{ market: { symbol: 'BTC', change24hPercent: '5' } }] as never,
       isLoading: false,
       refetch: jest.fn(),
       defaultSortOptionId: 'priceChange' as const,
@@ -369,6 +405,104 @@ describe('NowTab — Perps Movers "View All" navigation', () => {
       expect.anything(), // navigation object
       'all',
       'priceChange',
+      { sortDirection: 'desc' },
+    );
+  });
+
+  it('renders Gainers by default and filters out negative price changes', () => {
+    mockUsePerpsFeed.mockReturnValue({
+      data: [
+        { market: { symbol: 'BTC', change24hPercent: '5' } },
+        { market: { symbol: 'ETH', change24hPercent: '-3' } },
+      ] as never,
+      isLoading: false,
+      refetch: jest.fn(),
+      defaultSortOptionId: 'priceChange' as const,
+    });
+
+    renderNowTab();
+
+    expect(screen.getByTestId('perps-movers-pill-gainers')).toBeOnTheScreen();
+    expect(screen.getByTestId('perps-pill-BTC')).toBeOnTheScreen();
+    expect(screen.queryByTestId('perps-pill-ETH')).toBeNull();
+  });
+
+  it('renders pill skeletons while Perps Movers are loading', () => {
+    mockUsePerpsFeed.mockReturnValue({
+      data: [],
+      isLoading: true,
+      refetch: jest.fn(),
+      defaultSortOptionId: 'priceChange' as const,
+    });
+
+    renderNowTab();
+
+    expect(
+      screen.getAllByTestId('section-pills-skeleton').length,
+    ).toBeGreaterThan(0);
+  });
+
+  it('renders placeholder perps when price change data is unavailable after loading', () => {
+    mockUsePerpsFeed.mockReturnValue({
+      data: [
+        { market: { symbol: 'BTC', change24hPercent: '' } },
+        { market: { symbol: 'ETH', change24hPercent: undefined } },
+      ] as never,
+      isLoading: false,
+      refetch: jest.fn(),
+      defaultSortOptionId: 'priceChange' as const,
+    });
+
+    renderNowTab();
+
+    expect(screen.queryByTestId('section-pills-skeleton')).toBeNull();
+    expect(screen.getByTestId('perps-pill-BTC')).toBeOnTheScreen();
+    expect(screen.getByTestId('perps-pill-ETH')).toBeOnTheScreen();
+  });
+
+  it('does not render pill skeletons when price change data is valid but filtered out', () => {
+    mockUsePerpsFeed.mockReturnValue({
+      data: [
+        { market: { symbol: 'BTC', change24hPercent: '0%' } },
+        { market: { symbol: 'ETH', change24hPercent: '0.00%' } },
+      ] as never,
+      isLoading: false,
+      refetch: jest.fn(),
+      defaultSortOptionId: 'priceChange' as const,
+    });
+
+    renderNowTab();
+
+    expect(screen.queryByTestId('section-pills-skeleton')).toBeNull();
+  });
+
+  it('renders Losers sorted by biggest negative move and passes ascending sort direction to the market list', () => {
+    mockUsePerpsFeed.mockReturnValue({
+      data: [
+        { market: { symbol: 'BTC', change24hPercent: '5' } },
+        { market: { symbol: 'ETH', change24hPercent: '-3' } },
+        { market: { symbol: 'SOL', change24hPercent: '-8' } },
+      ] as never,
+      isLoading: false,
+      refetch: jest.fn(),
+      defaultSortOptionId: 'priceChange' as const,
+    });
+
+    renderNowTab();
+
+    fireEvent.press(screen.getByTestId('perps-movers-pill-losers'));
+
+    expect(screen.getByTestId('perps-pill-SOL')).toBeOnTheScreen();
+    expect(screen.getByTestId('perps-pill-ETH')).toBeOnTheScreen();
+    expect(screen.queryByTestId('perps-pill-BTC')).toBeNull();
+
+    fireEvent.press(screen.getByTestId('section-header-view-all-perps'));
+
+    expect(mockNavigateToPerpsMarketList).toHaveBeenCalledWith(
+      expect.anything(),
+      'all',
+      'priceChange',
+      { sortDirection: 'asc' },
     );
   });
 
@@ -385,6 +519,63 @@ describe('NowTab — Perps Movers "View All" navigation', () => {
   });
 });
 
+describe('NowTab — Predictions navigation', () => {
+  const mockUseSelector = useSelector as jest.MockedFunction<
+    typeof useSelector
+  >;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPerpsEnabledFlag) return false;
+      if (selector === selectPredictEnabledFlag) return true;
+      if (selector === selectWhatsHappeningEnabled) return false;
+      return undefined;
+    });
+    mockControlAbTest();
+    mockUsePredictionsFeed.mockReturnValue({
+      data: [{ id: 'market-1' }],
+      isLoading: false,
+    });
+  });
+
+  it('opens the Predict trending tab from the Predictions section title', () => {
+    renderNowTab();
+
+    fireEvent.press(screen.getByTestId(predictSectionTestId));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        tab: 'trending',
+      },
+    });
+  });
+
+  it('opens the World Cup screen from the Predictions section title when World Cup predictions are enabled', () => {
+    mockUseWorldCupPredictionsFeed.mockReturnValue({
+      data: [{ id: 'world-cup-market-1' }],
+      isLoading: false,
+      isEnabled: true,
+    });
+
+    renderNowTab();
+
+    expect(screen.getByText('World Cup predictions')).toBeOnTheScreen();
+
+    fireEvent.press(screen.getByTestId(predictSectionTestId));
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.WORLD_CUP,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        initialTab: 'all',
+      },
+    });
+  });
+});
+
 describe('NowTab — Crypto Movers', () => {
   const mockUseSelector = useSelector as jest.MockedFunction<
     typeof useSelector
diff --git a/app/components/Views/TrendingView/tabs/NowTab.tsx b/app/components/Views/TrendingView/tabs/NowTab.tsx
index e71a0aab52d7..fc2d98b95bf6 100644
--- a/app/components/Views/TrendingView/tabs/NowTab.tsx
+++ b/app/components/Views/TrendingView/tabs/NowTab.tsx
@@ -1,4 +1,10 @@
-import React, { useCallback, useEffect, useRef } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { useNavigation, NavigationProp } from '@react-navigation/native';
 import { useSelector } from 'react-redux';
 import { Box } from '@metamask/design-system-react-native';
@@ -18,18 +24,29 @@ import CryptoMoversPillItem from '../feeds/tokens/CryptoMoversPillItem';
 import CryptoMoversSkeleton from '../feeds/tokens/CryptoMoversSkeleton';
 import TrendingTokensSkeleton from '../../../UI/Trending/components/TrendingTokenSkeleton/TrendingTokensSkeleton';
 import { TimeOption } from '../../../UI/Trending/components/TrendingTokensBottomSheet';
-import { usePerpsFeed, type PerpsFeedItem } from '../feeds/perps/usePerpsFeed';
+import {
+  filterAndSortByPriceChangeDirection,
+  PERPS_PRICE_CHANGE_SORT_DIRECTION,
+  usePerpsFeed,
+  type PerpsFeedItem,
+  type PerpsPriceChangeDirection,
+} 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 PredictionsCarouselSection from '../feeds/predictions/PredictionsCarouselSection';
-import { navigateToExplorePredictionsList } from '../feeds/predictions/predictionsNavigation';
+import {
+  navigateToExplorePredictionsList,
+  navigateToExploreWorldCupPredictions,
+} from '../feeds/predictions/predictionsNavigation';
+import { useWorldCupPredictionsFeed } from '../feeds/predictions/useWorldCupPredictionsFeed';
 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 PillScrollList from '../components/PillScrollList';
+import PillRow, { type PillOption } from '../components/PillRow';
 import SectionHeader from '../components/SectionHeader';
 import type { TabProps } from '../hooks/useExploreRefresh';
 import { trackExploreInteracted } from '../search/analytics';
@@ -50,12 +67,52 @@ interface PerpsBlockProps {
 }
 
 const PerpsBlock: React.FC<PerpsBlockProps> = ({ refresh, navigation }) => {
+  const [activeMoverDirection, setActiveMoverDirection] =
+    useState<PerpsPriceChangeDirection>('gainers');
   const perps = usePerpsFeed({
     variant: 'all',
     refresh,
     withTileExtras: false,
   });
 
+  const moverPills: PillOption[] = [
+    {
+      key: 'gainers',
+      name: strings('trending.perps_movers_pill_gainers'),
+    },
+    {
+      key: 'losers',
+      name: strings('trending.perps_movers_pill_losers'),
+    },
+  ];
+
+  const handleMoverPillSelect = (key: string) => {
+    if (key === 'gainers' || key === 'losers') {
+      setActiveMoverDirection(key);
+    }
+  };
+
+  const data = useMemo<PerpsFeedItem[]>(() => {
+    const feedItemsBySymbol = new Map(
+      perps.data.map((item) => [item.market.symbol, item]),
+    );
+    const markets = filterAndSortByPriceChangeDirection(
+      perps.data.map((item) => item.market),
+      activeMoverDirection,
+    );
+    return markets
+      .map((market) => feedItemsBySymbol.get(market.symbol))
+      .filter((item): item is PerpsFeedItem => item !== undefined);
+  }, [activeMoverDirection, perps.data]);
+  const pillData =
+    data.length === 0 &&
+    perps.data.length > 0 &&
+    perps.data.every(({ market }) =>
+      Number.isNaN(parseFloat(market.change24hPercent)),
+    )
+      ? perps.data
+      : data;
+
   if (!perps.isLoading && perps.data.length === 0) return null;
 
   return (
@@ -67,14 +124,24 @@ const PerpsBlock: React.FC<PerpsBlockProps> = ({ refresh, navigation }) => {
             navigation,
             'all',
             perps.defaultSortOptionId,
+            {
+              sortDirection:
+                PERPS_PRICE_CHANGE_SORT_DIRECTION[activeMoverDirection],
+            },
           )
         }
         testID="section-header-view-all-perps"
         tabName="Now"
         sectionName="perps_movers"
       />
+      <PillRow
+        pills={moverPills}
+        activeKey={activeMoverDirection}
+        onSelect={handleMoverPillSelect}
+        testIdPrefix="perps-movers"
+      />
       <PillScrollList<PerpsFeedItem>
-        data={perps.data}
+        data={pillData}
         isLoading={perps.isLoading}
         renderItem={(item, index) => (
           <PerpsPillItem
@@ -122,7 +189,17 @@ const NowTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
     whatsHappeningRef.current?.refresh();
   }, [refresh.trigger]);
 
-  const predictions = usePredictionsFeed({ refresh });
+  const worldCupPredictions = useWorldCupPredictionsFeed({
+    enabled: isPredictEnabled,
+    refresh,
+  });
+  const predictions = usePredictionsFeed({
+    refresh,
+    enabled: !worldCupPredictions.isEnabled,
+  });
+  const displayedPredictions = worldCupPredictions.isEnabled
+    ? worldCupPredictions
+    : predictions;
   const cryptoMovers = useTokensFeed({
     refresh,
     hideRiskyTokens: true,
@@ -169,13 +246,21 @@ const NowTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
   const predictionsSection = (
     <PredictionsCarouselSection
       key="predictions"
-      feed={predictions}
+      feed={displayedPredictions}
       tabName="Now"
       sectionName="predictions_trending"
-      title={strings('wallet.predict')}
+      title={
+        worldCupPredictions.isEnabled
+          ? strings('predict.world_cup.predictions_title')
+          : strings('wallet.predict')
+      }
       testIdPrefix="predict-market-row-item"
       idPrefix="predictions"
-      onViewAll={() => navigateToExplorePredictionsList(navigation, 'trending')}
+      onViewAll={() =>
+        worldCupPredictions.isEnabled
+          ? navigateToExploreWorldCupPredictions(navigation)
+          : navigateToExplorePredictionsList(navigation, 'trending')
+      }
       isEnabled={isPredictEnabled}
     />
   );
diff --git a/app/components/Views/TrendingView/tabs/SportsTab.test.tsx b/app/components/Views/TrendingView/tabs/SportsTab.test.tsx
new file mode 100644
index 000000000000..e6ca0dfc9b0f
--- /dev/null
+++ b/app/components/Views/TrendingView/tabs/SportsTab.test.tsx
@@ -0,0 +1,162 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react-native';
+import { NavigationContainer } from '@react-navigation/native';
+import { useSelector } from 'react-redux';
+import Routes from '../../../../constants/navigation/Routes';
+import { PredictEventValues } from '../../../UI/Predict/constants/eventNames';
+import { selectPredictEnabledFlag } from '../../../UI/Predict';
+import SportsTab from './SportsTab';
+import type { RefreshConfig } from '../hooks/useExploreRefresh';
+
+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('../../../../util/theme', () => ({
+  useTheme: () => ({
+    colors: {
+      icon: { default: 'black' },
+      primary: { default: 'blue' },
+    },
+  }),
+}));
+
+interface MockPredictionMarket {
+  id: string;
+}
+
+const mockUsePredictionsFeed = jest.fn<
+  { data: MockPredictionMarket[]; isLoading: boolean },
+  []
+>(() => ({
+  data: [],
+  isLoading: false,
+}));
+jest.mock('../feeds/predictions/usePredictionsFeed', () => ({
+  usePredictionsFeed: () => mockUsePredictionsFeed(),
+}));
+
+const mockUseWorldCupPredictionsFeed = jest.fn<
+  { data: MockPredictionMarket[]; isLoading: boolean; isEnabled: boolean },
+  []
+>(() => ({
+  data: [],
+  isLoading: false,
+  isEnabled: false,
+}));
+jest.mock('../feeds/predictions/useWorldCupPredictionsFeed', () => ({
+  useWorldCupPredictionsFeed: () => mockUseWorldCupPredictionsFeed(),
+}));
+
+const mockUseSportsMarketsFeed = jest.fn(() => ({
+  pills: [],
+  activeKey: 'soccer',
+  select: jest.fn(),
+  active: {
+    marketData: [],
+    isFetching: false,
+    isFetchingMore: false,
+    hasMore: false,
+    fetchMore: jest.fn(),
+  },
+}));
+jest.mock('../feeds/predictions/useSportsMarketsFeed', () => ({
+  useSportsMarketsFeed: () => mockUseSportsMarketsFeed(),
+}));
+
+jest.mock('../components/HorizontalCarousel', () => {
+  // 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 {
+    __esModule: true,
+    default: ({ idPrefix }: { idPrefix: string }) =>
+      createElement(View, { testID: `${idPrefix}-flash-list` }),
+  };
+});
+
+const defaultRefresh: RefreshConfig = { trigger: 0, silentRefresh: true };
+const defaultTabProps = {
+  refresh: defaultRefresh,
+  refreshing: false,
+  onRefresh: jest.fn(),
+};
+
+const renderSportsTab = () =>
+  render(
+    <NavigationContainer>
+      <SportsTab {...defaultTabProps} />
+    </NavigationContainer>,
+  );
+
+describe('SportsTab — Predictions carousel', () => {
+  const mockUseSelector = useSelector as jest.MockedFunction<
+    typeof useSelector
+  >;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockImplementation((selector) => {
+      if (selector === selectPredictEnabledFlag) return true;
+      return undefined;
+    });
+    mockUsePredictionsFeed.mockReturnValue({
+      data: [{ id: 'sports-market-1' }],
+      isLoading: false,
+    });
+    mockUseWorldCupPredictionsFeed.mockReturnValue({
+      data: [],
+      isLoading: false,
+      isEnabled: false,
+    });
+  });
+
+  it('opens the sports predictions tab when World Cup predictions are disabled', () => {
+    renderSportsTab();
+
+    fireEvent.press(
+      screen.getByTestId('section-header-view-all-sports_predictions'),
+    );
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.MARKET_LIST,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        tab: 'sports',
+      },
+    });
+  });
+
+  it('shows World Cup predictions and opens the World Cup screen when enabled', () => {
+    mockUseWorldCupPredictionsFeed.mockReturnValue({
+      data: [{ id: 'world-cup-market-1' }],
+      isLoading: false,
+      isEnabled: true,
+    });
+
+    renderSportsTab();
+
+    expect(screen.getByText('World Cup predictions')).toBeOnTheScreen();
+
+    fireEvent.press(
+      screen.getByTestId('section-header-view-all-sports_predictions'),
+    );
+
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.PREDICT.ROOT, {
+      screen: Routes.PREDICT.WORLD_CUP,
+      params: {
+        entryPoint: PredictEventValues.ENTRY_POINT.EXPLORE,
+        initialTab: 'all',
+      },
+    });
+  });
+});
diff --git a/app/components/Views/TrendingView/tabs/SportsTab.tsx b/app/components/Views/TrendingView/tabs/SportsTab.tsx
index 31f76d369081..41fb0dcaa160 100644
--- a/app/components/Views/TrendingView/tabs/SportsTab.tsx
+++ b/app/components/Views/TrendingView/tabs/SportsTab.tsx
@@ -25,13 +25,17 @@ 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 { useWorldCupPredictionsFeed } from '../feeds/predictions/useWorldCupPredictionsFeed';
 import {
   useSportsMarketsFeed,
   type UseSportsMarketsFeedResult,
 } from '../feeds/predictions/useSportsMarketsFeed';
 import PredictionsCarouselSection from '../feeds/predictions/PredictionsCarouselSection';
 import PredictionsSkeleton from '../feeds/predictions/PredictionsSkeleton';
-import { navigateToExplorePredictionsList } from '../feeds/predictions/predictionsNavigation';
+import {
+  navigateToExplorePredictionsList,
+  navigateToExploreWorldCupPredictions,
+} from '../feeds/predictions/predictionsNavigation';
 import PillRow from '../components/PillRow';
 import SectionHeader from '../components/SectionHeader';
 import type { TabProps } from '../hooks/useExploreRefresh';
@@ -51,6 +55,7 @@ interface SportsListHeaderProps {
   showSportsPredictions: boolean;
   sportsPredictionsData: PredictMarketType[];
   sportsPredictionsLoading: boolean;
+  showWorldCupPredictions: boolean;
   sportsMarkets: UseSportsMarketsFeedResult;
   showAllSportsSkeleton: boolean;
   showAllSportsEmpty: boolean;
@@ -61,6 +66,7 @@ const SportsListHeader: React.FC<SportsListHeaderProps> = ({
   showSportsPredictions,
   sportsPredictionsData,
   sportsPredictionsLoading,
+  showWorldCupPredictions,
   sportsMarkets,
   showAllSportsSkeleton,
   showAllSportsEmpty,
@@ -74,10 +80,18 @@ const SportsListHeader: React.FC<SportsListHeaderProps> = ({
       }}
       tabName="Sports"
       sectionName="predictions_sports"
-      title={strings('trending.predictions')}
+      title={
+        showWorldCupPredictions
+          ? strings('predict.world_cup.predictions_title')
+          : strings('trending.predictions')
+      }
       testIdPrefix="predict-sports-market-row-item"
       idPrefix="sports_predictions"
-      onViewAll={() => navigateToExplorePredictionsList(navigation, 'sports')}
+      onViewAll={() =>
+        showWorldCupPredictions
+          ? navigateToExploreWorldCupPredictions(navigation)
+          : navigateToExplorePredictionsList(navigation, 'sports')
+      }
       isEnabled={showSportsPredictions}
     />
 
@@ -125,7 +139,18 @@ const SportsTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
   const isPredictEnabled = useSelector(selectPredictEnabledFlag);
   const { colors } = useTheme();
 
-  const sportsPredictions = usePredictionsFeed({ variant: 'sports', refresh });
+  const worldCupPredictions = useWorldCupPredictionsFeed({
+    enabled: isPredictEnabled,
+    refresh,
+  });
+  const sportsPredictions = usePredictionsFeed({
+    variant: 'sports',
+    refresh,
+    enabled: !worldCupPredictions.isEnabled,
+  });
+  const displayedSportsPredictions = worldCupPredictions.isEnabled
+    ? worldCupPredictions
+    : sportsPredictions;
   const sportsMarkets = useSportsMarketsFeed({ refresh });
 
   const { active, activeKey } = sportsMarkets;
@@ -166,7 +191,8 @@ const SportsTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
 
   const showSportsPredictions =
     isPredictEnabled &&
-    (sportsPredictions.isLoading || sportsPredictions.data.length > 0);
+    (displayedSportsPredictions.isLoading ||
+      displayedSportsPredictions.data.length > 0);
   const showAllSportsSkeleton =
     active.isFetching && active.marketData.length === 0;
   const showAllSportsEmpty =
@@ -175,8 +201,9 @@ const SportsTab: React.FC<TabProps> = ({ refresh, refreshing, onRefresh }) => {
   const listHeader = (
     <SportsListHeader
       showSportsPredictions={showSportsPredictions}
-      sportsPredictionsData={sportsPredictions.data}
-      sportsPredictionsLoading={sportsPredictions.isLoading}
+      sportsPredictionsData={displayedSportsPredictions.data}
+      sportsPredictionsLoading={displayedSportsPredictions.isLoading}
+      showWorldCupPredictions={worldCupPredictions.isEnabled}
       sportsMarkets={sportsMarkets}
       showAllSportsSkeleton={showAllSportsSkeleton}
       showAllSportsEmpty={showAllSportsEmpty}
diff --git a/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx b/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx
index d655e652eafe..c41fdf3fc929 100644
--- a/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx
+++ b/app/components/Views/WhatsHappeningDetailView/components/AssetRow.tsx
@@ -51,7 +51,7 @@ const AssetRow: React.FC<AssetRowProps> = ({
       gap={3}
       twClassName="py-3"
     >
-      <RelatedAssetAvatar name={asset.name} image={image} />
+      <RelatedAssetAvatar name={asset.name || asset.symbol} image={image} />
 
       <Box
         twClassName="flex-1"
diff --git a/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx
index 9e4d6bf4ef5c..05a1145e2d68 100644
--- a/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx
+++ b/app/components/Views/WhatsHappeningDetailView/components/WhatsHappeningExpandedCard.tsx
@@ -262,9 +262,9 @@ const WhatsHappeningExpandedCard: React.FC<WhatsHappeningExpandedCardProps> = ({
                   {strings('homepage.sections.related_assets')}
                 </Text>
 
-                {item.relatedAssets.map((asset) => (
+                {item.relatedAssets.map((asset, index) => (
                   <PerpsRow
-                    key={asset.sourceAssetId}
+                    key={`${asset.symbol}-${index}`}
                     asset={asset}
                     item={item}
                     cardIndex={cardIndex}
diff --git a/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts b/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts
index 10fb8ed034cc..f97c82b9c32e 100644
--- a/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts
+++ b/app/components/Views/WhatsHappeningDetailView/hooks/useTradeNavigation.ts
@@ -27,11 +27,11 @@ const useTradeNavigation = (asset: RelatedAsset): UseTradeNavigationResult => {
     navigation.navigate(Routes.PERPS.ROOT, {
       screen: Routes.PERPS.MARKET_DETAILS,
       params: {
-        market: { symbol: hlPerpsMarket, name: asset.name },
+        market: { symbol: hlPerpsMarket, name: asset.name || asset.symbol },
         source: PERPS_EVENT_VALUE.SOURCE.HOME_SECTION,
       },
     });
-  }, [navigation, hlPerpsMarket, asset.name]);
+  }, [navigation, hlPerpsMarket, asset.name, asset.symbol]);
 
   return { handleTrade, canTrade: Boolean(hlPerpsMarket) };
 };
diff --git a/app/components/Views/confirmations/components/UI/token/token.tsx b/app/components/Views/confirmations/components/UI/token/token.tsx
index cba9e1d4d767..5b5bdd027118 100644
--- a/app/components/Views/confirmations/components/UI/token/token.tsx
+++ b/app/components/Views/confirmations/components/UI/token/token.tsx
@@ -20,6 +20,7 @@ import { BadgeVariant } from '../../../../../../component-library/components/Bad
 import { BadgePosition } from '../../../../../../component-library/components/Badges/BadgeWrapper/BadgeWrapper.types';
 import { AccountTypeLabel } from '../account-type-label';
 import { AssetType } from '../../../types/token';
+import { getAssetTestId } from '../../../../../../../tests/selectors/Wallet/WalletView.selectors';
 import { formatAmount } from '../../../../../../components/UI/SimulationDetails/formatAmount';
 import { ACCOUNT_TYPE_LABELS } from '../../../../../../constants/account-type-labels';
 import AssetLogo from '../../../../../UI/Assets/components/AssetLogo/AssetLogo';
@@ -41,6 +42,7 @@ export function Token({ asset, onPress }: TokenProps) {
 
   return (
     <Pressable
+      testID={getAssetTestId(asset.symbol as string)}
       disabled={asset.disabled}
       style={({ pressed }) =>
         tw.style(
diff --git a/app/components/Views/confirmations/components/footer/footer.test.tsx b/app/components/Views/confirmations/components/footer/footer.test.tsx
index 73e5e102e7e1..1fa28fa54f17 100644
--- a/app/components/Views/confirmations/components/footer/footer.test.tsx
+++ b/app/components/Views/confirmations/components/footer/footer.test.tsx
@@ -108,11 +108,13 @@ describe('Footer', () => {
     mockUseConfirmationContext.mockReturnValue({
       headlessBuyError: undefined,
       isFooterVisible: true,
+      isConfirmationSubmitting: false,
       isHeadlessBuyInProgress: false,
       isTransactionDataUpdating: false,
       isTransactionValueUpdating: false,
       setHeadlessBuyError: jest.fn(),
       setIsFooterVisible: jest.fn(),
+      setIsConfirmationSubmitting: jest.fn(),
       setIsHeadlessBuyInProgress: jest.fn(),
       setIsTransactionDataUpdating: jest.fn(),
       setIsTransactionValueUpdating: jest.fn(),
@@ -222,11 +224,13 @@ describe('Footer', () => {
     mockUseConfirmationContext.mockReturnValue({
       headlessBuyError: undefined,
       isFooterVisible: true,
+      isConfirmationSubmitting: false,
       isHeadlessBuyInProgress: false,
       isTransactionDataUpdating: true,
       isTransactionValueUpdating: true,
       setHeadlessBuyError: jest.fn(),
       setIsFooterVisible: jest.fn(),
+      setIsConfirmationSubmitting: jest.fn(),
       setIsHeadlessBuyInProgress: jest.fn(),
       setIsTransactionDataUpdating: jest.fn(),
       setIsTransactionValueUpdating: jest.fn(),
@@ -285,11 +289,13 @@ describe('Footer', () => {
     mockUseConfirmationContext.mockReturnValue({
       headlessBuyError: undefined,
       isFooterVisible: undefined,
+      isConfirmationSubmitting: false,
       isHeadlessBuyInProgress: false,
       isTransactionDataUpdating: false,
       isTransactionValueUpdating: false,
       setHeadlessBuyError: jest.fn(),
       setIsFooterVisible: jest.fn(),
+      setIsConfirmationSubmitting: jest.fn(),
       setIsHeadlessBuyInProgress: jest.fn(),
       setIsTransactionDataUpdating: jest.fn(),
       setIsTransactionValueUpdating: jest.fn(),
@@ -321,11 +327,13 @@ describe('Footer', () => {
     mockUseConfirmationContext.mockReturnValue({
       headlessBuyError: undefined,
       isFooterVisible: undefined,
+      isConfirmationSubmitting: false,
       isHeadlessBuyInProgress: false,
       isTransactionDataUpdating: false,
       isTransactionValueUpdating: false,
       setHeadlessBuyError: jest.fn(),
       setIsFooterVisible: jest.fn(),
+      setIsConfirmationSubmitting: jest.fn(),
       setIsHeadlessBuyInProgress: jest.fn(),
       setIsTransactionDataUpdating: jest.fn(),
       setIsTransactionValueUpdating: jest.fn(),
@@ -357,11 +365,13 @@ describe('Footer', () => {
     mockUseConfirmationContext.mockReturnValue({
       headlessBuyError: undefined,
       isFooterVisible: false,
+      isConfirmationSubmitting: false,
       isHeadlessBuyInProgress: false,
       isTransactionDataUpdating: false,
       isTransactionValueUpdating: false,
       setHeadlessBuyError: jest.fn(),
       setIsFooterVisible: jest.fn(),
+      setIsConfirmationSubmitting: jest.fn(),
       setIsHeadlessBuyInProgress: jest.fn(),
       setIsTransactionDataUpdating: jest.fn(),
       setIsTransactionValueUpdating: 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 93d8f1592925..09e3f571378b 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
@@ -23,6 +23,7 @@ import {
   SetPayTokenRequest,
   useAutomaticTransactionPayToken,
 } from '../../../hooks/pay/useAutomaticTransactionPayToken';
+import { useIsFiatPaymentAvailable } from '../../../hooks/pay/useIsFiatPaymentAvailable';
 import { useTransactionPayPostQuote } from '../../../hooks/pay/useTransactionPayPostQuote';
 import { useTransactionPayWithdraw } from '../../../hooks/pay/useTransactionPayWithdraw';
 import { AlertMessage } from '../../alerts/alert-message';
@@ -135,9 +136,12 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
     const { isNative: isNativePayToken } = useTransactionPayToken();
     const { styles } = useStyles(styleSheet, {});
     const [isKeyboardVisible, setIsKeyboardVisible] = useState(true);
-    const { hasTokens } = useTransactionPayAvailableTokens();
+    const { hasTokens: hasAvailableTokens } =
+      useTransactionPayAvailableTokens();
     const fiatPayment = useTransactionPayFiatPayment();
     const selectedFiatPaymentMethodId = fiatPayment?.selectedPaymentMethodId;
+    const isFiatAvailable = useIsFiatPaymentAvailable();
+    const hasPaymentOption = hasAvailableTokens || isFiatAvailable;
     const fiatEverSelectedRef = useRef(false);
     if (selectedFiatPaymentMethodId) {
       fiatEverSelectedRef.current = true;
@@ -228,7 +232,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
             currency={currency}
             hasAlert={Boolean(alertMessage)}
             onPress={handleAmountPress}
-            disabled={!hasTokens}
+            disabled={!hasPaymentOption}
           />
           {!hidePayTokenAmount &&
             disablePay !== true &&
@@ -237,7 +241,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
             ) : (
               <PayTokenAmount
                 amountHuman={amountHuman}
-                disabled={!hasTokens || isAccountSelectionNeeded}
+                disabled={!hasPaymentOption || isAccountSelectionNeeded}
               />
             ))}
           {!hidePayTokenAmount && children}
@@ -255,7 +259,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
                 !shouldHideAccountSelector && (
                   <PayAccountSelector style={styles.separator} />
                 )}
-              {disablePay !== true && hasTokens && <PayWithRow />}
+              {disablePay !== true && hasPaymentOption && <PayWithRow />}
             </>
           )}
           {isResultReady && (
@@ -263,7 +267,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
               {supportAccountSelection &&
                 !selectedFiatPaymentMethodId &&
                 !shouldHideAccountSelector && <PayAccountSelector />}
-              {disablePay !== true && hasTokens && <PayWithRow />}
+              {disablePay !== true && hasPaymentOption && <PayWithRow />}
               {showPaymentDetails && (
                 <>
                   <BridgeFeeRow />
@@ -287,7 +291,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
               {footerText}
             </Text>
           )}
-          {isKeyboardVisible && hasTokens && (
+          {isKeyboardVisible && hasPaymentOption && (
             <DepositKeyboard
               hidePercentageButtons={
                 Boolean(selectedFiatPaymentMethodId) ||
@@ -302,7 +306,7 @@ export const CustomAmountInfo: React.FC<CustomAmountInfoProps> = memo(
               hasMax={hasMax && (isWithdraw || !isNativePayToken)}
             />
           )}
-          {!hasTokens && <BuySection />}
+          {!hasPaymentOption && <BuySection />}
           {!isKeyboardVisible && (
             <ConfirmButton
               alertTitle={alertTitle}
diff --git a/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.test.tsx b/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.test.tsx
index 895956a1e325..8888ab8a05b4 100644
--- a/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.test.tsx
+++ b/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react-native';
 import { PredictClaimInfo } from './predict-claim-info';
 import useClearConfirmationOnBackSwipe from '../../../hooks/ui/useClearConfirmationOnBackSwipe';
+import Engine from '../../../../../../core/Engine';
 
 jest.mock('../../../hooks/ui/useClearConfirmationOnBackSwipe');
 
@@ -19,6 +20,14 @@ jest.mock('../../../hooks/useConfirmActions', () => ({
   }),
 }));
 
+jest.mock('../../../../../../core/Engine', () => ({
+  context: {
+    PredictController: {
+      clearPendingClaim: jest.fn(),
+    },
+  },
+}));
+
 jest.mock('../../predict-confirmations/predict-claim-amount', () => ({
   PredictClaimAmount: () => null,
   PredictClaimAmountSkeleton: () => null,
@@ -50,11 +59,26 @@ jest.mock('../../../../../../component-library/hooks', () => ({
 describe('PredictClaimInfo', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    (useClearConfirmationOnBackSwipe as jest.Mock).mockReturnValue(jest.fn());
   });
 
   it('clears the confirmation when dismissed with a back gesture', () => {
     render(<PredictClaimInfo />);
 
     expect(useClearConfirmationOnBackSwipe).toHaveBeenCalledTimes(1);
+    expect(useClearConfirmationOnBackSwipe).toHaveBeenCalledWith({
+      rejectOnBeforeRemove: true,
+      skipNavigationOnGestureEnd: false,
+      rejectOnBeforeRemoveWithoutGesture: true,
+      onBeforeReject: expect.any(Function),
+    });
+    const options = (useClearConfirmationOnBackSwipe as jest.Mock).mock
+      .calls[0][0];
+
+    options.onBeforeReject();
+
+    expect(
+      Engine.context.PredictController.clearPendingClaim,
+    ).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.tsx b/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.tsx
index 837b54c1dbd2..f63e28deabfe 100644
--- a/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.tsx
+++ b/app/components/Views/confirmations/components/info/predict-claim-info/predict-claim-info.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import {
   PredictClaimAmount,
   PredictClaimAmountSkeleton,
@@ -10,19 +10,28 @@ import ButtonIcon, {
   ButtonIconSizes,
 } from '../../../../../../component-library/components/Buttons/ButtonIcon';
 import { IconName } from '../../../../../../component-library/components/Icons/Icon';
-import { useConfirmActions } from '../../../hooks/useConfirmActions';
 import { useStyles } from '../../../../../../component-library/hooks';
 import styleSheet from './predict-claim-info.styles';
 import useClearConfirmationOnBackSwipe from '../../../hooks/ui/useClearConfirmationOnBackSwipe';
+import Engine from '../../../../../../core/Engine';
 
 export function PredictClaimInfo() {
   useModalNavbar();
   usePredictClaimConfirmationMetrics();
-  useClearConfirmationOnBackSwipe();
+  const clearPendingClaim = useCallback(() => {
+    Engine.context.PredictController.clearPendingClaim();
+  }, []);
+
+  const rejectConfirmation = useClearConfirmationOnBackSwipe({
+    rejectOnBeforeRemove: true,
+    rejectOnBeforeRemoveWithoutGesture: true,
+    skipNavigationOnGestureEnd: false,
+    onBeforeReject: clearPendingClaim,
+  });
 
   return (
     <>
-      <BackButton />
+      <BackButton onReject={rejectConfirmation} />
       <PredictClaimBackground />
       <PredictClaimAmount />
     </>
@@ -41,15 +50,18 @@ export function PredictClaimInfoSkeleton() {
 /**
  * Intentionally not using navigation header as `headerTransparent` not rendering buttons on Android.
  */
-function BackButton() {
+function BackButton({ onReject }: { onReject: () => void }) {
   const { styles } = useStyles(styleSheet, {});
-  const { onReject } = useConfirmActions();
+
+  const handleReject = useCallback(() => {
+    onReject();
+  }, [onReject]);
 
   return (
     <ButtonIcon
       size={ButtonIconSizes.Lg}
       iconName={IconName.Close}
-      onPress={() => onReject()}
+      onPress={handleReject}
       style={styles.backButton}
     />
   );
diff --git a/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/predict-claim-footer.tsx b/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/predict-claim-footer.tsx
index ba6d30405f0f..3d18a9d4ca9a 100644
--- a/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/predict-claim-footer.tsx
+++ b/app/components/Views/confirmations/components/predict-confirmations/predict-claim-footer/predict-claim-footer.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { strings } from '../../../../../../../locales/i18n';
 import Avatar, {
@@ -22,9 +22,10 @@ import { BigNumber } from 'bignumber.js';
 import ButtonHero from '../../../../../../component-library/components-temp/Buttons/ButtonHero';
 import { ButtonBaseSize } from '@metamask/design-system-react-native';
 import { useTransactionMetadataRequest } from '../../../hooks/transactions/useTransactionMetadataRequest';
+import { useConfirmationContext } from '../../../context/confirmation-context';
 
 export interface PredictClaimFooterProps {
-  onPress: () => void;
+  onPress: () => void | Promise<void>;
   onError: (error?: Error) => void;
 }
 
@@ -34,6 +35,7 @@ export function PredictClaimFooter({
 }: PredictClaimFooterProps) {
   const transactionMetadata = useTransactionMetadataRequest();
   const { styles } = useStyles(styleSheet, {});
+  const { setIsConfirmationSubmitting } = useConfirmationContext();
 
   const address = transactionMetadata?.txParams.from;
 
@@ -51,6 +53,17 @@ export function PredictClaimFooter({
     }
   }, [hasNoPositions, onError]);
 
+  const handlePress = useCallback(async () => {
+    setIsConfirmationSubmitting(true);
+
+    try {
+      await onPress();
+    } catch (error) {
+      setIsConfirmationSubmitting(false);
+      throw error;
+    }
+  }, [onPress, setIsConfirmationSubmitting]);
+
   if (hasNoPositions) {
     return null;
   }
@@ -64,7 +77,7 @@ export function PredictClaimFooter({
       )}
       <ButtonHero
         testID={PredictClaimConfirmationSelectorsIDs.CLAIM_CONFIRM_BUTTON}
-        onPress={onPress}
+        onPress={handlePress}
         size={ButtonBaseSize.Lg}
         isFullWidth
       >
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 d91a1ce1a236..ae8817d78e7b 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
@@ -329,6 +329,39 @@ describe('RecipientInput', () => {
     jest.advanceTimersByTime(100);
   });
 
+  it('clears pastedRecipient when clear button is pressed', () => {
+    mockUseSendContext.mockReturnValue({
+      to: '0x1234567890123456789012345678901234567890',
+      updateTo: mockUpdateTo,
+      asset: undefined,
+      chainId: undefined,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      fromAccount: {} as any,
+      from: '',
+      maxValueMode: false,
+      updateAsset: jest.fn(),
+      updateValue: jest.fn(),
+      value: undefined,
+    });
+
+    const mockSetPastedRecipient = jest.fn();
+    const { getByText } = renderWithProvider(
+      <RecipientInput
+        isRecipientSelectedFromList={false}
+        resetStateOnInput={noop}
+        setPastedRecipient={mockSetPastedRecipient}
+      />,
+    );
+
+    const clearButton = getByText('Clear');
+    fireEvent.press(clearButton);
+
+    expect(mockUpdateTo).toHaveBeenCalledWith('');
+    expect(mockSetPastedRecipient).toHaveBeenCalledWith(undefined);
+
+    jest.advanceTimersByTime(100);
+  });
+
   it('maintains correct button state based on isRecipientSelectedFromList prop', () => {
     mockUseSendContext.mockReturnValue({
       to: '0x123...',
diff --git a/app/components/Views/confirmations/components/recipient-input/recipient-input.tsx b/app/components/Views/confirmations/components/recipient-input/recipient-input.tsx
index 293eac231974..3420ad21cf50 100644
--- a/app/components/Views/confirmations/components/recipient-input/recipient-input.tsx
+++ b/app/components/Views/confirmations/components/recipient-input/recipient-input.tsx
@@ -49,10 +49,11 @@ export const RecipientInput = ({
 
   const handleClearInput = useCallback(() => {
     updateTo('');
+    setPastedRecipient(undefined);
     setTimeout(() => {
       inputRef.current?.blur();
     }, 100);
-  }, [updateTo, inputRef]);
+  }, [updateTo, inputRef, setPastedRecipient]);
 
   const handleTextChange = useCallback(
     async (toAddress: string) => {
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 74ea3e9163b6..edcdfaae1b96 100644
--- a/app/components/Views/confirmations/components/send/recipient/recipient.test.tsx
+++ b/app/components/Views/confirmations/components/send/recipient/recipient.test.tsx
@@ -770,6 +770,44 @@ describe('Recipient pastedRecipient effect gating (lines 96-101)', () => {
     expect(mockHandleSubmitPressLocal).not.toHaveBeenCalled();
   });
 
+  it('does not submit when recipient address is empty', () => {
+    mockUseToAddressValidation.mockReturnValue({
+      loading: false,
+      resolvedAddress: undefined,
+      toAddressError: undefined,
+      toAddressValidated: undefined,
+      toAddressWarning: undefined,
+    });
+
+    mockUseSendAlerts.mockReturnValue({
+      alerts: [],
+      hasUnacknowledgedAlerts: false,
+      acknowledgeAlerts: jest.fn(),
+      isAlertCheckPending: false,
+    });
+
+    mockUseSendContext.mockReturnValue({
+      to: '',
+      updateTo: jest.fn(),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      asset: {} as any,
+      chainId: '0x1',
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      fromAccount: {} as any,
+      from: '',
+      maxValueMode: false,
+      updateAsset: jest.fn(),
+      updateValue: jest.fn(),
+      value: undefined,
+    });
+
+    const { getByTestId } = renderWithProvider(<Recipient />);
+
+    fireEvent.press(getByTestId('set-pasted'));
+
+    expect(mockHandleSubmitPressLocal).not.toHaveBeenCalled();
+  });
+
   it('handles reviews exits early if toAddressError is defined', () => {
     // Given: valid to address, no errors/warnings/loading, but missing asset
     mockUseToAddressValidation.mockReturnValue({
diff --git a/app/components/Views/confirmations/components/send/recipient/recipient.tsx b/app/components/Views/confirmations/components/send/recipient/recipient.tsx
index f001f979c55a..ca89de8d8ad9 100644
--- a/app/components/Views/confirmations/components/send/recipient/recipient.tsx
+++ b/app/components/Views/confirmations/components/send/recipient/recipient.tsx
@@ -86,6 +86,10 @@ export const Recipient = () => {
       if (!asset || !chainId) {
         return;
       }
+      const recipientAddress = resolvedAddress || to;
+      if (!recipientAddress) {
+        return;
+      }
       setIsSubmittingTransaction(true);
       setPastedRecipient(undefined);
       captureRecipientSelected(
diff --git a/app/components/Views/confirmations/context/confirmation-context/confirmation-context.test.tsx b/app/components/Views/confirmations/context/confirmation-context/confirmation-context.test.tsx
index fa95899a8c1b..44dff7dc7817 100644
--- a/app/components/Views/confirmations/context/confirmation-context/confirmation-context.test.tsx
+++ b/app/components/Views/confirmations/context/confirmation-context/confirmation-context.test.tsx
@@ -16,11 +16,13 @@ describe('ConfirmationContext', () => {
     expect(result.current).toStrictEqual({
       headlessBuyError: undefined,
       isFooterVisible: undefined,
+      isConfirmationSubmitting: false,
       isHeadlessBuyInProgress: false,
       isTransactionDataUpdating: false,
       isTransactionValueUpdating: false,
       setHeadlessBuyError: expect.any(Function),
       setIsFooterVisible: expect.any(Function),
+      setIsConfirmationSubmitting: expect.any(Function),
       setIsHeadlessBuyInProgress: expect.any(Function),
       setIsTransactionDataUpdating: expect.any(Function),
       setIsTransactionValueUpdating: expect.any(Function),
@@ -84,4 +86,20 @@ describe('ConfirmationContext', () => {
 
     expect(result.current.isTransactionDataUpdating).toBe(false);
   });
+
+  it('updates isConfirmationSubmitting state when calling setIsConfirmationSubmitting', () => {
+    const { result } = renderHook(() => useConfirmationContext(), { wrapper });
+
+    act(() => {
+      result.current.setIsConfirmationSubmitting(true);
+    });
+
+    expect(result.current.isConfirmationSubmitting).toBe(true);
+
+    act(() => {
+      result.current.setIsConfirmationSubmitting(false);
+    });
+
+    expect(result.current.isConfirmationSubmitting).toBe(false);
+  });
 });
diff --git a/app/components/Views/confirmations/context/confirmation-context/confirmation-context.tsx b/app/components/Views/confirmations/context/confirmation-context/confirmation-context.tsx
index 910e40b5b8a3..a91dc67f951f 100644
--- a/app/components/Views/confirmations/context/confirmation-context/confirmation-context.tsx
+++ b/app/components/Views/confirmations/context/confirmation-context/confirmation-context.tsx
@@ -4,10 +4,12 @@ import React, { useContext, useMemo, useState } from 'react';
 export interface ConfirmationContextParams {
   headlessBuyError: string | undefined;
   isFooterVisible?: boolean;
+  isConfirmationSubmitting: boolean;
   isHeadlessBuyInProgress: boolean;
   isTransactionValueUpdating: boolean;
   isTransactionDataUpdating: boolean;
   setHeadlessBuyError: (error: string | undefined) => void;
+  setIsConfirmationSubmitting: (isConfirmationSubmitting: boolean) => void;
   setIsFooterVisible: (isFooterVisible: boolean) => void;
   setIsHeadlessBuyInProgress: (isHeadlessBuyInProgress: boolean) => void;
   setIsTransactionValueUpdating: (isTransactionValueUpdating: boolean) => void;
@@ -19,10 +21,12 @@ export interface ConfirmationContextParams {
 const ConfirmationContext = React.createContext<ConfirmationContextParams>({
   headlessBuyError: undefined,
   isFooterVisible: true,
+  isConfirmationSubmitting: false,
   isHeadlessBuyInProgress: false,
   isTransactionDataUpdating: false,
   isTransactionValueUpdating: false,
   setHeadlessBuyError: noop,
+  setIsConfirmationSubmitting: noop,
   setIsFooterVisible: noop,
   setIsHeadlessBuyInProgress: noop,
   setIsTransactionDataUpdating: noop,
@@ -50,6 +54,9 @@ export const ConfirmationContextProvider: React.FC<
   const [isTransactionDataUpdating, setIsTransactionDataUpdating] =
     useState<boolean>(false);
 
+  const [isConfirmationSubmitting, setIsConfirmationSubmitting] =
+    useState<boolean>(false);
+
   const contextValue = useMemo(
     () => ({
       headlessBuyError,
@@ -57,11 +64,13 @@ export const ConfirmationContextProvider: React.FC<
       isHeadlessBuyInProgress,
       isTransactionDataUpdating,
       isTransactionValueUpdating,
+      isConfirmationSubmitting,
       setHeadlessBuyError,
       setIsFooterVisible,
       setIsHeadlessBuyInProgress,
       setIsTransactionDataUpdating,
       setIsTransactionValueUpdating,
+      setIsConfirmationSubmitting,
     }),
     [
       headlessBuyError,
@@ -69,11 +78,13 @@ export const ConfirmationContextProvider: React.FC<
       isHeadlessBuyInProgress,
       isTransactionDataUpdating,
       isTransactionValueUpdating,
+      isConfirmationSubmitting,
       setHeadlessBuyError,
       setIsFooterVisible,
       setIsHeadlessBuyInProgress,
       setIsTransactionDataUpdating,
       setIsTransactionValueUpdating,
+      setIsConfirmationSubmitting,
     ],
   );
 
diff --git a/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.test.ts b/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.test.ts
index 7abd5e6d30c3..d87bbad22d1b 100644
--- a/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.test.ts
@@ -13,7 +13,6 @@ import { transactionApprovalControllerMock } from '../../__mocks__/controllers/a
 import {
   MetaMaskPayTokensFlags,
   selectMetaMaskPayTokensFlags,
-  selectMetaMaskPayFiatFlags,
 } from '../../../../../selectors/featureFlagController/confirmations';
 import {
   isHardwareAccount,
@@ -38,6 +37,8 @@ import { useTransactionAccountOverride } from '../transactions/useTransactionAcc
 import { MUSD_TOKEN_ADDRESS } from '../../../../UI/Earn/constants/musd';
 import { selectLastWithdrawTokenByType } from '../../../../../selectors/transactionController';
 import { selectPaymentOverrideByTransactionId } from '../../../../../selectors/transactionPayController';
+import { useIsFiatPaymentAvailable } from './useIsFiatPaymentAvailable';
+import { useMMPayFiatConfig } from './useMMPayFiatConfig';
 
 jest.mock('../transactions/useTransactionMetadataRequest');
 jest.mock('../transactions/useTransactionAccountOverride');
@@ -48,6 +49,8 @@ jest.mock('./useTransactionPayData');
 jest.mock('./useTransactionPayAvailableTokens');
 jest.mock('./useWithdrawTokenFilter');
 jest.mock('../../../../UI/Ramp/hooks/useRampsPaymentMethods');
+jest.mock('./useIsFiatPaymentAvailable');
+jest.mock('./useMMPayFiatConfig');
 jest.mock('../../../../../selectors/transactionController', () => ({
   ...jest.requireActual('../../../../../selectors/transactionController'),
   selectLastWithdrawTokenByType: jest.fn(),
@@ -59,7 +62,6 @@ jest.mock(
       '../../../../../selectors/featureFlagController/confirmations',
     ),
     selectMetaMaskPayTokensFlags: jest.fn(),
-    selectMetaMaskPayFiatFlags: jest.fn(),
   }),
 );
 
@@ -122,9 +124,6 @@ describe('useAutomaticTransactionPayToken', () => {
   const selectMetaMaskPayTokensFlagsMock = jest.mocked(
     selectMetaMaskPayTokensFlags,
   );
-  const selectMetaMaskPayFiatFlagsMock = jest.mocked(
-    selectMetaMaskPayFiatFlags,
-  );
   const useTransactionMetadataRequestMock = jest.mocked(
     useTransactionMetadataRequest,
   );
@@ -187,7 +186,8 @@ describe('useAutomaticTransactionPayToken', () => {
       error: null,
     });
 
-    selectMetaMaskPayFiatFlagsMock.mockReturnValue({
+    jest.mocked(useIsFiatPaymentAvailable).mockReturnValue(false);
+    jest.mocked(useMMPayFiatConfig).mockReturnValue({
       enabledTransactionTypes: [],
       maxDelayMinutesForPaymentMethods: 10,
     });
@@ -220,7 +220,7 @@ describe('useAutomaticTransactionPayToken', () => {
     });
   });
 
-  it('selects target token if no tokens with balance', () => {
+  it('does not select token when no tokens with balance and fiat unavailable', () => {
     useTransactionPayAvailableTokensMock.mockReturnValue({
       availableTokens: [] as AssetType[],
       hasTokens: false,
@@ -228,10 +228,7 @@ describe('useAutomaticTransactionPayToken', () => {
 
     runHook();
 
-    expect(setPayTokenMock).toHaveBeenCalledWith({
-      address: TOKEN_ADDRESS_1_MOCK,
-      chainId: CHAIN_ID_1_MOCK,
-    });
+    expect(setPayTokenMock).not.toHaveBeenCalled();
   });
 
   it('does nothing if no required tokens', () => {
@@ -418,7 +415,7 @@ describe('useAutomaticTransactionPayToken', () => {
     });
   });
 
-  it('selects target token when preferred payment token provided but no tokens available', () => {
+  it('does not select token when preferred payment token provided but no tokens available and fiat unavailable', () => {
     useTransactionPayAvailableTokensMock.mockReturnValue({
       availableTokens: [] as AssetType[],
       hasTokens: false,
@@ -431,10 +428,7 @@ describe('useAutomaticTransactionPayToken', () => {
       },
     });
 
-    expect(setPayTokenMock).toHaveBeenCalledWith({
-      address: TOKEN_ADDRESS_1_MOCK,
-      chainId: CHAIN_ID_1_MOCK,
-    });
+    expect(setPayTokenMock).not.toHaveBeenCalled();
   });
 
   it('selects first available token when preferred token not in available tokens', () => {
diff --git a/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts b/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts
index e4bd814a15b5..044c3fde4eef 100644
--- a/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts
+++ b/app/components/Views/confirmations/hooks/pay/useAutomaticTransactionPayToken.ts
@@ -28,10 +28,11 @@ import {
 import { useSelector } from 'react-redux';
 import {
   selectMetaMaskPayTokensFlags,
-  selectMetaMaskPayFiatFlags,
   PreferredToken,
   getPreferredTokensForTransactionType,
 } from '../../../../../selectors/featureFlagController/confirmations';
+import { useIsFiatPaymentAvailable } from './useIsFiatPaymentAvailable';
+import { useMMPayFiatConfig } from './useMMPayFiatConfig';
 import { RootState } from '../../../../../reducers';
 import { selectLastWithdrawTokenByType } from '../../../../../selectors/transactionController';
 import { selectPaymentOverrideByTransactionId } from '../../../../../selectors/transactionPayController';
@@ -160,11 +161,8 @@ export function useAutomaticTransactionPayToken({
   const automaticToken = useMemo(() => selectBestToken(), [selectBestToken]);
 
   const { paymentMethods } = useRampsPaymentMethods();
-  const fiatFlags = useSelector(selectMetaMaskPayFiatFlags);
-  const isFiatEnabled = hasTransactionType(
-    transactionMeta,
-    fiatFlags.enabledTransactionTypes,
-  );
+  const { maxDelayMinutesForPaymentMethods } = useMMPayFiatConfig();
+  const isFiatEnabled = useIsFiatPaymentAvailable();
 
   useEffect(() => {
     if (
@@ -177,20 +175,13 @@ export function useAutomaticTransactionPayToken({
       return;
     }
 
-    if (!automaticToken) {
-      log('No automatic pay token found');
-      return;
-    }
-
-    if (autoSelectFiatPayment) {
+    if (autoSelectFiatPayment || tokens.length === 0) {
       if (!isFiatEnabled || paymentMethods.length === 0) {
         return;
       }
 
       const eligibleMethod = paymentMethods.find(
-        (pm) =>
-          !pm.delay ||
-          pm.delay[1] <= fiatFlags.maxDelayMinutesForPaymentMethods,
+        (pm) => !pm.delay || pm.delay[1] <= maxDelayMinutesForPaymentMethods,
       );
 
       if (eligibleMethod) {
@@ -207,6 +198,11 @@ export function useAutomaticTransactionPayToken({
       return;
     }
 
+    if (!automaticToken) {
+      log('No automatic pay token found');
+      return;
+    }
+
     setPayToken({
       address: automaticToken.address,
       chainId: automaticToken.chainId,
@@ -219,9 +215,9 @@ export function useAutomaticTransactionPayToken({
     autoSelectFiatPayment,
     automaticToken,
     disable,
-    fiatFlags,
     hasFiatPaymentSelected,
     isFiatEnabled,
+    maxDelayMinutesForPaymentMethods,
     payToken,
     paymentMethods,
     requiredTokens,
diff --git a/app/components/Views/confirmations/hooks/pay/useFiatPaymentHighlightedActions.ts b/app/components/Views/confirmations/hooks/pay/useFiatPaymentHighlightedActions.ts
index e4349444deab..5e88d7ae6f15 100644
--- a/app/components/Views/confirmations/hooks/pay/useFiatPaymentHighlightedActions.ts
+++ b/app/components/Views/confirmations/hooks/pay/useFiatPaymentHighlightedActions.ts
@@ -4,10 +4,10 @@ import Engine from '../../../../../core/Engine';
 import { useRampsPaymentMethods } from '../../../../UI/Ramp/hooks/useRampsPaymentMethods';
 import { formatDelayFromArray } from '../../../../UI/Ramp/Aggregator/utils';
 import { useMMPayFiatConfig } from './useMMPayFiatConfig';
+import { useIsFiatPaymentAvailable } from './useIsFiatPaymentAvailable';
 import { useTransactionPayFiatPayment } from './useTransactionPayData';
 import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
 import { HighlightedItem } from '../../types/token';
-import { hasTransactionType } from '../../utils/transaction';
 
 /**
  * Converts available Ramps payment methods into {@link HighlightedItem}s for
@@ -16,20 +16,16 @@ import { hasTransactionType } from '../../utils/transaction';
  * `fiatPayment.selectedPaymentMethodId` on the current transaction.
  */
 export function useFiatPaymentHighlightedActions(): HighlightedItem[] {
-  const { enabledTransactionTypes, maxDelayMinutesForPaymentMethods } =
-    useMMPayFiatConfig();
+  const { maxDelayMinutesForPaymentMethods } = useMMPayFiatConfig();
   const { paymentMethods } = useRampsPaymentMethods();
   const fiatPayment = useTransactionPayFiatPayment();
   const transactionMeta = useTransactionMetadataRequest();
   const transactionId = transactionMeta?.id ?? '';
   const selectedPaymentMethodId = fiatPayment?.selectedPaymentMethodId;
-  const isFiatEnabled = hasTransactionType(
-    transactionMeta,
-    enabledTransactionTypes,
-  );
+  const isFiatAvailable = useIsFiatPaymentAvailable();
 
   return useMemo(() => {
-    if (!isFiatEnabled || paymentMethods.length === 0) {
+    if (!isFiatAvailable) {
       return [];
     }
 
@@ -39,7 +35,7 @@ export function useFiatPaymentHighlightedActions(): HighlightedItem[] {
         toHighlightedItem(pm, transactionId, selectedPaymentMethodId),
       );
   }, [
-    isFiatEnabled,
+    isFiatAvailable,
     maxDelayMinutesForPaymentMethods,
     paymentMethods,
     transactionId,
diff --git a/app/components/Views/confirmations/hooks/pay/useIsFiatPaymentAvailable.test.ts b/app/components/Views/confirmations/hooks/pay/useIsFiatPaymentAvailable.test.ts
new file mode 100644
index 000000000000..c648150835d2
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/pay/useIsFiatPaymentAvailable.test.ts
@@ -0,0 +1,90 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { TransactionType } from '@metamask/transaction-controller';
+import { useIsFiatPaymentAvailable } from './useIsFiatPaymentAvailable';
+import { useMMPayFiatConfig } from './useMMPayFiatConfig';
+import { useRampsPaymentMethods } from '../../../../UI/Ramp/hooks/useRampsPaymentMethods';
+import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
+
+jest.mock('./useMMPayFiatConfig');
+jest.mock('../../../../UI/Ramp/hooks/useRampsPaymentMethods');
+jest.mock('../transactions/useTransactionMetadataRequest');
+
+describe('useIsFiatPaymentAvailable', () => {
+  const useMMPayFiatConfigMock = jest.mocked(useMMPayFiatConfig);
+  const useRampsPaymentMethodsMock = jest.mocked(useRampsPaymentMethods);
+  const useTransactionMetadataRequestMock = jest.mocked(
+    useTransactionMetadataRequest,
+  );
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    useMMPayFiatConfigMock.mockReturnValue({
+      enabledTransactionTypes: [TransactionType.perpsDeposit],
+      maxDelayMinutesForPaymentMethods: 10,
+    });
+
+    useRampsPaymentMethodsMock.mockReturnValue({
+      paymentMethods: [{ id: 'apple-pay' }],
+    } as unknown as ReturnType<typeof useRampsPaymentMethods>);
+
+    useTransactionMetadataRequestMock.mockReturnValue({
+      type: TransactionType.perpsDeposit,
+    } as ReturnType<typeof useTransactionMetadataRequest>);
+  });
+
+  it('returns true when transaction type is enabled and payment methods exist', () => {
+    const { result } = renderHook(() => useIsFiatPaymentAvailable());
+    expect(result.current).toBe(true);
+  });
+
+  it('returns false when transaction type is not in enabledTransactionTypes', () => {
+    useTransactionMetadataRequestMock.mockReturnValue({
+      type: TransactionType.simpleSend,
+    } as ReturnType<typeof useTransactionMetadataRequest>);
+
+    const { result } = renderHook(() => useIsFiatPaymentAvailable());
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false when enabledTransactionTypes is empty', () => {
+    useMMPayFiatConfigMock.mockReturnValue({
+      enabledTransactionTypes: [],
+      maxDelayMinutesForPaymentMethods: 10,
+    });
+
+    const { result } = renderHook(() => useIsFiatPaymentAvailable());
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false when no payment methods exist', () => {
+    useRampsPaymentMethodsMock.mockReturnValue({
+      paymentMethods: [],
+    } as unknown as ReturnType<typeof useRampsPaymentMethods>);
+
+    const { result } = renderHook(() => useIsFiatPaymentAvailable());
+    expect(result.current).toBe(false);
+  });
+
+  it('returns false when transaction metadata is undefined', () => {
+    useTransactionMetadataRequestMock.mockReturnValue(undefined);
+
+    const { result } = renderHook(() => useIsFiatPaymentAvailable());
+    expect(result.current).toBe(false);
+  });
+
+  it('returns true for batch transaction with matching nested type', () => {
+    useMMPayFiatConfigMock.mockReturnValue({
+      enabledTransactionTypes: [TransactionType.predictDeposit],
+      maxDelayMinutesForPaymentMethods: 10,
+    });
+
+    useTransactionMetadataRequestMock.mockReturnValue({
+      type: TransactionType.batch,
+      nestedTransactions: [{ type: TransactionType.predictDeposit }],
+    } as ReturnType<typeof useTransactionMetadataRequest>);
+
+    const { result } = renderHook(() => useIsFiatPaymentAvailable());
+    expect(result.current).toBe(true);
+  });
+});
diff --git a/app/components/Views/confirmations/hooks/pay/useIsFiatPaymentAvailable.ts b/app/components/Views/confirmations/hooks/pay/useIsFiatPaymentAvailable.ts
new file mode 100644
index 000000000000..ebeef24f14ad
--- /dev/null
+++ b/app/components/Views/confirmations/hooks/pay/useIsFiatPaymentAvailable.ts
@@ -0,0 +1,20 @@
+import { useRampsPaymentMethods } from '../../../../UI/Ramp/hooks/useRampsPaymentMethods';
+import { hasTransactionType } from '../../utils/transaction';
+import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
+import { useMMPayFiatConfig } from './useMMPayFiatConfig';
+
+/**
+ * Returns whether fiat payment is available for the current transaction.
+ * True when the transaction type is fiat-enabled via remote feature flags
+ * AND at least one Ramps payment method exists.
+ */
+export function useIsFiatPaymentAvailable(): boolean {
+  const transactionMeta = useTransactionMetadataRequest();
+  const { enabledTransactionTypes } = useMMPayFiatConfig();
+  const { paymentMethods } = useRampsPaymentMethods();
+
+  return (
+    hasTransactionType(transactionMeta, enabledTransactionTypes) &&
+    paymentMethods.length > 0
+  );
+}
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.test.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.test.ts
index 1efe5e4048f0..63508787365e 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.test.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.test.ts
@@ -118,6 +118,32 @@ describe('useTransactionPayAvailableTokens', () => {
     );
   });
 
+  it('returns hasTokens false when all tokens are disabled', () => {
+    const disabledToken = { ...TOKEN_MOCK, disabled: true };
+    jest.mocked(getAvailableTokens).mockReturnValue([disabledToken]);
+
+    const { result } = renderHookWithProvider(useTransactionPayAvailableTokens);
+
+    expect(result.current.availableTokens).toHaveLength(1);
+    expect(result.current.hasTokens).toBe(false);
+  });
+
+  it('returns hasTokens true when at least one token is not disabled', () => {
+    const disabledToken = { ...TOKEN_MOCK, disabled: true };
+    const enabledToken = {
+      ...TOKEN_MOCK,
+      address: '0xEnabled',
+      disabled: false,
+    };
+    jest
+      .mocked(getAvailableTokens)
+      .mockReturnValue([disabledToken, enabledToken]);
+
+    const { result } = renderHookWithProvider(useTransactionPayAvailableTokens);
+
+    expect(result.current.hasTokens).toBe(true);
+  });
+
   it('passes default blocklist when transaction type has no override', () => {
     const defaultBlocked = {
       chainIds: ['0x1'],
diff --git a/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.ts b/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.ts
index 6ffe0b2c7532..174327dde395 100644
--- a/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.ts
+++ b/app/components/Views/confirmations/hooks/pay/useTransactionPayAvailableTokens.ts
@@ -22,8 +22,10 @@ export function useTransactionPayAvailableTokens() {
   );
 
   // For post-quote transactions, tokens are always available
-  // (the supported destination tokens from the bridge API)
-  const hasTokens = isPostQuote || availableTokens.length > 0;
+  // (the supported destination tokens from the bridge API).
+  // Disabled tokens (e.g. required tokens with no gas) are excluded
+  // so the UI can correctly fall back to fiat payment or BuySection.
+  const hasTokens = isPostQuote || availableTokens.some((t) => !t.disabled);
 
   return { availableTokens, hasTokens };
 }
diff --git a/app/components/Views/confirmations/hooks/tokens/useAddToken.test.ts b/app/components/Views/confirmations/hooks/tokens/useAddToken.test.ts
index f05976bbeeaa..b5ef8a763f4e 100644
--- a/app/components/Views/confirmations/hooks/tokens/useAddToken.test.ts
+++ b/app/components/Views/confirmations/hooks/tokens/useAddToken.test.ts
@@ -8,6 +8,8 @@ import {
   otherControllersMock,
 } from '../../__mocks__/controllers/other-controllers-mock';
 import { Token } from '@metamask/assets-controllers';
+import { selectIsAssetsUnifyStateEnabled } from '../../../../../selectors/featureFlagController/assetsUnifyState';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../../selectors/multichainAccounts/accountTreeController';
 
 jest.mock('../../../../../core/Engine', () => ({
   context: {
@@ -17,9 +19,30 @@ jest.mock('../../../../../core/Engine', () => ({
     TokensController: {
       addToken: jest.fn(),
     },
+    AssetsController: {
+      addCustomAsset: jest.fn(),
+    },
   },
 }));
 
+jest.mock(
+  '../../../../../selectors/featureFlagController/assetsUnifyState',
+  () => ({
+    selectIsAssetsUnifyStateEnabled: jest.fn(() => false),
+  }),
+);
+
+jest.mock(
+  '../../../../../selectors/multichainAccounts/accountTreeController',
+  () => ({
+    ...jest.requireActual(
+      '../../../../../selectors/multichainAccounts/accountTreeController',
+    ),
+    selectSelectedAccountGroupEvmInternalAccount: jest.fn(() => null),
+  }),
+);
+
+const ACCOUNT_ID_MOCK = 'mock-account-id';
 const TOKEN_ADDRESS_MOCK = '0x1234' as const;
 const CHAIN_ID_MOCK = '0x1' as const;
 const NETWORK_CLIENT_ID = 'mockNetworkClientId';
@@ -65,6 +88,9 @@ async function runHook({
 
 describe('useAddToken', () => {
   const mockAddToken = jest.mocked(Engine.context.TokensController.addToken);
+  const mockAddCustomAsset = jest.mocked(
+    Engine.context.AssetsController.addCustomAsset,
+  );
 
   const mockFindNetworkClientIdByChainId = jest.mocked(
     Engine.context.NetworkController.findNetworkClientIdByChainId,
@@ -75,6 +101,17 @@ describe('useAddToken', () => {
 
     mockFindNetworkClientIdByChainId.mockReturnValue(NETWORK_CLIENT_ID);
     mockAddToken.mockResolvedValue([]);
+    mockAddCustomAsset.mockResolvedValue(undefined);
+    (selectIsAssetsUnifyStateEnabled as unknown as jest.Mock).mockReturnValue(
+      false,
+    );
+    (
+      selectSelectedAccountGroupEvmInternalAccount as unknown as jest.Mock
+    ).mockReturnValue({
+      id: ACCOUNT_ID_MOCK,
+      address: accountMock,
+      type: 'eip155:eoa',
+    });
   });
 
   it('adds token if not present', async () => {
@@ -100,4 +137,45 @@ describe('useAddToken', () => {
 
     expect(mockAddToken).not.toHaveBeenCalled();
   });
+
+  it('does not call addCustomAsset when assetsUnifyState is disabled', async () => {
+    await runHook();
+
+    expect(mockAddToken).toHaveBeenCalled();
+    expect(mockAddCustomAsset).not.toHaveBeenCalled();
+  });
+
+  it('calls addCustomAsset when assetsUnifyState is enabled', async () => {
+    (selectIsAssetsUnifyStateEnabled as unknown as jest.Mock).mockReturnValue(
+      true,
+    );
+
+    await runHook();
+
+    expect(mockAddToken).toHaveBeenCalled();
+    expect(mockAddCustomAsset).toHaveBeenCalledWith(
+      ACCOUNT_ID_MOCK,
+      expect.stringContaining('erc20'),
+      {
+        address: TOKEN_ADDRESS_MOCK,
+        chainId: CHAIN_ID_MOCK,
+        decimals: DECIMALS_MOCK,
+        name: NAME_MOCK,
+        symbol: SYMBOL_MOCK,
+      },
+    );
+  });
+
+  it('does not add token if already present with assetsUnifyState enabled', async () => {
+    (selectIsAssetsUnifyStateEnabled as unknown as jest.Mock).mockReturnValue(
+      false,
+    );
+
+    await runHook({
+      existingTokens: [{ address: TOKEN_ADDRESS_MOCK }],
+    });
+
+    expect(mockAddToken).not.toHaveBeenCalled();
+    expect(mockAddCustomAsset).not.toHaveBeenCalled();
+  });
 });
diff --git a/app/components/Views/confirmations/hooks/tokens/useAddToken.ts b/app/components/Views/confirmations/hooks/tokens/useAddToken.ts
index 08c806217660..3c5173a9b646 100644
--- a/app/components/Views/confirmations/hooks/tokens/useAddToken.ts
+++ b/app/components/Views/confirmations/hooks/tokens/useAddToken.ts
@@ -1,7 +1,11 @@
 import Engine from '../../../../../core/Engine';
 import { useSelector } from 'react-redux';
 import { selectTokensByChainIdAndAddress } from '../../../../../selectors/tokensController';
+import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../../selectors/multichainAccounts/accountTreeController';
+import { selectIsAssetsUnifyStateEnabled } from '../../../../../selectors/featureFlagController/assetsUnifyState';
 import { useAsyncResult } from '../../../../hooks/useAsyncResult';
+import { toEvmCaipChainId } from '@metamask/multichain-network-controller';
+import { toAssetId } from '../../../../UI/Bridge/hooks/useAssetMetadata/utils';
 import { Hex, createProjectLogger } from '@metamask/utils';
 
 const log = createProjectLogger('add-token');
@@ -19,7 +23,8 @@ export function useAddToken({
   symbol: string;
   tokenAddress: Hex;
 }) {
-  const { NetworkController, TokensController } = Engine.context;
+  const { NetworkController, TokensController, AssetsController } =
+    Engine.context;
 
   const addedTokens = useSelector((state) =>
     selectTokensByChainIdAndAddress(state, chainId),
@@ -29,6 +34,12 @@ export function useAddToken({
     (t) => t.address.toLowerCase() === tokenAddress.toLowerCase(),
   );
 
+  const isAssetsUnifyStateEnabled = useSelector(
+    selectIsAssetsUnifyStateEnabled,
+  );
+  const evmAccount = useSelector(selectSelectedAccountGroupEvmInternalAccount);
+  const accountId = evmAccount?.id;
+
   const { error } = useAsyncResult(async () => {
     if (hasToken) {
       return;
@@ -45,8 +56,23 @@ export function useAddToken({
       symbol,
     });
 
+    if (isAssetsUnifyStateEnabled && accountId) {
+      const caipChainId = toEvmCaipChainId(chainId);
+      const caipAssetType = toAssetId(tokenAddress, caipChainId);
+
+      if (caipAssetType) {
+        await AssetsController.addCustomAsset(accountId, caipAssetType, {
+          address: tokenAddress,
+          chainId,
+          decimals,
+          name,
+          symbol,
+        });
+      }
+    }
+
     log('Added token', { tokenAddress, chainId });
-  }, [hasToken]);
+  }, [hasToken, isAssetsUnifyStateEnabled, accountId]);
 
   if (error) {
     log('Failed', { tokenAddress, chainId, error });
diff --git a/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.test.ts b/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.test.ts
index 898bd5cd1b84..90e2c2310009 100644
--- a/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.test.ts
+++ b/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.test.ts
@@ -2,9 +2,11 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useNavigation } from '@react-navigation/native';
 import { BackHandler } from 'react-native';
 import Device from '../../../../../util/device';
+import Logger from '../../../../../util/Logger';
 import { useConfirmActions } from '../useConfirmActions';
 import { useFullScreenConfirmation } from './useFullScreenConfirmation';
 import useClearConfirmationOnBackSwipe from './useClearConfirmationOnBackSwipe';
+import { useConfirmationContext } from '../../context/confirmation-context';
 
 jest.mock('@react-navigation/native', () => ({
   useNavigation: jest.fn(),
@@ -23,6 +25,17 @@ jest.mock('./useFullScreenConfirmation', () => ({
   useFullScreenConfirmation: jest.fn(),
 }));
 
+jest.mock('../../context/confirmation-context', () => ({
+  useConfirmationContext: jest.fn(),
+}));
+
+jest.mock('../../../../../util/Logger', () => ({
+  __esModule: true,
+  default: {
+    error: jest.fn(),
+  },
+}));
+
 describe('useClearConfirmationOnBackSwipe', () => {
   const mockUnsubscribe = jest.fn();
   const mockAddListener = jest.fn().mockReturnValue(mockUnsubscribe);
@@ -40,6 +53,10 @@ describe('useClearConfirmationOnBackSwipe', () => {
       onReject: mockOnReject,
     });
 
+    (useConfirmationContext as jest.Mock).mockReturnValue({
+      isConfirmationSubmitting: false,
+    });
+
     jest.spyOn(BackHandler, 'addEventListener').mockReturnValue({
       remove: mockBackHandlerRemove,
     });
@@ -81,6 +98,223 @@ describe('useClearConfirmationOnBackSwipe', () => {
       gestureEndCallback();
 
       expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith();
+    });
+
+    it('calls onReject with skipNavigation when beforeRemove follows a gestureStart event', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({ rejectOnBeforeRemove: true }),
+      );
+      const gestureStartCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureStart',
+      )?.[1];
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      gestureStartCallback();
+      beforeRemoveCallback();
+
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith(undefined, true);
+    });
+
+    it('does not reject on beforeRemove without a gestureStart event', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({ rejectOnBeforeRemove: true }),
+      );
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      beforeRemoveCallback();
+
+      expect(mockOnReject).not.toHaveBeenCalled();
+    });
+
+    it('calls onReject with skipNavigation on beforeRemove without gesture when configured', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({
+          rejectOnBeforeRemove: true,
+          rejectOnBeforeRemoveWithoutGesture: true,
+        }),
+      );
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      beforeRemoveCallback();
+
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith(undefined, true);
+    });
+
+    it('does not reject on beforeRemove when confirmation is submitting', () => {
+      (useConfirmationContext as jest.Mock).mockReturnValue({
+        isConfirmationSubmitting: true,
+      });
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({
+          rejectOnBeforeRemove: true,
+          rejectOnBeforeRemoveWithoutGesture: true,
+        }),
+      );
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      beforeRemoveCallback();
+
+      expect(mockOnReject).not.toHaveBeenCalled();
+    });
+
+    it('does not reject on gestureEnd when confirmation is submitting', () => {
+      const mockOnBeforeReject = jest.fn();
+      (useConfirmationContext as jest.Mock).mockReturnValue({
+        isConfirmationSubmitting: true,
+      });
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({
+          rejectOnBeforeRemove: true,
+          onBeforeReject: mockOnBeforeReject,
+        }),
+      );
+      const gestureEndCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureEnd',
+      )?.[1];
+
+      gestureEndCallback();
+
+      expect(mockOnBeforeReject).not.toHaveBeenCalled();
+      expect(mockOnReject).not.toHaveBeenCalled();
+    });
+
+    it('does not reject on beforeRemove after a gestureCancel event', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({ rejectOnBeforeRemove: true }),
+      );
+      const gestureStartCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureStart',
+      )?.[1];
+      const gestureCancelCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureCancel',
+      )?.[1];
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      gestureStartCallback();
+      gestureCancelCallback();
+      beforeRemoveCallback();
+
+      expect(mockOnReject).not.toHaveBeenCalled();
+    });
+
+    it('does not reject twice when multiple dismissal events are triggered', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({ rejectOnBeforeRemove: true }),
+      );
+      const gestureStartCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureStart',
+      )?.[1];
+      const gestureEndCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureEnd',
+      )?.[1];
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      gestureStartCallback();
+      beforeRemoveCallback();
+      gestureEndCallback();
+
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+    });
+
+    it('calls onReject without skipNavigation when gestureEnd is triggered for rejectOnBeforeRemove by default', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({ rejectOnBeforeRemove: true }),
+      );
+      const gestureEndCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureEnd',
+      )?.[1];
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      gestureEndCallback();
+      beforeRemoveCallback();
+
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith(undefined, false);
+    });
+
+    it('calls onReject with skipNavigation when gestureEnd is configured to skip navigation', () => {
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({
+          rejectOnBeforeRemove: true,
+          skipNavigationOnGestureEnd: true,
+        }),
+      );
+      const gestureEndCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureEnd',
+      )?.[1];
+      const beforeRemoveCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'beforeRemove',
+      )?.[1];
+
+      gestureEndCallback();
+      beforeRemoveCallback();
+
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith(undefined, true);
+    });
+
+    it('logs onBeforeReject errors and still rejects the confirmation', () => {
+      const mockError = new Error('cleanup failed');
+      const mockOnBeforeReject = jest.fn(() => {
+        throw mockError;
+      });
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({
+          rejectOnBeforeRemove: true,
+          onBeforeReject: mockOnBeforeReject,
+        }),
+      );
+      const gestureEndCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureEnd',
+      )?.[1];
+
+      gestureEndCallback();
+
+      expect(Logger.error).toHaveBeenCalledTimes(1);
+      expect(Logger.error).toHaveBeenCalledWith(
+        mockError,
+        'useClearConfirmationOnBackSwipe: onBeforeReject failed',
+      );
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith(undefined, false);
+    });
+
+    it('calls onBeforeReject before rejecting the confirmation', () => {
+      const mockOnBeforeReject = jest.fn();
+      renderHook(() =>
+        useClearConfirmationOnBackSwipe({
+          rejectOnBeforeRemove: true,
+          onBeforeReject: mockOnBeforeReject,
+        }),
+      );
+      const gestureEndCallback = mockAddListener.mock.calls.find(
+        ([eventName]) => eventName === 'gestureEnd',
+      )?.[1];
+
+      gestureEndCallback();
+
+      expect(mockOnBeforeReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnBeforeReject.mock.invocationCallOrder[0]).toBeLessThan(
+        mockOnReject.mock.invocationCallOrder[0],
+      );
     });
 
     it('calls unsubscribe when unmounted', () => {
@@ -122,6 +356,7 @@ describe('useClearConfirmationOnBackSwipe', () => {
       const result = backHandlerCallback();
 
       expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith();
       expect(result).toBe(true);
     });
 
@@ -148,6 +383,7 @@ describe('useClearConfirmationOnBackSwipe', () => {
       gestureEndCallback();
 
       expect(mockOnReject).toHaveBeenCalledTimes(1);
+      expect(mockOnReject).toHaveBeenCalledWith();
     });
   });
 });
diff --git a/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.ts b/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.ts
index e372ab36da2c..971caa8d182a 100644
--- a/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.ts
+++ b/app/components/Views/confirmations/hooks/ui/useClearConfirmationOnBackSwipe.ts
@@ -1,33 +1,152 @@
 import { useNavigation } from '@react-navigation/native';
 import { StackNavigationProp } from '@react-navigation/stack';
-import { useEffect } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import { BackHandler } from 'react-native';
 import Device from '../../../../../util/device';
+import Logger from '../../../../../util/Logger';
+import { ensureError } from '../../../../../util/errorUtils';
 import { useConfirmActions } from '../useConfirmActions';
 import { useFullScreenConfirmation } from './useFullScreenConfirmation';
 import type { RootStackParamList } from '../../../../../core/NavigationService/types';
+import { useConfirmationContext } from '../../context/confirmation-context';
 
-const useClearConfirmationOnBackSwipe = () => {
+interface UseClearConfirmationOnBackSwipeOptions {
+  rejectOnBeforeRemove?: boolean;
+  rejectOnBeforeRemoveWithoutGesture?: boolean;
+  skipNavigationOnGestureEnd?: boolean;
+  onBeforeReject?: () => void;
+}
+
+const useClearConfirmationOnBackSwipe = ({
+  rejectOnBeforeRemove = false,
+  rejectOnBeforeRemoveWithoutGesture = false,
+  skipNavigationOnGestureEnd = false,
+  onBeforeReject,
+}: UseClearConfirmationOnBackSwipeOptions = {}) => {
   const navigation = useNavigation<StackNavigationProp<RootStackParamList>>();
   const { isFullScreenConfirmation } = useFullScreenConfirmation();
   const { onReject } = useConfirmActions();
+  const { isConfirmationSubmitting } = useConfirmationContext();
+  const hasRejectedRef = useRef(false);
+  const isGestureInProgressRef = useRef(false);
+  const isConfirmationSubmittingRef = useRef(isConfirmationSubmitting);
+
+  useEffect(() => {
+    isConfirmationSubmittingRef.current = isConfirmationSubmitting;
+  }, [isConfirmationSubmitting]);
+
+  const rejectConfirmation = useCallback(
+    (skipNavigation = false) => {
+      if (hasRejectedRef.current || isConfirmationSubmittingRef.current) {
+        return;
+      }
+
+      try {
+        onBeforeReject?.();
+      } catch (error) {
+        Logger.error(
+          ensureError(error),
+          'useClearConfirmationOnBackSwipe: onBeforeReject failed',
+        );
+      }
+
+      hasRejectedRef.current = true;
+      onReject(undefined, skipNavigation);
+    },
+    [onBeforeReject, onReject],
+  );
 
   useEffect(() => {
     if (isFullScreenConfirmation) {
       const unsubscribe = navigation.addListener('gestureEnd', () => {
+        isGestureInProgressRef.current = false;
+        if (rejectOnBeforeRemove) {
+          rejectConfirmation(skipNavigationOnGestureEnd);
+          return;
+        }
+
         onReject();
       });
 
-      return unsubscribe;
+      return () => {
+        if (typeof unsubscribe === 'function') {
+          unsubscribe();
+        }
+      };
+    }
+  }, [
+    isFullScreenConfirmation,
+    navigation,
+    onReject,
+    rejectConfirmation,
+    rejectOnBeforeRemove,
+    skipNavigationOnGestureEnd,
+  ]);
+
+  useEffect(() => {
+    if (isFullScreenConfirmation && rejectOnBeforeRemove) {
+      const unsubscribeGestureStart = navigation.addListener(
+        'gestureStart',
+        () => {
+          isGestureInProgressRef.current = true;
+        },
+      );
+      const unsubscribeGestureCancel = navigation.addListener(
+        'gestureCancel',
+        () => {
+          isGestureInProgressRef.current = false;
+        },
+      );
+      const unsubscribeBeforeRemove = navigation.addListener(
+        'beforeRemove',
+        () => {
+          const shouldRejectBeforeRemove =
+            isGestureInProgressRef.current ||
+            rejectOnBeforeRemoveWithoutGesture;
+
+          if (
+            isConfirmationSubmittingRef.current ||
+            !shouldRejectBeforeRemove
+          ) {
+            return;
+          }
+
+          isGestureInProgressRef.current = false;
+          rejectConfirmation(true);
+        },
+      );
+
+      return () => {
+        if (typeof unsubscribeGestureStart === 'function') {
+          unsubscribeGestureStart();
+        }
+        if (typeof unsubscribeGestureCancel === 'function') {
+          unsubscribeGestureCancel();
+        }
+        if (typeof unsubscribeBeforeRemove === 'function') {
+          unsubscribeBeforeRemove();
+        }
+      };
     }
-  }, [isFullScreenConfirmation, navigation, onReject]);
+  }, [
+    isFullScreenConfirmation,
+    navigation,
+    rejectConfirmation,
+    rejectOnBeforeRemove,
+    rejectOnBeforeRemoveWithoutGesture,
+  ]);
 
   useEffect(() => {
     if (isFullScreenConfirmation && Device.isAndroid()) {
       const backHandlerSubscription = BackHandler.addEventListener(
         'hardwareBackPress',
         () => {
-          onReject();
+          if (rejectOnBeforeRemove) {
+            rejectConfirmation();
+          } else {
+            onReject();
+          }
+
           return true;
         },
       );
@@ -36,7 +155,14 @@ const useClearConfirmationOnBackSwipe = () => {
         backHandlerSubscription.remove();
       };
     }
-  }, [isFullScreenConfirmation, onReject]);
+  }, [
+    isFullScreenConfirmation,
+    onReject,
+    rejectConfirmation,
+    rejectOnBeforeRemove,
+  ]);
+
+  return rejectConfirmation;
 };
 
 export default useClearConfirmationOnBackSwipe;
diff --git a/app/constants/navigation/Routes.ts b/app/constants/navigation/Routes.ts
index c73aca978b25..e7504df02f0d 100644
--- a/app/constants/navigation/Routes.ts
+++ b/app/constants/navigation/Routes.ts
@@ -385,6 +385,7 @@ const Routes = {
     ROOT: 'Predict',
     MARKET_LIST: 'PredictMarketList',
     MARKET_DETAILS: 'PredictMarketDetails',
+    POSITIONS: 'PredictPositions',
     ACTIVITY_DETAIL: 'PredictActivityDetail',
     WORLD_CUP: 'PredictWorldCup',
     MODALS: {
diff --git a/app/core/AgenticService/AgentStepHud.test.tsx b/app/core/AgenticService/AgentStepHud.test.tsx
index 45e3d4cad3dd..7ea873053b2a 100644
--- a/app/core/AgenticService/AgentStepHud.test.tsx
+++ b/app/core/AgenticService/AgentStepHud.test.tsx
@@ -52,11 +52,59 @@ describe('AgentStepHud', () => {
     const callback = getLatestCallback();
 
     act(() => {
-      callback({ id: 'open-pos', description: 'Open BTC position' });
+      callback({ id: 'run 2/10', description: 'Open BTC position' });
     });
 
-    expect(getByText('open-pos')).toBeOnTheScreen();
-    expect(getByText('Open BTC position')).toBeOnTheScreen();
+    expect(getByText('RUN 2/10')).toBeOnTheScreen();
+    expect(getByText(/Open BTC position/)).toBeOnTheScreen();
+  });
+
+  it('renders failed status in red instead of success green', () => {
+    const { getByText } = render(<AgentStepHud />);
+    const callback = getLatestCallback();
+
+    act(() => {
+      callback({ id: 'fail 9/19', description: 'Close position failed' });
+    });
+
+    expect(getByText('FAIL 9/19')).toHaveStyle({ color: '#FF4D4F' });
+  });
+
+  it('shows one intent line and hides unmarked metadata lines', () => {
+    const { getAllByText, queryByText } = render(<AgentStepHud />);
+    const callback = getLatestCallback();
+
+    act(() => {
+      callback({
+        id: 'run 1/2',
+        description: 'Prepare clean state\nPrepare clean state\nperps setup',
+      });
+    });
+
+    expect(getAllByText(/Prepare clean state/)).toHaveLength(1);
+    expect(queryByText('perps setup')).toBeNull();
+  });
+
+  it('shows explicit subflow and error lines only', () => {
+    const { getByText, queryByText } = render(<AgentStepHud />);
+    const callback = getLatestCallback();
+
+    act(() => {
+      callback({
+        id: 'fail 1/2',
+        description:
+          'Complete the validation checkpoint\nDuplicate metadata line should stay hidden\nsubflow: Prepare scenario\nerror: Timed out waiting for checkpoint',
+      });
+    });
+
+    expect(getByText(/Complete the validation checkpoint/)).toBeOnTheScreen();
+    expect(getByText('Prepare scenario')).toBeOnTheScreen();
+    expect(
+      getByText('error: Timed out waiting for checkpoint'),
+    ).toBeOnTheScreen();
+    expect(
+      queryByText('Duplicate metadata line should stay hidden'),
+    ).toBeNull();
   });
 
   it('hides overlay when callback fires with null', () => {
diff --git a/app/core/AgenticService/AgentStepHud.tsx b/app/core/AgenticService/AgentStepHud.tsx
index 14995b2bcfc2..ad4c8f762e6f 100644
--- a/app/core/AgenticService/AgentStepHud.tsx
+++ b/app/core/AgenticService/AgentStepHud.tsx
@@ -6,6 +6,65 @@ import { registerStepHudCallback } from './AgenticService';
 interface Step {
   id: string;
   description: string;
+  status?: string;
+}
+
+function statusForStep(step: Step) {
+  return String(step.status ?? step.id.split(/\s+/)[0] ?? '').toLowerCase();
+}
+
+function progressForStep(step: Step) {
+  const progressPattern = /\b\d+\s*\/\s*\d+\b/;
+  const match = progressPattern.exec(step.id);
+  return match ? match[0].replace(/\s+/g, '') : null;
+}
+
+function badgeTextForStep(step: Step) {
+  const status = statusForStep(step);
+  const progress = progressForStep(step);
+  return [status || 'run', progress].filter(Boolean).join(' ').toUpperCase();
+}
+
+function statusToneForStep(step: Step) {
+  const status = statusForStep(step);
+  if (status === 'fail' || status === 'failed' || status === 'error') {
+    return 'fail';
+  }
+  if (status === 'pass' || status === 'passed' || status === 'success') {
+    return 'pass';
+  }
+  return 'running';
+}
+
+function secondaryDisplayText(part: string) {
+  const errorPrefix = 'error:';
+  const subflowPrefix = 'subflow:';
+  const detailPrefix = 'detail:';
+  const normalized = part.toLowerCase();
+
+  if (normalized.startsWith(errorPrefix)) {
+    return part;
+  }
+  if (normalized.startsWith(subflowPrefix)) {
+    return part.slice(subflowPrefix.length).trim();
+  }
+  if (normalized.startsWith(detailPrefix)) {
+    return part.slice(detailPrefix.length).trim();
+  }
+  return null;
+}
+
+function parseDescription(description: string) {
+  const parts = description
+    .split('\n')
+    .map((part) => part.trim())
+    .filter(Boolean);
+  const deduped = parts.filter((part, index) => parts.indexOf(part) === index);
+  const [intent = '', ...secondaryCandidates] = deduped;
+  const secondary = secondaryCandidates
+    .map(secondaryDisplayText)
+    .filter((part): part is string => Boolean(part));
+  return { intent, secondary };
 }
 
 // Debug-only overlay — intentionally uses hardcoded colors for guaranteed
@@ -14,23 +73,37 @@ interface Step {
 const styles = StyleSheet.create({
   container: {
     position: 'absolute',
-    bottom: 0,
     left: 0,
     right: 0,
     zIndex: 9999,
-    backgroundColor: 'rgba(0, 0, 0, 0.75)',
-    paddingVertical: 6,
+    backgroundColor: 'rgba(0, 0, 0, 0.58)',
+    paddingVertical: 3,
   },
-  stepId: {
-    color: '#00FF88',
-    fontFamily: 'Courier',
-    fontSize: 12,
+  line: {
+    color: '#FFFFFF',
+    fontSize: 11,
     fontWeight: '700',
+    lineHeight: 14,
   },
-  description: {
-    color: '#FFFFFF',
-    fontSize: 12,
-    fontWeight: '500',
+  badgeText: {
+    fontFamily: 'Courier',
+    fontSize: 9,
+    fontWeight: '800',
+  },
+  badgeTextRunning: {
+    color: '#00FF88',
+  },
+  badgeTextPass: {
+    color: '#00FF88',
+  },
+  badgeTextFail: {
+    color: '#FF4D4F',
+  },
+  secondary: {
+    color: '#E6E6E6',
+    fontSize: 10,
+    fontWeight: '400',
+    lineHeight: 12,
   },
 });
 /* eslint-enable react-native/no-color-literals, @metamask/design-tokens/color-no-hex */
@@ -44,9 +117,9 @@ const AgentStepHudInner = () => {
     () => [
       styles.container,
       {
+        bottom: Math.max(insets.bottom, 0),
         paddingLeft: Math.max(insets.left, 10),
         paddingRight: Math.max(insets.right, 10),
-        paddingBottom: insets.bottom > 0 ? insets.bottom : 6,
       },
     ],
     [insets.left, insets.right, insets.bottom],
@@ -61,12 +134,27 @@ const AgentStepHudInner = () => {
 
   if (!step) return null;
 
+  const { intent, secondary } = parseDescription(step.description);
+  const badge = badgeTextForStep(step);
+  const tone = statusToneForStep(step);
+  const badgeTextStyle =
+    tone === 'fail'
+      ? styles.badgeTextFail
+      : tone === 'pass'
+        ? styles.badgeTextPass
+        : styles.badgeTextRunning;
+
   return (
     <View style={containerStyle} pointerEvents="none">
-      <Text numberOfLines={3}>
-        <Text style={styles.stepId}>{step.id}</Text>
-        <Text style={styles.description}>{`  ${step.description}`}</Text>
+      <Text style={styles.line}>
+        <Text style={[styles.badgeText, badgeTextStyle]}>{badge}</Text>
+        {intent ? `  ${intent}` : ''}
       </Text>
+      {secondary.map((detail) => (
+        <Text key={detail} style={styles.secondary}>
+          {detail}
+        </Text>
+      ))}
     </View>
   );
 };
diff --git a/app/core/AgenticService/AgenticService.test.ts b/app/core/AgenticService/AgenticService.test.ts
index 85b96e2655c6..a29dead227f9 100644
--- a/app/core/AgenticService/AgenticService.test.ts
+++ b/app/core/AgenticService/AgenticService.test.ts
@@ -5,10 +5,13 @@ import AgenticService, {
   tryScroll,
   toAccountSummary,
   registerStepHudCallback,
+  getFixtureMnemonicCount,
+  getFixtureAccountNames,
   type FiberNode,
   type ReactDevToolsHook,
 } from './AgenticService';
 import Engine from '../Engine';
+import { Platform } from 'react-native';
 import type {
   NavigationContainerRef,
   ParamListBase,
@@ -38,6 +41,10 @@ jest.mock('../Engine', () => ({
         },
       },
     },
+    AccountTreeController: {
+      state: { accountTree: { wallets: {} } },
+      setAccountGroupName: jest.fn(),
+    },
     MultichainAccountService: {
       createMultichainAccountWallet: (...args: unknown[]) =>
         mockCreateWallet(...args),
@@ -45,13 +52,60 @@ jest.mock('../Engine', () => ({
     },
     KeyringController: {
       importAccountWithStrategy: (...args: unknown[]) =>
-        mockImportAccount(...args),
+        mockImportAccount(...(args as [string, string[]])),
     },
     PerpsController: {
       markTutorialCompleted: jest.fn(),
+      getPositions: jest.fn().mockResolvedValue([]),
     },
   },
   setSelectedAddress: jest.fn(),
+  setAccountLabel: jest.fn(),
+}));
+
+// AgenticService imports the Engine *class* (for the disableAutomaticVaultBackup
+// static) separately from the ../Engine facade. Stub it so the test does not
+// pull in the full Engine/RewardsController/SecureKeychain stack.
+jest.mock('../Engine/Engine', () => ({
+  Engine: class {
+    static disableAutomaticVaultBackup = false;
+  },
+}));
+
+const mockEnsureConnected = jest.fn().mockResolvedValue(undefined);
+const mockClearAllChannels = jest.fn();
+
+jest.mock('../../components/UI/Perps/services/PerpsConnectionManager', () => ({
+  __esModule: true,
+  default: {
+    ensureConnected: (...args: unknown[]) => mockEnsureConnected(...args),
+  },
+}));
+
+jest.mock('../../components/UI/Perps/providers/PerpsStreamManager', () => ({
+  getStreamManagerInstance: () => ({
+    clearAllChannels: (...args: unknown[]) => mockClearAllChannels(...args),
+  }),
+}));
+
+// Authentication pulls in the full auth/keychain stack; stub the singleton.
+jest.mock('../Authentication', () => ({
+  __esModule: true,
+  default: {
+    unlockWallet: jest.fn().mockResolvedValue(undefined),
+  },
+}));
+
+// addNewHdAccount/importNewSecretRecoveryPhrase pull in a sentry/selector chain
+// that cannot load in the unit-test env; stub them directly.
+const mockAddNewHdAccount = jest.fn().mockResolvedValue(undefined);
+const mockImportNewSecretRecoveryPhrase = jest
+  .fn()
+  .mockResolvedValue(undefined);
+jest.mock('../../actions/multiSrp', () => ({
+  addNewHdAccount: (...args: unknown[]) => mockAddNewHdAccount(...args),
+  importNewSecretRecoveryPhrase: (...args: unknown[]) =>
+    mockImportNewSecretRecoveryPhrase(...args),
 }));
 
 const mockDispatch = jest.fn();
@@ -88,9 +142,18 @@ jest.mock('../../actions/settings', () => ({
 jest.mock('@metamask/key-tree', () => ({
   mnemonicPhraseToBytes: jest.fn((s: string) => new Uint8Array(s.length)),
 }));
-jest.mock('../../store/storage-wrapper', () => ({
-  setItem: jest.fn().mockResolvedValue(undefined),
-}));
+jest.mock('../../store/storage-wrapper', () => {
+  const storageWrapper = {
+    getItem: jest.fn().mockResolvedValue(null),
+    setItem: jest.fn().mockResolvedValue(undefined),
+  };
+  return {
+    __esModule: true,
+    default: storageWrapper,
+    getItem: storageWrapper.getItem,
+    setItem: storageWrapper.setItem,
+  };
+});
 jest.mock('../../constants/storage', () => ({
   OPTIN_META_METRICS_UI_SEEN: 'optin_meta_metrics_ui_seen',
   PERPS_GTM_MODAL_SHOWN: 'perps_gtm',
@@ -273,6 +336,49 @@ describe('toAccountSummary', () => {
   });
 });
 
+describe('getFixtureMnemonicCount', () => {
+  it('defaults to 1 when no count is provided', () => {
+    expect(getFixtureMnemonicCount(undefined)).toBe(1);
+    expect(getFixtureMnemonicCount({})).toBe(1);
+  });
+
+  it('prefers count, falls back to numberOfAccounts', () => {
+    expect(getFixtureMnemonicCount({ count: 3 })).toBe(3);
+    expect(getFixtureMnemonicCount({ numberOfAccounts: 2 })).toBe(2);
+    expect(getFixtureMnemonicCount({ count: 5, numberOfAccounts: 2 })).toBe(5);
+  });
+
+  it('throws on out-of-range or non-integer counts', () => {
+    expect(() => getFixtureMnemonicCount({ count: 0 })).toThrow();
+    expect(() => getFixtureMnemonicCount({ count: 101 })).toThrow();
+    expect(() => getFixtureMnemonicCount({ count: 1.5 })).toThrow();
+  });
+});
+
+describe('getFixtureAccountNames', () => {
+  it('uses explicit names by index when present', () => {
+    expect(getFixtureAccountNames({ names: ['One', 'Two'] }, 2)).toEqual([
+      'One',
+      'Two',
+    ]);
+  });
+
+  it('uses name only for the first account', () => {
+    expect(getFixtureAccountNames({ name: 'Primary' }, 2)).toEqual([
+      'Primary',
+      'Account 2',
+    ]);
+  });
+
+  it('falls back to Account N when nothing is provided', () => {
+    expect(getFixtureAccountNames(undefined, 3)).toEqual([
+      'Account 1',
+      'Account 2',
+      'Account 3',
+    ]);
+  });
+});
+
 describe('tryScroll', () => {
   it('returns false for null start', () => {
     expect(tryScroll(null, 100, false)).toBe(false);
@@ -392,6 +498,24 @@ describe('AgenticService.install', () => {
     expect(mockDeferredNav.goBack).toHaveBeenCalled();
   });
 
+  it('refreshPerpsStreams reconnects streams and reports position count', async () => {
+    mockEnsureConnected.mockClear();
+    mockClearAllChannels.mockClear();
+    (
+      MockEngine.context.PerpsController.getPositions as jest.Mock
+    ).mockResolvedValue([{ coin: 'ETH' }, { coin: 'BTC' }]);
+
+    await expect(bridge().refreshPerpsStreams()).resolves.toEqual({
+      ok: true,
+      positions: 2,
+    });
+    expect(mockEnsureConnected).toHaveBeenCalledWith({
+      source: 'agentic_refresh_perps_streams',
+      suppressError: true,
+    });
+    expect(mockClearAllChannels).toHaveBeenCalledTimes(1);
+  });
+
   it('listAccounts returns mapped accounts', () => {
     (
       MockEngine.context.AccountsController.listAccounts as jest.Mock
@@ -641,43 +765,6 @@ describe('AgenticService.install', () => {
       mockDispatch.mockClear();
     });
 
-    it('creates wallet from mnemonic and returns accounts', async () => {
-      const result = await bridge().setupWallet({
-        password: 'test123',
-        accounts: [{ type: 'mnemonic', value: 'word1 word2 word3' }],
-      });
-      expect(result.ok).toBe(true);
-      expect(result.accounts).toEqual([
-        { id: 'a1', address: '0xABC', name: 'Account 1' },
-      ]);
-      expect(mockCreateWallet).toHaveBeenCalledWith(
-        expect.objectContaining({ type: 'restore', password: 'test123' }),
-      );
-    });
-
-    it('creates wallet without mnemonic when no mnemonic account', async () => {
-      const result = await bridge().setupWallet({
-        password: 'test123',
-        accounts: [{ type: 'privateKey', value: '0xkey' }],
-      });
-      expect(result.ok).toBe(true);
-      expect(mockCreateWallet).toHaveBeenCalledWith(
-        expect.objectContaining({ type: 'create', password: 'test123' }),
-      );
-      expect(mockImportAccount).toHaveBeenCalled();
-    });
-
-    it('imports private key accounts', async () => {
-      await bridge().setupWallet({
-        password: 'test123',
-        accounts: [
-          { type: 'mnemonic', value: 'word1 word2' },
-          { type: 'privateKey', value: '0xkey1' },
-        ],
-      });
-      expect(mockImportAccount).toHaveBeenCalledWith('privateKey', ['0xkey1']);
-    });
-
     it('dispatches all onboarding flags', async () => {
       await bridge().setupWallet({
         password: 'test123',
@@ -700,18 +787,6 @@ describe('AgenticService.install', () => {
       expect(result.error).toBe('boom');
     });
 
-    it('handles failed private key import gracefully', async () => {
-      mockImportAccount.mockRejectedValueOnce(new Error('bad key'));
-      const result = await bridge().setupWallet({
-        password: 'test123',
-        accounts: [
-          { type: 'mnemonic', value: 'words' },
-          { type: 'privateKey', value: '0xbad' },
-        ],
-      });
-      expect(result.ok).toBe(true);
-    });
-
     it('opts out of metametrics when specified', async () => {
       const { analytics } = jest.requireMock('../../util/analytics/analytics');
       await bridge().setupWallet({
@@ -807,16 +882,43 @@ describe('AgenticService.install', () => {
       );
     });
 
-    it('dispatches setOsAuthEnabled(true) when deviceAuthEnabled is true', async () => {
+    it('dispatches setOsAuthEnabled(true) on Android when deviceAuthEnabled is true', async () => {
       mockDispatch.mockClear();
-      await bridge().setupWallet({
-        password: 'test123',
-        accounts: [],
-        settings: { deviceAuthEnabled: true },
-      });
-      expect(mockDispatch).toHaveBeenCalledWith(
-        expect.objectContaining({ type: 'SET_OS_AUTH_ENABLED', enabled: true }),
-      );
+      const originalOS = Platform.OS;
+      Platform.OS = 'android';
+      try {
+        await bridge().setupWallet({
+          password: 'test123',
+          accounts: [],
+          settings: { deviceAuthEnabled: true },
+        });
+        expect(mockDispatch).toHaveBeenCalledWith(
+          expect.objectContaining({
+            type: 'SET_OS_AUTH_ENABLED',
+            enabled: true,
+          }),
+        );
+      } finally {
+        Platform.OS = originalOS;
+      }
+    });
+
+    it('does not dispatch setOsAuthEnabled on iOS even when deviceAuthEnabled is true', async () => {
+      mockDispatch.mockClear();
+      const originalOS = Platform.OS;
+      Platform.OS = 'ios';
+      try {
+        await bridge().setupWallet({
+          password: 'test123',
+          accounts: [],
+          settings: { deviceAuthEnabled: true },
+        });
+        expect(mockDispatch).not.toHaveBeenCalledWith(
+          expect.objectContaining({ type: 'SET_OS_AUTH_ENABLED' }),
+        );
+      } finally {
+        Platform.OS = originalOS;
+      }
     });
 
     it('does not dispatch setOsAuthEnabled when deviceAuthEnabled is not set', async () => {
diff --git a/app/core/AgenticService/AgenticService.ts b/app/core/AgenticService/AgenticService.ts
index 8f98502fff3e..733ff9f880c2 100644
--- a/app/core/AgenticService/AgenticService.ts
+++ b/app/core/AgenticService/AgenticService.ts
@@ -1,21 +1,20 @@
 /**
- * AgenticService — __DEV__-only bridge for AI coding agents.
+ * AgenticService — __DEV__-only bridge for Farmslot recipe runners.
  *
- * This file is NEVER bundled in production builds (guarded by __DEV__).
- * It intentionally uses loose types, inline casts, and minimal abstractions
- * because it is throwaway dev tooling — not shared library code. Do not
- * apply production code standards (strict types, full error handling,
- * abstraction layers) here; keep it pragmatic and easy to change.
+ * This file is not bundled in production builds. It exposes a stable control
+ * surface for deterministic local recipes while keeping user-visible proof
+ * flows on the real app path.
  */
 import {
   NavigationContainerRef,
   ParamListBase,
 } from '@react-navigation/native';
-import { Platform } from 'react-native';
+import { Dimensions, Platform } from 'react-native';
 import Logger from '../../util/Logger';
 import ReduxService from '../redux';
 import { persistor } from '../../store';
 import Engine from '../Engine';
+import { Engine as EngineClass } from '../Engine/Engine';
 import {
   passwordSet,
   setExistingUser,
@@ -26,6 +25,7 @@ import {
 import { setCompletedOnboarding } from '../../actions/onboarding';
 import { mnemonicPhraseToBytes } from '@metamask/key-tree';
 import { AccountImportStrategy } from '@metamask/keyring-controller';
+import type { AccountGroupId } from '@metamask/account-api';
 import StorageWrapper from '../../store/storage-wrapper';
 import {
   OPTIN_META_METRICS_UI_SEEN,
@@ -45,6 +45,15 @@ import Routes from '../../constants/navigation/Routes';
 import SecureKeychain from '../SecureKeychain';
 import AUTHENTICATION_TYPE from '../../constants/userProperties';
 import DevLogger from '../SDKConnect/utils/DevLogger';
+import {
+  addNewHdAccount,
+  importNewSecretRecoveryPhrase,
+} from '../../actions/multiSrp';
+import { bufferToHex, privateToAddress } from 'ethereumjs-util';
+import Authentication from '../Authentication';
+import { Wallet as EthersWallet } from 'ethers';
+import PerpsConnectionManager from '../../components/UI/Perps/services/PerpsConnectionManager';
+import { getStreamManagerInstance } from '../../components/UI/Perps/providers/PerpsStreamManager';
 
 // ─── Fiber tree types ──────────────────────────────────────────────────────
 
@@ -65,6 +74,19 @@ interface FiberNode {
   stateNode: {
     scrollTo?: (opts: { y: number; animated: boolean }) => void;
     scrollToOffset?: (opts: { offset: number; animated: boolean }) => void;
+    measure?: (
+      callback: (
+        x: number,
+        y: number,
+        width: number,
+        height: number,
+        pageX: number,
+        pageY: number,
+      ) => void,
+    ) => void;
+    measureInWindow?: (
+      callback: (x: number, y: number, width: number, height: number) => void,
+    ) => void;
     [key: string]: unknown;
   } | null;
 }
@@ -81,6 +103,7 @@ interface ReactDevToolsHook {
 /** Shape of the __DEV__-only agentic bridge on globalThis. */
 interface AgenticBridge {
   platform: string;
+  replayHarnessPatch?: string;
   navigate: (name: string, params?: object) => void;
   getRoute: () => unknown;
   getState: () => unknown;
@@ -146,6 +169,9 @@ interface AgenticBridge {
       type: 'mnemonic' | 'privateKey';
       value: string;
       name?: string;
+      count?: number;
+      numberOfAccounts?: number;
+      names?: string[];
     }[];
     settings?: {
       metametrics?: boolean;
@@ -155,15 +181,41 @@ interface AgenticBridge {
       deviceAuthEnabled?: boolean;
     };
   }) => Promise<{
+    ok: boolean;
+    error?: string;
+    step?: string;
+    accounts?: { address: string; name: string }[];
+  }>;
+  applyWalletFixture: (
+    fixture: Parameters<AgenticBridge['setupWallet']>[0],
+  ) => Promise<{
     ok: boolean;
     error?: string;
     accounts?: { address: string; name: string }[];
   }>;
   showStep: (step: { id: string; description: string }) => void;
   hideStep: () => void;
+  refreshPerpsStreams: () => Promise<{ ok: boolean; positions: number }>;
   findFiberByTestId: (testId: string) => boolean;
+  queryUiTarget: (options: {
+    testId?: string;
+    textContains?: string;
+    visibility?: 'tree' | 'viewport';
+  }) => Promise<{
+    present: boolean;
+    visible: boolean;
+    visibility: 'tree' | 'viewport';
+    testId?: string;
+    textContains?: string;
+    textMatched?: boolean;
+    rect?: { x: number; y: number; width: number; height: number };
+    viewport?: { width: number; height: number };
+    error?: string;
+  }>;
 }
 
+type WalletFixture = Parameters<AgenticBridge['setupWallet']>[0];
+
 declare global {
   // eslint-disable-next-line no-var
   var __AGENTIC__: AgenticBridge | undefined;
@@ -242,6 +294,334 @@ function toAccountSummary(a: {
   return { id: a.id, address: a.address, name: a.metadata.name };
 }
 
+export function getFixtureMnemonicCount(account?: {
+  count?: number;
+  numberOfAccounts?: number;
+}): number {
+  const raw = account?.count ?? account?.numberOfAccounts ?? 1;
+  const count = Number(raw);
+  if (!Number.isInteger(count) || count < 1 || count > 100) {
+    throw new Error(`Invalid mnemonic account count: ${raw}`);
+  }
+  return count;
+}
+
+export function getFixtureAccountNames(
+  account: { name?: string; names?: string[] } | undefined,
+  count: number,
+): string[] {
+  return Array.from({ length: count }, (_unused, index) => {
+    const explicitName = account?.names?.[index];
+    if (typeof explicitName === 'string' && explicitName.trim()) {
+      return explicitName.trim();
+    }
+    if (
+      index === 0 &&
+      typeof account?.name === 'string' &&
+      account.name.trim()
+    ) {
+      return account.name.trim();
+    }
+    return `Account ${index + 1}`;
+  });
+}
+
+interface FixtureEvmAccount {
+  id: string;
+  address: string;
+  metadata: { name: string; keyring?: { type?: string } };
+}
+
+function findEvmAccounts(accounts: Record<string, unknown>) {
+  return (Object.values(accounts) as FixtureEvmAccount[]).filter((account) =>
+    account.address?.startsWith('0x'),
+  );
+}
+
+function isHdFixtureAccount(account: FixtureEvmAccount) {
+  return account.metadata?.keyring?.type === 'HD Key Tree';
+}
+
+function normalizePrivateKey(value: string) {
+  return value.startsWith('0x') ? value.slice(2) : value;
+}
+
+function getPrivateKeyAddress(value: string) {
+  return bufferToHex(
+    privateToAddress(Buffer.from(normalizePrivateKey(value), 'hex')),
+  ).toLowerCase();
+}
+
+function isExpectedLegacyAccountTreeInitError(error: unknown) {
+  const message = String((error as Error).message || error);
+  return (
+    message.includes('Money Keyring') ||
+    message.includes('No keyringBuilder found')
+  );
+}
+
+async function initializeFixtureAccountTree(
+  options: {
+    allowLegacyAccountTreeInitFailure?: boolean;
+  } = {},
+) {
+  try {
+    await AccountTreeInitService.initializeAccountTree();
+  } catch (error) {
+    if (
+      !options.allowLegacyAccountTreeInitFailure ||
+      !isExpectedLegacyAccountTreeInitError(error)
+    ) {
+      throw error;
+    }
+    // Historical replay vaults can lack the multichain keyring builder. In that
+    // mode AccountsController remains the source of truth for fixture validation
+    // and account labels; group renames are skipped when no account-tree group
+    // exists.
+    Logger.log(
+      '[AgenticService] Skipping fixture account-tree refresh for historical replay fixture setup',
+    );
+  }
+}
+
+function getMnemonicFirstAddress(value: string) {
+  return EthersWallet.fromMnemonic(
+    value,
+    "m/44'/60'/0'/0/0",
+  ).address.toLowerCase();
+}
+
+interface FixtureHdWallet {
+  keyringId?: string;
+  accounts: FixtureEvmAccount[];
+}
+
+function getHdFixtureWallets(
+  accountsController: {
+    state: { internalAccounts: { accounts: Record<string, unknown> } };
+  },
+  accountTreeController: {
+    state: { accountTree?: { wallets?: Record<string, unknown> } };
+  },
+): FixtureHdWallet[] {
+  const evmById = new Map(
+    findEvmAccounts(accountsController.state.internalAccounts.accounts).map(
+      (account) => [account.id, account],
+    ),
+  );
+  const wallets = accountTreeController.state.accountTree?.wallets ?? {};
+  const result: FixtureHdWallet[] = [];
+  for (const wallet of Object.values(wallets) as {
+    metadata?: { entropy?: { id?: string } };
+    groups?: Record<
+      string,
+      { accounts?: string[]; metadata?: { entropy?: { groupIndex?: number } } }
+    >;
+  }[]) {
+    const entropyId = wallet.metadata?.entropy?.id;
+    if (!entropyId) continue;
+    const accounts = Object.values(wallet.groups ?? {})
+      .map((group) => ({
+        index: group.metadata?.entropy?.groupIndex ?? Number.MAX_SAFE_INTEGER,
+        account: group.accounts?.[0]
+          ? evmById.get(group.accounts[0])
+          : undefined,
+      }))
+      .filter((entry): entry is { index: number; account: FixtureEvmAccount } =>
+        Boolean(entry.account),
+      )
+      .sort((left, right) => left.index - right.index)
+      .map((entry) => entry.account);
+    if (accounts.length > 0) {
+      result.push({ keyringId: entropyId, accounts });
+    }
+  }
+  if (result.length > 0) {
+    return result;
+  }
+  const legacyHdAccounts = findEvmAccounts(
+    accountsController.state.internalAccounts.accounts,
+  ).filter(isHdFixtureAccount);
+  return legacyHdAccounts.length > 0 ? [{ accounts: legacyHdAccounts }] : [];
+}
+
+async function ensureFixtureMnemonicAccounts(
+  mnemonicAccount: WalletFixture['accounts'][number],
+  mnemonicIndex: number,
+  controllers: {
+    AccountsController: {
+      state: { internalAccounts: { accounts: Record<string, unknown> } };
+    };
+    AccountTreeController: {
+      state: { accountTree?: { wallets?: Record<string, unknown> } };
+      setAccountGroupName: (
+        accountGroupId: AccountGroupId,
+        accountGroupName: string,
+      ) => void;
+    };
+  },
+  options: { allowLegacyAccountTreeInitFailure?: boolean } = {},
+) {
+  const { AccountsController, AccountTreeController } = controllers;
+  const count = getFixtureMnemonicCount(mnemonicAccount);
+  const names = getFixtureAccountNames(mnemonicAccount, count);
+  const firstAddress = getMnemonicFirstAddress(mnemonicAccount.value);
+  const findWallet = () =>
+    getHdFixtureWallets(AccountsController, AccountTreeController).find(
+      (hdWallet) =>
+        hdWallet.accounts[0]?.address.toLowerCase() === firstAddress,
+    );
+
+  let wallet = findWallet();
+  if (!wallet) {
+    await importNewSecretRecoveryPhrase(mnemonicAccount.value, {
+      shouldSelectAccount: false,
+    });
+    await initializeFixtureAccountTree(options);
+    wallet = findWallet();
+  }
+
+  if (!wallet) {
+    throw new Error(
+      `No HD wallet found for fixture mnemonic ${mnemonicIndex + 1}`,
+    );
+  }
+
+  for (
+    let accountIndex = wallet.accounts.length;
+    accountIndex < count;
+    accountIndex += 1
+  ) {
+    await addNewHdAccount(wallet.keyringId, names[accountIndex]);
+    await initializeFixtureAccountTree(options);
+    wallet = findWallet();
+    if (!wallet) {
+      throw new Error(
+        `No HD wallet found after adding fixture account ${accountIndex + 1}`,
+      );
+    }
+  }
+
+  wallet.accounts.slice(0, count).forEach((account, index) => {
+    setFixtureAccountName(AccountTreeController, account, names[index]);
+  });
+}
+
+function findAccountGroupIdByAccountId(
+  accountTreeController: {
+    state: { accountTree?: { wallets?: Record<string, unknown> } };
+  },
+  accountId: string,
+): string | undefined {
+  const wallets = accountTreeController.state.accountTree?.wallets ?? {};
+  for (const wallet of Object.values(wallets) as {
+    groups?: Record<string, { accounts?: string[] }>;
+  }[]) {
+    for (const [groupId, group] of Object.entries(wallet.groups ?? {})) {
+      if (group.accounts?.includes(accountId)) {
+        return groupId;
+      }
+    }
+  }
+  return undefined;
+}
+
+function setFixtureAccountName(
+  accountTreeController: {
+    state: { accountTree?: { wallets?: Record<string, unknown> } };
+    setAccountGroupName: (
+      accountGroupId: AccountGroupId,
+      accountGroupName: string,
+    ) => void;
+  },
+  account: { id: string; address: string },
+  name: string,
+) {
+  Engine.setAccountLabel(account.address, name);
+  const groupId = findAccountGroupIdByAccountId(
+    accountTreeController,
+    account.id,
+  );
+  // Legacy vault fallback skips account-tree init, so no group exists yet.
+  // The account label set above is sufficient; skip the group rename instead
+  // of throwing and crashing fixture setup.
+  if (!groupId) {
+    DevLogger.log(
+      `[AgenticService] No account group for fixture account ${account.address}; skipped group rename`,
+    );
+    return;
+  }
+  accountTreeController.setAccountGroupName(groupId as AccountGroupId, name);
+}
+
+async function materializeFixtureAccounts(
+  fixture: WalletFixture,
+  controllers: {
+    KeyringController: {
+      importAccountWithStrategy: (
+        strategy: AccountImportStrategy,
+        args: string[],
+      ) => Promise<unknown>;
+    };
+    AccountsController: {
+      state: { internalAccounts: { accounts: Record<string, unknown> } };
+    };
+    AccountTreeController: {
+      state: { accountTree?: { wallets?: Record<string, unknown> } };
+      setAccountGroupName: (
+        accountGroupId: AccountGroupId,
+        accountGroupName: string,
+      ) => void;
+    };
+  },
+  options: { allowLegacyAccountTreeInitFailure?: boolean } = {},
+) {
+  const { KeyringController, AccountsController, AccountTreeController } =
+    controllers;
+  const mnemonicAccounts = fixture.accounts.filter(
+    (account) => account.type === 'mnemonic',
+  );
+
+  for (const [mnemonicIndex, mnemonicAccount] of mnemonicAccounts.entries()) {
+    await ensureFixtureMnemonicAccounts(
+      mnemonicAccount,
+      mnemonicIndex,
+      {
+        AccountsController,
+        AccountTreeController,
+      },
+      options,
+    );
+  }
+
+  for (const account of fixture.accounts) {
+    if (account.type !== 'privateKey') continue;
+    const address = getPrivateKeyAddress(account.value);
+    let imported = findEvmAccounts(
+      AccountsController.state.internalAccounts.accounts,
+    ).find((evmAccount) => evmAccount.address.toLowerCase() === address);
+
+    if (!imported) {
+      await KeyringController.importAccountWithStrategy(
+        AccountImportStrategy.privateKey,
+        [`0x${normalizePrivateKey(account.value)}`],
+      );
+      imported = findEvmAccounts(
+        AccountsController.state.internalAccounts.accounts,
+      ).find((evmAccount) => evmAccount.address.toLowerCase() === address);
+    }
+
+    if (!imported) {
+      throw new Error(
+        `Fixture private key import did not create account ${address}`,
+      );
+    }
+    if (account.name) {
+      setFixtureAccountName(AccountTreeController, imported, account.name);
+    }
+  }
+}
+
 /**
  * Walk a fiber sub-tree looking for a scrollable stateNode (scrollTo or
  * scrollToOffset). When `walkSiblings` is false only the child axis is
@@ -273,6 +653,182 @@ function tryScroll(
   return false;
 }
 
+function targetMatches(
+  fiber: FiberNode,
+  options: { testId?: string; textContains?: string },
+): boolean {
+  if (options.testId && fiber.memoizedProps?.testID !== options.testId) {
+    return false;
+  }
+  if (options.textContains) {
+    const needle = options.textContains.toLowerCase();
+    const texts = options.testId
+      ? collectFiberTexts(fiber)
+      : collectOwnFiberTexts(fiber);
+    return texts.some((text) => text.toLowerCase().includes(needle));
+  }
+  return Boolean(options.testId);
+}
+
+function findUiTargetFiber(
+  rootFiber: FiberNode,
+  options: { testId?: string; textContains?: string },
+): FiberNode | null {
+  let result: FiberNode | null = null;
+  walkFiber(rootFiber, (fiber) => {
+    if (targetMatches(fiber, options)) {
+      result = fiber;
+      return true;
+    }
+    return false;
+  });
+  return result;
+}
+
+function findMeasurableStateNode(
+  fiber: FiberNode | null,
+): FiberNode['stateNode'] | null {
+  let result: FiberNode['stateNode'] | null = null;
+  walkFiber(fiber, (node) => {
+    const sn = node.stateNode;
+    if (
+      sn &&
+      (typeof sn.measureInWindow === 'function' ||
+        typeof sn.measure === 'function')
+    ) {
+      result = sn;
+      return true;
+    }
+    return false;
+  });
+  return result;
+}
+
+function measureStateNode(
+  stateNode: FiberNode['stateNode'],
+): Promise<{ x: number; y: number; width: number; height: number } | null> {
+  return new Promise((resolve) => {
+    if (!stateNode) {
+      resolve(null);
+      return;
+    }
+    let settled = false;
+    const settle = (
+      value: { x: number; y: number; width: number; height: number } | null,
+    ) => {
+      if (settled) return;
+      settled = true;
+      resolve(value);
+    };
+    // Native measure callbacks never fire for detached/off-screen views;
+    // fall back to null after a short delay so callers don't hang forever.
+    const timeout = setTimeout(() => settle(null), 2500);
+    const finish = (x: number, y: number, width: number, height: number) => {
+      clearTimeout(timeout);
+      settle({ x, y, width, height });
+    };
+    try {
+      if (typeof stateNode.measureInWindow === 'function') {
+        stateNode.measureInWindow(finish);
+        return;
+      }
+      if (typeof stateNode.measure === 'function') {
+        stateNode.measure((_x, _y, width, height, pageX, pageY) =>
+          finish(pageX, pageY, width, height),
+        );
+        return;
+      }
+    } catch (e) {
+      Logger.log(String(e), 'AgenticService.measureStateNode');
+    }
+    clearTimeout(timeout);
+    settle(null);
+  });
+}
+
+async function queryUiTarget(options: {
+  testId?: string;
+  textContains?: string;
+  visibility?: 'tree' | 'viewport';
+}): Promise<{
+  present: boolean;
+  visible: boolean;
+  visibility: 'tree' | 'viewport';
+  testId?: string;
+  textContains?: string;
+  textMatched?: boolean;
+  rect?: { x: number; y: number; width: number; height: number };
+  viewport?: { width: number; height: number };
+  error?: string;
+}> {
+  const visibility: 'tree' | 'viewport' =
+    options.visibility === 'viewport' ? 'viewport' : 'tree';
+  let target: FiberNode | null = null;
+
+  walkFiberRoots((rootFiber) => {
+    target = findUiTargetFiber(rootFiber, options);
+    return Boolean(target);
+  });
+
+  const base = {
+    present: Boolean(target),
+    visible: Boolean(target) && visibility === 'tree',
+    visibility,
+    testId: options.testId,
+    textContains: options.textContains,
+    textMatched: options.textContains
+      ? Boolean(
+          target &&
+            collectFiberTexts(target).some((text) =>
+              text
+                .toLowerCase()
+                .includes(String(options.textContains).toLowerCase()),
+            ),
+        )
+      : undefined,
+  };
+
+  if (!target || visibility === 'tree') {
+    return base;
+  }
+
+  const stateNode = findMeasurableStateNode(target);
+  if (!stateNode) {
+    return {
+      ...base,
+      visible: false,
+      error:
+        'Target exists in fiber tree but no measurable native node was found',
+    };
+  }
+
+  const rect = await measureStateNode(stateNode);
+  const viewport = Dimensions.get('window');
+  if (!rect) {
+    return {
+      ...base,
+      visible: false,
+      viewport: { width: viewport.width, height: viewport.height },
+      error: 'Target exists in fiber tree but measurement returned no frame',
+    };
+  }
+
+  const visible =
+    rect.width > 0 &&
+    rect.height > 0 &&
+    rect.x < viewport.width &&
+    rect.y < viewport.height &&
+    rect.x + rect.width > 0 &&
+    rect.y + rect.height > 0;
+
+  return {
+    ...base,
+    visible,
+    rect,
+    viewport: { width: viewport.width, height: viewport.height },
+  };
+}
+
 function appendTextContent(value: unknown, out: string[]) {
   if (value === null || value === undefined) {
     return;
@@ -311,6 +867,14 @@ function collectFiberTexts(fiber: FiberNode | null): string[] {
   return dedupeTexts(texts);
 }
 
+function collectOwnFiberTexts(fiber: FiberNode | null): string[] {
+  const texts: string[] = [];
+  if (fiber?.memoizedProps?.children !== undefined) {
+    appendTextContent(fiber.memoizedProps.children, texts);
+  }
+  return dedupeTexts(texts);
+}
+
 function findAncestorTexts(
   fiber: FiberNode | null,
   predicate: (texts: string[]) => boolean,
@@ -382,18 +946,12 @@ function getRowValue(
     maxTexts?: number;
   } = {},
 ): string | null {
-  try {
-    const rowTexts = findRowTexts(label, options);
-    if (!rowTexts) {
-      return null;
-    }
-    const matcher = new RegExp(pattern);
-    return (
-      rowTexts.find((text) => text !== label && matcher.test(text)) ?? null
-    );
-  } catch {
+  const rowTexts = findRowTexts(label, options);
+  if (!rowTexts) {
     return null;
   }
+  const matcher = new RegExp(pattern);
+  return rowTexts.find((text) => text !== label && matcher.test(text)) ?? null;
 }
 
 // ─── Step HUD callback registry ─────────────────────────────────────────────
@@ -434,6 +992,7 @@ const AgenticService = {
 
     globalThis.__AGENTIC__ = {
       platform: Platform.OS,
+      replayHarnessPatch: 'legacy-wallet-fixture-r2',
       navigate: (name: string, params?: object) =>
         (
           deferredNav as unknown as {
@@ -648,6 +1207,19 @@ const AgenticService = {
       hideStep: () => {
         _stepHudCallback?.(null);
       },
+      refreshPerpsStreams: async () => {
+        await PerpsConnectionManager.ensureConnected({
+          source: 'agentic_refresh_perps_streams',
+          suppressError: true,
+        });
+        const streamManager = getStreamManagerInstance();
+        streamManager.clearAllChannels();
+        const positions = await Engine.context.PerpsController.getPositions();
+        return {
+          ok: true,
+          positions: Array.isArray(positions) ? positions.length : 0,
+        };
+      },
       findFiberByTestId: (testId: string): boolean => {
         let found = false;
         walkFiberRoots((rootFiber) => {
@@ -659,54 +1231,147 @@ const AgenticService = {
         });
         return found;
       },
+      queryUiTarget,
+      applyWalletFixture: async (fixture) => {
+        try {
+          const {
+            KeyringController,
+            AccountsController,
+            AccountTreeController,
+          } = Engine.context;
+          // The backup subscriber reads the Engine class static, so set it on
+          // the class (not the facade) before importing/renaming accounts to
+          // avoid racing native keychain export during fixture apply.
+          EngineClass.disableAutomaticVaultBackup = true;
+          // Unlock via the real auth flow (loginVaultCreation + dispatchLogin +
+          // post-login) rather than a bare KeyringController.submitPassword, so
+          // multichain services and Redux/auth state are consistent before we
+          // mutate accounts.
+          if (!KeyringController.isUnlocked()) {
+            await Authentication.unlockWallet({ password: fixture.password });
+          }
+          // Existing replay vaults can have the same historical multichain
+          // account-tree init gap as fresh legacy setup. Only the known legacy
+          // init errors are tolerated by this option; unexpected errors still
+          // throw from initializeFixtureAccountTree().
+          const legacyAccountTreeInitOptions = {
+            allowLegacyAccountTreeInitFailure: true,
+          };
+          await initializeFixtureAccountTree(legacyAccountTreeInitOptions);
+          await materializeFixtureAccounts(
+            fixture,
+            {
+              KeyringController,
+              AccountsController,
+              AccountTreeController,
+            },
+            legacyAccountTreeInitOptions,
+          );
+          const ethAccs = findEvmAccounts(
+            AccountsController.state.internalAccounts.accounts,
+          ).map(toAccountSummary);
+          return { ok: true, accounts: ethAccs };
+        } catch (e) {
+          return { ok: false, error: String((e as Error).message || e) };
+        }
+      },
       setupWallet: async (fixture) => {
+        let setupStep = 'start';
         try {
+          setupStep = 'read-engine';
           const {
             MultichainAccountService,
             KeyringController,
             AccountsController,
+            AccountTreeController,
           } = Engine.context;
           const store = ReduxService.store;
           const settings = fixture.settings ?? {};
+          // Deliberately one-way for the dev harness process: fixture setup
+          // rewrites vault/account state, so automatic backup must stay disabled
+          // for the rest of this simulator session to avoid native keychain
+          // export paths racing the synthetic setup flow.
+          EngineClass.disableAutomaticVaultBackup = true;
 
           // 1. Create wallet from the first mnemonic (same path as onboarding UI)
+          setupStep = 'create-wallet';
           const mnemonicAccount = fixture.accounts.find(
             (a) => a.type === 'mnemonic',
           );
+          let usedLegacyVaultSetup = false;
           if (mnemonicAccount) {
             const mnemonic = mnemonicPhraseToBytes(mnemonicAccount.value);
-            await MultichainAccountService.createMultichainAccountWallet({
-              type: 'restore',
-              password: fixture.password,
-              mnemonic,
-            });
+            try {
+              await MultichainAccountService.createMultichainAccountWallet({
+                type: 'restore',
+                password: fixture.password,
+                mnemonic,
+              });
+            } catch (error) {
+              if (!isExpectedLegacyAccountTreeInitError(error)) {
+                throw error;
+              }
+              Logger.log(
+                '[AgenticService] Falling back to legacy vault restore for historical replay fixture setup',
+              );
+              await KeyringController.createNewVaultAndRestore(
+                fixture.password,
+                mnemonic,
+              );
+              usedLegacyVaultSetup = true;
+            }
           } else {
-            await MultichainAccountService.createMultichainAccountWallet({
-              type: 'create',
-              password: fixture.password,
-            });
+            try {
+              await MultichainAccountService.createMultichainAccountWallet({
+                type: 'create',
+                password: fixture.password,
+              });
+            } catch (error) {
+              if (!isExpectedLegacyAccountTreeInitError(error)) {
+                throw error;
+              }
+              Logger.log(
+                '[AgenticService] Falling back to legacy vault creation for historical replay fixture setup',
+              );
+              await KeyringController.createNewVaultAndKeychain(
+                fixture.password,
+              );
+              usedLegacyVaultSetup = true;
+            }
           }
 
           // 2. Initialize services (same as Authentication.dispatchLogin)
-          await AccountTreeInitService.initializeAccountTree();
-          await MultichainAccountService.init();
-
-          // 3. Import private key accounts
-          for (const account of fixture.accounts) {
-            if (account.type !== 'privateKey') continue;
+          setupStep = 'initialize-services';
+          if (!usedLegacyVaultSetup) {
             try {
-              await KeyringController.importAccountWithStrategy(
-                AccountImportStrategy.privateKey,
-                [account.value],
-              );
-            } catch (e) {
+              await AccountTreeInitService.initializeAccountTree();
+              await MultichainAccountService.init();
+            } catch (error) {
+              if (!isExpectedLegacyAccountTreeInitError(error)) {
+                throw error;
+              }
               Logger.log(
-                `[AgenticService] Failed to import key: ${(e as Error).message}`,
+                '[AgenticService] Skipping multichain account-tree initialization for historical replay fixture setup',
               );
             }
           }
 
+          // 3. Materialize requested fixture accounts. A mnemonic account can
+          // declare count/numberOfAccounts plus names[]; this is generic
+          // fixture semantics, not a dev-account special case.
+          setupStep = 'materialize-srp-accounts';
+          await materializeFixtureAccounts(
+            fixture,
+            {
+              KeyringController,
+              AccountsController,
+              AccountTreeController,
+            },
+            { allowLegacyAccountTreeInitFailure: usedLegacyVaultSetup },
+          );
+
           // 4. Dispatch all onboarding/auth flags
+          setupStep = 'dispatch-onboarding-flags';
           store.dispatch(passwordSet());
           store.dispatch(seedphraseBackedUp());
           store.dispatch(setCompletedOnboarding(true));
@@ -714,6 +1379,7 @@ const AgenticService = {
           store.dispatch(logIn());
 
           // 5. Suppress post-onboarding modals if explicitly requested
+          setupStep = 'persist-modal-settings';
           if (settings.skipGtmModals === true) {
             await Promise.all([
               StorageWrapper.setItem(PERPS_GTM_MODAL_SHOWN, 'true'),
@@ -726,29 +1392,41 @@ const AgenticService = {
 
           // 5b. Set metrics UI as seen (prevents Authentication.unlockWallet
           // from navigating to OptinMetrics after setupWallet resets to Wallet)
+          setupStep = 'persist-metrics-setting';
           if (settings.metametrics !== undefined) {
             await StorageWrapper.setItem(OPTIN_META_METRICS_UI_SEEN, 'true');
           }
 
           // 5c. Mark multichain accounts intro modal as seen
+          setupStep = 'dispatch-multichain-intro-seen';
           store.dispatch(setMultichainAccountsIntroModalSeen(true));
 
           // 6. Skip perps tutorial onboarding if requested
+          setupStep = 'persist-perps-tutorial-setting';
           if (settings.skipPerpsTutorial === true) {
             Engine.context.PerpsController?.markTutorialCompleted();
           }
 
           // 7. Set auto-lock to "Never" (-1) for agentic workflows
+          setupStep = 'dispatch-auto-lock';
           if (settings.autoLockNever === true) {
             ReduxService.store.dispatch(setLockTime(-1));
           }
 
-          // 8. Enable device authentication (biometrics/passcode bypass)
-          if (settings.deviceAuthEnabled === true) {
+          // 8. Enable device authentication only on Android fixture runs.
+          // On iOS simulator, toggling OS auth during synthetic setup can drive
+          // react-native-keychain/quick-crypto secret export on the JS runtime
+          // and crash the app after setupWallet returns. Android is the only
+          // harness path that stores the fixture password for auto-unlock here.
+          setupStep = 'dispatch-device-auth';
+          if (
+            settings.deviceAuthEnabled === true &&
+            Platform.OS === 'android'
+          ) {
             ReduxService.store.dispatch(setOsAuthEnabled(true));
           }
 
-          // 8b. Store password in SecureKeychain for device-auth auto-unlock on reload (Android only — iOS already handles this)
+          // 8b. Store password in SecureKeychain for device-auth auto-unlock on reload (Android only)
           if (
             settings.deviceAuthEnabled === true &&
             Platform.OS === 'android'
@@ -764,6 +1442,7 @@ const AgenticService = {
           }
 
           // 9. Configure MetaMetrics if specified
+          setupStep = 'configure-metametrics';
           if (settings.metametrics === false) {
             await analytics.optOut();
           } else if (settings.metametrics === true) {
@@ -771,22 +1450,24 @@ const AgenticService = {
           }
 
           // 10. Navigate to wallet (same as Authentication.unlockWallet)
+          setupStep = 'navigate-wallet';
           NavigationService.navigation?.reset({
             routes: [{ name: Routes.ONBOARDING.HOME_NAV }],
           });
 
           // 11. Collect all ETH accounts for the summary
-          const ethAccs = (
-            Object.values(
-              AccountsController.state.internalAccounts.accounts,
-            ) as { id: string; address: string; metadata: { name: string } }[]
-          )
-            .filter((a) => a.address?.startsWith('0x'))
-            .map(toAccountSummary);
+          setupStep = 'collect-accounts';
+          const ethAccs = findEvmAccounts(
+            AccountsController.state.internalAccounts.accounts,
+          ).map(toAccountSummary);
 
           return { ok: true, accounts: ethAccs };
         } catch (e) {
-          return { ok: false, error: String((e as Error).message || e) };
+          return {
+            ok: false,
+            step: setupStep,
+            error: String((e as Error).message || e),
+          };
         }
       },
     };
diff --git a/app/util/transactions/delegation.test.ts b/app/util/transactions/delegation.test.ts
index 5d18b52b32dc..6b8c31152fd8 100644
--- a/app/util/transactions/delegation.test.ts
+++ b/app/util/transactions/delegation.test.ts
@@ -32,8 +32,11 @@ const NONCE_MOCK = 123;
 const AUTHORIZATION_SIGNATURE_MOCK =
   '0xf85c827a6994663f3ad617193148711d28f5334ee4ed070166028080a040e292da533253143f134643a03405f1af1de1d305526f44ed27e62061368d4ea051cfb0af34e491aa4d6796dececf95569088322e116c4b2f312bb23f20699269';
 
+const NETWORK_CLIENT_ID_MOCK = 'mainnet';
+
 const TRANSACTION_META_MOCK = {
   chainId: '0x1' as Hex,
+  networkClientId: NETWORK_CLIENT_ID_MOCK,
   nestedTransactions: [
     {
       data: '0x123456781234' as Hex,
@@ -79,7 +82,7 @@ describe('Transaction Delegation Utils', () => {
     ]);
 
     mockGetNonceLock.mockResolvedValue({
-      nextNonce: NONCE_MOCK,
+      nonceDetails: { params: { nextNetworkNonce: NONCE_MOCK } },
       releaseLock: jest.fn(),
     });
   });
diff --git a/app/util/transactions/delegation.ts b/app/util/transactions/delegation.ts
index 4dd9d0bb81a9..b04cf705abb6 100644
--- a/app/util/transactions/delegation.ts
+++ b/app/util/transactions/delegation.ts
@@ -139,7 +139,7 @@ async function buildAuthorizationList<MessengerType extends SignMessenger>(
     networkClientId,
   );
 
-  const nonce = nonceLock.nextNonce;
+  const nonce = nonceLock.nonceDetails.params.nextNetworkNonce;
   nonceLock.releaseLock();
 
   const authorizationSignature = (await messenger.call(
diff --git a/docs/perps/myx-validation-report.md b/docs/perps/myx-validation-report.md
deleted file mode 100644
index 496012b866ec..000000000000
--- a/docs/perps/myx-validation-report.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# MYX Provider Validation Report
-
-**Date:** 2026-02-25
-**Branch:** `fet/perps/myx-reads-write`
-**Script:** `scripts/perps/agentic/validate-myx.sh`
-
----
-
-## Testnet (chainId 421614, Arbitrum Sepolia → `api-test.myx.cash`)
-
-| Category     | Test                     | Result     | Details                          |
-| ------------ | ------------------------ | ---------- | -------------------------------- |
-| Init         | Provider registered      | PASS       | `myx` in providers map           |
-| Init         | Markets loaded           | PASS       | 2 pools, 1 with price data       |
-| Init         | Markets have name        | PASS       |                                  |
-| Prices       | Tickers with real prices | PASS       | KNY=$65,629                      |
-| Candles REST | 1h historical            | PASS       | 101 candles                      |
-| Candles REST | 1D historical            | PASS       | 101 candles                      |
-| Candles REST | 5m historical            | PASS       | 101 candles                      |
-| Candles WS   | Sustained kline updates  | PASS       | 3 WS callbacks                   |
-| Prices WS    | Live ticker update       | PASS       | KNY `"65587.50"`                 |
-| Auth         | isReadyToTrade           | UNVERIFIED | `auth()` is sync, proves nothing |
-| Positions    | getPositions             | UNVERIFIED | 0 (auth not validated)           |
-| Orders       | getOrders                | UNVERIFIED | 0 (auth not validated)           |
-| Account      | getAccountState          | UNVERIFIED | all zeros (auth not validated)   |
-| Ping         | Health check             | PASS       |                                  |
-
-**Summary:** 10 passed, 0 failed, 0 skipped, 4 unverified
-
-### Testnet Markets
-
-2 pools on API, 1 returned after filtering (pools without ticker data are excluded):
-
-| Symbol | Price   | Candles | Volume | Chain              |
-| ------ | ------- | ------- | ------ | ------------------ |
-| KNY    | $65,629 | Yes     | $0.53  | Arb Sepolia 421614 |
-
-SGLT (Linea Sepolia 59141) is filtered out — paused pool, no ticker data.
-
----
-
-## Mainnet (chainId 56, BNB Chain → `api.myx.finance`)
-
-| Category     | Test                     | Result     | Details                            |
-| ------------ | ------------------------ | ---------- | ---------------------------------- |
-| Init         | Provider registered      | PASS       | `myx` in providers map             |
-| Init         | Markets loaded           | PASS       | 27 pools, 3 with price data        |
-| Init         | Markets have name        | PASS       |                                    |
-| Prices       | Tickers with real prices | PASS       | WBTC=$65,585, MYX=$0.40, WBNB=$602 |
-| Candles REST | 1h historical            | PASS       | 101 candles (MYX token)            |
-| Candles REST | 1D historical            | PASS       | 101 candles (MYX token)            |
-| Candles REST | 5m historical            | PASS       | 101 candles (MYX token)            |
-| Candles WS   | Sustained kline updates  | PASS       | 3 WS callbacks                     |
-| Prices WS    | Live ticker update       | PASS       | MYX `"0.4012..."`                  |
-| Auth         | isReadyToTrade           | UNVERIFIED | `auth()` is sync, proves nothing   |
-| Positions    | getPositions             | UNVERIFIED | 0 (auth not validated)             |
-| Orders       | getOrders                | UNVERIFIED | 0 (auth not validated)             |
-| Account      | getAccountState          | UNVERIFIED | all zeros (auth not validated)     |
-| Ping         | Health check             | PASS       |                                    |
-
-**Summary:** 10 passed, 0 failed, 0 skipped, 4 unverified
-
-### Mainnet Markets
-
-27 pools on API, 3 returned after filtering:
-
-| Symbol | Price   | Candles | Volume |
-| ------ | ------- | ------- | ------ |
-| WBTC   | $65,585 | —       | $0     |
-| MYX    | $0.40   | Yes     | $50.34 |
-| WBNB   | $602    | —       | $0     |
-
-24 pools filtered out — community/meme tokens with no ticker data. MYX uses a Multi-Pool Model where anyone can create pools; most are inactive.
-
----
-
-## Testnet vs Mainnet Comparison
-
-| Dimension             | Testnet       | Mainnet                         |
-| --------------------- | ------------- | ------------------------------- |
-| Pools on API          | 2             | 27                              |
-| Active (with prices)  | 1             | 3                               |
-| Prices                | KNY=$65,629   | WBTC=$65k, MYX=$0.40, WBNB=$602 |
-| REST candles          | All intervals | All intervals                   |
-| WS candles + prices   | Yes           | Yes                             |
-| Auth/positions/orders | Unverified    | Unverified                      |
-| Tests passed          | 10/14         | 10/14                           |
-
----
-
-## Known Issues
-
-1. **Most pools have no ticker data** — API only returns prices for active pools (1/2 testnet, 3/27 mainnet). `getMarketDataWithPrices()` filters these out.
-2. **Auth never validated** — `myxClient.auth()` is sync (stores callbacks, no API call). Empty results prove nothing.
-3. **No mainnet credentials** — `.js.env` has testnet creds only.
-
----
-
-## Next Steps
-
-1. **Validate auth** — call token API directly or attempt a testnet order.
-2. **Mainnet credentials** — get dedicated `appId`/`apiSecret` from MYX team.
-3. **Curated pool list** — get from MYX team which pools to show, or rely on the active-ticker filter.
diff --git a/docs/perps/perps-account-abstraction-and-balance-contract.md b/docs/perps/perps-account-abstraction-and-balance-contract.md
index 6914d2c174db..a687a0486798 100644
--- a/docs/perps/perps-account-abstraction-and-balance-contract.md
+++ b/docs/perps/perps-account-abstraction-and-balance-contract.md
@@ -1,389 +1,13 @@
-# Perps — Account Abstraction & Balance Contract
+# Perps account abstraction and 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.
+Historical agentic validation for this contract used Mobile-local recipe files.
+Recipe authoring has moved out of the Mobile repository to the external Recipe
+v1 runner. Keep this document focused on the product contract; executable
+recipes and evidence artifacts should live with the external runner.
 
-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.
+## Contract summary
 
-## 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   |
+Perps account balance display must preserve the distinction between spendable
+balance, collateral, and HyperLiquid account abstraction state. Validation should
+exercise clean accounts, accounts with positions/orders, and Unified/Standard
+mode transitions through the runner-owned recipe suite.
diff --git a/docs/perps/perps-agentic-feedback-loop.md b/docs/perps/perps-agentic-feedback-loop.md
index b4541207a873..b3acf75f9f14 100644
--- a/docs/perps/perps-agentic-feedback-loop.md
+++ b/docs/perps/perps-agentic-feedback-loop.md
@@ -1,403 +1,47 @@
-# Perps Agentic Toolkit
+# Perps agentic feedback loop
 
-The agentic toolkit lets AI agents interact with a running MetaMask Mobile app via CDP (Chrome DevTools Protocol). Agents execute parameterized flows — JSON test sequences that navigate screens, press buttons, type values, and assert state — to verify their own code changes without human intervention.
+MetaMask Mobile exposes a development-only agentic bridge so external Farmslot
+Recipe v1 runners can control the app, seed deterministic fixtures, show a small
+HUD, and capture proof from the real UI path.
 
-The toolkit lives at `scripts/perps/agentic/`. It works on both iOS Simulator and Android Emulator.
+## Repository boundary
 
----
+The Mobile repository owns the product integration only:
 
-## Architecture
+- `app/core/AgenticService/` installs `globalThis.__AGENTIC__` in `__DEV__`.
+- `scripts/perps/agentic/cdp-bridge.js` connects external tools to the React
+  Native CDP target.
+- `scripts/perps/agentic/setup-wallet.sh` applies wallet fixtures through the
+  bridge.
+- `scripts/perps/agentic/app-state.sh`, `app-navigate.sh`, and `screenshot.sh`
+  are small diagnostics used by humans and external runners.
 
-```
-Agent (Claude Code / Cursor / etc.)
-  |
-  v
-validate-recipe.sh          # Orchestrates flow execution
-  |
-  +-- cdp-bridge.js         # CDP engine (WebSocket -> Metro -> Hermes)
-  |     +-- lib/ws-client.js        # WebSocket connection
-  |     +-- lib/target-discovery.js  # Find the right CDP target
-  |     +-- lib/cdp-eval.js         # Eval sync/async via CDP
-  |     +-- lib/config.js           # Port + env resolution
-  |     +-- lib/assert.js           # Assertion operators
-  |     +-- lib/registry.js         # Pre-condition registry
-  |
-  +-- teams/perps/
-        +-- flows/           # 12 parameterized flow JSONs
-        +-- evals/           # Hierarchical eval ref collections
-        +-- evals.json       # Built-in eval refs
-        +-- pre-conditions.js # Named pre-condition checks
-```
+Recipe definitions, flow composition, action manifests, trace/summary output,
+and MetaMask domain actions are maintained by the external Recipe v1 runner.
+Do not add task-specific recipes or reusable runner actions to Mobile.
 
----
+## Human workflow
 
-## Quick Start
+Use Mobile scripts to start and inspect a controllable runtime:
 
 ```bash
-# 1. Check app + Metro + CDP are connected
+yarn a:ios
 yarn a:status
-
-# 2. Run a built-in eval ref (single CDP eval)
-bash scripts/perps/agentic/app-state.sh eval-ref perps/positions
-
-# 3. Run a flow (multi-step UI sequence)
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/flows/market-discovery.json --skip-manual
-
-# 4. Dry-run a flow (prints steps without executing)
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/flows/trade-open-market.json --dry-run
-
-# 5. Run all flows (dry-run)
-for f in scripts/perps/agentic/teams/perps/flows/*.json; do
-  bash scripts/perps/agentic/validate-recipe.sh "$f" --dry-run --skip-manual
-done
-```
-
----
-
-## Flows
-
-A flow is a parameterized JSON file that `validate-recipe.sh` executes step-by-step against the live app. Each flow declares its parameters in an `inputs` block, its required app state in `pre_conditions`, and a sequence of `steps`.
-
-### Parameter Templating
-
-Flows use `{{param}}` tokens in titles, expressions, test_ids, and params. Defaults come from the `inputs` block:
-
-```json
-{
-  "title": "Trade — market {{side}} {{symbol}} ${{usdAmount}}",
-  "inputs": {
-    "side": { "type": "string", "default": "long" },
-    "symbol": { "type": "string", "default": "BTC" },
-    "usdAmount": { "type": "string", "default": "10" }
-  }
-}
-```
-
-When run standalone, `inputs` defaults are applied. When called via `flow_ref`, the parent provides values that override defaults. Params without a default are required.
-
-### Pre-Conditions
-
-Pre-conditions gate flow execution. If any check fails, the runner aborts with a clear error and hint.
-
-```json
-"pre_conditions": [
-  "wallet.unlocked",
-  "perps.ready_to_trade",
-  { "name": "perps.open_position", "symbol": "{{symbol}}" }
-]
-```
-
-String form for simple checks, object form for parameterized checks. Shorthand `"perps.open_position(symbol={{symbol}})"` is also supported.
-
-**Available pre-conditions** (from `teams/perps/pre-conditions.js`):
-
-| Name                               | Description                                       |
-| ---------------------------------- | ------------------------------------------------- |
-| `wallet.unlocked`                  | Wallet is unlocked and navigable                  |
-| `perps.feature_enabled`            | PerpsController is available                      |
-| `perps.trading_flag`               | Perps trading remote flag is on                   |
-| `perps.ready_to_trade`             | Provider is authenticated                         |
-| `perps.sufficient_balance`         | Account has non-zero balance                      |
-| `perps.open_position`              | Open position exists (optionally by symbol)       |
-| `perps.open_position_tpsl`         | Position with TP/SL exists (optionally by symbol) |
-| `perps.open_limit_order`           | Open limit order exists (optionally by symbol)    |
-| `perps.not_in_watchlist`           | Symbol is not in watchlist                        |
-| `ui.homepage_redesign_v1_enabled`  | Homepage redesign V1 flag is on                   |
-| `ui.homepage_redesign_v1_disabled` | Homepage redesign V1 flag is off                  |
-
-### Authoring Rules
-
-Enforced by `node scripts/perps/agentic/validate-flow-schema.js`:
-
-1. **Eval steps must assert.** Every `eval_sync`, `eval_async`, `eval_ref` step needs an `"assert"` block. Use `{"operator":"not_null"}` at minimum.
-2. **Terminal step must assert.** The last step must be an asserting eval or a `log_watch`. Never end on `wait`, `navigate`, or `press`.
-3. **No unknown actions.** Only recognized action types are allowed.
-4. **Inputs must match params.** Every `{{param}}` in steps must have a matching key in `inputs`.
-
-Full schema: `scripts/perps/agentic/schemas/flow.schema.json`
-
-### Available Flows
-
-| Flow                   | Inputs (defaults)                                                             | Pre-conditions                                                  |
-| ---------------------- | ----------------------------------------------------------------------------- | --------------------------------------------------------------- |
-| `activity-view`        | `tab` ("trades")                                                              | wallet.unlocked, perps.feature_enabled                          |
-| `market-discovery`     | `symbol` ("BTC")                                                              | wallet.unlocked, perps.feature_enabled                          |
-| `market-watchlist`     | `symbol` ("BTC")                                                              | wallet.unlocked, perps.feature_enabled, perps.not_in_watchlist  |
-| `order-limit-cancel`   | `symbol` (required)                                                           | wallet.unlocked, perps.open_limit_order                         |
-| `order-limit-place`    | `side` ("long"), `symbol` ("BTC"), `usdAmount` ("10"), `limitPrice` ("60000") | wallet.unlocked, perps.ready_to_trade                           |
-| `position-add-margin`  | `symbol` (required), `marginAmount` (required)                                | wallet.unlocked, perps.open_position                            |
-| `setup-account`        | `address` (required)                                                          | wallet.unlocked                                                 |
-| `setup-testnet`        | _(none)_                                                                      | wallet.unlocked, perps.feature_enabled                          |
-| `tpsl-create`          | `symbol` (required), `tpPreset` ("25"), `slPreset` ("-10")                    | wallet.unlocked, perps.open_position                            |
-| `tpsl-edit`            | `symbol` (required), `tpPreset` ("50"), `slPreset` ("-25")                    | wallet.unlocked, perps.open_position_tpsl                       |
-| `trade-close-position` | `symbol` (required)                                                           | wallet.unlocked, perps.open_position                            |
-| `trade-open-market`    | `side` ("long"), `symbol` ("BTC"), `usdAmount` ("10")                         | wallet.unlocked, perps.ready_to_trade, perps.sufficient_balance |
-
----
-
-## Eval Refs
-
-Eval refs are named CDP eval expressions in `teams/perps/evals.json` and `teams/perps/evals/*.json`. Unlike flows (multi-step UI sequences), eval refs are single eval calls.
-
-```bash
-# List all eval refs
-bash scripts/perps/agentic/app-state.sh eval-ref --list
-
-# Run an eval ref
-bash scripts/perps/agentic/app-state.sh eval-ref perps/positions
-bash scripts/perps/agentic/app-state.sh eval-ref perps/core/watchlist
-bash scripts/perps/agentic/app-state.sh eval-ref perps/setup/testnet-mode
-```
-
-**Built-in eval refs** (`perps/`): positions, auth, balances, markets, orders, state, providers, pre-trade, post-trade, place-order
-
-**Extended eval refs** (`perps/core/`): pump-market, tpsl-orders, positions-by-symbol, leverage-config, watchlist
-
-**Setup eval refs** (`perps/setup/`): testnet-mode, current-provider
-
-### eval_ref in Flows
-
-Use `eval_ref` inside a flow to run a built-in eval ref and assert on its result:
-
-```json
-{
-  "id": "check-pos",
-  "action": "eval_ref",
-  "ref": "positions",
-  "assert": { "operator": "length_gt", "field": "positions", "value": 0 }
-}
+yarn a:navigate WalletView
+yarn a:reload
 ```
 
----
-
-## CDP Commands
+Use the recipe-harness skill or external runner to execute Recipe v1 scenarios.
+The runner consumes Mobile's bridge and writes its own evidence artifacts.
 
-All CDP commands go through `cdp-bridge.js` or `app-state.sh` wrappers:
+## HUD intent
 
-```bash
-CDP="node scripts/perps/agentic/cdp-bridge.js"
-AS="bash scripts/perps/agentic/app-state.sh"
-
-$CDP status                     # Route + account snapshot
-$CDP get-route                  # Current route name
-$CDP eval "<expression>"        # Sync JS eval (ES5 only)
-$CDP eval-async "<expression>"  # Async eval (Promise, use .then())
-$CDP eval-ref perps/positions    # Run a named eval ref
-$CDP check-pre-conditions '<json>'  # Validate pre-conditions
-$CDP press-test-id <testId>     # Press by testID
-$CDP scroll-view --test-id <id> # Scroll a view
-$CDP set-input <testId> "val"   # Type into input
-```
-
-**ES5 only.** No arrow functions, no `const`/`let`, no template literals, no top-level `await`.
-
-```bash
-# Good:
-$CDP eval "var x = Engine.context.PerpsController.state; JSON.stringify(x)"
-$CDP eval-async "Engine.context.PerpsController.getPositions().then(function(r){ return JSON.stringify(r) })"
-
-# Bad:
-$CDP eval "const x = () => Engine.context"       # arrow + const
-$CDP eval-async "await Engine.context.getPos()"   # top-level await
-```
-
----
-
-## Shell Commands
-
-| Command                                                                                      | Purpose                                                        |
-| -------------------------------------------------------------------------------------------- | -------------------------------------------------------------- |
-| `app-state.sh status\|route\|eval\|eval-async\|eval-ref\|accounts\|press\|scroll\|set-input` | State queries and UI interaction                               |
-| `app-navigate.sh <Route> [params-json]`                                                      | Navigate + auto-screenshot. `--list` discovers all live routes |
-| `screenshot.sh [label]`                                                                      | Cross-platform screenshot (iOS simctl / Android adb)           |
-| `validate-recipe.sh <path> [--dry-run] [--skip-manual] [--step <id>]`                        | Execute a flow/recipe against the live app                     |
-| `validate-flow-schema.js`                                                                    | Validate all flows against authoring rules                     |
-| `validate-pre-conditions.js`                                                                 | Verify pre-condition expressions and assertions                |
-| `start-metro.sh --platform ios\|android`                                                     | Start or attach to Metro                                       |
-| `setup-wallet.sh`                                                                            | Seed wallet from `.agent/wallet-fixture.json`                  |
-
----
-
-## Assertions
-
-Every asserting step includes `"assert": { "operator": "<op>", "field": "<path>", "value": <expected> }`.
-
-| Operator       | Passes when                                   |
-| -------------- | --------------------------------------------- |
-| `not_null`     | `actual != null`                              |
-| `eq`           | `actual === expected`                         |
-| `gt`           | `actual > expected` (number)                  |
-| `length_eq`    | `actual.length === expected`                  |
-| `length_gt`    | `actual.length > expected`                    |
-| `contains`     | `actual.includes(expected)` (string or array) |
-| `not_contains` | `!actual.includes(expected)`                  |
-
-`field` is a dot-path into the result JSON (e.g. `"route"`, `"positions.0.symbol"`). Omit or set to `null` to assert on the entire result. Double-encoded JSON strings are automatically unwrapped.
-
----
-
-## UI Interactions
-
-The toolkit interacts with React components by `testID` — no coordinates needed. Under the hood, it walks the React fiber tree via `__REACT_DEVTOOLS_GLOBAL_HOOK__`.
-
-```bash
-bash app-state.sh press <testId>                         # tap a button
-bash app-state.sh scroll --test-id <testId> --offset 300 # scroll down
-bash app-state.sh set-input <testId> "0.5"               # type into input
-```
-
-In flows, use `press`, `scroll`, `set_input`, `type_keypad`, `clear_keypad`, and `wait_for` actions.
-
-**Keypad pattern:** Always clear before typing — use `clear_keypad` (count: 8) before `type_keypad` to wipe any pre-filled value. Assert the displayed amount matches before submitting.
-
----
-
-## Gherkin to Flow Translation
-
-Gherkin maps naturally to flow JSON:
-
-| Gherkin                     | Flow equivalent                                                   |
-| --------------------------- | ----------------------------------------------------------------- |
-| **Given** (preconditions)   | `pre_conditions` array                                            |
-| **When** (user actions)     | `navigate`, `press`, `set_input`, `type_keypad`, `wait_for` steps |
-| **Then** (expected outcome) | `eval_sync`/`eval_async` steps with `assert`                      |
-
-**Example:**
-
-```gherkin
-Given the wallet is unlocked
-  And BTC has an open position
-When the user navigates to BTC market detail
-  And presses the Close Position button
-Then the close position screen is shown
-```
-
-```json
-{
-  "title": "Close BTC position",
-  "inputs": {
-    "symbol": { "type": "string", "description": "Market symbol" }
-  },
-  "validate": {
-    "runtime": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        { "name": "perps.open_position", "symbol": "{{symbol}}" }
-      ],
-      "steps": [
-        {
-          "id": "nav",
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          }
-        },
-        {
-          "id": "wait-market",
-          "action": "wait_for",
-          "route": "PerpsMarketDetails"
-        },
-        {
-          "id": "press-close",
-          "action": "press",
-          "test_id": "perps-market-details-close-button"
-        },
-        {
-          "id": "wait-close-screen",
-          "action": "wait_for",
-          "route": "PerpsClosePosition"
-        }
-      ]
-    }
-  }
-}
-```
-
----
-
-## Recipes
-
-Recipes compose multiple flows via `flow_ref` for integration-level validation. They live in `scripts/perps/agentic/teams/<team>/recipes/` and prove that end-to-end scenarios work across flow boundaries.
-
-See `teams/perps/recipes/full-trade-lifecycle.json` for an example that chains: wallet home → mainnet → perps → testnet → clear position → open market → TP/SL (presets) → close — all via `flow_ref`.
-
-```bash
-# Run a recipe
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json
-
-# Dry-run
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json --dry-run
-```
-
----
-
-## Error Recovery
-
-| Symptom                  | Fix                                                                               |
-| ------------------------ | --------------------------------------------------------------------------------- |
-| Metro crash / no output  | `bash start-metro.sh --platform <p>`                                              |
-| CDP "not connected"      | Check Metro running + device booted. Poll for `__AGENTIC__` (5-120s after unlock) |
-| Hot reload resets app    | `app-navigate.sh WalletTabHome` then target screen                                |
-| App crash / white screen | `bash preflight.sh --platform <p>`                                                |
-| eval returns undefined   | Use `eval-async` with `.then(function(r){ return JSON.stringify(r) })`            |
-| "SyntaxError" in eval    | ES5 violation — check for arrow functions, const/let, template literals           |
-| Eval ref assertion fails | Check `eval-ref --list` for correct name; re-read the eval ref JSON               |
-| adb reverse lost         | `adb reverse tcp:PORT tcp:PORT`                                                   |
-| Route not found          | Check route name in the table below; cdp-bridge handles nested routing            |
-
----
-
-## Routes and State Paths
-
-### Perps Routes
-
-| Route                   | Description                               | Params                                                                                                                         |
-| ----------------------- | ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| `PerpsMarketListView`   | Perps home (positions, orders, watchlist) |                                                                                                                                |
-| `PerpsTrendingView`     | Market list (all markets)                 |                                                                                                                                |
-| `PerpsMarketDetails`    | Market detail view                        | `{"market":{"symbol":"BTC","name":"BTC","price":"0","change24h":"0","change24hPercent":"0","volume":"0","maxLeverage":"100"}}` |
-| `PerpsActivity`         | Activity history                          | `{"redirectToPerpsTransactions":true}`                                                                                         |
-| `PerpsClosePosition`    | Close a position                          |                                                                                                                                |
-| `PerpsTPSL`             | Take-profit / stop-loss                   |                                                                                                                                |
-| `PerpsAdjustMargin`     | Adjust position margin                    |                                                                                                                                |
-| `PerpsOrderDetailsView` | Order detail view                         |                                                                                                                                |
-| `PerpsOrderBook`        | Order book depth                          |                                                                                                                                |
-| `PerpsWithdraw`         | Withdraw funds                            |                                                                                                                                |
-| `PerpsTutorial`         | Onboarding tutorial                       |                                                                                                                                |
-
-Other useful routes: `WalletTabHome`, `SettingsView`, `DeveloperOptions`, `BrowserTabHome`.
-
-### Engine Controller Paths
-
-```bash
-Engine.context.PerpsController.state              # Positions, orders, balances, config
-Engine.context.NetworkController.state             # Network selection
-Engine.context.AccountsController.state            # Accounts, selected account
-Engine.context.RemoteFeatureFlagController.state   # Feature flags
-Engine.context.PreferencesController.state         # User preferences
-```
+The HUD is a human-facing proof aid. It should display one concise current
+intent, optionally one subflow/context line, and failure details when useful. It
+must not duplicate internal action names or task-specific debug text.
 
-### Common PerpsController Methods
+## Fixture workflow
 
-| Method                      | Returns                 | Description              |
-| --------------------------- | ----------------------- | ------------------------ |
-| `getPositions()`            | `Promise<Position[]>`   | Open positions           |
-| `getAccountState()`         | `Promise<AccountState>` | Balances, margin         |
-| `getMarketDataWithPrices()` | `Promise<Market[]>`     | Markets with live prices |
-| `getOpenOrders()`           | `Promise<Order[]>`      | Active limit/stop orders |
-| `getTradeConfiguration()`   | `Promise<TradeConfig>`  | Leverage limits, fees    |
-| `placeOrder(params)`        | `Promise<OrderResult>`  | Submit an order          |
-| `closePosition({symbol})`   | `Promise<CloseResult>`  | Close by symbol          |
+Local fixture files belong under `.agent/` and must not be committed. The bridge
+supports fixture setup so recipes can start from a deterministic wallet state,
+while still validating behavior through the real app runtime.
diff --git a/docs/perps/perps-agentic-scripts-quickref.md b/docs/perps/perps-agentic-scripts-quickref.md
deleted file mode 100644
index 2e59a61cbec2..000000000000
--- a/docs/perps/perps-agentic-scripts-quickref.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Agentic Scripts — Quick Reference
-
-## Yarn Shortcuts
-
-| Command                | What it does                                               | Time    |
-| ---------------------- | ---------------------------------------------------------- | ------- |
-| `yarn a:setup:ios`     | Clean install + build + Metro + launch + CDP + wallet seed | ~2.5min |
-| `yarn a:setup:android` | Same as above for Android                                  | ~3min   |
-| `yarn a:ios`           | Metro + launch + CDP + unlock/seed (no clean, no rebuild)  | ~30s    |
-| `yarn a:android`       | Same as above for Android                                  | ~30s    |
-| `yarn a:watch`         | Interactive Metro with live reload                         | —       |
-| `yarn a:stop`          | Stop Metro                                                 | —       |
-| `yarn a:reload`        | Reload JS bundle on connected app                          | —       |
-| `yarn a:status`        | App state snapshot (route + account)                       | —       |
-| `yarn a:navigate`      | Navigate to a route                                        | —       |
-
-## When to use what
-
-- **First time / after `git clean`**: `yarn a:setup:ios` (full clean)
-- **Daily dev / branch switch**: `yarn a:ios` (reuses existing build, unlocks wallet)
-- **Just want Metro**: `yarn a:watch`
-
-## Prerequisites
-
-1. `.js.env` must have `WATCHER_PORT`, `IOS_SIMULATOR`, `SIM_UDID` (iOS) or `ANDROID_DEVICE` (Android)
-2. `.agent/wallet-fixture.json` must exist (copy from `scripts/perps/agentic/wallet-fixture.example.json`)
-
-## Flows
-
-Flows are parameterized JSON test sequences in `scripts/perps/agentic/teams/<team>/flows/`.
-
-```bash
-# List all flows
-ls scripts/perps/agentic/teams/perps/flows/*.json
-
-# Run a flow
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/flows/market-discovery.json --skip-manual
-
-# Dry-run (prints steps, no execution)
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/flows/trade-open-market.json --dry-run
-
-# Run all flows (dry-run)
-for f in scripts/perps/agentic/teams/perps/flows/*.json; do
-  bash scripts/perps/agentic/validate-recipe.sh "$f" --dry-run --skip-manual
-done
-```
-
-### Parameter Passing
-
-Flows use `{{param}}` tokens. Defaults are declared in the flow's `inputs` block. Override via `flow_ref` params or by editing the JSON.
-
-### Pre-Conditions
-
-Flows can declare `pre_conditions` — named checks that must pass before steps run. If a check fails, the runner aborts with a hint. Available pre-conditions are registered in `teams/perps/pre-conditions.js`.
-
-## CDP Bridge Commands
-
-```bash
-CDP="node scripts/perps/agentic/cdp-bridge.js"
-
-$CDP status                          # Route + account snapshot
-$CDP navigate PerpsMarketListView    # Navigate to a screen
-$CDP get-route                       # Current route
-$CDP get-state engine.backgroundState.NetworkController  # Redux state
-$CDP eval "1+1"                      # Eval JS in app
-$CDP eval-async "fetch('...')"       # Eval async JS
-$CDP unlock <password>               # Unlock wallet on login screen
-$CDP press-test-id <testId>          # Press component by testID
-$CDP scroll-view --test-id <id>      # Scroll a ScrollView/FlatList
-$CDP list-accounts                   # All accounts
-$CDP switch-account <address>        # Switch active account
-$CDP eval-ref perps/positions        # Run a named eval ref
-$CDP eval-ref --list                 # List all eval refs
-$CDP check-pre-conditions '<json>'   # Validate pre-conditions
-```
-
-## Other Scripts
-
-```bash
-scripts/perps/agentic/app-navigate.sh <route>      # Navigate + screenshot
-scripts/perps/agentic/app-navigate.sh --list        # Discover all live routes
-scripts/perps/agentic/screenshot.sh                 # Capture simulator screenshot
-scripts/perps/agentic/setup-wallet.sh               # Seed wallet via CDP
-scripts/perps/agentic/unlock-wallet.sh <password>   # Unlock via CDP
-scripts/perps/agentic/validate-recipe.sh <folder>   # Run PR recipe folder
-scripts/perps/agentic/validate-flow-schema.js       # Validate flow authoring rules
-scripts/perps/agentic/validate-pre-conditions.js    # Validate pre-condition registry
-```
-
-## Architecture
-
-```
-NavigationService.ts (set navigation)
-  --> AgenticService.install(navRef, deferredNav)   [__DEV__ only]
-        --> globalThis.__AGENTIC__ = { setupWallet, pressTestId, scrollView, ... }
-
-CDP Bridge (cdp-bridge.js)
-  --> Metro /json/list --> WebSocket --> Runtime.evaluate
-        --> reads globalThis.__AGENTIC__.*
-```
-
-## Worktree / Multi-Device Mapping
-
-Ports are set per-slot via `.js.env` `WATCHER_PORT`. When both iOS and Android devices are connected, set `PLATFORM=android` or `PLATFORM=ios` to disambiguate screenshot targets. CDP commands are platform-agnostic.
diff --git a/docs/perps/perps-agentic-system-design.md b/docs/perps/perps-agentic-system-design.md
deleted file mode 100644
index e1b56c531d60..000000000000
--- a/docs/perps/perps-agentic-system-design.md
+++ /dev/null
@@ -1,295 +0,0 @@
-# Agentic System Design
-
-The agentic toolkit is a system that lets AI agents write code, verify it against a running
-app, and iterate — all without human intervention. It provides a fast, local feedback loop:
-the agent gets signal in seconds from a live app instead of waiting for heavyweight test
-frameworks. It complements E2E tests (Detox) and CI — it doesn't replace them. It's built
-on three pillars.
-
-The toolkit was built by the perps team but designed for any team in MetaMask Mobile. The
-infrastructure (`scripts/perps/agentic/teams/`) auto-discovers team directories — any team
-can add flows, recipes, and pre-conditions without modifying shared code.
-
----
-
-## The Three Pillars
-
-1. **Wallet Fixtures & Preflight** — Get to a known state in seconds, not minutes
-2. **Recipe & Flow System** — Parameterized, composable, deterministic test sequences
-3. **CDP Instrumentation** — Direct app access via Chrome DevTools Protocol, no vision model needed
-
-These aren't independent tools. They form a flywheel:
-
-```
-Wallet Fixtures ──→ Known State ──→ Recipes execute deterministically
-       ↑                                         │
-       └──── Clean state for next iteration ←────┘
-                        ↑
-               CDP: text-based assertions
-               (no screenshots, no vision tokens)
-```
-
----
-
-## Pillar 1: Wallet Fixtures & Preflight
-
-### The problem
-
-A fresh MetaMask wallet requires ~15 manual steps to reach a usable state: create wallet,
-back up seed phrase, dismiss onboarding modals, import trading accounts, enable feature
-flags, suppress consent screens, navigate to the target feature. An E2E test takes 2-5
-minutes for this. An agent doing it via UI automation burns tokens on every step and hits
-flaky modal dismissals along the way.
-
-### The solution
-
-`wallet-fixture.json` defines the desired wallet state declaratively — password, accounts
-(mnemonic or private key), and settings that suppress friction:
-
-```json
-{
-  "password": "...",
-  "accounts": [
-    { "type": "mnemonic", "value": "twelve word seed ..." },
-    { "type": "privateKey", "value": "0xabc...", "name": "Trading" }
-  ],
-  "settings": {
-    "metametrics": false,
-    "skipGtmModals": true,
-    "skipPerpsTutorial": true,
-    "autoLockNever": true
-  }
-}
-```
-
-`setup-wallet.sh` reads this fixture and calls `__AGENTIC__.setupWallet(fixture)` — a single
-CDP eval that restores the wallet, imports accounts, dispatches all onboarding flags,
-suppresses modals, and navigates to wallet home. Pure JS execution, no UI navigation, no
-modal handling, no screenshot verification.
-
-`preflight.sh` orchestrates the full environment pipeline:
-
-| Scenario                           | What runs                           | Time    |
-| ---------------------------------- | ----------------------------------- | ------- |
-| Cold start (first time)            | build + boot + Metro + CDP + wallet | ~150s   |
-| Warm start (Metro running)         | boot device + CDP + wallet          | ~10-20s |
-| Hot iteration (everything running) | wallet restore if needed            | ~2-5s   |
-
-**Key insight: isolation.** Each agent run starts from a known wallet state. No leaking
-state between iterations. The fixture is the contract — deterministic input produces
-deterministic starting point.
-
----
-
-## Pillar 2: Recipe & Flow System
-
-### The problem
-
-E2E tests (Detox) take 90-300 seconds per test, run serially, and produce failures that
-require screenshots to diagnose. CI on GitHub can take up to 20 minutes per push. These
-tools remain essential for final validation, but an agent iterating on a fix needs faster
-signal during development.
-
-### The solution
-
-JSON-based recipes and flows executed via `validate-recipe.sh`, organized by team under
-`scripts/perps/agentic/teams/`. Each team directory follows the same structure:
-
-- `teams/<team>/flows/` — flow JSONs validated by `validate-flow-schema.js`
-- `teams/<team>/evals.json` — quick eval refs (e.g. `perps/positions`, `swap/quote-status`)
-- `teams/<team>/evals/` — named eval ref collections
-- `teams/<team>/pre-conditions.js` — namespaced checks (e.g. `perps.ready_to_trade`, `swap.has_valid_quote`)
-
-`lib/registry.js` auto-discovers all team directories and merges their pre-conditions at load
-time. Duplicate keys across teams cause a load-time error — namespace enforcement by convention.
-A new team adds a directory and immediately gets access to all shared infrastructure.
-
-**Recipes** are single CDP eval expressions — state snapshots that run in <1 second.
-The path `<team>/<name>` is the team boundary — `eval-ref perps/positions` is a perps team
-eval ref, `eval-ref swap/quote-status` would be a swap team eval ref.
-
-**Flows** are multi-step UI sequences — navigate, press, type, wait, assert. They run in
-10-30 seconds. Parameterized with `{{symbol}}`, composable via `flow_ref` and `eval_ref`.
-
-| Dimension     | E2E (Detox)                 | Recipes/Flows                             |
-| ------------- | --------------------------- | ----------------------------------------- |
-| Speed         | 90-300s/test                | 1-30s/flow                                |
-| Flakiness     | High (animations, timing)   | Low (explicit waits, direct fiber access) |
-| Output        | Screenshots (vision tokens) | JSON text (cheap)                         |
-| Composability | Copy entire test files      | `flow_ref` + `eval_ref` + params          |
-
-Flows declare their requirements via pre-conditions. If the wallet isn't unlocked or no
-position exists, the runner aborts with a clear error before wasting time on doomed steps.
-
-### Recipes are the agent's eyes
-
-Instead of "take a screenshot and look at it" (thousands of vision tokens), the agent runs
-`recipe perps/positions` and gets structured JSON back. The assertion system (`eq`, `gt`,
-`length_gt`, `contains`) lets the agent verify state without seeing the screen. One recipe
-call costs one tool invocation. One screenshot costs a vision model call plus the tokens
-to describe what's in the image.
-
-### Recipes are proof
-
-When an agent fixes a bug, it writes a recipe that reproduces the bug (assertion fails),
-applies the fix, re-runs the recipe (assertion passes). The recipe IS the proof. It goes
-into the PR as `recipe.json` — reviewers can re-run it to verify. The same recipe becomes
-a regression check for future changes.
-
----
-
-## Pillar 3: CDP Instrumentation
-
-### The problem
-
-Traditional mobile test automation requires either a native framework (Detox, Appium) with
-heavy setup, or coordinate-based tapping that breaks on layout changes.
-
-### The solution
-
-The `__AGENTIC__` bridge on `globalThis`, installed by `AgenticService.ts` in `__DEV__`
-mode when NavigationService sets its ref. It exposes:
-
-- **Navigation**: `navigate()`, `getRoute()`, `canGoBack()`, `goBack()`
-- **Accounts**: `listAccounts()`, `getSelectedAccount()`, `switchAccount()`
-- **UI interaction**: `pressTestId()`, `scrollView()`, `setInput()`
-- **Setup**: `setupWallet()` (the 11-step initialization from Pillar 1)
-
-`pressTestId` walks the React fiber tree via `__REACT_DEVTOOLS_GLOBAL_HOOK__` to find the
-component with a matching `testID` prop and calls its `onPress` handler directly. No
-coordinates, no image recognition, no screenshots. Same for `setInput` (calls
-`onChangeText`) and `scrollView` (calls `scrollTo` on the nearest scrollable ancestor).
-
-`cdp-bridge.js` connects via Metro's Hermes WebSocket — same protocol on iOS and Android.
-Everything returns structured JSON.
-
-**Key insight: the bridge turns the running app into an API.** Instead of "look at the
-screen, find the button, tap at coordinates", the agent says
-`press perps-market-details-long-button`. Instead of "take a screenshot to check what
-screen we're on", the agent evaluates `getRoute().name` and gets `"PerpsMarketDetails"`
-as a string.
-
----
-
-## The Flywheel: How It All Connects
-
-### Agent development cycle
-
-1. Agent gets a task (bug fix, new feature, PR review)
-2. Preflight restores wallet to known state (~2-5s warm)
-3. Agent reads code, understands the problem
-4. Agent writes a recipe that reproduces the bug (assertion fails)
-5. Agent fixes the code
-6. Metro hot-reloads (~2s)
-7. Agent re-runs the recipe (assertion passes) — **sub-minute verification**
-8. Agent commits fix + recipe as PR evidence
-
-**Without the toolkit:** the agent's fastest feedback is Detox (90-300s per test) or pushing
-to CI (up to 20 minutes). Screenshots require vision models (expensive, fragile).
-
-**With the toolkit:** the agent verifies locally against a running app. Metro auto-reloads
-on save (HMR for React changes is instantaneous), and feedback comes back as text.
-
-### Feedback channels — cheapest to most expensive
-
-The toolkit provides multiple feedback layers. In practice, ~95% of verification uses the
-cheapest one:
-
-1. **DevLogger + grep (primary)** — Drop a tagged log line in any render path or hook, save
-   the file, Metro hot-reloads instantly, grep the Metro log for your tag. One log line +
-   one grep = instant signal about what the UI is actually doing. Works for state bugs, race
-   conditions, render order, data flow — anything where you need to know _what happened_, not
-   _what it looks like_. Zero vision tokens, near-zero cost.
-2. **CDP eval / recipes** — Query app state directly via `__AGENTIC__` bridge. Returns
-   structured JSON. Use when you need to assert on controller state, position data, or
-   any value the UI consumes. Cheap but each call is a tool invocation.
-3. **Screenshots** — Capture the screen for visual feedback. Use when implementing from a
-   design reference and comparing against designer mockups. Triggers a vision model call —
-   reserve for cases where visual appearance is what you're verifying.
-4. **System logs (logcat / Console.app)** — For native module work (Objective-C, Java/Kotlin).
-   Rare on MetaMask Mobile since most code is JS/TS in the React Native layer.
-
-**Rule of thumb:** if you can verify with a log line, don't take a screenshot. If you can
-verify with a recipe, don't write custom CDP eval. Always start at level 1.
-
-### HUD overlay — making videos reviewable
-
-Agents produce video recordings as PR evidence, but raw video of an app being tapped by
-an invisible hand is hard for human reviewers to follow. The **Agent Step HUD**
-(`AgentStepHud.tsx`) solves this by rendering a persistent on-screen overlay during recipe
-execution that shows the current step ID, description, and action type.
-
-The HUD is enabled by default. Use `--no-hud` to disable it. Before each step executes,
-the runner sends the step metadata to the app via CDP eval, and `AgentStepHud` renders it
-as an overlay banner. The HUD propagates through `flow_ref` sub-invocations
-automatically, so nested flow steps are annotated too.
-
-This turns an opaque screen recording into a narrated walkthrough: reviewers see exactly
-what the agent is testing at each moment, which assertion is running, and what the
-expected outcome is — without needing to cross-reference the recipe JSON. The result is a
-tighter feedback loop between autonomous agents and human reviewers: the video itself
-communicates intent.
-
-### The compounding effect
-
-- Wallet fixtures make recipes deterministic (known starting state)
-- Recipes make bug fixes provable (assertion = proof)
-- CDP instrumentation makes recipes cheap (text, not vision)
-- Pre-conditions catch stale state early (fail fast with hints)
-- `flow_ref` lets agents compose complex scenarios from simple building blocks
-- Each recipe written for one PR becomes reusable regression for future PRs
-
-### Beyond single agents
-
-The toolkit is designed to be consumed by autonomous orchestration systems. The orchestrator
-dispatches tasks using **workflow templates** (bug fix, PR review, feature dev) that are
-project-scoped, not team-scoped. An outer orchestrator can:
-
-1. **Dispatch tasks** — assign a Jira ticket to an agent with a worker template
-2. **Prepare the environment** — run `preflight.sh` to get the slot ready
-3. **Monitor progress** — poll the task file for status transitions
-4. **Validate results** — re-run the agent's recipe to confirm the fix independently
-5. **Scale horizontally** — run multiple agents in parallel worktrees, each with its own
-   `WATCHER_PORT`, device, and wallet fixture
-
-The worker template injects team-specific context (which flows to run, which pre-conditions
-to check) via template variables — different teams have different flow libraries but share
-the same preflight, CDP bridge, recipe runner, and assertion engine.
-
-This works because the toolkit's contracts are stable: fixtures produce known state, recipes
-produce JSON assertions, CDP returns structured data. An orchestrator just prepares the
-environment and lets the agent use the toolkit's primitives.
-
----
-
-## Practical Example: Bug Fix Workflow
-
-Here's a concrete example from the perps team — the first adopter. The same pattern
-applies to any team's flows.
-
-An agent is assigned: "TP/SL values don't persist after edit."
-
-1. **Preflight** — wallet restored with funds on testnet (~5s)
-2. **`flow_ref: trade-open-market`** — opens a BTC long position ($10)
-3. **`flow_ref: tpsl-create`** — sets initial TP/SL using percentage presets (TP +25%, SL -10%)
-4. **Recipe: read TP/SL** — `recipe perps/core/tpsl-orders` → assert TP/SL orders exist (PASS)
-5. **`flow_ref: tpsl-edit`** — changes TP/SL presets (TP +50%, SL -25%)
-6. **Recipe: read TP/SL** — assert updated TP/SL values (FAIL — bug confirmed, still shows old values)
-7. **Agent reads code** — finds stale cache in the edit handler, fixes it
-8. **Hot-reload** — Metro picks up changes (~2s)
-9. **Re-run steps 5-6** — assert updated TP/SL values (PASS — fix verified)
-10. **Recipe goes into PR** as `recipe.json` — reviewer runs `validate-recipe.sh` to verify
-
-Total time from bug confirmation to verified fix: under 3 minutes of agent wall time.
-The recipe.json is the test, the reproduction, and the proof — all in one file.
-
----
-
-## Cross-Reference
-
-- `docs/perps/perps-agentic-feedback-loop.md` — full reference for all commands, actions,
-  routes, and pre-conditions
-- `docs/perps/agentic-scripts-quickref.md` — cheat sheet for daily use
-- `scripts/perps/agentic/schemas/flow.schema.json` — formal flow specification
-- `scripts/perps/agentic/teams/README.md` — contribution guide for adding a new team
-- `app/core/AgenticService/AgenticService.ts` — bridge implementation
diff --git a/locales/languages/en.json b/locales/languages/en.json
index 5588603e8747..80dd67c4349d 100644
--- a/locales/languages/en.json
+++ b/locales/languages/en.json
@@ -2301,6 +2301,7 @@
     },
     "world_cup": {
       "title": "World Cup",
+      "predictions_title": "World Cup predictions",
       "banner_title": "World Cup 2026",
       "banner_description": "Trade every match, every moment.",
       "tabs": {
@@ -2380,9 +2381,15 @@
       "new_prediction": "New prediction",
       "resolved_markets": "Resolved markets"
     },
+    "positions_empty": {
+      "description": "Your predictions will appear here, showing your stake and market movements",
+      "browse_markets": "Browse markets"
+    },
     "tabs": {
       "about": "About",
+      "active_positions": "Active positions",
       "positions": "Positions",
+      "history": "History",
       "outcomes": "Outcomes"
     },
     "outcome_groups": {
@@ -4068,13 +4075,18 @@
     "risky": "Risky",
     "malicious_token_title": "Malicious token",
     "malicious_token_description": "{{symbol}} is a malicious token. Avoid interacting with it or trading it.",
+    "malicious_token_description_no_symbol": "This is a malicious token. Avoid interacting with it or trading it.",
     "malicious_token_banner_description": "{{symbol}} is flagged as malicious. It's likely to steal funds from anyone who interacts with it.",
+    "malicious_token_banner_description_no_symbol": "This token is flagged as malicious. It's likely to steal funds from anyone who interacts with it.",
     "suspicious_token_description": "{{symbol}} is a suspicious token.",
+    "suspicious_token_description_no_symbol": "This is a suspicious token.",
     "verified_token_title": "Verified token",
     "verified_token_description": "{{symbol}} is actively traded and is widely recognized. Verification is not an endorsement by MetaMask.",
     "risky_token_title": "Suspicious token",
     "risky_token_description": "{{symbol}} is flagged as suspicious. Take a look at the risks before you continue.",
+    "risky_token_description_no_symbol": "This token is flagged as suspicious. Take a look at the risks before you continue.",
     "malicious_token_sheet_description": "Serious risk signals detected on {{symbol}}. We recommend not trading this token.",
+    "malicious_token_sheet_description_no_symbol": "Serious risk signals detected on this token. We recommend not trading this token.",
     "got_it": "Got it",
     "proceed": "Proceed",
     "continue_anyway": "Continue anyway",
@@ -9252,6 +9264,8 @@
     "title": "Explore",
     "crypto_movers": "Crypto movers",
     "perps_movers": "Perps movers",
+    "perps_movers_pill_gainers": "Gainers",
+    "perps_movers_pill_losers": "Losers",
     "trending_tokens": "Trending",
     "crypto": "Crypto",
     "stocks": "Stocks",
diff --git a/package.json b/package.json
index 081792342ed9..2e938b775ef7 100644
--- a/package.json
+++ b/package.json
@@ -160,10 +160,10 @@
     "a:status": "scripts/perps/agentic/app-state.sh status",
     "a:reload": "scripts/perps/agentic/reload-metro.sh",
     "a:navigate": "scripts/perps/agentic/app-navigate.sh",
-    "a:ios": "scripts/perps/agentic/preflight.sh --platform ios --wallet-setup",
-    "a:android": "scripts/perps/agentic/preflight.sh --platform android --wallet-setup",
-    "a:setup:ios": "scripts/perps/agentic/preflight.sh --platform ios --clean --wallet-setup",
-    "a:setup:android": "scripts/perps/agentic/preflight.sh --platform android --clean --wallet-setup"
+    "a:ios": "scripts/perps/agentic/preflight.sh --platform ios --mode fast --wallet-setup",
+    "a:android": "scripts/perps/agentic/preflight.sh --platform android --mode fast --wallet-setup",
+    "a:setup:ios": "scripts/perps/agentic/preflight.sh --platform ios --mode clean --wallet-setup",
+    "a:setup:android": "scripts/perps/agentic/preflight.sh --platform android --mode clean --wallet-setup"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -243,12 +243,12 @@
     "@metamask/account-tree-controller": "^7.2.0",
     "@metamask/accounts-controller": "^38.0.0",
     "@metamask/address-book-controller": "^7.1.2",
-    "@metamask/ai-controllers": "0.6.3",
+    "@metamask/ai-controllers": "^0.7.0",
     "@metamask/analytics-controller": "^1.0.0",
     "@metamask/app-metadata-controller": "^2.0.0",
     "@metamask/approval-controller": "^9.0.0",
-    "@metamask/assets-controller": "^8.0.1",
-    "@metamask/assets-controllers": "^108.1.0",
+    "@metamask/assets-controller": "^8.2.0",
+    "@metamask/assets-controllers": "^108.3.0",
     "@metamask/authenticated-user-storage": "^2.0.0",
     "@metamask/base-controller": "^9.0.1",
     "@metamask/bitcoin-wallet-snap": "^1.11.0",
diff --git a/scripts/perps/agentic/CDP-capabilities-mobile.md b/scripts/perps/agentic/CDP-capabilities-mobile.md
index 5d9473da8a8e..1c8b3e6ee4d7 100644
--- a/scripts/perps/agentic/CDP-capabilities-mobile.md
+++ b/scripts/perps/agentic/CDP-capabilities-mobile.md
@@ -1,127 +1,17 @@
-# MetaMask Mobile — CDP Capabilities
+# Mobile CDP bridge capabilities
 
-Mobile mirror of the extension's CDP capabilities study. Records which runner capabilities are exposed, how they're validated, and which families are structurally absent.
+Mobile keeps a small product-side bridge for local development builds. External
+Recipe v1 runners use this bridge to implement portable actions.
 
-Substrate:
+Supported bridge commands include:
 
-- **Hermes CDP** via Metro inspector-proxy (Runtime.evaluate, Profiler)
-- **Device layer** via `xcrun simctl` (iOS) / `adb` (Android)
-- **In-app bridges**: `globalThis.__AGENTIC__`, Redux `store`, `Engine.context.*`, React DevTools hook
+- route/status inspection;
+- navigation and back navigation;
+- selected-account reads and account switching;
+- testID press, input, and scroll helpers;
+- screenshot capture through the companion shell script;
+- Hermes profiler start/stop;
+- console/error issue capture for validation evidence.
 
-## Supported families
-
-| Family | Recipe verbs | Mobile path | Status |
-| --- | --- | --- | --- |
-| Runtime / eval | `eval_sync`, `eval_async`, `eval_ref` | `Runtime.evaluate` | validated |
-| UI interaction | `navigate`, `press`, `scroll`, `set_input`, `type_keypad`, `wait_for` | `__AGENTIC__` + fiber walk | validated |
-| Lifecycle | `app_background`, `app_foreground`, `app_restart` | simctl / adb | validated |
-| App surface | `select_account`, `toggle_testnet`, `switch_provider` | Redux + `Engine.context.*` | validated |
-| Evidence (manual) | `screenshot`, `log_watch`, `manual` | `screenshot.sh` / Metro log | validated |
-| Evidence (automatic) | built-in run-wide issue review | Metro log + in-app console hook | validated 2026-04-17 |
-| Performance | `eval_sync` on `HermesInternal.getInstrumentedStats()` | Hermes built-in | validated 2026-04-17 |
-| Tracing | `trace_start`, `trace_stop` | Hermes `Profiler` via CDP | validated 2026-04-17 |
-
-The runner exposes intent, not raw CDP plumbing. Canonical recipes live in `teams/perps/recipes/capabilities/`.
-
-## Structurally absent (document, don't force)
-
-| Family | Why | Workaround |
-| --- | --- | --- |
-| Network (offline/throttling) | no Hermes Network domain; iOS NLC is device-wide | XHR/fetch monkey-patch via `eval_sync` (narrow); simctl NLC (blunt) |
-| Emulation — CPU | no Hermes Emulation domain | synthetic JS burn loop (not equivalent) |
-| Emulation — media / timezone | no Hermes Emulation domain | `xcrun simctl status_bar` + appearance |
-| Storage (web) | no Hermes Storage domain | MMKV / Redux clear via `eval_ref` |
-| Service worker | no RN analog | `app_background` / `app_foreground` |
-| Target (multi-page) | one Hermes target per simulator | N/A |
-| Browser permissions | no Browser CDP domain | `xcrun simctl privacy` (deferred) |
-| Fetch (request failure) | no Hermes Fetch domain | `global.fetch` / XHR monkey-patch |
-
-## Capability details
-
-### Performance metrics snapshot
-
-`eval_sync` on `HermesInternal.getInstrumentedStats()` — GC counters, heap/allocation stats, RN bridge counters — plus `global.performance.now()` for timestamps. Direct Hermes analog to Chrome's `Metrics.Timestamp`. Canonical: `capabilities/performance-metrics-smoke.json`.
-
-### Hermes sampling profiler
-
-`trace_start` / `trace_stop` call the CDP `Profiler` domain. Output is a Chrome-compatible `.cpuprofile` under `.agent/recipe-runs/<run>/traces/trace-<label>.cpuprofile`. Hermes quirk: `Profiler.enable` is unsupported (`-32601`); bridge calls `start` / `stop` directly. Canonical: `capabilities/profiler-trace-smoke.json`.
-
-Wiring: `cdp-bridge.js` `profiler-start` / `profiler-stop`; `validate-recipe.js` action cases; `lib/workflow.js` verb allowlist.
-
-### Automatic recipe issue review
-
-Every recipe run emits a uniform review contract without per-recipe wiring. Workers do **not** add `log_watch` for generic warnings/errors/exceptions.
-
-Dual-channel capture, merged at teardown:
-
-- **In-app console hook** — one-shot `Runtime.evaluate` at run start wraps `console.warn` / `console.error`, attaches `error` / `unhandledrejection` listeners, chains `ErrorUtils.setGlobalHandler`. Pushes to `globalThis.__AGENTIC_ISSUES__` (500-entry cap).
-- **Metro log tail** — records byte offset at run start; classifies the appended slice at teardown via regex (`WARN`, `ERROR`, `Uncaught` / `unhandledRejection` / `FATAL EXCEPTION`).
-
-Artifacts per run dir (`.agent/recipe-runs/<timestamp>_<recipe>/`):
-
-| File | Content |
-| --- | --- |
-| `recipe-issues.json` | all issues, deduped by `(level, channel, source, textHash)` |
-| `console-warnings.json` | `level === "warning"` |
-| `console-errors.json` | `level === "error"` |
-| `runtime-exceptions.json` | `level === "exception"` |
-| `recipe-issues-review.json` | synthesized worker-facing review |
-| `recipe-issues-review.md` | human-readable equivalent |
-
-`summary.json.recipeIssues = { captured, unexpected, failOn, review }` where `review = { status, note, observed, gating, informational, topIssues, artifactFiles }`.
-
-`review.status`:
-
-- `clean` — nothing captured
-- `review` — passed but issues observed; worker should mention with artifact paths. **Not automatic proof the PR caused the signal** (may be ambient RN noise).
-- `gating` — `fail_on_unexpected` matched; recipe forced to `FAIL`
-
-Opt-in gating (recipe top-level, all sub-fields optional):
-
-```json
-{
-  "fail_on_unexpected": {
-    "levels": ["error", "exception"],
-    "textMatches": ["^Fatal:", "SES_UNCAUGHT"],
-    "allowlist": [
-      { "textMatch": "ExpoModulesProxy", "level": "warning", "reason": "known benign" }
-    ]
-  }
-}
-```
-
-Allowlist is evaluated first: matches move `observed` → `informational` and never trigger gating.
-
-Canonical: `capabilities/recipe-issues-smoke.json`.
-
-Limitations:
-
-- No WebView / in-app browser console (no mobile WebView CDP target).
-- No native crash ingestion (iOS crash reports, Crashlytics, Sentry). JS layer only.
-- No Android logcat (scope = iOS simulator).
-- Metro regex classification is coarser than real CDP event types; in-app hook entries preferred when both channels report same text.
-- In-app hook installs at run start; boot-time exceptions fall through to metro-log only.
-
-## Recipe vocabulary
-
-**UI**: `navigate`, `wait`, `wait_for`, `press`, `scroll`, `set_input`, `type_keypad`, `clear_keypad`
-**Eval**: `eval_sync`, `eval_async`, `eval_ref`
-**App state**: `select_account`, `toggle_testnet`, `switch_provider`
-**Lifecycle**: `app_background`, `app_foreground`, `app_restart`
-**Evidence**: `screenshot`, `log_watch`, `manual`
-**Profiling**: `trace_start`, `trace_stop`
-**Control**: `switch`, `end`, `call`
-
-Converges with extension where semantics align; diverges where mobile has no primitive (no `network`, `fetch`, `storage`, `emulation`, `service_worker`, `target`, `browser`).
-
-## Next steps
-
-1. Wrap `xcrun simctl privacy` as `permission_grant` / `permission_reset` — smallest useful gap for controlled experiments.
-2. Expose `global.fetch` / XHR fault injection via `eval_ref`. Defer until a concrete recipe demands it.
-3. **Do not** add synthetic network throttling. Network conditioning belongs to Detox mock servers or whole-device NLC; a fake primitive weakens the parity claim.
-
-## References
-
-- [CDP-summary-mobile.md](./CDP-summary-mobile.md) — matrix only
-- [validate-recipe.js](./validate-recipe.js), [cdp-bridge.js](./cdp-bridge.js), [lib/workflow.js](./lib/workflow.js)
-- `teams/perps/recipes/capabilities/` — canonical smokes
+Recipe files, capability smokes, and action manifests live in the external
+MetaMask recipe runner, not in this Mobile repository.
diff --git a/scripts/perps/agentic/CDP-summary-mobile.md b/scripts/perps/agentic/CDP-summary-mobile.md
index ffccee148d3a..fe49230eec09 100644
--- a/scripts/perps/agentic/CDP-summary-mobile.md
+++ b/scripts/perps/agentic/CDP-summary-mobile.md
@@ -1,54 +1,17 @@
-# MetaMask Mobile — CDP Summary
+# Mobile CDP bridge summary
 
-Quick-reference parity matrix for the mobile agentic runner. Detailed rationale lives in [CDP-capabilities-mobile.md](./CDP-capabilities-mobile.md).
+The Mobile CDP bridge exposes development-only app control for external Recipe
+v1 runners and local diagnostics. It does not own recipe definitions or flow
+composition.
 
-## Validated capability matrix
+Core entry points:
 
-| Family | Slice | Substrate | Canonical recipe |
-| --- | --- | --- | --- |
-| `runtime` | sync / async / ref evaluation | Hermes `Runtime.evaluate` | any `benchmark/*.json` |
-| `page` | navigate / press / scroll / set_input | `__AGENTIC__` + React DevTools hook | `benchmark/perps-position-market-buy.json` |
-| `page` | `wait_for` route / testID / expression | bridge + fiber walk | same |
-| `lifecycle` | background / foreground / restart | `xcrun simctl` (iOS) / `adb` (Android) | `benchmark/perps-app-restart-preserves-state.json` |
-| `app_state` | testnet / provider / account | Redux + `Engine.context.*` | `benchmark/perps-position-market-buy.json` |
-| `evidence` | screenshot | `screenshot.sh` | any |
-| `evidence` | automatic issue review (warnings/errors/exceptions) | Metro log + in-app console hook | `capabilities/recipe-issues-smoke.json` |
-| `performance` | metrics snapshot | `HermesInternal.getInstrumentedStats()` | `capabilities/performance-metrics-smoke.json` |
-| `trace` | sampling CPU profile (.cpuprofile) | Hermes `Profiler` domain | `capabilities/profiler-trace-smoke.json` |
+- `cdp-bridge.js` — Hermes CDP command bridge.
+- `app-state.sh` — route/account status snapshot.
+- `app-navigate.sh` — local navigation diagnostic.
+- `setup-wallet.sh` — deterministic wallet fixture setup through
+  `AgenticService`.
+- `screenshot.sh` — visible proof capture.
 
-## Structurally absent (do not force)
-
-| Family | Why | Workaround if needed |
-| --- | --- | --- |
-| `network` | no Hermes Network domain; iOS NLC is device-wide | XHR/fetch monkey-patch via `eval_sync` |
-| `emulation` CPU | no Hermes Emulation | synthetic JS burn loop (not equivalent) |
-| `emulation` media/timezone | no Hermes Emulation | `xcrun simctl status_bar` + appearance |
-| `storage` web | no Hermes Storage | MMKV/Redux clear via `eval_ref` |
-| `service_worker` | no RN analog | `app_background` / `app_foreground` |
-| `target` multi-page | one Hermes target per sim | N/A |
-| `browser` permissions | no Browser CDP | `xcrun simctl privacy` (deferred) |
-| `fetch` request failure | no Hermes Fetch | `global.fetch` / XHR monkey-patch |
-
-## Directory convention
-
-- `teams/<team>/recipes/benchmark/` — migrated Detox specs
-- `teams/<team>/recipes/capabilities/` — generic capability proofs
-- `teams/<team>/recipes/` — other product recipes
-
-Product behavior stays separate from capability proofs.
-
-## Validation stance
-
-Smallest trustworthy proof per slice:
-
-- Hermes-layer (Profiler, getInstrumentedStats): CDP response shape + artifact size
-- Device-layer (simctl/adb): before/after probe of page-visible effect
-- App-layer (Redux, Engine.context, `__AGENTIC__`): direct `eval_ref`
-- Structurally absent families: documented as gaps, no synthetic equivalents
-
-## References
-
-- [CDP-capabilities-mobile.md](./CDP-capabilities-mobile.md)
-- [validate-recipe.js](./validate-recipe.js) — runner
-- [cdp-bridge.js](./cdp-bridge.js) — CDP dispatcher
-- [lib/workflow.js](./lib/workflow.js) — action allowlist
+Portable recipes and action manifests are maintained in the external MetaMask
+recipe runner.
diff --git a/scripts/perps/agentic/GETTING_STARTED.md b/scripts/perps/agentic/GETTING_STARTED.md
deleted file mode 100644
index ed3c33d24818..000000000000
--- a/scripts/perps/agentic/GETTING_STARTED.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Getting Started — Agentic Recipes
-
-Run your first recipe on a side simulator without touching the iPhone-16-Pro + Metro you already use to develop.
-
-## Prereqs
-
-You already have the repo cloned, Pods installed, an iOS simulator booted, and Metro on `8081` for daily work. Keep it running. This doc spins up a *second* simulator on a *different* Metro port. `node`, `jq`, `xcrun`, and your wallet seed phrase are the only extras.
-
-## Setup
-
-**1. Create a dedicated simulator + pick a port.** Recommended: a fresh simulator used only for recipes — keeps your dev sim's wallet, history, and notifications untouched and makes it obvious which window is the recipe runner.
-
-```bash
-xcrun simctl create "mm-agentic" "iPhone 15"   # one-time; reuse the same name forever
-```
-
-(Or skip this and pick any non-dev simulator from `xcrun simctl list devices available | grep iPhone`.)
-
-Append to `.js.env` (preflight reads these; they override defaults):
-
-```bash
-IOS_SIMULATOR=mm-agentic           # the dedicated sim, NOT your dev sim
-WATCHER_PORT=8062                  # any free port other than 8081
-```
-
-**2. Create the wallet fixture.** The recipe needs an unlocked wallet at boot:
-
-```bash
-mkdir -p .agent
-cp scripts/perps/agentic/wallet-fixture.example.json .agent/wallet-fixture.json
-# Edit .agent/wallet-fixture.json — fill in `password` and at least one account
-# (type `mnemonic` with a 12-word seed, or `privateKey` with `0x...`).
-```
-
-`.agent/wallet-fixture.json` is gitignored. Use a throwaway seed for testnet work.
-
-**3. Run preflight.** Boots the chosen simulator, builds + installs the app on `$WATCHER_PORT`, starts Metro, connects CDP, imports the fixture wallet:
-
-```bash
-yarn a:setup:ios
-```
-
-Expected tail: `=== Preflight complete ===` with all steps green. Your dev simulator + Metro on `8081` keep running untouched.
-
-**4. Verify the toolkit is wired up.** Do not skip — recipes require all three (Metro, CDP, route) to be live:
-
-```bash
-yarn a:status
-```
-
-Expected: JSON with a `route` field (e.g. `"Wallet"`) and a selected account address. Empty/error output ⇒ stop and re-check step 3 before running a recipe.
-
-## Run a recipe
-
-```bash
-bash scripts/perps/agentic/validate-recipe.sh \
-  scripts/perps/agentic/teams/perps/recipes/provider-smoke.json
-```
-
-What to look for: a Mermaid graph prints, then per-node `pass` lines (`check-testnet → decide-testnet → … → done`), then `summary: pass`. Artifacts (`trace.json`, `summary.json`, `workflow.mmd`) land in the recipe's output dir.
-
-## What to try next
-
-| Recipe | What it does | Notes |
-|---|---|---|
-| `teams/perps/recipes/app-lifecycle.json` | App launch + route smoke | No funded account needed |
-| `teams/perps/recipes/full-trade-lifecycle.json` | Open → TPSL → close on testnet | Needs a funded testnet account in fixture |
-| `teams/perps/recipes/reference-decimal-key-screens.json` | Visual decimal/format audit | Produces screenshots |
-
-## Troubleshooting
-
-Re-run `yarn a:status` first when anything looks off — it pinpoints which leg (Metro / CDP / route) is down.
-
-- **`Neither IOS_SIMULATOR nor SIM_UDID is set`** — `.js.env` change wasn't picked up. New shell, or check the var name.
-- **Preflight booted/built on your dev simulator** — `IOS_SIMULATOR` matches the dev sim's name. Pick a different one.
-- **CDP timeout, "targets found on 8081 but none on $PORT"** — `WATCHER_PORT` collided or wasn't exported. Confirm `.js.env` has a non-8081 port and re-run.
-- **`Wallet fixture not found`** — step 2 was skipped or `.agent/wallet-fixture.json` is in the wrong directory (must be repo root).
-
-After a successful run, `xcrun simctl list devices | grep Booted` shows both simulators (dev + recipe) booted.
-
-## The `a:*` script family
-
-`a` is for *agentic* — thin yarn aliases over the same scripts in `scripts/perps/agentic/` that validate-recipe.sh uses. Same plumbing the toolkit uses to drive the app, exposed for humans. Goal is for these to become the default way to launch the app for daily dev once they've fully replaced the legacy `yarn start` / `yarn ios` flow.
-
-| Script | What it does |
-|---|---|
-| `yarn a:setup:ios` / `:android` | Full clean: deps + build + install + Metro + CDP + wallet (this doc, step 3) |
-| `yarn a:ios` / `:android` | Same as `a:setup:*` but skips clean — fast re-launch when build artifacts are warm |
-| `yarn a:start` / `a:stop` | Metro lifecycle on `$WATCHER_PORT` |
-| `yarn a:reload` | Reload the JS bundle without restarting Metro |
-| `yarn a:status` | Health probe (Metro + CDP + route) |
-| `yarn a:navigate` | Drive the app to a route from the CLI |
-| `yarn a:watch` | Interactive Metro with live log filtering |
-
-## Further reading
-
-- [docs/perps/perps-agentic-system-design.md](../../../docs/perps/perps-agentic-system-design.md) — architecture: CDP bridge, recipe runner, eval refs/flows
-- [docs/perps/perps-agentic-feedback-loop.md](../../../docs/perps/perps-agentic-feedback-loop.md) — how recipes plug into the dev/PR loop
-- [docs/perps/perps-agentic-scripts-quickref.md](../../../docs/perps/perps-agentic-scripts-quickref.md) — full command reference for everything under `scripts/perps/agentic/`
-- [README.md](./README.md) — directory map for this folder
-- ADR — [decisions/core/0058-recipe-based-verification-system.md](https://github.com/MetaMask/decisions/blob/main/decisions/core/0058-recipe-based-verification-system.md) — why recipes exist
diff --git a/scripts/perps/agentic/README.md b/scripts/perps/agentic/README.md
index 4e6193260f6a..60c3e7015850 100644
--- a/scripts/perps/agentic/README.md
+++ b/scripts/perps/agentic/README.md
@@ -1,307 +1,46 @@
-# Agentic Workflow Toolkit
+# Mobile agentic bridge
 
-Automated validation toolkit for MetaMask Mobile. Drives the app on a simulator over CDP (Chrome DevTools Protocol via Hermes inspector-proxy) — no manual tapping, no Detox build cycle.
+This directory contains the MetaMask Mobile product-side bridge used by external
+Farmslot Recipe v1 runners. It is not the recipe authoring surface.
 
-## Scope
+## Ownership boundary
 
-Lives under `scripts/perps/` and is owned by `@MetaMask/perps`. The infrastructure (`lib/`, validators, `teams/` layout) is team-agnostic by design. The intent is to promote it to a shared `scripts/agentic/` location with each product team owning `teams/<team>/`.
+Mobile owns only the code required to make a development build controllable and
+observable:
 
-## Layout
+- `cdp-bridge.js` and `lib/cdp-eval.js` connect to the React Native Hermes CDP
+  target.
+- `app-state.sh`, `app-navigate.sh`, and `screenshot.sh` provide small local
+  diagnostics for humans and runners.
+- `setup-wallet.sh` applies deterministic wallet fixtures through the
+  `AgenticService` bridge.
+- Metro/preflight scripts start, stop, reload, and check a development runtime.
 
-```
-agentic/
-  cdp-bridge.js              CDP client: eval, navigate, press, scroll, eval-ref, profiler-start/stop
-  validate-recipe.js         Recipe runner (live app)
-  validate-recipe.sh         Wrapper for validate-recipe.js
-  validate-flow-schema.js    Offline: enforce flow/recipe authoring rules
-  validate-pre-conditions.js Offline: verify pre-condition assertion fixtures
-  lib/
-    assert.js                Assertion evaluator
-    catalog.js               Team/flow/eval discovery + template rendering + ref resolution
-    workflow.js              Graph normalization, cycle detection, Mermaid
-    recipe-issues.js         Automatic issue-review capture
-    cdp-eval.js              Low-level CDP eval helpers
-    ws-client.js             WebSocket client
-    screenshot.js            Screenshot filename helpers
-    config.js                Runtime config (ports, paths)
-  schemas/flow.schema.json   JSON Schema for flow docs
-  teams/
-    perps/                   Perps team (flows, recipes, pre-conditions, evals)
-    mobile-platform/         Placeholder
-  app-state.sh               Wrapper: status, eval, press, eval-ref, accounts
-  app-navigate.sh            Navigate to any registered screen
-  screenshot.sh              Capture simulator screenshot
-  start-metro.sh             Start Metro bundler
-  preflight.sh               Verify app + Metro + CDP connectivity
-  setup-wallet.sh            Seed wallet from fixture
-```
-
-## Concepts
-
-### Flows
-
-Parameterized, reusable UI sequences. Live in `teams/<team>/flows/<name>.json`. Declare `inputs` (with defaults) and a `validate.workflow` graph. `{{param}}` tokens resolve at runtime.
-
-```json
-{
-  "title": "Trade — market {{side}} {{symbol}} ${{usdAmount}}",
-  "inputs": {
-    "side":      { "type": "string", "default": "long" },
-    "symbol":    { "type": "string", "default": "BTC" },
-    "usdAmount": { "type": "string", "default": "10" }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade"],
-      "entry": "nav",
-      "nodes": {
-        "nav": { "action": "navigate", "target": "PerpsMarketDetails", "params": { "market": { "symbol": "{{symbol}}" } }, "next": "press-side" },
-        "press-side": { "action": "press", "test_id": "perps-market-details-{{side}}-button", "next": "place-order" },
-        "place-order": { "action": "press", "test_id": "perps-order-view-place-order-button", "next": "done" },
-        "done": { "action": "end", "status": "pass" }
-      }
-    }
-  }
-}
-```
-
-### Recipes
-
-Directed graph that composes flows and inline steps. Live in `teams/<team>/recipes/`. Nodes keyed by ID; most have a `next` pointer. `switch` branches on assertions. `end` terminates.
-
-```json
-{
-  "entry": "setup",
-  "nodes": {
-    "setup": { "action": "call", "ref": "setup-testnet", "next": "open" },
-    "open":  { "action": "call", "ref": "trade-open-market", "params": { "symbol": "BTC" }, "next": "verify" },
-    "verify":{ "action": "eval_ref", "ref": "positions", "assert": { "operator": "length_gt", "value": 0 }, "next": "close" },
-    "close": { "action": "call", "ref": "trade-close-position", "params": { "symbol": "BTC" }, "next": "done" },
-    "done":  { "action": "end", "status": "pass" }
-  }
-}
-```
-
-### Branching — `switch`
-
-Cases evaluate against `env`, `inputs`, `vars`, `last`; `default` catches unmatched.
-
-```json
-{
-  "decide": {
-    "action": "switch",
-    "cases": [
-      { "when": { "operator": "length_gt", "field": "vars.positions.length", "value": 0 }, "next": "close-first" },
-      { "when": { "operator": "length_eq", "field": "vars.positions.length", "value": 0 }, "next": "open-new" }
-    ],
-    "default": "open-new"
-  }
-}
-```
-
-### Guards — `when` / `unless`
-
-Any executable node can guard on the same condition language; skipped nodes fall through to `next`.
-
-```json
-{
-  "maybe-close": {
-    "action": "call",
-    "ref": "trade-close-position",
-    "when": { "operator": "gt", "field": "vars.positionCount", "value": 0 },
-    "next": "done"
-  }
-}
-```
-
-Context available to guards and switch: `env` (appRoot, recipePath, team), `inputs` (templated params), `vars` (via `save_as`), `last` (most recent result), `nodes` (per-node records).
-
-### Setup / teardown
-
-Linear arrays before/after the workflow graph. Teardown runs on both pass and fail.
-
-```json
-{
-  "setup":    [{ "id": "enable-testnet", "action": "toggle_testnet", "enabled": true }],
-  "teardown": [{ "id": "close-all", "action": "eval_async", "expression": "Engine.context.PerpsController.closeAllPositions().then(function(r){return JSON.stringify(r)})", "assert": { "operator": "not_null" } }]
-}
-```
-
-### Eval refs
-
-Named CDP eval expressions. Two homes:
-- `teams/<team>/evals.json` — quick refs (`perps/positions`)
-- `teams/<team>/evals/<file>.json` — grouped refs (`perps/core/tpsl-orders`)
-
-```bash
-node cdp-bridge.js eval-ref --list
-node cdp-bridge.js eval-ref perps/positions
-```
-
-### Pre-conditions
-
-Gate checks that must pass before a flow runs. Defined in `teams/<team>/pre-conditions.js`.
-
-| Field | Description |
-| --- | --- |
-| `description` | human-readable label |
-| `async` | whether expression returns a Promise |
-| `expression` | CDP eval (string, or function for parameterized) |
-| `assert` | `{ operator, field, value }` |
-| `hint` | actionable failure message |
-| `fixtures` | `{ pass, fail }` JSON strings for offline validation |
+Portable recipes, flow composition, action manifests, and MetaMask domain
+actions live outside the Mobile repository in the external recipe runner. The
+Mobile repository should not grow task-specific recipes or reusable recipe
+actions.
 
-```js
-'wallet.unlocked': {
-  description: 'Wallet is unlocked and app is navigable',
-  async: false,
-  expression: '(function(){ var r=globalThis.__AGENTIC__.getRoute().name; return JSON.stringify({route:r,unlocked:r!=="Login"}); })()',
-  assert: { operator: 'eq', field: 'unlocked', value: true },
-  hint: 'Unlock the wallet first.',
-  fixtures: {
-    pass: '{"route":"WalletView","unlocked":true}',
-    fail: '{"route":"Login","unlocked":false}',
-  },
-},
-```
-
-## Actions
-
-| Action | Required | Purpose |
-| --- | --- | --- |
-| `navigate` | `target` | go to a screen |
-| `press` | `test_id` | tap component by testID |
-| `set_input` | `test_id`, `value` | type into TextInput |
-| `type_keypad` | `value` | type digits via keypad buttons |
-| `clear_keypad` | — | press delete N times (default 8) |
-| `scroll` | — | scroll view (optional `test_id`, `offset`) |
-| `eval_sync` | `expression`, `assert` | sync CDP eval |
-| `eval_async` | `expression`, `assert` | promise-based CDP eval |
-| `eval_ref` | `ref`, `assert` | run a named eval ref |
-| `call` | `ref` | invoke another flow (workflow only) |
-| `wait` | — | pause N ms |
-| `wait_for` | condition | poll until route / test_id / expression matches. Timing fields: `timeout_ms`, `poll_ms` |
-| `log_watch` | `watch_for` / `must_not_appear` | scan Metro logs |
-| `screenshot` | — | capture screen |
-| `manual` | — | human intervention point |
-| `select_account` | `address` | switch Ethereum account |
-| `toggle_testnet` | — | enable/disable testnet |
-| `switch_provider` | `provider` | switch perps provider |
-| `app_background` | — | send app to home. `duration_ms` default 5000 |
-| `app_foreground` | — | relaunch via `xcrun simctl launch` |
-| `app_restart` | — | terminate + relaunch. `boot_wait_ms` default 15000 |
-| `trace_start` / `trace_stop` | `label` | Hermes sampling profiler → `.cpuprofile` |
-| `switch` | `cases` | branch on assertions (workflow only) |
-| `end` | — | terminal node (workflow only) |
-
-## Assertion operators
-
-Used in `assert` blocks on steps and pre-conditions:
-
-| Operator | Meaning |
-| --- | --- |
-| `not_null` | value not null/undefined |
-| `truthy` / `falsy` | boolean truthiness |
-| `eq` / `neq` | strict equality |
-| `gt` / `lt` / `gte` / `lte` | numeric comparison |
-| `deep_eq` | deep strict equality |
-| `length_eq` / `length_gt` / `length_gte` | array/string length |
-| `contains` / `not_contains` | array or string includes |
-| `matches` | regex match (`/pattern/flags` or string) |
-| `one_of` | value in `values` array |
-| `exists` | field not undefined |
-
-Compound: `{ all: [...] }`, `{ any: [...] }`, `{ none: [...] }`.
-
-## Preflight modes
-
-`preflight.sh` accepts `--mode <auto|fast|rebuild-native|clean>` to control how much of the native setup runs. Cuts cold-rebuild waste when the native dep graph hasn't changed.
-
-| Mode | yarn setup | pod install | xcodebuild | Reads shared cache |
-|---|---|---|---|---|
-| `auto` (recommended) | no | only on native rebuild, no `--repo-update` (one-shot `--repo-update` retry on failure) | only on fingerprint miss | yes |
-| `fast` | no | no | no — fail loud if missing | yes |
-| `rebuild-native` | no | yes (no `--repo-update`) | yes | no |
-| `clean` (legacy `--clean`) | yes | yes with `--repo-update` | yes | no (writes only) |
-
-Cache lives in `$MM_BUILD_CACHE_DIR` (default `~/Library/Caches/mm-mobile-builds` on macOS, `~/.cache/mm-mobile-builds` on Linux), keyed by an agentic `@expo/fingerprint` hash computed by `scripts/perps/agentic/lib/compute-cache-fp.js`. The agentic fingerprint *extends* the project-wide `fingerprint.config.js` (which EAS Build and OTA still consume unchanged) with additional `ignorePaths` for per-worktree build artifacts that don't influence binary semantics (`ios/build/`, `.gradle/`, Xcode `xcuserdata`, NDK `.cxx`, etc.). Binary-affecting inputs — env-populated `xcconfig`, `google-services.json`, and the bundled `InpageBridgeWeb3.js` — stay hashed, so the cache only converges across worktrees when those inputs match. Parallel worktrees at the same fingerprint share one artifact through a per-fingerprint mutex: Linux uses `flock(1)` (auto-released by the kernel on process death); macOS, where `flock` is not in base, uses an atomic `mkdir <fp>.lock.d` fallback that is released by the script's `EXIT` trap. If a script is killed with `kill -9` between `mkdir` and the trap, the mutex dir can be left behind — delete it manually under `$MM_BUILD_CACHE_DIR/<plat>/`. Override retention with `BUILD_CACHE_RETAIN=N` (default 5 per platform).
-
-Invoke directly:
-
-```bash
-bash scripts/perps/agentic/preflight.sh --platform ios --mode auto --wallet-setup   # fingerprint-gated reuse, build only on miss
-bash scripts/perps/agentic/preflight.sh --platform ios --mode fast --wallet-setup   # fail loud if no cached/installed build
-bash scripts/perps/agentic/preflight.sh --platform ios --clean --wallet-setup       # legacy clean rebuild (unchanged)
-```
-
-Farmslot dispatch: once this branch lands on `main`, switch `projects/metamask-mobile-farm/project.json` `preflight` hook from `--clean` to `--mode auto`. Keep `--mode clean` as the explicit burn-it-down escape.
+## Local bridge commands
 
-## CLI
+From the repository root:
 
 ```bash
-# Run recipe (live app)
-bash scripts/perps/agentic/validate-recipe.sh teams/perps/recipes/full-trade-lifecycle.json
-bash scripts/perps/agentic/validate-recipe.sh teams/perps/recipes/full-trade-lifecycle.json --dry-run
-
-# Offline validators
-node scripts/perps/agentic/validate-flow-schema.js                                    # all
-node scripts/perps/agentic/validate-flow-schema.js teams/perps/flows/trade-open-market.json
-node scripts/perps/agentic/validate-pre-conditions.js
-
-# App interaction
-bash scripts/perps/agentic/app-state.sh status
-bash scripts/perps/agentic/app-state.sh eval "Engine.context.PerpsController.state"
-bash scripts/perps/agentic/app-state.sh eval-ref perps/positions
-bash scripts/perps/agentic/app-state.sh eval-ref --list
-bash scripts/perps/agentic/app-navigate.sh PerpsMarketDetails '{"market":{"symbol":"BTC"}}'
-bash scripts/perps/agentic/screenshot.sh my-label
-bash scripts/perps/agentic/start-metro.sh --platform ios
-```
-
-## Adding a new team
-
-1. `teams/<team>/pre-conditions.js` exporting `Record<string, PreCondition>`.
-2. Key convention: `<team>.<check>` (e.g. `swap.has_quote`).
-3. Include `fixtures: { pass, fail }` on every entry.
-4. Optionally add `flows/`, `recipes/`, `evals/`, `evals.json`.
-5. Run both validators:
-
-```bash
-node scripts/perps/agentic/validate-pre-conditions.js
-node scripts/perps/agentic/validate-flow-schema.js
-```
-
-See `teams/README.md` for the full contribution guide.
-
-## CDP eval rules
-
-All expressions are **ES5** — no arrow functions, `const`/`let`, template literals, top-level `await`.
-
-```js
-// OK
-var x = Engine.context.PerpsController.state;
-JSON.stringify({ count: x.positions.length });
-
-// Not OK
-const x = Engine.context.PerpsController.state;
-`count: ${x.positions.length}`;
-```
-
-Async via `.then()`:
-
-```js
-Engine.context.PerpsController.getPositions().then(function(ps) {
-  return JSON.stringify({ count: ps.length });
-});
+yarn a:status
+yarn a:navigate <route-name>
+yarn a:reload
+yarn a:ios      # start/reuse an iOS development runtime
+yarn a:android  # start/reuse an Android development runtime
 ```
 
-## Run artifacts
+Use the recipe-harness skill or the external runner for Recipe v1 execution.
+Those tools consume this bridge but own recipe semantics and evidence output.
 
-Every recipe run writes to `.agent/recipe-runs/<timestamp>_<recipe>/`:
+## Fixture setup
 
-- `summary.json`, `workflow.json`, `workflow.mmd`, `trace.json`
-- `screenshots/`, `traces/` (`.cpuprofile` when `trace_stop` ran)
-- `recipe-issues.json` + `console-warnings.json` + `console-errors.json` + `runtime-exceptions.json`
-- `recipe-issues-review.json` + `recipe-issues-review.md`
+Create a local fixture at `.agent/wallet-fixture.json` when deterministic wallet
+state is required. `setup-wallet.sh` validates the file and applies it through
+`globalThis.__AGENTIC__` in a development build.
 
-`summary.json.recipeIssues` is automatic and aligned with the extension contract. See [CDP-capabilities-mobile.md](./CDP-capabilities-mobile.md#automatic-recipe-issue-review) for the review vocabulary and opt-in `fail_on_unexpected` gating.
+Do not commit real fixture secrets or task-specific validation recipes to this
+repository.
diff --git a/scripts/perps/agentic/app-state.sh b/scripts/perps/agentic/app-state.sh
index 1497f00db815..86a7e08be0f7 100755
--- a/scripts/perps/agentic/app-state.sh
+++ b/scripts/perps/agentic/app-state.sh
@@ -17,8 +17,6 @@
 #   scripts/perps/agentic/app-state.sh press <testId>           # Press component by testID
 #   scripts/perps/agentic/app-state.sh scroll [--test-id <id>] [--offset <n>]  # Scroll
 #   scripts/perps/agentic/app-state.sh set-input <testId> <value>  # Set text input value
-#   scripts/perps/agentic/app-state.sh eval-ref perps/positions  # Run an eval ref
-#   scripts/perps/agentic/app-state.sh eval-ref --list          # List eval refs
 
 set -euo pipefail
 
@@ -79,9 +77,6 @@ case "$COMMAND" in
   unlock)
     node scripts/perps/agentic/cdp-bridge.js unlock "$@"
     ;;
-  eval-ref)
-    node scripts/perps/agentic/cdp-bridge.js eval-ref "$@"
-    ;;
   *)
     echo "Usage: app-state.sh <command> [args...]"
     echo ""
@@ -103,8 +98,6 @@ case "$COMMAND" in
     echo "  set-input <testId> <value>  Set text input value by testID"
     echo "  sentry-debug [enable|disable]  Patch Sentry to log errors to console"
     echo "  unlock <password>      Unlock wallet via fiber tree"
-    echo "  eval-ref <team/name>   Run an eval ref (e.g. perps/positions)"
-    echo "  eval-ref --list        List all available eval refs"
     exit 1
     ;;
 esac
diff --git a/scripts/perps/agentic/cdp-bridge.js b/scripts/perps/agentic/cdp-bridge.js
index 983a96f75371..be453aed9adb 100644
--- a/scripts/perps/agentic/cdp-bridge.js
+++ b/scripts/perps/agentic/cdp-bridge.js
@@ -18,23 +18,11 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const PRE_CONDITIONS = require('./lib/registry');
 const { loadPort } = require('./lib/config');
 const { discoverTarget } = require('./lib/target-discovery');
 const { createWSClient } = require('./lib/ws-client');
 const { cdpEval, cdpEvalAsync } = require('./lib/cdp-eval');
-const { checkAssert } = require('./lib/assert');
-const { buildArmSnippet, buildCollectSnippet } = require('./lib/recipe-issues');
-
-async function evalSpec(client, entry, params) {
-  const expr = typeof entry.expression === 'function' ? entry.expression(params) : entry.expression;
-  let raw = entry.async
-    ? await cdpEvalAsync(client, expr)
-    : await cdpEval(client, expr);
-  if (raw === undefined || raw === null) raw = 'null';
-  if (typeof raw !== 'string') raw = JSON.stringify(raw);
-  return raw;
-}
+const { buildArmSnippet, buildCollectSnippet } = require('./lib/issue-capture');
 
 // ---------------------------------------------------------------------------
 // Commands
@@ -504,48 +492,6 @@ const COMMANDS = {
     };
   },
 
-  async 'check-pre-conditions'(client, args) {
-    const specsJson = args[0];
-    if (!specsJson) throw new Error('Usage: check-pre-conditions <specs-json>');
-
-    let specs;
-    try {
-      specs = JSON.parse(specsJson);
-    } catch (e) {
-      throw new Error(`Invalid specs JSON: ${e.message}`);
-    }
-    if (!Array.isArray(specs) || specs.length === 0) return { ok: true, checked: 0 };
-
-    const failures = [];
-
-    for (const spec of specs) {
-      const name = typeof spec === 'string' ? spec : spec.name;
-      const params = typeof spec === 'object' ? spec : {};
-      const entry = PRE_CONDITIONS[name];
-
-      if (!entry) {
-        failures.push({ name, error: `Unknown pre-condition "${name}". Check pre-conditions.js for valid names.` });
-        continue;
-      }
-
-      let raw;
-      try {
-        raw = await evalSpec(client, entry, params);
-      } catch (e) {
-        failures.push({ name, description: entry.description, error: `Eval failed: ${e.message}`, hint: entry.hint });
-        continue;
-      }
-
-      const passed = checkAssert(raw, entry.assert);
-      if (!passed) {
-        failures.push({ name, description: entry.description, got: raw, hint: entry.hint });
-      }
-    }
-
-    const ok = failures.length === 0;
-    return { ok, checked: specs.length, failures: ok ? [] : failures };
-  },
-
   async 'show-step'(client, args) {
     const stepId = args[0] || '';
     const description = args.slice(1).join(' ');
@@ -585,7 +531,7 @@ const COMMANDS = {
     }
     const serialized = JSON.stringify(profile);
     if (!outPath) {
-      const tracesDir = path.resolve(process.env.APP_ROOT || process.cwd(), 'temp/agentic/recipes/test-artifacts/traces');
+      const tracesDir = path.resolve(process.env.APP_ROOT || process.cwd(), 'temp/agentic/traces');
       fs.mkdirSync(tracesDir, { recursive: true });
       outPath = path.join(tracesDir, `trace-${label}.cpuprofile`);
     } else {
@@ -621,93 +567,8 @@ const COMMANDS = {
     return result || { count: 0, entries: [] };
   },
 
-  async 'eval-ref'(client, args) {
-    const arg = args[0];
-    if (!arg || arg === '--help') {
-      console.error('Usage: eval-ref <team/name> | eval-ref --list');
-      process.exit(1);
-    }
-
-    const teamsDir = path.resolve(__dirname, 'teams');
-
-    if (arg === '--list') {
-      return listEvalRefs(teamsDir);
-    }
-
-    // Parse "team/name" (2-part) or "team/subfile/name" (3-part)
-    const parts = arg.split('/');
-    if (parts.length < 2 || parts.length > 3) {
-      throw new Error('Eval ref must be "team/name" or "team/subfile/name" (e.g. perps/positions or perps/core/pump-market)');
-    }
-    let evalFile, evalName;
-    if (parts.length === 3) {
-      const [team, subfile, name] = parts;
-      evalFile = path.join(teamsDir, team, 'evals', `${subfile}.json`);
-      evalName = name;
-    } else {
-      const [team, name] = parts;
-      evalFile = path.join(teamsDir, team, 'evals.json');
-      evalName = name;
-    }
-    if (!fs.existsSync(evalFile)) {
-      throw new Error(`No eval file found: ${path.relative(path.dirname(teamsDir), evalFile)}`);
-    }
-    const evals = JSON.parse(fs.readFileSync(evalFile, 'utf8'));
-    const entry = evals[evalName];
-    if (!entry) {
-      const available = Object.keys(evals).join(', ');
-      throw new Error(`Eval ref "${evalName}" not found. Available: ${available}`);
-    }
-
-    const raw = entry.async
-      ? await cdpEvalAsync(client, entry.expression)
-      : await cdpEval(client, entry.expression);
-    // Eval expressions typically JSON.stringify their result.
-    // Parse it so main()'s JSON.stringify produces clean output
-    // instead of double-encoded strings.
-    if (typeof raw === 'string') {
-      try { return JSON.parse(raw); } catch { /* not JSON — return as-is */ }
-    }
-    return raw;
-  },
 };
 
-// ---------------------------------------------------------------------------
-// Eval-ref helpers
-// ---------------------------------------------------------------------------
-
-/** List all eval refs from teams/<team>/evals.json and teams/<team>/evals/*.json */
-function listEvalRefs(teamsDir) {
-  const all = {};
-  const teamDirs = fs.readdirSync(teamsDir, { withFileTypes: true })
-    .filter((d) => d.isDirectory())
-    .map((d) => d.name);
-  // Top-level evals: teams/<team>/evals.json → keyed as <team>
-  for (const team of teamDirs) {
-    const f = path.join(teamsDir, team, 'evals.json');
-    if (fs.existsSync(f)) {
-      const data = JSON.parse(fs.readFileSync(f, 'utf8'));
-      all[team] = Object.fromEntries(
-        Object.entries(data).map(([name, r]) => [name, r.description || ''])
-      );
-    }
-  }
-  // Sub-collections: teams/<team>/evals/<file>.json → keyed as <team>/<file>
-  for (const team of teamDirs) {
-    const evalsDir = path.join(teamsDir, team, 'evals');
-    if (!fs.existsSync(evalsDir)) continue;
-    const subFiles = fs.readdirSync(evalsDir).filter((f) => f.endsWith('.json'));
-    for (const file of subFiles) {
-      const key = `${team}/${path.basename(file, '.json')}`;
-      const data = JSON.parse(fs.readFileSync(path.join(evalsDir, file), 'utf8'));
-      all[key] = Object.fromEntries(
-        Object.entries(data).map(([name, r]) => [name, r.description || ''])
-      );
-    }
-  }
-  return all;
-}
-
 // ---------------------------------------------------------------------------
 // Main
 // ---------------------------------------------------------------------------
@@ -740,13 +601,11 @@ Commands:
   set-input <testId> <value>           Set text input value by testID (calls onChangeText)
   sentry-debug [enable|disable]          Patch Sentry to log errors to console with [SENTRY-DEBUG] prefix
   unlock <password>                      Unlock wallet (inject password + press login button via fiber tree)
-  eval-ref <team/name>                 Run an eval ref (e.g. perps/positions)
-  eval-ref --list                      List all available eval refs
   profiler-start                       Start Hermes sampling profiler
   profiler-stop [--out <path>] [--label <name>]
                                        Stop profiler, dump Chrome-compatible
                                        .cpuprofile to <path> (default:
-                                       temp/agentic/recipes/test-artifacts/traces/trace-<label>.cpuprofile)
+                                       temp/agentic/traces/trace-<label>.cpuprofile)
   issues-arm                           Install console/exception hooks that
                                        populate globalThis.__AGENTIC_ISSUES__
   issues-collect                       Snapshot + clear the in-app issue buffer
@@ -766,12 +625,6 @@ Environment:
     process.exit(1);
   }
 
-  // `eval-ref --list` only reads local JSON files — skip CDP connection entirely.
-  if (command === 'eval-ref' && args[1] === '--list') {
-    const result = await handler(null, args.slice(1), {});
-    console.log(JSON.stringify(result, null, 2));
-    return;
-  }
 
   const port = loadPort();
   const timeout = Number.parseInt(process.env.CDP_TIMEOUT || '5000', 10);
diff --git a/scripts/perps/agentic/e2e-recipe-benchmark.md b/scripts/perps/agentic/e2e-recipe-benchmark.md
deleted file mode 100644
index 5c5c360c88ca..000000000000
--- a/scripts/perps/agentic/e2e-recipe-benchmark.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Perps E2E Recipe Benchmark
-
-Detox perps specs couple tightly to mock infra (commandQueueServer, deposit mocks, price manipulation) that only exists inside the Detox harness. Slow to iterate, fragile, often skipped in CI.
-
-The agentic recipe runner (`validate-recipe.js`) drives a live app via Hermes CDP — no mocks. This doc records the migration of 8 Detox/Playwright specs to recipe JSON.
-
-## Results
-
-8/8 recipes validated on `mm-2` testnet; full UI-navigation parity with their Detox counterparts.
-
-### Risk-free (no trades)
-
-| Recipe | Detox spec | Nodes | Coverage |
-| --- | --- | --- | --- |
-| perps-no-funds-tutorial | smoke/perps/perps-no-funds-tutorial.spec.ts | 7/7 | tutorial show/dismiss via controller state |
-| perps-add-funds | smoke/perps/perps-add-funds.spec.ts | 9/9 | UI navigation; Detox also mocks deposit server-side |
-| perf-add-funds | performance/login/perps-add-funds.spec.ts | 7/7 | simplified variant |
-
-### Trades (real testnet orders)
-
-| Recipe | Detox spec | Nodes | Coverage |
-| --- | --- | --- | --- |
-| perps-position | smoke/perps/perps-position.spec.ts | 11/11 | open long ETH, set TP/SL, close |
-| perps-position-stop-loss | smoke/perps/perps-position-stop-loss.spec.ts | 9/9 | open long ETH, set SL, verify, close |
-| perps-position-liquidation | smoke/perps/perps-position-liquidation.spec.ts | 9/9 | UI parity; Detox also mocks price manipulation |
-| perf-position-management | performance/login/perps-position-management.spec.ts | 9/9 | open BTC long, verify, close |
-| perps-limit-long-fill | smoke/perps/perps-limit-long-fill.spec.ts | 22/22 | limit long ETH at Mid, fill, cleanup |
-
-Detox mocks server-side behavior (deposits, liquidations) — neither approach tests real backend execution. Both validate the UI flow.
-
-## What each approach validates
-
-**Recipes** — no build cycle, idempotent setup/teardown hooks, composable flows (`trade-open-market`, `trade-close-position`, `tpsl-create`), real testnet orders.
-
-**Detox** — hermetic app-data wipe before each test, mocked deposits / price / liquidations, pixel-level visual assertions, multi-app coordination.
-
-## Shared flows
-
-| Flow | Purpose |
-| --- | --- |
-| `setup-testnet` | enable testnet, verify markets load |
-| `trade-open-market` | nav → keypad → place market order |
-| `trade-close-position` | nav → close → confirm |
-| `tpsl-create` | open auto-close, set TP/SL presets |
-
-## Layout
-
-- Recipes: `scripts/perps/agentic/teams/perps/recipes/benchmark/`
-- Flows: `scripts/perps/agentic/teams/perps/flows/`
-- Runner: `scripts/perps/agentic/validate-recipe.js`
-
-## Running
-
-```bash
-# single
-IOS_SIMULATOR=mm-2 node scripts/perps/agentic/validate-recipe.js \
-  scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position.json
-
-# all
-for f in scripts/perps/agentic/teams/perps/recipes/benchmark/*.json; do
-  IOS_SIMULATOR=mm-2 node scripts/perps/agentic/validate-recipe.js "$f"
-done
-```
-
-Prereqs: `mm-2` iOS simulator, Metro running (`yarn start`), wallet unlocked, sufficient testnet balance for trades.
-
-## Related docs
-
-- [timing-benchmark.md](./timing-benchmark.md) — dual-simulator wall-clock comparison and harness setup
diff --git a/scripts/perps/agentic/lib/assert.js b/scripts/perps/agentic/lib/assert.js
deleted file mode 100644
index ef574039e4b2..000000000000
--- a/scripts/perps/agentic/lib/assert.js
+++ /dev/null
@@ -1,147 +0,0 @@
-'use strict';
-
-const { isDeepStrictEqual } = require('node:util');
-
-function parseRaw(raw) {
-  let parsed = raw;
-
-  if (typeof raw === 'string') {
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      parsed = raw;
-    }
-  }
-
-  if (typeof parsed === 'string') {
-    try {
-      parsed = JSON.parse(parsed);
-    } catch {
-      // Keep the plain string when it is not nested JSON.
-    }
-  }
-
-  return parsed;
-}
-
-function getFieldValue(value, field) {
-  if (field == null || field === '') {
-    return value;
-  }
-
-  let current = value;
-  for (const part of String(field).split('.')) {
-    if (current == null) {
-      return undefined;
-    }
-    current = current[part];
-  }
-  return current;
-}
-
-function checkAssert(raw, assertSpec) {
-  if (!assertSpec) {
-    return true;
-  }
-
-  const parsed = parseRaw(raw);
-  return evaluateAssert(parsed, assertSpec);
-}
-
-function normalizeRegex(value) {
-  if (value instanceof RegExp) {
-    return value;
-  }
-
-  if (typeof value !== 'string') {
-    return new RegExp(String(value));
-  }
-
-  const match = value.match(/^\/(.+)\/([dgimsuvy]*)$/);
-  if (match) {
-    return new RegExp(match[1], match[2]);
-  }
-
-  return new RegExp(value);
-}
-
-function evaluateAssert(parsed, assertSpec) {
-  if (!assertSpec) {
-    return true;
-  }
-
-  if (Array.isArray(assertSpec.all)) {
-    return assertSpec.all.every((entry) => evaluateAssert(parsed, entry));
-  }
-
-  if (Array.isArray(assertSpec.any)) {
-    return assertSpec.any.some((entry) => evaluateAssert(parsed, entry));
-  }
-
-  if (Array.isArray(assertSpec.none)) {
-    return assertSpec.none.every((entry) => !evaluateAssert(parsed, entry));
-  }
-
-  const actual = getFieldValue(parsed, assertSpec.field);
-  const expected = assertSpec.value;
-
-  switch (assertSpec.operator) {
-    case 'exists':
-      return actual !== undefined;
-    case 'not_null':
-      return actual != null;
-    case 'truthy':
-      return Boolean(actual);
-    case 'falsy':
-      return !actual;
-    case 'eq':
-      return actual === expected;
-    case 'deep_eq':
-      return isDeepStrictEqual(actual, expected);
-    case 'neq':
-      return actual !== expected;
-    case 'lt':
-      return typeof actual === 'number' && actual < expected;
-    case 'gt':
-      return typeof actual === 'number' && actual > expected;
-    case 'lte':
-      return typeof actual === 'number' && actual <= expected;
-    case 'gte':
-      return typeof actual === 'number' && actual >= expected;
-    case 'length_eq':
-      return actual != null && actual.length === expected;
-    case 'length_gt':
-      return actual != null && actual.length > expected;
-    case 'length_gte':
-      return actual != null && actual.length >= expected;
-    case 'contains':
-      if (Array.isArray(actual)) {
-        return actual.includes(expected);
-      }
-      return typeof actual === 'string' && actual.includes(expected);
-    case 'not_contains':
-      if (Array.isArray(actual)) {
-        return !actual.includes(expected);
-      }
-      return typeof actual !== 'string' || !actual.includes(expected);
-    case 'matches':
-      return (
-        (typeof actual === 'string' || typeof actual === 'number') &&
-        normalizeRegex(assertSpec.pattern ?? expected).test(String(actual))
-      );
-    case 'one_of': {
-      const values = Array.isArray(assertSpec.values) ? assertSpec.values : expected;
-      return Array.isArray(values) && values.includes(actual);
-    }
-    default:
-      throw new Error(`Unknown operator: ${assertSpec.operator}`);
-  }
-}
-
-module.exports = {
-  checkAssert,
-  evaluateAssert,
-  getFieldValue,
-  normalizeRegex,
-  parseRaw,
-};
diff --git a/scripts/perps/agentic/lib/catalog.js b/scripts/perps/agentic/lib/catalog.js
deleted file mode 100644
index fe18befba93b..000000000000
--- a/scripts/perps/agentic/lib/catalog.js
+++ /dev/null
@@ -1,301 +0,0 @@
-'use strict';
-
-const fs = require('node:fs');
-const path = require('node:path');
-
-function getAppRoot(explicitAppRoot) {
-  return path.resolve(explicitAppRoot || process.env.APP_ROOT || process.cwd());
-}
-
-function getTeamsDir(explicitAppRoot) {
-  return path.join(getAppRoot(explicitAppRoot), 'scripts', 'perps', 'agentic', 'teams');
-}
-
-function listTeamNames(explicitAppRoot) {
-  const teamsDir = getTeamsDir(explicitAppRoot);
-  if (!fs.existsSync(teamsDir)) {
-    return [];
-  }
-
-  return fs
-    .readdirSync(teamsDir, { withFileTypes: true })
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => entry.name)
-    .sort();
-}
-
-function readJsonFile(filePath) {
-  return JSON.parse(fs.readFileSync(filePath, 'utf8'));
-}
-
-function renderTemplateString(value, params = {}) {
-  if (typeof value !== 'string') {
-    return value;
-  }
-
-  return value.replace(
-    /\{\{([^|}]+)(?:\|([^}]+))?\}\}/g,
-    (_match, key, fallback) => {
-      if (Object.prototype.hasOwnProperty.call(params, key) && params[key] != null) {
-        return String(params[key]);
-      }
-      return fallback != null ? String(fallback) : `{{${key}}}`;
-    }
-  );
-}
-
-function renderTemplate(value, params = {}) {
-  if (typeof value === 'string') {
-    return renderTemplateString(value, params);
-  }
-
-  if (Array.isArray(value)) {
-    return value.map((item) => renderTemplate(item, params));
-  }
-
-  if (value && typeof value === 'object') {
-    return Object.fromEntries(
-      Object.entries(value).map(([key, item]) => [key, renderTemplate(item, params)])
-    );
-  }
-
-  return value;
-}
-
-function parsePreConditionSpec(spec) {
-  if (typeof spec !== 'string') {
-    return spec;
-  }
-
-  const match = spec.match(/^([^(]+)\((.+)\)$/);
-  if (!match) {
-    return spec;
-  }
-
-  const result = { name: match[1] };
-  match[2].split(',').forEach((pair) => {
-    const eqIndex = pair.indexOf('=');
-    if (eqIndex <= 0) {
-      return;
-    }
-    const key = pair.slice(0, eqIndex).trim();
-    const rawValue = pair.slice(eqIndex + 1).trim();
-    result[key] = rawValue;
-  });
-  return result;
-}
-
-function inferTeamFromPath(filePath, explicitAppRoot) {
-  const teamsDir = getTeamsDir(explicitAppRoot);
-  const relative = path.relative(teamsDir, path.resolve(filePath));
-  if (
-    relative.startsWith(`..${path.sep}`) ||
-    relative === '..' ||
-    path.isAbsolute(relative)
-  ) {
-    return null;
-  }
-
-  const [team] = relative.split(path.sep);
-  return team || null;
-}
-
-function splitRef(ref, defaultTeam) {
-  const parts = String(ref || '')
-    .split('/')
-    .filter(Boolean);
-
-  if (parts.length === 0) {
-    throw new Error('Reference cannot be empty');
-  }
-
-  if (parts.length === 1) {
-    if (!defaultTeam) {
-      throw new Error(
-        `Unqualified reference "${ref}" requires a default team. Use "team/name" instead.`
-      );
-    }
-
-    return {
-      team: defaultTeam,
-      refParts: parts,
-    };
-  }
-
-  return {
-    team: parts[0],
-    refParts: parts.slice(1),
-  };
-}
-
-function resolveFlowRef(ref, options = {}) {
-  const appRoot = getAppRoot(options.appRoot);
-  const teamsDir = getTeamsDir(appRoot);
-  const { team, refParts } = splitRef(ref, options.defaultTeam);
-  const filePath = path.join(teamsDir, team, 'flows', `${path.join(...refParts)}.json`);
-
-  if (!fs.existsSync(filePath)) {
-    throw new Error(`Flow "${ref}" not found at ${filePath}`);
-  }
-
-  return {
-    team,
-    ref: `${team}/${refParts.join('/')}`,
-    filePath,
-  };
-}
-
-function resolveEvalRef(ref, options = {}) {
-  const appRoot = getAppRoot(options.appRoot);
-  const teamsDir = getTeamsDir(appRoot);
-  const { team, refParts } = splitRef(ref, options.defaultTeam);
-
-  let filePath;
-  let key;
-  if (refParts.length === 1) {
-    filePath = path.join(teamsDir, team, 'evals.json');
-    key = refParts[0];
-  } else {
-    filePath = path.join(
-      teamsDir,
-      team,
-      'evals',
-      `${path.join(...refParts.slice(0, -1))}.json`
-    );
-    key = refParts[refParts.length - 1];
-  }
-
-  if (!fs.existsSync(filePath)) {
-    throw new Error(`Eval ref "${ref}" not found at ${filePath}`);
-  }
-
-  const catalog = readJsonFile(filePath);
-  const entry = catalog[key];
-  if (!entry) {
-    throw new Error(`Eval ref "${ref}" is missing key "${key}" in ${filePath}`);
-  }
-
-  return {
-    team,
-    ref: `${team}/${refParts.join('/')}`,
-    filePath,
-    key,
-    entry,
-  };
-}
-
-function walkJsonFiles(dirPath, files = []) {
-  if (!fs.existsSync(dirPath)) {
-    return files;
-  }
-
-  for (const entry of fs.readdirSync(dirPath, { withFileTypes: true })) {
-    const fullPath = path.join(dirPath, entry.name);
-    if (entry.isDirectory()) {
-      walkJsonFiles(fullPath, files);
-    } else if (entry.isFile() && entry.name.endsWith('.json')) {
-      files.push(fullPath);
-    }
-  }
-
-  return files;
-}
-
-function collectScenarioFiles(explicitAppRoot, directories = ['flows', 'recipes']) {
-  const appRoot = getAppRoot(explicitAppRoot);
-  const teamsDir = getTeamsDir(appRoot);
-  const files = [];
-
-  if (!fs.existsSync(teamsDir)) {
-    return files;
-  }
-
-  for (const team of listTeamNames(appRoot)) {
-    for (const directory of directories) {
-      walkJsonFiles(path.join(teamsDir, team, directory), files);
-    }
-  }
-
-  return files.sort();
-}
-
-function listEvalRefs(explicitAppRoot) {
-  const appRoot = getAppRoot(explicitAppRoot);
-  const teamsDir = getTeamsDir(appRoot);
-  const refs = [];
-
-  for (const team of listTeamNames(appRoot)) {
-    const quickFile = path.join(teamsDir, team, 'evals.json');
-    if (fs.existsSync(quickFile)) {
-      const quickRefs = readJsonFile(quickFile);
-      for (const [key, entry] of Object.entries(quickRefs)) {
-        refs.push({
-          ref: `${team}/${key}`,
-          description: entry.description || '',
-          async: entry.async === true,
-          filePath: quickFile,
-        });
-      }
-    }
-
-    const evalDir = path.join(teamsDir, team, 'evals');
-    for (const filePath of walkJsonFiles(evalDir, [])) {
-      const relative = path
-        .relative(evalDir, filePath)
-        .replace(/\.json$/u, '')
-        .split(path.sep)
-        .join('/');
-      const collection = readJsonFile(filePath);
-      for (const [key, entry] of Object.entries(collection)) {
-        refs.push({
-          ref: `${team}/${relative}/${key}`,
-          description: entry.description || '',
-          async: entry.async === true,
-          filePath,
-        });
-      }
-    }
-  }
-
-  return refs.sort((a, b) => a.ref.localeCompare(b.ref));
-}
-
-function loadPreConditionRegistry(explicitAppRoot) {
-  const appRoot = getAppRoot(explicitAppRoot);
-  const teamsDir = getTeamsDir(appRoot);
-  const merged = {};
-
-  for (const team of listTeamNames(appRoot)) {
-    const filePath = path.join(teamsDir, team, 'pre-conditions.js');
-    if (!fs.existsSync(filePath)) {
-      continue;
-    }
-
-    delete require.cache[require.resolve(filePath)];
-    const entries = require(filePath);
-    for (const [key, entry] of Object.entries(entries)) {
-      if (merged[key]) {
-        throw new Error(`Duplicate pre-condition key "${key}" from team "${team}"`);
-      }
-      merged[key] = entry;
-    }
-  }
-
-  return merged;
-}
-
-module.exports = {
-  collectScenarioFiles,
-  getAppRoot,
-  getTeamsDir,
-  inferTeamFromPath,
-  listEvalRefs,
-  listTeamNames,
-  loadPreConditionRegistry,
-  parsePreConditionSpec,
-  readJsonFile,
-  renderTemplate,
-  renderTemplateString,
-  resolveEvalRef,
-  resolveFlowRef,
-};
diff --git a/scripts/perps/agentic/lib/cdp-eval.js b/scripts/perps/agentic/lib/cdp-eval.js
index 480cc670040f..366614bbd549 100644
--- a/scripts/perps/agentic/lib/cdp-eval.js
+++ b/scripts/perps/agentic/lib/cdp-eval.js
@@ -30,7 +30,7 @@ async function cdpEval(client, expression) {
  * Hermes CDP doesn't support awaitPromise, so we store the result on
  * globalThis.__cdp_async__ and poll for it.
  */
-async function cdpEvalAsync(client, expression, timeoutMs = 30000) {
+async function cdpEvalAsync(client, expression, timeoutMs = cdpMessageTimeout()) {
   // Unique key per call to avoid collisions
   const key = `__cdp_async_${Date.now()}_${Math.random().toString(36).slice(2)}__`;
 
@@ -102,4 +102,9 @@ async function cdpEvalAsync(client, expression, timeoutMs = 30000) {
   }
 }
 
+function cdpMessageTimeout() {
+  const timeoutMs = Number.parseInt(process.env.CDP_TIMEOUT || '30000', 10);
+  return Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : 30000;
+}
+
 module.exports = { cdpEval, cdpEvalAsync };
diff --git a/scripts/perps/agentic/lib/recipe-issues.js b/scripts/perps/agentic/lib/issue-capture.js
similarity index 98%
rename from scripts/perps/agentic/lib/recipe-issues.js
rename to scripts/perps/agentic/lib/issue-capture.js
index 3b2e9d367ace..f9140d88de29 100644
--- a/scripts/perps/agentic/lib/recipe-issues.js
+++ b/scripts/perps/agentic/lib/issue-capture.js
@@ -320,12 +320,12 @@ function writeArtifacts(runDir, { unexpected, informational, review }) {
   const all = [...(unexpected || []), ...(informational || [])];
 
   const paths = {
-    allIssues: path.join(outDir, 'recipe-issues.json'),
+    allIssues: path.join(outDir, 'agentic-issues.json'),
     consoleWarnings: path.join(outDir, 'console-warnings.json'),
     consoleErrors: path.join(outDir, 'console-errors.json'),
     runtimeExceptions: path.join(outDir, 'runtime-exceptions.json'),
-    reviewJson: path.join(outDir, 'recipe-issues-review.json'),
-    reviewMd: path.join(outDir, 'recipe-issues-review.md'),
+    reviewJson: path.join(outDir, 'agentic-issues-review.json'),
+    reviewMd: path.join(outDir, 'agentic-issues-review.md'),
   };
 
   writeJsonArtifact(paths.allIssues, all);
diff --git a/scripts/perps/agentic/lib/registry.js b/scripts/perps/agentic/lib/registry.js
deleted file mode 100644
index dab23021f0bb..000000000000
--- a/scripts/perps/agentic/lib/registry.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-const path = require('node:path');
-const { loadPreConditionRegistry } = require('./catalog');
-
-// Load from the repo root (three levels up from lib/)
-const appRoot = path.resolve(__dirname, '..', '..', '..', '..');
-module.exports = loadPreConditionRegistry(appRoot);
diff --git a/scripts/perps/agentic/lib/safe-env-parser.sh b/scripts/perps/agentic/lib/safe-env-parser.sh
new file mode 100755
index 000000000000..64cf64e283d0
--- /dev/null
+++ b/scripts/perps/agentic/lib/safe-env-parser.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# Shared safe .js.env parser. Source this file, then call load_js_env.
+# Values are treated as data — no eval/source. Only allowlisted keys are exported.
+# Caller env takes precedence (vars already set are not overwritten).
+
+_JS_ENV_ALLOWED="WATCHER_PORT SIM_UDID IOS_SIMULATOR ANDROID_DEVICE ADB_SERIAL PLATFORM METAMASK_ENVIRONMENT MM_PASSWORD MM_WALLET_PASSWORD CDP_TIMEOUT CDP_DISCOVERY_RETRIES DETOX_SIMULATOR AGENTIC_SIMULATOR MM_BUILD_CACHE_DIR WALLET_FIXTURE BUILD_TYPE METAMASK_DEBUG"
+
+load_js_env() {
+  local envfile="${1:-.js.env}"
+  [ -f "$envfile" ] || return 0
+  local _line _key _val
+  while IFS= read -r _line || [ -n "$_line" ]; do
+    [[ "$_line" =~ ^[[:space:]]*(#|$) ]] && continue
+    _line="${_line#export }"
+    _key="${_line%%=*}"
+    _key="${_key//[[:space:]]/}"
+    _val="${_line#*=}"
+    _val="${_val#\"}" ; _val="${_val%\"}"
+    _val="${_val#\'}" ; _val="${_val%\'}"
+    case " $_JS_ENV_ALLOWED " in
+      *" $_key "*) ;;
+      *) continue ;;
+    esac
+    [[ -z "${!_key+x}" ]] && export "$_key=$_val"
+  done < "$envfile"
+  return 0
+}
diff --git a/scripts/perps/agentic/lib/workflow.js b/scripts/perps/agentic/lib/workflow.js
deleted file mode 100644
index 7377e751e4e2..000000000000
--- a/scripts/perps/agentic/lib/workflow.js
+++ /dev/null
@@ -1,435 +0,0 @@
-'use strict';
-
-const path = require('node:path');
-
-const EXECUTABLE_ACTIONS = new Set([
-  'navigate',
-  'wait',
-  'wait_for',
-  'press',
-  'scroll',
-  'set_input',
-  'screenshot',
-  'call',
-  'eval_ref',
-  'eval_sync',
-  'eval_async',
-  'manual',
-  'log_watch',
-  // MetaMask-specific actions
-  'type_keypad',
-  'clear_keypad',
-  'select_account',
-  'toggle_testnet',
-  'switch_provider',
-  // App lifecycle actions
-  'app_background',
-  'app_foreground',
-  'app_restart',
-  // Profiler / trace capture (Hermes sampling profiler via CDP)
-  'trace_start',
-  'trace_stop',
-]);
-
-const CONTROL_ACTIONS = new Set(['switch', 'end']);
-const ALL_WORKFLOW_ACTIONS = new Set([...EXECUTABLE_ACTIONS, ...CONTROL_ACTIONS]);
-
-function deepClone(value) {
-  if (value == null) {
-    return value;
-  }
-
-  return JSON.parse(JSON.stringify(value));
-}
-
-function normalizeNodeAction(node) {
-  const action = node.action || node.type || '';
-  return String(action || '').trim();
-}
-
-function normalizeTarget(value) {
-  if (typeof value === 'string') {
-    return value.trim();
-  }
-
-  if (value && typeof value === 'object') {
-    return String(value.next || value.node || '').trim();
-  }
-
-  return '';
-}
-
-function normalizeSwitchCase(rawCase, index) {
-  const entry =
-    typeof rawCase === 'string'
-      ? { next: rawCase }
-      : deepClone(rawCase || {});
-
-  return {
-    ...entry,
-    index,
-    label: entry.label || '',
-    next: normalizeTarget(entry.next),
-  };
-}
-
-function normalizeNode(nodeId, rawNode) {
-  const node = deepClone(rawNode || {});
-  const action = normalizeNodeAction(node);
-  const normalized = {
-    ...node,
-    action,
-    id: String(nodeId),
-  };
-
-  delete normalized.type;
-
-  if (Object.prototype.hasOwnProperty.call(normalized, 'next')) {
-    normalized.next = normalizeTarget(normalized.next);
-  }
-
-  if (Object.prototype.hasOwnProperty.call(normalized, 'default')) {
-    normalized.default = normalizeTarget(normalized.default);
-  }
-
-  if (Array.isArray(normalized.cases)) {
-    normalized.cases = normalized.cases.map((entry, index) =>
-      normalizeSwitchCase(entry, index)
-    );
-  }
-
-  return normalized;
-}
-
-function normalizeGraphWorkflow(spec = {}) {
-  const rawNodes =
-    spec.nodes && typeof spec.nodes === 'object' && !Array.isArray(spec.nodes)
-      ? spec.nodes
-      : {};
-
-  const nodes = Object.fromEntries(
-    Object.entries(rawNodes).map(([nodeId, rawNode]) => [
-      String(nodeId),
-      normalizeNode(nodeId, rawNode),
-    ])
-  );
-
-  if (Object.keys(nodes).length === 0) {
-    nodes.__end__ = normalizeNode('__end__', {
-      action: 'end',
-      status: 'pass',
-      message: '',
-    });
-  }
-
-  return {
-    entry: String(spec.entry || Object.keys(nodes)[0] || '__end__'),
-    nodes,
-  };
-}
-
-function normalizeWorkflowDocument(document, options = {}) {
-  const validate = document.validate || {};
-  const workflowSpec = validate.workflow || null;
-
-  if (!workflowSpec || typeof workflowSpec !== 'object') {
-    throw new Error('validate.workflow is required');
-  }
-
-  const workflow = normalizeGraphWorkflow(workflowSpec);
-
-  return {
-    description: document.description || '',
-    hooks: {
-      pre_conditions: deepClone(workflowSpec.pre_conditions || []),
-      setup: deepClone(workflowSpec.setup || []),
-      teardown: deepClone(workflowSpec.teardown || []),
-    },
-    inputs: deepClone(document.inputs || {}),
-    sourcePath: options.sourcePath ? path.resolve(options.sourcePath) : '',
-    title: document.title || '',
-    workflow,
-  };
-}
-
-function summarizeAssert(assertSpec) {
-  if (!assertSpec || typeof assertSpec !== 'object') {
-    return '';
-  }
-
-  if (Array.isArray(assertSpec.all)) {
-    return assertSpec
-      .all
-      .map((entry) => summarizeAssert(entry))
-      .filter(Boolean)
-      .join(' & ');
-  }
-
-  if (Array.isArray(assertSpec.any)) {
-    return assertSpec
-      .any
-      .map((entry) => summarizeAssert(entry))
-      .filter(Boolean)
-      .join(' | ');
-  }
-
-  if (Array.isArray(assertSpec.none)) {
-    return `not(${assertSpec.none
-      .map((entry) => summarizeAssert(entry))
-      .filter(Boolean)
-      .join(' | ')})`;
-  }
-
-  const operator = assertSpec.operator || '';
-  const field = assertSpec.field || '$';
-
-  if (Object.prototype.hasOwnProperty.call(assertSpec, 'value')) {
-    return `${field} ${operator} ${JSON.stringify(assertSpec.value)}`;
-  }
-
-  if (Object.prototype.hasOwnProperty.call(assertSpec, 'values')) {
-    return `${field} ${operator} ${JSON.stringify(assertSpec.values)}`;
-  }
-
-  if (Object.prototype.hasOwnProperty.call(assertSpec, 'pattern')) {
-    return `${field} ${operator} ${JSON.stringify(assertSpec.pattern)}`;
-  }
-
-  return `${field} ${operator}`.trim();
-}
-
-function getNodeTargets(node) {
-  if (!node) {
-    return [];
-  }
-
-  if (node.action === 'switch') {
-    const targets = [];
-
-    (node.cases || []).forEach((entry) => {
-      if (entry.next) {
-        targets.push(entry.next);
-      }
-    });
-
-    if (node.default) {
-      targets.push(node.default);
-    }
-
-    return targets;
-  }
-
-  if (node.action === 'end') {
-    return [];
-  }
-
-  return node.next ? [node.next] : [];
-}
-
-function listWorkflowEdges(workflow) {
-  const edges = [];
-
-  for (const [nodeId, node] of Object.entries(workflow.nodes || {})) {
-    if (node.action === 'switch') {
-      (node.cases || []).forEach((entry, index) => {
-        if (!entry.next) {
-          return;
-        }
-
-        edges.push({
-          from: nodeId,
-          label: entry.label || summarizeAssert(entry.when) || `case ${index + 1}`,
-          to: entry.next,
-        });
-      });
-
-      if (node.default) {
-        edges.push({
-          from: nodeId,
-          label: 'default',
-          to: node.default,
-        });
-      }
-
-      continue;
-    }
-
-    if (node.next) {
-      edges.push({
-        from: nodeId,
-        label: node.when
-          ? `when ${summarizeAssert(node.when)}`
-          : node.unless
-            ? `unless ${summarizeAssert(node.unless)}`
-            : '',
-        to: node.next,
-      });
-    }
-  }
-
-  return edges;
-}
-
-function findReachableNodes(workflow) {
-  const visited = new Set();
-  const queue = [workflow.entry];
-
-  while (queue.length > 0) {
-    const nodeId = queue.shift();
-    if (!nodeId || visited.has(nodeId)) {
-      continue;
-    }
-
-    visited.add(nodeId);
-    const node = workflow.nodes?.[nodeId];
-    if (!node) {
-      continue;
-    }
-
-    getNodeTargets(node).forEach((target) => {
-      if (target && !visited.has(target)) {
-        queue.push(target);
-      }
-    });
-  }
-
-  return visited;
-}
-
-function findUnreachableNodes(workflow) {
-  const reachable = findReachableNodes(workflow);
-  return Object.keys(workflow.nodes || {}).filter((nodeId) => !reachable.has(nodeId));
-}
-
-function findMissingTargets(workflow) {
-  return listWorkflowEdges(workflow).filter((edge) => !workflow.nodes?.[edge.to]);
-}
-
-function detectWorkflowCycles(workflow) {
-  const visited = new Set();
-  const active = new Set();
-  const stack = [];
-  const dedupe = new Set();
-  const cycles = [];
-
-  function visit(nodeId) {
-    if (!nodeId || !workflow.nodes?.[nodeId]) {
-      return;
-    }
-
-    if (active.has(nodeId)) {
-      const startIndex = stack.indexOf(nodeId);
-      const cycle = stack.slice(startIndex).concat(nodeId);
-      const key = cycle.join(' -> ');
-      if (!dedupe.has(key)) {
-        dedupe.add(key);
-        cycles.push(cycle);
-      }
-      return;
-    }
-
-    if (visited.has(nodeId)) {
-      return;
-    }
-
-    visited.add(nodeId);
-    active.add(nodeId);
-    stack.push(nodeId);
-
-    getNodeTargets(workflow.nodes[nodeId]).forEach((target) => visit(target));
-
-    stack.pop();
-    active.delete(nodeId);
-  }
-
-  Object.keys(workflow.nodes || {}).forEach((nodeId) => visit(nodeId));
-  return cycles;
-}
-
-function escapeMermaidLabel(value) {
-  return String(value || '')
-    .replaceAll('"', '\\"')
-    .replaceAll('\n', '<br/>');
-}
-
-function buildMermaidIdMap(workflow) {
-  const map = {};
-  const used = new Set();
-  let index = 1;
-
-  for (const nodeId of Object.keys(workflow.nodes || {})) {
-    let candidate = `node_${String(nodeId).replaceAll(/[^a-zA-Z0-9_]/g, '_') || index}`;
-    while (used.has(candidate)) {
-      index += 1;
-      candidate = `${candidate}_${index}`;
-    }
-    used.add(candidate);
-    map[nodeId] = candidate;
-  }
-
-  return map;
-}
-
-function mermaidNodeShape(nodeId, node, mermaidId) {
-  const action = node.action || '';
-  const title = node.description || node.ref || action || nodeId;
-  const label = escapeMermaidLabel(`${nodeId}<br/>${title}`);
-
-  if (action === 'switch') {
-    return `${mermaidId}{"${label}"}`;
-  }
-
-  if (action === 'end') {
-    const status = String(node.status || 'pass').toUpperCase();
-    return `${mermaidId}(["${escapeMermaidLabel(`${nodeId}<br/>${status}`)}"])`;
-  }
-
-  if (action === 'call') {
-    return `${mermaidId}[["${label}"]]`;
-  }
-
-  return `${mermaidId}["${label}"]`;
-}
-
-function renderWorkflowMermaid(normalizedDocument) {
-  const workflow = normalizedDocument.workflow || normalizedDocument;
-  const mermaidIds = buildMermaidIdMap(workflow);
-  const lines = ['flowchart TD'];
-
-  if (normalizedDocument.title) {
-    lines.push(`  %% ${escapeMermaidLabel(normalizedDocument.title)}`);
-  }
-
-  lines.push(`  __entry__(["ENTRY"]) --> ${mermaidIds[workflow.entry] || workflow.entry}`);
-
-  for (const [nodeId, node] of Object.entries(workflow.nodes || {})) {
-    lines.push(`  ${mermaidNodeShape(nodeId, node, mermaidIds[nodeId] || nodeId)}`);
-  }
-
-  for (const edge of listWorkflowEdges(workflow)) {
-    const label = edge.label ? `|${escapeMermaidLabel(edge.label)}|` : '';
-    lines.push(
-      `  ${mermaidIds[edge.from] || edge.from} -->${label} ${mermaidIds[edge.to] || edge.to}`
-    );
-  }
-
-  return `${lines.join('\n')}\n`;
-}
-
-module.exports = {
-  ALL_WORKFLOW_ACTIONS,
-  CONTROL_ACTIONS,
-  EXECUTABLE_ACTIONS,
-  deepClone,
-  detectWorkflowCycles,
-  findMissingTargets,
-  findReachableNodes,
-  findUnreachableNodes,
-  getNodeTargets,
-  listWorkflowEdges,
-  normalizeGraphWorkflow,
-  normalizeNode,
-  normalizeWorkflowDocument,
-  renderWorkflowMermaid,
-  summarizeAssert,
-};
diff --git a/scripts/perps/agentic/run-timing-benchmark.sh b/scripts/perps/agentic/run-timing-benchmark.sh
deleted file mode 100755
index 295091c699dc..000000000000
--- a/scripts/perps/agentic/run-timing-benchmark.sh
+++ /dev/null
@@ -1,345 +0,0 @@
-#!/usr/bin/env bash
-# run-timing-benchmark.sh — Wall-clock timing comparison: Detox vs Agentic recipes
-#
-# Uses TWO separate simulators and builds to avoid conflicts:
-#   - Detox:   e2e debug build on dedicated "detox-benchmark" simulator (port 8081)
-#              Detox wipes app data each test — isolated from dev environment.
-#   - Agentic: dev build on IOS_SIMULATOR from .js.env (port from WATCHER_PORT)
-#              Uses existing wallet with real testnet balance — no wipe.
-#
-# Prerequisites:
-#   1. Detox build:  yarn test:e2e:ios:debug:build
-#   2. Dev build:    yarn a:setup:ios (or preflight.sh)
-#   3. Wallet unlocked on IOS_SIMULATOR with perps enabled + testnet balance
-#
-# The two phases run sequentially. Each manages its own Metro instance.
-#
-# Usage:
-#   bash scripts/perps/agentic/run-timing-benchmark.sh
-#
-# Override simulators:
-#   DETOX_SIMULATOR="my-detox-sim" AGENTIC_SIMULATOR="my-dev-sim" \
-#     bash scripts/perps/agentic/run-timing-benchmark.sh
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
-
-# ---------------------------------------------------------------------------
-# Source .js.env (non-destructive: only sets vars not already in env)
-# Same approach as preflight.sh — caller env takes precedence.
-# ---------------------------------------------------------------------------
-if [[ -f "$PROJECT_ROOT/.js.env" ]]; then
-  while IFS= read -r _line || [[ -n "$_line" ]]; do
-    [[ "$_line" =~ ^[[:space:]]*(#|$) ]] && continue
-    _line="${_line#export }"
-    _key="${_line%%=*}"
-    _key="${_key//[[:space:]]/}"
-    [[ -n "$_key" && -z "${!_key+x}" ]] && eval "export $_line" 2>/dev/null || true
-  done < "$PROJECT_ROOT/.js.env"
-  unset _line _key
-fi
-
-# ---------------------------------------------------------------------------
-# Config — two simulators, shared port (Metro restarts between phases)
-# ---------------------------------------------------------------------------
-
-DETOX_SIMULATOR="${DETOX_SIMULATOR:-detox-benchmark}"
-SHARED_PORT="${WATCHER_PORT:-8062}"
-DETOX_PORT="$SHARED_PORT"
-
-AGENTIC_SIMULATOR="${AGENTIC_SIMULATOR:-${IOS_SIMULATOR:-mm-2}}"
-AGENTIC_PORT="$SHARED_PORT"
-
-# Matched pairs: Detox spec path -> agentic recipe path
-SPEC_NAMES=("perps-position" "perps-position-stop-loss" "perps-limit-long-fill")
-
-declare -A DETOX_SPECS
-DETOX_SPECS[perps-position]="tests/smoke/perps/perps-position.spec.ts"
-DETOX_SPECS[perps-position-stop-loss]="tests/smoke/perps/perps-position-stop-loss.spec.ts"
-DETOX_SPECS[perps-limit-long-fill]="tests/smoke/perps/perps-limit-long-fill.spec.ts"
-
-declare -A AGENTIC_RECIPES
-AGENTIC_RECIPES[perps-position]="scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position.json"
-AGENTIC_RECIPES[perps-position-stop-loss]="scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-stop-loss.json"
-AGENTIC_RECIPES[perps-limit-long-fill]="scripts/perps/agentic/teams/perps/recipes/benchmark/perps-limit-long-fill.json"
-
-# Results arrays
-declare -A DETOX_TIMES
-declare -A AGENTIC_TIMES
-declare -A DETOX_STATUS
-declare -A AGENTIC_STATUS
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-timestamp() { date '+%Y-%m-%d %H:%M:%S'; }
-
-run_timed() {
-  # run_timed <label> <command...>
-  # Prints elapsed seconds, returns exit code
-  local label="$1"; shift
-  local start_s=$SECONDS
-  echo ""
-  echo "================================================================"
-  echo "[$label] started at $(timestamp)"
-  echo "================================================================"
-  set +e
-  "$@"
-  local exit_code=$?
-  set -e
-  local elapsed=$(( SECONDS - start_s ))
-  echo "----------------------------------------------------------------"
-  echo "[$label] finished in ${elapsed}s (exit=$exit_code)"
-  echo "----------------------------------------------------------------"
-  # Export via global
-  _TIMED_ELAPSED=$elapsed
-  _TIMED_EXIT=$exit_code
-}
-
-wait_for_cdp() {
-  local port=$1
-  local timeout=${2:-60}
-  echo "Waiting for CDP targets on port $port..."
-  for i in $(seq 1 "$timeout"); do
-    TARGETS=$(curl -sf "http://localhost:$port/json/list" 2>/dev/null \
-      | python3 -c "import sys,json; print(len(json.loads(sys.stdin.read() or '[]')))" 2>/dev/null || echo 0)
-    if [[ "$TARGETS" -gt 0 ]]; then
-      echo "CDP ready: $TARGETS target(s)"
-      return 0
-    fi
-    sleep 2
-  done
-  echo "WARNING: CDP not ready after $((timeout * 2))s"
-  return 1
-}
-
-# ---------------------------------------------------------------------------
-# Header
-# ---------------------------------------------------------------------------
-
-cd "$PROJECT_ROOT"
-
-echo ""
-echo "========================================"
-echo "  Perps Timing Benchmark"
-echo "  $(timestamp)"
-echo "========================================"
-echo ""
-echo "  Detox:   simulator=$DETOX_SIMULATOR  port=$DETOX_PORT  env=e2e"
-echo "  Agentic: simulator=$AGENTIC_SIMULATOR  port=$AGENTIC_PORT  env=dev"
-echo ""
-
-# ---------------------------------------------------------------------------
-# Phase 1: Detox specs (e2e build, dedicated simulator)
-# ---------------------------------------------------------------------------
-
-echo ""
-echo "========================================"
-echo "  PHASE 1: Detox Smoke Specs"
-echo "  Simulator: $DETOX_SIMULATOR"
-echo "  Metro port: $DETOX_PORT (METAMASK_ENVIRONMENT=e2e)"
-echo "========================================"
-
-# Ensure Metro on shared port with e2e env — kill any existing Metro first
-METRO_PID=$(lsof -iTCP:"$SHARED_PORT" -sTCP:LISTEN -t 2>/dev/null | head -1 || true)
-if [[ -n "$METRO_PID" ]]; then
-  METRO_ENV=$(ps -p "$METRO_PID" -E 2>/dev/null | grep -o 'METAMASK_ENVIRONMENT=[^ ]*' || echo "")
-  if [[ "$METRO_ENV" == "METAMASK_ENVIRONMENT=e2e" ]]; then
-    echo "Metro already running on $SHARED_PORT with e2e"
-  else
-    echo "Metro on $SHARED_PORT has $METRO_ENV — restarting with e2e..."
-    kill "$METRO_PID" 2>/dev/null; sleep 3
-    METRO_PID=""
-  fi
-fi
-if [[ -z "$METRO_PID" ]] || ! curl -sf "http://localhost:$SHARED_PORT/status" >/dev/null 2>&1; then
-  echo "Starting Metro on port $SHARED_PORT with METAMASK_ENVIRONMENT=e2e IS_TEST=true..."
-  METAMASK_ENVIRONMENT=e2e IS_TEST=true METAMASK_BUILD_TYPE=main WATCHER_PORT="$SHARED_PORT" \
-    bash "$SCRIPT_DIR/start-metro.sh"
-fi
-
-# Source .e2e.env for Detox
-E2E_ENV="$PROJECT_ROOT/.e2e.env"
-[[ -f "$E2E_ENV" ]] && source "$E2E_ENV"
-
-# Boot detox simulator if needed
-if ! xcrun simctl list devices | grep "$DETOX_SIMULATOR" | grep -q "Booted"; then
-  echo "Booting $DETOX_SIMULATOR..."
-  xcrun simctl boot "$DETOX_SIMULATOR" 2>/dev/null || true
-  sleep 3
-fi
-
-for name in "${SPEC_NAMES[@]}"; do
-  spec="${DETOX_SPECS[$name]}"
-
-  run_timed "detox:$name" \
-    env IOS_SIMULATOR="$DETOX_SIMULATOR" WATCHER_PORT="$DETOX_PORT" \
-    yarn test:e2e:ios:debug:run "$spec"
-
-  DETOX_TIMES[$name]=$_TIMED_ELAPSED
-  if [[ $_TIMED_EXIT -eq 0 ]]; then
-    DETOX_STATUS[$name]="PASS"
-  else
-    DETOX_STATUS[$name]="FAIL"
-  fi
-done
-
-# ---------------------------------------------------------------------------
-# Phase 2: Agentic recipes (dev build, existing simulator + wallet)
-# ---------------------------------------------------------------------------
-
-echo ""
-echo "========================================"
-echo "  PHASE 2: Agentic Recipes"
-echo "  Simulator: $AGENTIC_SIMULATOR"
-echo "  Metro port: $AGENTIC_PORT (METAMASK_ENVIRONMENT=dev)"
-echo "========================================"
-
-# Restart Metro on shared port with dev env for agentic phase
-echo "Switching Metro on $SHARED_PORT to dev environment..."
-METRO_PID=$(lsof -iTCP:"$SHARED_PORT" -sTCP:LISTEN -t 2>/dev/null | head -1 || true)
-if [[ -n "$METRO_PID" ]]; then
-  kill "$METRO_PID" 2>/dev/null; sleep 3
-fi
-METAMASK_ENVIRONMENT=dev METAMASK_BUILD_TYPE=main \
-  bash "$SCRIPT_DIR/start-metro.sh" --platform ios --launch
-wait_for_cdp "$SHARED_PORT"
-
-# Post-restart setup: unlock wallet, dismiss onboarding, init perps
-echo ""
-echo "Post-restart: setting up agentic environment..."
-CDP_BRIDGE="$SCRIPT_DIR/cdp-bridge.js"
-export IOS_SIMULATOR="$AGENTIC_SIMULATOR"
-export WATCHER_PORT="$AGENTIC_PORT"
-
-# Wait for app to fully load (Login or Wallet screen)
-echo "  Waiting for app to be ready..."
-for i in $(seq 1 15); do
-  ROUTE=$(node "$CDP_BRIDGE" get-route 2>/dev/null | python3 -c "import sys,json; print(json.load(sys.stdin).get('name',''))" 2>/dev/null || echo "")
-  if [[ "$ROUTE" == "Login" || "$ROUTE" == "Wallet" ]]; then
-    echo "  App ready on $ROUTE screen after $((i * 2))s"
-    break
-  fi
-  sleep 2
-done
-
-# Unlock wallet if on Login screen
-WALLET_PW=$(python3 -c "import json; print(json.load(open('.agent/wallet-fixture.json'))['password'])" 2>/dev/null || echo "qwerasdf")
-if [[ "$ROUTE" == "Login" ]]; then
-  echo "  Unlocking wallet..."
-  node "$CDP_BRIDGE" unlock "$WALLET_PW" 2>/dev/null; sleep 3
-else
-  echo "  Wallet already unlocked"
-fi
-
-# Init perps provider + testnet
-echo "  Initializing perps provider..."
-node "$CDP_BRIDGE" eval-async 'Engine.context.PerpsController.init().then(function(){return Engine.context.PerpsController.toggleTestnet(true)}).then(function(){return JSON.stringify({ok:true})})' >/dev/null 2>&1
-sleep 2
-
-# Verify readiness
-echo "  Checking perps readiness..."
-node "$CDP_BRIDGE" check-pre-conditions '["perps.ready_to_trade","perps.sufficient_balance"]' 2>/dev/null || echo "WARNING: perps pre-conditions may not be met"
-
-# Pre-flight: check agentic wallet balance via CDP
-echo ""
-echo "Pre-flight: checking perps balance on $AGENTIC_SIMULATOR..."
-BALANCE_CHECK=$(env IOS_SIMULATOR="$AGENTIC_SIMULATOR" WATCHER_PORT="$AGENTIC_PORT" \
-  node "$SCRIPT_DIR/cdp-bridge.js" eval-ref perps/balances 2>/dev/null || echo '{"error":"balance check failed (non-fatal)"}')
-echo "  $BALANCE_CHECK"
-echo ""
-
-for name in "${SPEC_NAMES[@]}"; do
-  recipe="${AGENTIC_RECIPES[$name]}"
-
-  run_timed "agentic:$name" \
-    env IOS_SIMULATOR="$AGENTIC_SIMULATOR" WATCHER_PORT="$AGENTIC_PORT" \
-    node scripts/perps/agentic/validate-recipe.js "$recipe"
-
-  AGENTIC_TIMES[$name]=$_TIMED_ELAPSED
-  if [[ $_TIMED_EXIT -eq 0 ]]; then
-    AGENTIC_STATUS[$name]="PASS"
-  else
-    AGENTIC_STATUS[$name]="FAIL"
-  fi
-done
-
-# ---------------------------------------------------------------------------
-# Phase 3: Results table
-# ---------------------------------------------------------------------------
-
-echo ""
-echo "========================================"
-echo "  TIMING BENCHMARK RESULTS"
-echo "  $(timestamp)"
-echo "========================================"
-echo ""
-
-# Print markdown table
-TABLE="| Spec | Detox (s) | Detox Status | Agentic (s) | Agentic Status | Delta (s) | Speedup |
-|------|-----------|--------------|-------------|----------------|-----------|---------|"
-
-TOTAL_DETOX=0
-TOTAL_AGENTIC=0
-
-for name in "${SPEC_NAMES[@]}"; do
-  dt=${DETOX_TIMES[$name]}
-  at=${AGENTIC_TIMES[$name]}
-  ds=${DETOX_STATUS[$name]}
-  as=${AGENTIC_STATUS[$name]}
-  delta=$(( dt - at ))
-  if [[ $at -gt 0 ]]; then
-    speedup_100=$(( dt * 100 / at ))
-    speedup="$(( speedup_100 / 100 )).$(printf '%02d' $(( speedup_100 % 100 )))x"
-  else
-    speedup="N/A"
-  fi
-  TABLE="$TABLE
-| $name | $dt | $ds | $at | $as | ${delta} | ${speedup} |"
-  TOTAL_DETOX=$(( TOTAL_DETOX + dt ))
-  TOTAL_AGENTIC=$(( TOTAL_AGENTIC + at ))
-done
-
-TOTAL_DELTA=$(( TOTAL_DETOX - TOTAL_AGENTIC ))
-if [[ $TOTAL_AGENTIC -gt 0 ]]; then
-  total_speedup_100=$(( TOTAL_DETOX * 100 / TOTAL_AGENTIC ))
-  total_speedup="$(( total_speedup_100 / 100 )).$(printf '%02d' $(( total_speedup_100 % 100 )))x"
-else
-  total_speedup="N/A"
-fi
-TABLE="$TABLE
-| **TOTAL** | **$TOTAL_DETOX** | | **$TOTAL_AGENTIC** | | **${TOTAL_DELTA}** | **${total_speedup}** |"
-
-echo "$TABLE"
-
-# ---------------------------------------------------------------------------
-# Append to benchmark doc
-# ---------------------------------------------------------------------------
-
-BENCHMARK_DOC="$SCRIPT_DIR/timing-benchmark.md"
-RUN_DATE=$(date '+%Y-%m-%d %H:%M')
-
-SECTION="
-
-## Timing Benchmark ($RUN_DATE)
-
-**Detox:** simulator=$DETOX_SIMULATOR, port=$DETOX_PORT, env=e2e (debug build, mock infrastructure)
-**Agentic:** simulator=$AGENTIC_SIMULATOR, port=$AGENTIC_PORT, env=dev (dev build, real testnet)
-
-$TABLE
-
-### Notes
-- Detox and agentic use **different builds and simulators** — Detox needs e2e mocks, recipes need real API.
-- Detox times include app wipe+reinstall, fixture inject, mock server, test execution, teardown.
-- Agentic times include CDP connection, preflight checks, recipe execution, teardown.
-- Delta = Detox - Agentic (positive = agentic faster).
-- Speedup = Detox time / Agentic time.
-"
-
-echo "$SECTION" >> "$BENCHMARK_DOC"
-echo ""
-echo "Results appended to: $BENCHMARK_DOC"
-echo "Done."
diff --git a/scripts/perps/agentic/schemas/flow.schema.json b/scripts/perps/agentic/schemas/flow.schema.json
deleted file mode 100644
index 25da6e5e1590..000000000000
--- a/scripts/perps/agentic/schemas/flow.schema.json
+++ /dev/null
@@ -1,328 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "flow.schema.json",
-  "title": "Agentic Flow",
-  "description": "A parameterized test sequence that agents execute against a running MetaMask Mobile app via CDP. Flows combine navigation, UI interaction, and state assertions into a reproducible validation sequence.",
-  "type": "object",
-  "required": ["title", "validate"],
-  "additionalProperties": false,
-  "properties": {
-    "title": {
-      "type": "string",
-      "description": "Human-readable title. May contain {{param}} template tokens that resolve at runtime."
-    },
-    "schema_version": {
-      "type": ["string", "number"],
-      "description": "Opt-in strict-validation marker. Set to 1 to require fields like screenshot `note`. Recipes without this field (legacy/demo) only get console warnings instead of validation errors. Bump in future versions when adopting additional strict rules."
-    },
-    "pr": {
-      "type": ["string", "number"],
-      "description": "Associated PR number (informational)."
-    },
-    "inputs": {
-      "type": "object",
-      "description": "Declared parameters. Every {{param}} used in steps MUST have a matching key here. Params without a default are required.",
-      "additionalProperties": {
-        "type": "object",
-        "required": ["type"],
-        "properties": {
-          "type": {
-            "type": "string",
-            "enum": ["string", "number", "boolean"],
-            "description": "Informational type hint (no runtime type checking)."
-          },
-          "default": {
-            "description": "Default value. If present, the param is optional. Single source of truth — prefer this over inline {{param|default}} syntax."
-          },
-          "description": {
-            "type": "string",
-            "description": "What this parameter controls."
-          }
-        },
-        "additionalProperties": false
-      }
-    },
-    "initial_conditions": {
-      "type": "object",
-      "description": "App state to establish before running steps.",
-      "properties": {
-        "account": { "type": "string", "description": "Ethereum address to switch to." },
-        "testnet": { "type": "boolean", "description": "Enable/disable testnet mode." },
-        "provider": { "type": "string", "description": "Active provider (hyperliquid, myx, aggregated)." }
-      },
-      "additionalProperties": false
-    },
-    "validate": {
-      "type": "object",
-      "required": ["runtime"],
-      "additionalProperties": false,
-      "properties": {
-        "runtime": {
-          "type": "object",
-          "required": ["steps"],
-          "additionalProperties": false,
-          "properties": {
-            "pre_conditions": {
-              "type": "array",
-              "description": "Checks that must pass before steps run. String refs or parameterized objects.",
-              "items": {
-                "oneOf": [
-                  {
-                    "type": "string",
-                    "description": "Named pre-condition (e.g. 'wallet.unlocked'). Shorthand 'name(k=v)' is also supported."
-                  },
-                  {
-                    "type": "object",
-                    "required": ["name"],
-                    "properties": {
-                      "name": { "type": "string", "description": "Pre-condition registry key." }
-                    },
-                    "additionalProperties": { "type": "string" },
-                    "description": "Parameterized pre-condition (e.g. { name: 'perps.open_position', symbol: 'BTC' })."
-                  }
-                ]
-              }
-            },
-            "initial_conditions": {
-              "type": "object",
-              "description": "Same as top-level initial_conditions (nested form for backward compat).",
-              "properties": {
-                "account": { "type": "string" },
-                "testnet": { "type": "boolean" },
-                "provider": { "type": "string" }
-              },
-              "additionalProperties": false
-            },
-            "steps": {
-              "type": "array",
-              "minItems": 1,
-              "description": "Ordered sequence of actions. Terminal step MUST assert.",
-              "items": { "$ref": "#/$defs/step" }
-            }
-          }
-        }
-      }
-    }
-  },
-  "$defs": {
-    "assert": {
-      "type": "object",
-      "required": ["operator"],
-      "additionalProperties": false,
-      "description": "Assertion applied to step result.",
-      "properties": {
-        "operator": {
-          "type": "string",
-          "enum": ["not_null", "eq", "neq", "gt", "length_eq", "length_gt", "contains", "not_contains"],
-          "description": "Comparison operator."
-        },
-        "field": {
-          "type": ["string", "null"],
-          "description": "Dot-path into the result JSON to extract the actual value (e.g. 'route', 'positions.0.symbol'). Null or omitted = use entire result."
-        },
-        "value": {
-          "description": "Expected value for eq/gt/length_eq/length_gt/contains/not_contains. Not used for not_null."
-        }
-      }
-    },
-    "step": {
-      "type": "object",
-      "required": ["id", "action"],
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Unique step identifier. Use descriptive kebab-case (e.g. 'assert-route', 'press-close')."
-        },
-        "description": {
-          "type": "string",
-          "description": "Optional human note. Only add when the id + action aren't self-explanatory."
-        },
-        "action": {
-          "type": "string",
-          "enum": [
-            "navigate", "eval_sync", "eval_async", "eval_ref",
-            "press", "scroll", "set_input", "type_keypad", "clear_keypad",
-            "call", "log_watch", "wait", "wait_for", "screenshot", "manual",
-            "select_account", "toggle_testnet", "switch_provider"
-          ]
-        },
-        "assert": { "$ref": "#/$defs/assert" }
-      },
-      "allOf": [
-        {
-          "if": { "properties": { "action": { "const": "navigate" } } },
-          "then": {
-            "properties": {
-              "target": { "type": "string", "description": "Route name (e.g. 'PerpsMarketDetails')." },
-              "params": { "type": "object", "description": "Navigation params (route-specific)." }
-            },
-            "required": ["target"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "eval_sync" } } },
-          "then": {
-            "properties": {
-              "expression": { "type": "string", "description": "ES5 JS expression evaluated synchronously via CDP." }
-            },
-            "required": ["expression", "assert"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "eval_async" } } },
-          "then": {
-            "properties": {
-              "expression": { "type": "string", "description": "ES5 JS expression returning a Promise. Use .then() chains, NOT await." }
-            },
-            "required": ["expression", "assert"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "eval_ref" } } },
-          "then": {
-            "properties": {
-              "ref": { "type": "string", "description": "Eval ref name (e.g. 'positions', 'core/tpsl-orders')." }
-            },
-            "required": ["ref", "assert"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "press" } } },
-          "then": {
-            "properties": {
-              "test_id": { "type": "string", "description": "testID prop of the React component to press." }
-            },
-            "required": ["test_id"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "scroll" } } },
-          "then": {
-            "properties": {
-              "test_id": { "type": "string", "description": "testID of the scrollable container." },
-              "offset": { "type": "number", "default": 300, "description": "Scroll offset in pixels." },
-              "animated": { "type": "boolean", "default": false }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "set_input" } } },
-          "then": {
-            "properties": {
-              "test_id": { "type": "string", "description": "testID of the TextInput." },
-              "value": { "type": "string", "description": "Text to type into the input." }
-            },
-            "required": ["test_id", "value"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "type_keypad" } } },
-          "then": {
-            "properties": {
-              "value": { "type": "string", "description": "Digits/dot to type via keypad buttons (e.g. '10.5')." }
-            },
-            "required": ["value"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "clear_keypad" } } },
-          "then": {
-            "properties": {
-              "count": { "type": "number", "default": 8, "description": "Number of delete presses." }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "call" } } },
-          "then": {
-            "properties": {
-              "ref": { "type": "string", "description": "Flow path: 'team/name' or just 'name' (defaults to perps team)." },
-              "params": { "type": "object", "description": "Values for the referenced flow's {{param}} tokens." }
-            },
-            "required": ["ref"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "log_watch" } } },
-          "then": {
-            "properties": {
-              "window_seconds": { "type": "number", "default": 10 },
-              "must_not_appear": { "type": "array", "items": { "type": "string" }, "description": "Strings that must NOT appear in recent logs (case-insensitive)." },
-              "watch_for": { "type": "array", "items": { "type": "string" }, "description": "Strings to count in recent logs (informational)." }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "wait" } } },
-          "then": {
-            "properties": {
-              "ms": { "type": "number", "default": 1000, "description": "Milliseconds to pause." }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "screenshot" } } },
-          "then": {
-            "required": ["filename"],
-            "properties": {
-              "filename": { "type": "string", "minLength": 1, "description": "Screenshot label." },
-              "note": {
-                "type": "string",
-                "minLength": 3,
-                "description": "State-specific caption describing what the screenshot proves (e.g. 'AC1: Recent Activity skeleton with 3 shimmer rows'). Required when top-level schema_version is set (>= 1). Recipes without schema_version (legacy) only get a console warning."
-              }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "manual" } } },
-          "then": {
-            "properties": {
-              "note": { "type": "string", "description": "Instructions for human intervention." }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "select_account" } } },
-          "then": {
-            "properties": {
-              "address": { "type": "string", "description": "Ethereum address to switch to." }
-            },
-            "required": ["address"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "toggle_testnet" } } },
-          "then": {
-            "properties": {
-              "enabled": { "type": "boolean", "default": true, "description": "Desired testnet state." }
-            }
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "switch_provider" } } },
-          "then": {
-            "properties": {
-              "provider": { "type": "string", "description": "Provider ID (hyperliquid, myx, aggregated)." }
-            },
-            "required": ["provider"]
-          }
-        },
-        {
-          "if": { "properties": { "action": { "const": "wait_for" } } },
-          "then": {
-            "properties": {
-              "expression": { "type": "string", "description": "ES5 JS expression to poll (sync or async with .then()). Used when route/test_id sugar is not sufficient." },
-              "route": { "type": "string", "description": "Shorthand: poll until current route name equals this value. Expands to a getRoute() expression + eq assert." },
-              "not_route": { "type": "string", "description": "Shorthand: poll until current route name does NOT equal this value (e.g. wait to leave a screen)." },
-              "test_id": { "type": "string", "description": "Shorthand: poll until a component with this testID exists (or disappears if visible=false) in the React fiber tree." },
-              "visible": { "type": "boolean", "default": true, "description": "Used with test_id: true = wait for element to appear, false = wait for element to disappear." },
-              "timeout_ms": { "type": "number", "default": 10000, "description": "Max wait in milliseconds before failing." },
-              "poll_ms": { "type": "number", "default": 500, "description": "Polling interval in milliseconds." }
-            }
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/setup-wallet.sh b/scripts/perps/agentic/setup-wallet.sh
index 0f12efea97d2..3c52aca5fd62 100755
--- a/scripts/perps/agentic/setup-wallet.sh
+++ b/scripts/perps/agentic/setup-wallet.sh
@@ -11,29 +11,27 @@
 #   {
 #     "password": "yourpassword",
 #     "accounts": [
-#       { "type": "mnemonic", "value": "word1 word2 ..." },
-#       { "type": "privateKey", "value": "0xabc...", "name": "Trading" }
+#       { "type": "mnemonic", "value": "word1 word2 ...", "name": "Primary" },
+#       { "type": "privateKey", "value": "0xabc...", "name": "Trading" },
+#       { "type": "privateKey", "value": "0xdef...", "name": "MYXTrading" }
 #     ],
-#     "settings": { "metametrics": false, "skipGtmModals": true }
+#     "settings": { "metametrics": true, "skipGtmModals": true, "skipPerpsTutorial": true, "autoLockNever": true, "deviceAuthEnabled": true }
 #   }
 
 set -euo pipefail
 
-cd "$(dirname "$0")/../../.."
+# Resolve the script directory to an absolute path BEFORE cd, so sourcing and
+# helper paths work regardless of the caller's CWD (e.g. ./setup-wallet.sh).
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+cd "$SCRIPT_DIR/../../.."
 # Source .js.env but only for vars not already set, so caller env takes precedence.
-if [ -f .js.env ]; then
-  while IFS= read -r _line || [ -n "$_line" ]; do
-    [[ "$_line" =~ ^[[:space:]]*(#|$) ]] && continue
-    _line="${_line#export }"
-    _key="${_line%%=*}"
-    _key="${_key//[[:space:]]/}"
-    [[ -n "$_key" && -z "${!_key+x}" ]] && eval "export $_line" 2>/dev/null || true
-  done < .js.env
-  unset _line _key
-fi
+# shellcheck source=lib/safe-env-parser.sh
+. "$SCRIPT_DIR/lib/safe-env-parser.sh"
+load_js_env
 
 PORT="${WATCHER_PORT:-8081}"
-SCRIPTS="$(dirname "$0")"
+[[ "$PORT" =~ ^[0-9]+$ ]] || { echo "ERROR: WATCHER_PORT must be numeric (got: $PORT)" >&2; exit 1; }
+SCRIPTS="$SCRIPT_DIR"
 export CDP_TIMEOUT="${CDP_TIMEOUT:-30000}"
 export CDP_DISCOVERY_RETRIES="${CDP_DISCOVERY_RETRIES:-3}"
 CDP="node $SCRIPTS/cdp-bridge.js"
@@ -45,7 +43,9 @@ cdp_eval_async() { $CDP eval-async "$1" 2>/dev/null | jq -r '.'; }
 # -- Parse args --
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    --fixture) FIXTURE_PATH="$2"; shift 2 ;;
+    --fixture)
+      [ $# -ge 2 ] || { echo "ERROR: --fixture requires a path argument"; exit 2; }
+      FIXTURE_PATH="$2"; shift 2 ;;
     -h|--help) echo "Usage: setup-wallet.sh [--fixture path.json]"; exit 0 ;;
     *)         echo "Unknown arg: $1"; exit 2 ;;
   esac
@@ -82,7 +82,12 @@ for i in $(seq 0 $((ACCOUNT_COUNT - 1))); do
   fi
   [ -z "$ACC_VALUE" ] && { echo "ERROR: accounts[$i].value is empty"; exit 1; }
 done
-echo "Fixture OK: password + ${ACCOUNT_COUNT} account(s)"
+# Expected EVM account total = sum of mnemonic counts + one per private key.
+# A mnemonic entry with count=N materializes N HD accounts, not one, so the
+# entry count alone (ACCOUNT_COUNT) under-counts and would let setup pass while
+# silently missing HD accounts.
+EXPECTED_ETH_TOTAL=$(jq -r '[.accounts[] | if .type == "mnemonic" then (.count // .numberOfAccounts // 1) else 1 end] | add // 0' "$FIXTURE_PATH")
+echo "Fixture OK: password + ${ACCOUNT_COUNT} entry(ies), ${EXPECTED_ETH_TOTAL} expected EVM account(s)"
 
 # -- Check CDP --
 $CDP eval "JSON.stringify({ok:true})" >/dev/null 2>&1 || { echo "ERROR: CDP not reachable"; exit 1; }
@@ -103,50 +108,156 @@ if [ "$ENGINE_OK" != "ready" ]; then
   exit 1
 fi
 
+# The backup subscriber reads the Engine *class* static
+# `disableAutomaticVaultBackup`. AgenticService.setupWallet/applyWalletFixture
+# set that static authoritatively before any account import/rename. The
+# CDP-exposed `Engine` is the facade object, not the class, so we cannot set the
+# static from here — only record harness intent for observability.
+if ! DISABLE_BACKUP=$(cdp_eval "(function(){ globalThis.__AGENTIC_DISABLE_VAULT_BACKUP = true; return JSON.stringify({agenticDisableVaultBackup: globalThis.__AGENTIC_DISABLE_VAULT_BACKUP === true}); })()"); then
+  echo "WARN: could not record vault backup guard intent before wallet setup"
+  DISABLE_BACKUP='{}'
+fi
+echo "Vault backup guard intent: $DISABLE_BACKUP"
+
+# Read fixture JSON and escape it for safe embedding in a JS string literal.
+FIXTURE_JSON=$(jq -c '.' "$FIXTURE_PATH")
+ESCAPED_FIXTURE=$(node -p "JSON.stringify(JSON.stringify(JSON.parse(process.argv[1])))" "$FIXTURE_JSON")
+
 # -- Check vault state --
-VAULT_STATE=$(cdp_eval "(function(){ var v = Engine.context.KeyringController.state; return JSON.stringify({hasVault: v.vault !== undefined && v.vault !== null, isUnlocked: v.isUnlocked}); })()")
+VAULT_STATE=$(cdp_eval "(function(){ var v = Engine.context.KeyringController.state; return JSON.stringify({hasVault: v.vault !== undefined && v.vault !== null, isUnlocked: Engine.context.KeyringController.isUnlocked()}); })()")
 HAS_VAULT=$(echo "$VAULT_STATE" | jq -r '.hasVault')
 IS_UNLOCKED=$(echo "$VAULT_STATE" | jq -r '.isUnlocked')
 echo "Vault state: hasVault=$HAS_VAULT, isUnlocked=$IS_UNLOCKED"
 
-# -- Existing vault: just unlock and skip to summary --
 if [ "$HAS_VAULT" = "true" ]; then
-  if [ "$IS_UNLOCKED" != "true" ]; then
-    echo "Unlocking existing vault..."
-    bash "$SCRIPTS/unlock-wallet.sh" "$PASSWORD"
-  else
+  # Do NOT unlock here with a bare KeyringController.submitPassword(): that
+  # bypasses the real auth flow (multichain init + dispatchLogin/password state)
+  # and can leave Redux/auth state stale. applyWalletFixture unlocks via
+  # Authentication.unlockWallet() when the vault is locked.
+  if [ "$IS_UNLOCKED" = "true" ]; then
     echo "Vault already unlocked."
+  else
+    echo "Vault locked — applyWalletFixture will unlock via Authentication.unlockWallet() (real post-login flow)."
   fi
+
+  echo "Applying fixture accounts/names to existing vault..."
+  APPLY_RESULT=$(cdp_eval_async "(function(){ var fixture = JSON.parse($ESCAPED_FIXTURE); if (!globalThis.__AGENTIC__ || typeof globalThis.__AGENTIC__.applyWalletFixture !== 'function') { return JSON.stringify({ok:false, error:'__AGENTIC__.applyWalletFixture is not installed; reload the app from Metro'}); } return globalThis.__AGENTIC__.applyWalletFixture(fixture).then(function(r){ return JSON.stringify(r); }).catch(function(e){ return JSON.stringify({ok:false, error: e.message || String(e)}); }); })()")
+  APPLY_OK=$(echo "$APPLY_RESULT" | jq -r '.ok')
+  if [ "$APPLY_OK" != "true" ]; then
+    APPLY_ERR=$(echo "$APPLY_RESULT" | jq -r '.error // "unknown error"')
+    echo "ERROR: applyWalletFixture failed — $APPLY_ERR"
+    exit 1
+  fi
+  echo "Wallet fixture apply result:"
+  echo "$APPLY_RESULT" | jq -r '.accounts[]? | "  \(.name): \(.address)"'
 else
-  # -- Call AgenticService.setupWallet() --
+  # -- Call AgenticService.setupWallet() on fresh app only --
   echo "Calling __AGENTIC__.setupWallet()..."
 
-  # Read fixture JSON and escape it for safe embedding in a JS string literal
-  FIXTURE_JSON=$(jq -c '.' "$FIXTURE_PATH")
-  ESCAPED_FIXTURE=$(node -p "JSON.stringify(JSON.stringify(JSON.parse(process.argv[1])))" "$FIXTURE_JSON")
-
-  SETUP_RESULT=$(cdp_eval_async "(function(){ var fixture = JSON.parse($ESCAPED_FIXTURE); return globalThis.__AGENTIC__.setupWallet(fixture).then(function(r){ return JSON.stringify(r); }).catch(function(e){ return JSON.stringify({ok:false, error: e.message || String(e)}); }); })()")
+  SETUP_RESULT=$(cdp_eval_async "(function(){ var fixture = JSON.parse($ESCAPED_FIXTURE); if (!globalThis.__AGENTIC__ || typeof globalThis.__AGENTIC__.setupWallet !== 'function') { return JSON.stringify({ok:false, error:'__AGENTIC__.setupWallet is not installed'}); } return globalThis.__AGENTIC__.setupWallet(fixture).then(function(r){ return JSON.stringify(r); }).catch(function(e){ return JSON.stringify({ok:false, error: e.message || String(e)}); }); })()")
 
   SETUP_OK=$(echo "$SETUP_RESULT" | jq -r '.ok')
   if [ "$SETUP_OK" != "true" ]; then
     SETUP_ERR=$(echo "$SETUP_RESULT" | jq -r '.error // "unknown error"')
-    echo "ERROR: setupWallet failed — $SETUP_ERR"
+    SETUP_STEP=$(echo "$SETUP_RESULT" | jq -r '.step // "unknown-step"')
+    echo "ERROR: setupWallet failed at ${SETUP_STEP} — $SETUP_ERR"
     exit 1
   fi
 
-  echo "Wallet created. Accounts:"
+  echo "Wallet setup result:"
   echo "$SETUP_RESULT" | jq -r '.accounts[]? | "  \(.name): \(.address)"'
   sleep 2
 fi
 
-# -- Summary --
-ACCOUNTS=$(cdp_eval "(function(){ var accs = Object.values(Engine.context.AccountsController.state.internalAccounts.accounts); var eth = accs.filter(function(a){ return a.address.indexOf('0x') === 0; }); return JSON.stringify({total: accs.length, ethAccounts: eth.length, first3: eth.slice(0,3).map(function(a){ return {name: a.metadata.name, address: a.address}; })}); })()")
+# -- Ask the app to leave auth/onboarding after unlock.
+# HomeNav matches the product auth reset path, but some warm/onboarding states
+# land on intermediate post-onboarding screens. Follow with WalletView so the
+# harness proves the user-visible unlocked wallet, not just a populated vault.
+$CDP navigate HomeNav >/dev/null 2>&1 || true
+sleep 1
+$CDP navigate WalletView >/dev/null 2>&1 || true
+sleep 1
+
+# -- Summary + hard validation --
+ACCOUNTS=$(cdp_eval "(function(){ try { var ctx = Engine && Engine.context ? Engine.context : {}; var accountsController = ctx.AccountsController || {}; var keyringController = ctx.KeyringController || {}; var state = accountsController.state || {}; var internalAccounts = state.internalAccounts || {}; var accountsById = internalAccounts.accounts || {}; var accs = Object.values(accountsById); var eth = accs.filter(function(a){ return String(a && a.address || '').indexOf('0x') === 0; }); var route = globalThis.__AGENTIC__ && globalThis.__AGENTIC__.getRoute ? globalThis.__AGENTIC__.getRoute() : null; var selected = null; if (typeof accountsController.getSelectedAccount === 'function') { selected = accountsController.getSelectedAccount(); } else if (internalAccounts.selectedAccount && accountsById[internalAccounts.selectedAccount]) { selected = accountsById[internalAccounts.selectedAccount]; } return JSON.stringify({ok:true, unlocked: typeof keyringController.isUnlocked === 'function' ? keyringController.isUnlocked() : null, routeName: route && route.name, selected: selected ? {name: selected.metadata && selected.metadata.name, address: selected.address} : null, total: accs.length, ethAccounts: eth.length, accounts: eth.map(function(a){ return {name: a && a.metadata && a.metadata.name, address: a && a.address}; }), first3: eth.slice(0,3).map(function(a){ return {name: a && a.metadata && a.metadata.name, address: a && a.address}; })}); } catch (e) { return JSON.stringify({ok:false, error: e && (e.stack || e.message) || String(e)}); } })()")
+ACCOUNTS_OK=$(echo "$ACCOUNTS" | jq -r '.ok // false')
+if [ "$ACCOUNTS_OK" != "true" ]; then
+  echo "ERROR: Unable to read wallet state after setupWallet"
+  echo "$ACCOUNTS" | jq .
+  exit 1
+fi
 TOTAL=$(echo "$ACCOUNTS" | jq -r '.total')
 ETH_COUNT=$(echo "$ACCOUNTS" | jq -r '.ethAccounts')
+UNLOCKED=$(echo "$ACCOUNTS" | jq -r '.unlocked')
+ROUTE_NAME=$(echo "$ACCOUNTS" | jq -r '.routeName // empty')
+EXPECTED_ADDRESSES=$(node - "$FIXTURE_PATH" <<'NODE'
+const fs = require('fs');
+const { Wallet } = require('ethers');
+const fixture = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
+const addresses = [];
+for (const account of fixture.accounts || []) {
+  if (account.type === 'mnemonic') {
+    const rawCount =
+      account.count != null
+        ? account.count
+        : account.numberOfAccounts != null
+        ? account.numberOfAccounts
+        : 1;
+    const count = Number(rawCount);
+    for (let i = 0; i < count; i += 1) {
+      addresses.push(
+        Wallet.fromMnemonic(account.value, `m/44'/60'/0'/0/${i}`).address.toLowerCase(),
+      );
+    }
+  } else if (account.type === 'privateKey') {
+    const key = account.value.startsWith('0x') ? account.value : `0x${account.value}`;
+    addresses.push(new Wallet(key).address.toLowerCase());
+  }
+}
+console.log(JSON.stringify(addresses));
+NODE
+)
+MISSING_ADDRESSES=$(ACCOUNTS_JSON="$ACCOUNTS" EXPECTED_JSON="$EXPECTED_ADDRESSES" node <<'NODE'
+const accounts = JSON.parse(process.env.ACCOUNTS_JSON);
+const expected = JSON.parse(process.env.EXPECTED_JSON);
+const actual = new Set((accounts.accounts || accounts.first3 || []).map((a) => String(a.address || '').toLowerCase()));
+const missing = expected.filter((address) => !actual.has(address));
+console.log(JSON.stringify(missing));
+NODE
+)
+if [ "$UNLOCKED" != "true" ]; then
+  echo "ERROR: Wallet setup did not unlock the vault"
+  echo "$ACCOUNTS" | jq .
+  exit 1
+fi
+if [ "$ETH_COUNT" -lt "$EXPECTED_ETH_TOTAL" ]; then
+  echo "ERROR: Wallet setup produced $ETH_COUNT ETH account(s), expected at least $EXPECTED_ETH_TOTAL from fixture"
+  echo "$ACCOUNTS" | jq .
+  exit 1
+fi
+if [ "$(echo "$MISSING_ADDRESSES" | jq 'length')" != "0" ]; then
+  echo "ERROR: Wallet setup did not import/unlock the expected fixture account(s)"
+  echo "Missing addresses:"
+  echo "$MISSING_ADDRESSES" | jq -r '.[] | "  " + .'
+  echo "Actual wallet state:"
+  echo "$ACCOUNTS" | jq .
+  exit 1
+fi
+case "$ROUTE_NAME" in
+  Login|Onboarding|ExperienceEnhancer|FoxLoader|"")
+    echo "ERROR: Wallet setup did not reach the unlocked wallet UI (route=${ROUTE_NAME:-empty})"
+    echo "$ACCOUNTS" | jq .
+    exit 1
+    ;;
+esac
 echo ""
 echo "=== Wallet Ready ==="
+echo "Route: ${ROUTE_NAME:-unknown}"
+echo "Unlocked: $UNLOCKED"
 echo "Accounts: $ETH_COUNT ETH (${TOTAL} total)"
 echo "$ACCOUNTS" | jq -r '.first3[] | "  \(.name): \(.address)"'
+echo "Selected:"
+echo "$ACCOUNTS" | jq -r '.selected | "  \(.name): \(.address)"'
 echo ""
 echo "Done."
 exit 0
diff --git a/scripts/perps/agentic/teams/README.md b/scripts/perps/agentic/teams/README.md
deleted file mode 100644
index 5b3dc6506131..000000000000
--- a/scripts/perps/agentic/teams/README.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Agentic Teams — Contribution Guide
-
-Each team owns its own directory under `teams/<team-name>/`.
-The registry auto-discovers and merges all team pre-conditions at load time.
-
-## Directory structure
-
-```
-teams/
-  perps/
-    flows/              ← flow JSON files (validated by validate-flow-schema.js)
-    recipes/            ← integration-level recipes that compose flows via call action
-    evals/              ← named eval collections (core.json, setup.json, ...)
-    evals.json          ← quick CDP eval refs (positions, auth, balances, ...)
-    pre-conditions.js   ← perps.* checks
-  mobile-platform/
-    pre-conditions.js   ← mobile-platform.* checks
-  <your-team>/
-    flows/              ← optional: flow JSON files
-    recipes/            ← optional: integration-level recipes
-    evals/              ← optional: named eval collections
-    evals.json          ← optional: quick CDP eval refs
-    pre-conditions.js   ← <your-team>.* checks
-```
-
-## Adding a new team
-
-1. Create `teams/<your-team>/pre-conditions.js` exporting a `Record<string, PreCondition>`.
-2. Key naming convention: `<your-team>.<check_name>` — e.g. `swap.has_quote`, `nft.owns_token`.
-3. Duplicate keys across teams cause a load-time error, so namespacing is enforced by convention.
-4. Optionally add `flows/`, `evals/`, and `evals.json` for team-specific automation.
-
-## Pre-condition shape
-
-```js
-'use strict';
-const REGISTRY = {
-  'myteam.some_check': {
-    description: 'Human-readable description shown on failure.',
-    async: false,
-    // Plain string for fixed checks; function(params) => string for parameterised ones.
-    expression: 'JSON.stringify({ ok: true })',
-    assert: { operator: 'eq', field: 'ok', value: true },
-    hint: 'What the user should do when this check fails.',
-  },
-};
-module.exports = REGISTRY;
-```
-
-## Flows
-
-Flow JSON files live in `teams/<team>/flows/`. They are automatically discovered by `validate-flow-schema.js`.
-
-```bash
-# Validate all flows
-node scripts/perps/agentic/validate-flow-schema.js
-
-# Validate a single flow
-node scripts/perps/agentic/validate-flow-schema.js scripts/perps/agentic/teams/perps/flows/trade-open-market.json
-```
-
-## Evals
-
-Named eval collections live in `teams/<team>/evals/<file>.json`.
-Run them via: `node cdp-bridge.js eval-ref <team>/<file>/<name>`
-
-Example: `node cdp-bridge.js eval-ref perps/core/pump-market`
-
-Quick CDP eval refs live in `teams/<team>/evals.json`.
-Run them via: `node cdp-bridge.js eval-ref <team>/<name>`
-
-Example: `node cdp-bridge.js eval-ref perps/positions`
-
-List all available eval refs:
-
-```bash
-node scripts/perps/agentic/cdp-bridge.js eval-ref --list
-```
-
-## Recipes
-
-Recipes live in `teams/<team>/recipes/`. They compose multiple flows via the `call` action for integration-level validation — proving that end-to-end scenarios work across flow boundaries.
-
-```bash
-# Run a recipe against the live app
-bash scripts/perps/agentic/validate-recipe.sh scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json
-
-# Dry-run (prints steps without executing)
-bash scripts/perps/agentic/validate-recipe.sh scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json --dry-run
-```
-
-See `teams/perps/recipes/full-trade-lifecycle.json` for an example that chains wallet home → mainnet → perps → testnet → open position → TP/SL → close.
-
-## Validators
-
-```bash
-# Check assertion correctness for all pre-conditions (no live app needed)
-node scripts/perps/agentic/validate-pre-conditions.js
-
-# Validate all flow JSON files against schema rules
-node scripts/perps/agentic/validate-flow-schema.js
-
-# Run a recipe against the live app
-bash scripts/perps/agentic/validate-recipe.sh <recipe-folder>
-```
diff --git a/scripts/perps/agentic/teams/mobile-platform/pre-conditions.js b/scripts/perps/agentic/teams/mobile-platform/pre-conditions.js
deleted file mode 100644
index 051618a3e5e6..000000000000
--- a/scripts/perps/agentic/teams/mobile-platform/pre-conditions.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-/** @type {Record<string, import('../perps/pre-conditions').PreCondition>} */
-const REGISTRY = {
-  // mobile-platform.* pre-conditions go here.
-  // Key naming convention: mobile-platform.<check_name>
-};
-module.exports = REGISTRY;
diff --git a/scripts/perps/agentic/teams/perps/evals.json b/scripts/perps/agentic/teams/perps/evals.json
deleted file mode 100644
index 31e60411ee8f..000000000000
--- a/scripts/perps/agentic/teams/perps/evals.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "positions": {
-    "description": "Open perps positions",
-    "expression": "Engine.context.PerpsController.getPositions().then(function(r){return JSON.stringify(r)})",
-    "async": true
-  },
-  "auth": {
-    "description": "Active provider auth state (isReadyToTrade)",
-    "expression": "(function(){var c=Engine.context.PerpsController;var id=c.state.activeProvider;var p=c.providers.get(id);if(!p)return JSON.stringify({error:'no provider for '+id});return p.isReadyToTrade().then(function(r){return JSON.stringify({provider:id,isAuthenticated:r.ready,authenticatedAddress:r.authenticatedAddress||null})});})()",
-    "async": true
-  },
-  "balances": {
-    "description": "Account state (balances, margin) from cached state",
-    "expression": "JSON.stringify(Engine.context.PerpsController.state.accountState)",
-    "async": false
-  },
-  "markets": {
-    "description": "Markets with live prices",
-    "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(r){return JSON.stringify(r.map(function(m){return{symbol:m.symbol,price:m.price,change24h:m.change24hPercent}}))})",
-    "async": true
-  },
-  "orders": {
-    "description": "Open limit/stop orders",
-    "expression": "Engine.context.PerpsController.getOpenOrders().then(function(r){return JSON.stringify(r)})",
-    "async": true
-  },
-  "state": {
-    "description": "Full PerpsController state snapshot",
-    "expression": "JSON.stringify(Engine.context.PerpsController.state)",
-    "async": false
-  },
-  "providers": {
-    "description": "Registered provider IDs",
-    "expression": "JSON.stringify(Array.from(Engine.context.PerpsController.providers.keys()))",
-    "async": false
-  },
-  "pre-trade": {
-    "description": "Position count + balance snapshot before a trade (use for pre/post comparison)",
-    "expression": "Promise.all([Engine.context.PerpsController.getPositions(),Engine.context.PerpsController.getAccountState()]).then(function(r){return JSON.stringify({positionCount:r[0].length,positions:r[0].map(function(p){return{symbol:p.symbol,side:p.side,size:p.size,entryPrice:p.entryPrice,unrealizedPnl:p.unrealizedPnl}}),accountState:r[1]})})",
-    "async": true
-  },
-  "place-order": {
-    "description": "TEMPLATE: market buy BTC $10 at 2x leverage — substitute params via eval-async for custom scenarios",
-    "expression": "Engine.context.PerpsController.placeOrder({symbol:'BTC',isBuy:true,orderType:'market',size:'0.0001',leverage:2,usdAmount:'10',maxSlippageBps:500}).then(function(r){return JSON.stringify(r)})",
-    "async": true
-  },
-  "post-trade": {
-    "description": "Position count + balance snapshot after a trade (compare with pre-trade output)",
-    "expression": "Promise.all([Engine.context.PerpsController.getPositions(),Engine.context.PerpsController.getAccountState()]).then(function(r){return JSON.stringify({positionCount:r[0].length,positions:r[0].map(function(p){return{symbol:p.symbol,side:p.side,size:p.size,entryPrice:p.entryPrice,unrealizedPnl:p.unrealizedPnl}}),accountState:r[1]})})",
-    "async": true
-  },
-  "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.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/evals/core.json b/scripts/perps/agentic/teams/perps/evals/core.json
deleted file mode 100644
index 194c67b5b118..000000000000
--- a/scripts/perps/agentic/teams/perps/evals/core.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "pump-market": {
-    "description": "PUMP market data with live price",
-    "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){return JSON.stringify(ms.find(function(m){return m.symbol==='PUMP'}))})",
-    "async": true
-  },
-  "tpsl-orders": {
-    "description": "Open TP/SL trigger orders",
-    "expression": "Engine.context.PerpsController.getOpenOrders().then(function(os){return JSON.stringify(os.filter(function(o){return o.isTrigger}))})",
-    "async": true
-  },
-  "positions-by-symbol": {
-    "description": "Find open position by symbol (TEMPLATE — substitute symbol via eval-async for custom scenarios)",
-    "expression": "Engine.context.PerpsController.getPositions().then(function(ps){return JSON.stringify(ps.find(function(p){return p.symbol==='BTC'}))})",
-    "async": true
-  },
-  "leverage-config": {
-    "description": "Trade configurations (leverage, fee tiers) from controller state",
-    "expression": "JSON.stringify(Engine.context.PerpsController.state.tradeConfigurations)",
-    "async": false
-  },
-  "watchlist": {
-    "description": "Watchlist markets from controller state",
-    "expression": "JSON.stringify(Engine.context.PerpsController.state.watchlistMarkets)",
-    "async": false
-  },
-  "available-dexs": {
-    "description": "HIP-3 DEX list (validates DEX discovery cache)",
-    "expression": "Engine.context.PerpsController.getAvailableDexs().then(function(dexs){return JSON.stringify({count:dexs.length,dexs:dexs,hasMainDex:dexs.indexOf('')>=0})})",
-    "async": true
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/evals/setup.json b/scripts/perps/agentic/teams/perps/evals/setup.json
deleted file mode 100644
index 2f9e276111f7..000000000000
--- a/scripts/perps/agentic/teams/perps/evals/setup.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "testnet-mode": {
-    "description": "Current testnet mode (isTestnet boolean)",
-    "expression": "Engine.context.PerpsController.state.isTestnet",
-    "async": false
-  },
-  "current-provider": {
-    "description": "Currently active provider",
-    "expression": "Engine.context.PerpsController.state.activeProvider",
-    "async": false
-  },
-  "account-balance": {
-    "description": "Perps account balance",
-    "expression": "Engine.context.PerpsController.getBalance().then(function(r){return JSON.stringify(r)})",
-    "async": true
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/activity-view.json b/scripts/perps/agentic/teams/perps/flows/activity-view.json
deleted file mode 100644
index 24484ab4a838..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/activity-view.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "title": "Activity — view recent trades and funding history",
-  "inputs": {
-    "tab": {
-      "type": "string",
-      "default": "trades",
-      "description": "Activity tab to select (trades/orders/funding/deposits)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.feature_enabled"
-      ],
-      "entry": "nav-activity",
-      "nodes": {
-        "nav-activity": {
-          "description": "Navigate to perps activity screen (perps transactions tab)",
-          "action": "navigate",
-          "target": "PerpsActivity",
-          "params": {
-            "redirectToPerpsTransactions": true
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "route": "PerpsActivity",
-          "next": "press-tab"
-        },
-        "press-tab": {
-          "description": "Select the requested tab",
-          "action": "press",
-          "test_id": "perps-transactions-tab-{{tab}}",
-          "next": "wait-filter"
-        },
-        "wait-filter": {
-          "action": "wait_for",
-          "route": "PerpsActivity",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/candle-rapid-switch.json b/scripts/perps/agentic/teams/perps/flows/candle-rapid-switch.json
deleted file mode 100644
index 1998321912cd..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/candle-rapid-switch.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-  "title": "Rapid market switching — validates candles load and no rate-limit/abort errors across BTC→ETH→SOL→HYPE→BTC→ETH",
-  "schema_version": 1,
-  "inputs": {
-    "screenshot_filename": {
-      "type": "string",
-      "default": "",
-      "description": "If non-empty, capture a screenshot of the final market detail screen with this filename. Pass e.g. 'evidence-ac3-rapid-switch.png' from a recipe that needs visual proof."
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "entry": "nav-list",
-      "nodes": {
-        "nav-list": {
-          "action": "navigate",
-          "target": "PerpsTrendingView",
-          "next": "wait-list"
-        },
-        "wait-list": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-BTC",
-          "timeout_ms": 10000,
-          "next": "open-btc-1"
-        },
-        "open-btc-1": {
-          "action": "press",
-          "test_id": "perps-market-row-item-BTC",
-          "next": "wait-detail-btc-1"
-        },
-        "wait-detail-btc-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "back-1"
-        },
-        "back-1": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "wait-eth-1"
-        },
-        "wait-eth-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-ETH",
-          "timeout_ms": 5000,
-          "next": "open-eth-1"
-        },
-        "open-eth-1": {
-          "action": "press",
-          "test_id": "perps-market-row-item-ETH",
-          "next": "wait-detail-eth-1"
-        },
-        "wait-detail-eth-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "back-2"
-        },
-        "back-2": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "wait-sol-1"
-        },
-        "wait-sol-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-SOL",
-          "timeout_ms": 5000,
-          "next": "open-sol-1"
-        },
-        "open-sol-1": {
-          "action": "press",
-          "test_id": "perps-market-row-item-SOL",
-          "next": "wait-detail-sol-1"
-        },
-        "wait-detail-sol-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "back-3"
-        },
-        "back-3": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "wait-hype-1"
-        },
-        "wait-hype-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-HYPE",
-          "timeout_ms": 5000,
-          "next": "open-hype-1"
-        },
-        "open-hype-1": {
-          "action": "press",
-          "test_id": "perps-market-row-item-HYPE",
-          "next": "wait-detail-hype-1"
-        },
-        "wait-detail-hype-1": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "back-4"
-        },
-        "back-4": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "wait-btc-2"
-        },
-        "wait-btc-2": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-BTC",
-          "timeout_ms": 5000,
-          "next": "open-btc-2"
-        },
-        "open-btc-2": {
-          "action": "press",
-          "test_id": "perps-market-row-item-BTC",
-          "next": "wait-detail-btc-2"
-        },
-        "wait-detail-btc-2": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "back-5"
-        },
-        "back-5": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "wait-eth-2"
-        },
-        "wait-eth-2": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-ETH",
-          "timeout_ms": 5000,
-          "next": "open-eth-2"
-        },
-        "open-eth-2": {
-          "action": "press",
-          "test_id": "perps-market-row-item-ETH",
-          "next": "wait-detail-eth-2"
-        },
-        "wait-detail-eth-2": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "gate-screenshot-check"
-        },
-        "gate-screenshot-check": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify({take: '{{screenshot_filename}}' !== ''})",
-          "assert": { "operator": "not_null" },
-          "next": "gate-screenshot-route"
-        },
-        "gate-screenshot-route": {
-          "action": "switch",
-          "cases": [
-            { "when": { "operator": "eq", "field": "take", "value": true }, "next": "screenshot-chart" }
-          ],
-          "default": "back-6"
-        },
-        "screenshot-chart": {
-          "action": "screenshot",
-          "filename": "{{screenshot_filename}}",
-          "note": "Final ETH market detail after rapid BTC→ETH→SOL→HYPE→BTC→ETH switch — proves chart loads on the last symbol without rate-limit/abort errors",
-          "next": "back-6"
-        },
-        "back-6": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "check-no-errors"
-        },
-        "check-no-errors": {
-          "action": "log_watch",
-          "window_seconds": 45,
-          "must_not_appear": [
-            "candleSnapshot error",
-            "historical_candles_api",
-            "candle_subscription_async",
-            "initial_candles_fetch"
-          ],
-          "watch_for": ["candleSnapshot", "fetchHistoricalCandles", "historical_candles"],
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
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
deleted file mode 100644
index c02813aafd42..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/hl-balance-contract-check.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "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
deleted file mode 100644
index aa9f877859ab..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/hl-balance-math-check.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "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
deleted file mode 100644
index a51552c6eb2b..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/hl-balance-validation.json
+++ /dev/null
@@ -1,237 +0,0 @@
-{
-    "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 (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",
-        "default": "unified",
-        "description": "HL abstraction mode expected in this phase: 'unified' or 'standard'"
-      },
-      "phaseLabel": {
-        "type": "string",
-        "default": "phase",
-        "description": "Short label used in screenshot filenames and trace annotations (e.g. 'initial-unified', 'after-flip-standard', 'restored-unified')"
-      }
-    },
-    "validate": {
-      "workflow": {
-        "pre_conditions": [
-          "wallet.unlocked",
-          "perps.feature_enabled"
-        ],
-        "entry": "refresh-state",
-        "nodes": {
-          "refresh-state": {
-            "action": "eval_async",
-            "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"
-          },
-          "capture-controller-state": {
-            "action": "eval_ref",
-            "ref": "perps/hl-fixture-state",
-            "assert": {
-              "operator": "not_null",
-              "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.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",
-              "value": true
-            },
-            "next": "nav-market-list"
-          },
-          "nav-market-list": {
-            "action": "navigate",
-            "target": "PerpsMarketListView",
-            "next": "wait-market-list"
-          },
-          "wait-market-list": {
-            "action": "wait_for",
-            "expression": "(function(){try{var r=globalThis.__AGENTIC__&&globalThis.__AGENTIC__.getRoute();return JSON.stringify({route:r?r.name:'unknown'})}catch(e){return JSON.stringify({route:'unknown'})}})()",
-            "assert": {
-              "operator": "eq",
-              "field": "route",
-              "value": "PerpsMarketListView"
-            },
-            "timeout_ms": 15000,
-            "next": "settle-market-list"
-          },
-          "settle-market-list": {
-            "action": "wait_for",
-            "expression": "(function(){var a=globalThis.__AGENTIC__;var mounted=!!(a&&a.findFiberByTestId&&a.findFiberByTestId('perps-market-available-balance-text'));return JSON.stringify({mounted:mounted})})()",
-            "assert": { "operator": "eq", "field": "mounted", "value": true },
-            "timeout_ms": 15000,
-            "next": "capture-market-list-balance"
-          },
-          "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.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"
-            },
-            "next": "screenshot-market-list"
-          },
-          "screenshot-market-list": {
-            "action": "screenshot",
-            "filename": "tat3016-{{phaseLabel}}-market-list.png",
-            "note": "PerpsMarketListView available-balance text in {{phaseLabel}} phase — must reflect availableToTradeBalance (gates Long/Add-Funds CTA)",
-            "next": "nav-withdraw"
-          },
-          "nav-withdraw": {
-            "action": "navigate",
-            "target": "PerpsWithdraw",
-            "next": "wait-withdraw"
-          },
-          "wait-withdraw": {
-            "action": "wait_for",
-            "expression": "(function(){try{var r=globalThis.__AGENTIC__&&globalThis.__AGENTIC__.getRoute();return JSON.stringify({route:r?r.name:'unknown'})}catch(e){return JSON.stringify({route:'unknown'})}})()",
-            "assert": {
-              "operator": "eq",
-              "field": "route",
-              "value": "PerpsWithdraw"
-            },
-            "timeout_ms": 15000,
-            "next": "settle-withdraw"
-          },
-          "settle-withdraw": {
-            "action": "wait_for",
-            "expression": "(function(){var a=globalThis.__AGENTIC__;var mounted=!!(a&&a.findFiberByTestId&&a.findFiberByTestId('perps-withdraw-available-balance-text'));return JSON.stringify({mounted:mounted})})()",
-            "assert": { "operator": "eq", "field": "mounted", "value": true },
-            "timeout_ms": 15000,
-            "next": "capture-withdraw-balance"
-          },
-          "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.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 },
-                { "operator": "eq", "field": "displayLeaksFold", "value": false }
-              ]
-            },
-            "next": "screenshot-withdraw"
-          },
-          "screenshot-withdraw": {
-            "action": "screenshot",
-            "filename": "tat3016-{{phaseLabel}}-withdraw.png",
-            "note": "PerpsWithdraw available-balance text in {{phaseLabel}} phase — must show availableBalance only, never the spot-fold amount (TAT-3016 hotfix invariant)",
-            "next": "nav-market-details"
-          },
-          "nav-market-details": {
-            "action": "navigate",
-            "target": "PerpsMarketDetails",
-            "params": {
-              "market": {
-                "symbol": "BTC",
-                "name": "BTC",
-                "price": "0",
-                "change24h": "0",
-                "change24hPercent": "0",
-                "volume": "0",
-                "maxLeverage": "100"
-              }
-            },
-            "next": "wait-long-button"
-          },
-          "wait-long-button": {
-            "action": "wait_for",
-            "expression": "(function(){var a=globalThis.__AGENTIC__;var mounted=!!(a&&a.findFiberByTestId&&a.findFiberByTestId('perps-market-details-long-button'));return JSON.stringify({mounted:mounted})})()",
-            "assert": { "operator": "eq", "field": "mounted", "value": true },
-            "timeout_ms": 15000,
-            "next": "press-long"
-          },
-          "press-long": {
-            "action": "press",
-            "test_id": "perps-market-details-long-button",
-            "next": "wait-order-form"
-          },
-          "wait-order-form": {
-            "action": "wait_for",
-            "expression": "(function(){var a=globalThis.__AGENTIC__;var btn=!!(a&&a.findFiberByTestId&&a.findFiberByTestId('perps-order-view-place-order-button'));var payWith=!!(a&&a.findFiberByTestId&&a.findFiberByTestId('pay-with-symbol'));return JSON.stringify({placeOrderMounted:btn,payWithMounted:payWith,ready:btn&&payWith})})()",
-            "assert": { "operator": "eq", "field": "ready", "value": true },
-            "timeout_ms": 15000,
-            "next": "capture-order-form"
-          },
-          "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.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 },
-                { "operator": "eq", "field": "placeOrderButtonMounted", "value": true }
-              ]
-            },
-            "next": "screenshot-order-form"
-          },
-          "screenshot-order-form": {
-            "action": "screenshot",
-            "filename": "tat3016-{{phaseLabel}}-order-form.png",
-            "note": "BTC order form in {{phaseLabel}} phase — pay-with should default to Perps balance when availableToTradeBalance > 0; place-order button mounted",
-            "next": "back-to-wallet"
-          },
-          "back-to-wallet": {
-            "action": "navigate",
-            "target": "Wallet",
-            "next": "mode-switch"
-          },
-          "mode-switch": {
-            "action": "switch",
-            "cases": [
-              {
-                "label": "expect-unified",
-                "when": {
-                  "operator": "eq",
-                  "field": "inputs.expectedMode",
-                  "value": "unified"
-                },
-                "next": "assert-unified-shape"
-              },
-              {
-                "label": "expect-standard",
-                "when": {
-                  "operator": "eq",
-                  "field": "inputs.expectedMode",
-                  "value": "standard"
-                },
-                "next": "assert-standard-shape"
-              }
-            ],
-            "default": "done"
-          },
-          "assert-unified-shape": {
-            "action": "eval_sync",
-            "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",
-              "value": true
-            },
-            "next": "done"
-          },
-          "assert-standard-shape": {
-            "action": "eval_sync",
-            "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",
-              "value": true
-            },
-            "next": "done"
-          },
-          "done": {
-            "action": "end",
-            "status": "pass"
-          }
-        }
-      }
-    }
-  }
\ No newline at end of file
diff --git a/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json b/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json
deleted file mode 100644
index 3d12a418e7b9..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/hl-provision-fixture.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "title": "HL fixture provisioning — abstraction={{abstraction}} transfer={{transferDirection}} amount={{transferAmount}}",
-    "description": "Admin/test flow. Drives the HyperLiquid SDK directly via HyperLiquidProvider.getExchangeClient() escape hatch. Guards each op with when/unless so callers can skip either phase. Amounts: transferAmount='max' (default when direction!='none') transfers the full source-side balance; explicit amount strings forward as-is. Requires mainnet HL (abstraction modes do not exist on testnet).",
-    "inputs": {
-      "abstraction": {
-        "type": "string",
-        "default": "none",
-        "description": "Target abstraction mode: 'unifiedAccount' | 'dexAbstraction' | 'portfolioMargin' | 'disabled' | 'none' (skip)"
-      },
-      "transferDirection": {
-        "type": "string",
-        "default": "none",
-        "description": "USDC move direction: 'to-spot' (perps -> spot), 'to-perp' (spot -> perps), 'none' (skip)"
-      },
-      "transferAmount": {
-        "type": "string",
-        "default": "max",
-        "description": "USDC amount as string. 'max' = full source-side balance read at execution time."
-      }
-    },
-    "validate": {
-      "workflow": {
-        "pre_conditions": [
-          "wallet.unlocked",
-          "perps.feature_enabled"
-        ],
-        "entry": "mode-switch",
-        "nodes": {
-          "mode-switch": {
-            "action": "switch",
-            "cases": [
-              {
-                "when": {
-                  "operator": "neq",
-                  "field": "inputs.abstraction",
-                  "value": "none"
-                },
-                "next": "set-abstraction"
-              }
-            ],
-            "default": "transfer-switch"
-          },
-          "set-abstraction": {
-            "action": "eval_async",
-            "expression": "(function(){try{var ctrl=Engine.context.PerpsController;var provider=ctrl.getActiveProvider();var accs=Engine.context.AccountsController.state.internalAccounts;var user=accs.accounts[accs.selectedAccount].address;return provider.getExchangeClient().then(function(client){return client.userSetAbstraction({user:user,abstraction:'{{abstraction}}'})}).then(function(r){return JSON.stringify({ok:true,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",
-              "value": true
-            },
-            "timeout_ms": 30000,
-            "next": "wait-mode-settle"
-          },
-          "wait-mode-settle": {
-            "action": "wait_for",
-            "expression": "Engine.context.PerpsController.getAccountState().then(function(r){return JSON.stringify({refreshed:!!r,totalBalance:r&&r.totalBalance})}).catch(function(e){return JSON.stringify({refreshed:false,error:String(e)})})",
-            "assert": { "operator": "eq", "field": "refreshed", "value": true },
-            "timeout_ms": 30000,
-            "next": "transfer-switch"
-          },
-          "transfer-switch": {
-            "action": "switch",
-            "cases": [
-              {
-                "when": {
-                  "operator": "eq",
-                  "field": "inputs.transferDirection",
-                  "value": "to-spot"
-                },
-                "next": "transfer-to-spot"
-              },
-              {
-                "when": {
-                  "operator": "eq",
-                  "field": "inputs.transferDirection",
-                  "value": "to-perp"
-                },
-                "next": "transfer-to-perp"
-              }
-            ],
-            "default": "done"
-          },
-          "transfer-to-spot": {
-            "action": "eval_async",
-            "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",
-              "value": true
-            },
-            "timeout_ms": 60000,
-            "next": "wait-transfer-settle"
-          },
-          "transfer-to-perp": {
-            "action": "eval_async",
-            "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",
-              "value": true
-            },
-            "timeout_ms": 60000,
-            "next": "wait-transfer-settle"
-          },
-          "wait-transfer-settle": {
-            "action": "wait_for",
-            "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"
-          },
-          "verify-state": {
-            "action": "eval_ref",
-            "ref": "hl-fixture-state",
-            "assert": {
-              "operator": "not_null",
-              "field": "totalBalance"
-            },
-            "next": "done"
-          },
-          "done": {
-            "action": "end",
-            "status": "pass"
-          }
-        }
-      }
-    }
-  }
\ No newline at end of file
diff --git a/scripts/perps/agentic/teams/perps/flows/market-discovery.json b/scripts/perps/agentic/teams/perps/flows/market-discovery.json
deleted file mode 100644
index 5036f886f949..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/market-discovery.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "title": "Market Discovery — find {{symbol}} in list and verify price loads",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol to look up"
-    },
-    "category": {
-      "type": "string",
-      "default": "",
-      "description": "Optional category filter: crypto, stocks, commodities, forex. If empty, no chip is pressed (shows all)."
-    },
-    "search": {
-      "type": "string",
-      "default": "",
-      "description": "Optional search query to type into the search bar. If empty, search is skipped."
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.feature_enabled"
-      ],
-      "entry": "nav-market-list",
-      "nodes": {
-        "nav-market-list": {
-          "action": "navigate",
-          "target": "PerpsTrendingView",
-          "next": "wait-market-data"
-        },
-        "wait-market-data": {
-          "action": "wait_for",
-          "route": "PerpsTrendingView",
-          "next": "select-category"
-        },
-        "select-category": {
-          "action": "eval_sync",
-          "expression": "(function(){var cat='{{category}}';if(!cat)return JSON.stringify({skipped:true,category:'all'});var r=globalThis.__AGENTIC__.pressTestId('perps-market-list-sort-filters-categories-'+cat);return JSON.stringify({selected:true,category:cat})})()",
-          "assert": {
-            "operator": "not_null"
-          },
-          "next": "search-symbol"
-        },
-        "search-symbol": {
-          "action": "eval_sync",
-          "expression": "(function(){var q='{{search}}';if(!q)return JSON.stringify({skipped:true});globalThis.__AGENTIC__.setInput('perps-market-list-search-bar',q);return JSON.stringify({searched:true,query:q})})()",
-          "assert": {
-            "operator": "not_null"
-          },
-          "next": "wait-filter"
-        },
-        "wait-filter": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){return JSON.stringify({count:ms.length})})",
-          "assert": {
-            "operator": "gt",
-            "field": "count",
-            "value": 0
-          },
-          "next": "assert-symbol-in-list"
-        },
-        "assert-symbol-in-list": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){var m=ms.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({found:!!m,symbol:m?m.symbol:null})})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": true
-          },
-          "next": "nav-market-detail"
-        },
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-price-load"
-        },
-        "wait-price-load": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){var m=ms.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({price:m?m.price:'0'})})",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/market-visit.json b/scripts/perps/agentic/teams/perps/flows/market-visit.json
deleted file mode 100644
index d63074551eec..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/market-visit.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "title": "Market Visit — open {{symbol}} detail, wait for candles to load, go back",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol to visit (must be visible in the current market list)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "entry": "wait-row",
-      "nodes": {
-        "wait-row": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-{{symbol}}",
-          "timeout_ms": 8000,
-          "next": "open-market"
-        },
-        "open-market": {
-          "action": "press",
-          "test_id": "perps-market-row-item-{{symbol}}",
-          "next": "wait-detail"
-        },
-        "wait-detail": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-view",
-          "timeout_ms": 8000,
-          "next": "back"
-        },
-        "back": {
-          "action": "press",
-          "test_id": "perps-market-header-back-button",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/market-watchlist.json b/scripts/perps/agentic/teams/perps/flows/market-watchlist.json
deleted file mode 100644
index 3825e865bb65..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/market-watchlist.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "title": "Market Watchlist — toggle {{symbol}} on/off watchlist",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol to toggle on/off watchlist"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.feature_enabled",
-        {
-          "name": "perps.not_in_watchlist",
-          "symbol": "{{symbol}}"
-        }
-      ],
-      "entry": "ensure-not-in-watchlist",
-      "nodes": {
-        "ensure-not-in-watchlist": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify({inWatchlist:(Engine.context.PerpsController.state.watchlistMarkets.mainnet||[]).indexOf('{{symbol}}')>=0||(Engine.context.PerpsController.state.watchlistMarkets.testnet||[]).indexOf('{{symbol}}')>=0})",
-          "assert": {
-            "operator": "eq",
-            "field": "inWatchlist",
-            "value": false
-          },
-          "next": "nav-market-detail"
-        },
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-market-header-favorite-button",
-          "next": "press-favorite-add"
-        },
-        "press-favorite-add": {
-          "description": "Press star button to add to watchlist",
-          "action": "press",
-          "test_id": "perps-market-header-favorite-button",
-          "next": "wait-state-update"
-        },
-        "wait-state-update": {
-          "action": "wait_for",
-          "expression": "JSON.stringify({inWatchlist:(Engine.context.PerpsController.state.watchlistMarkets.mainnet||[]).indexOf('{{symbol}}')>=0||(Engine.context.PerpsController.state.watchlistMarkets.testnet||[]).indexOf('{{symbol}}')>=0})",
-          "assert": {
-            "operator": "eq",
-            "field": "inWatchlist",
-            "value": true
-          },
-          "next": "press-favorite-remove"
-        },
-        "press-favorite-remove": {
-          "description": "Press star button again to remove from watchlist",
-          "action": "press",
-          "test_id": "perps-market-header-favorite-button",
-          "next": "wait-state-update-2"
-        },
-        "wait-state-update-2": {
-          "action": "wait_for",
-          "expression": "JSON.stringify({inWatchlist:(Engine.context.PerpsController.state.watchlistMarkets.mainnet||[]).indexOf('{{symbol}}')>=0||(Engine.context.PerpsController.state.watchlistMarkets.testnet||[]).indexOf('{{symbol}}')>=0})",
-          "assert": {
-            "operator": "eq",
-            "field": "inWatchlist",
-            "value": false
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/order-limit-cancel.json b/scripts/perps/agentic/teams/perps/flows/order-limit-cancel.json
deleted file mode 100644
index 3c34a0c7c1ce..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/order-limit-cancel.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "title": "Order — cancel first open limit order for {{symbol}}",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "description": "Market symbol of limit order to cancel"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        {
-          "name": "perps.open_limit_order",
-          "symbol": "{{symbol}}"
-        }
-      ],
-      "entry": "assert-order-exists",
-      "nodes": {
-        "assert-order-exists": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getOpenOrders().then(function(os){var filtered=os.filter(function(o){return o.symbol==='{{symbol}}'&&!o.isTrigger});return JSON.stringify({count:filtered.length})})",
-          "assert": {
-            "operator": "gt",
-            "field": "count",
-            "value": 0
-          },
-          "next": "nav-market-detail"
-        },
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-compact-order-row-first",
-          "next": "press-first-order"
-        },
-        "press-first-order": {
-          "description": "Tap first compact order row to navigate to order details",
-          "action": "press",
-          "test_id": "perps-compact-order-row-first",
-          "next": "wait-order-details"
-        },
-        "wait-order-details": {
-          "action": "wait_for",
-          "test_id": "perps-order-details-cancel-button",
-          "next": "press-cancel-button"
-        },
-        "press-cancel-button": {
-          "action": "press",
-          "test_id": "perps-order-details-cancel-button",
-          "next": "wait-cancel"
-        },
-        "wait-cancel": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getOpenOrders().then(function(os){var filtered=os.filter(function(o){return o.symbol==='{{symbol}}'&&!o.isTrigger});return JSON.stringify({count:filtered.length})})",
-          "assert": {
-            "operator": "eq",
-            "field": "count",
-            "value": 0
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/order-limit-place-controller.json b/scripts/perps/agentic/teams/perps/flows/order-limit-place-controller.json
deleted file mode 100644
index 0d14b5790b8f..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/order-limit-place-controller.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "title": "Order (controller) — limit {{side}} {{symbol}} ${{usdAmount}} at mid price",
-  "description": "Controller-level limit order via PerpsController.placeOrder(). Gets current mid price from markets, then places limit order at that price. Bypasses UI order form which hits depositWithOrder → RedesignedConfirmations spinner in dev mode.",
-  "inputs": {
-    "side": {
-      "type": "string",
-      "default": "long",
-      "description": "Trade side (long/short)"
-    },
-    "symbol": {
-      "type": "string",
-      "default": "ETH",
-      "description": "Market symbol"
-    },
-    "usdAmount": {
-      "type": "string",
-      "default": "10",
-      "description": "USD notional amount"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.ready_to_trade"
-      ],
-      "entry": "nav",
-      "nodes": {
-        "nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-{{side}}-button",
-          "next": "place-limit-controller"
-        },
-        "place-limit-controller": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(markets){var m=markets.find(function(x){return x.symbol==='{{symbol}}'});var raw=m?String(m.price):'2000';var midPrice=raw.replace(/[$,]/g,'');return Engine.context.PerpsController.placeOrder({symbol:'{{symbol}}',isBuy:'{{side}}'==='long',orderType:'limit',price:midPrice,size:'0.001',leverage:2,usdAmount:'{{usdAmount}}',maxSlippageBps:500}).then(function(r){return JSON.stringify(r)})})",
-          "assert": { "operator": "eq", "field": "success", "value": true },
-          "timeout_ms": 30000,
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/order-limit-place.json b/scripts/perps/agentic/teams/perps/flows/order-limit-place.json
deleted file mode 100644
index b313ca9a5587..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/order-limit-place.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-  "title": "Order — limit {{side}} {{symbol}} ${{usdAmount}} at ${{limitPrice}}",
-  "inputs": {
-    "side": {
-      "type": "string",
-      "default": "long",
-      "description": "Trade side (long/short)"
-    },
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol"
-    },
-    "usdAmount": {
-      "type": "string",
-      "default": "10",
-      "description": "USD notional amount"
-    },
-    "limitPrice": {
-      "type": "string",
-      "default": "60000",
-      "description": "Limit price in USD"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.ready_to_trade"
-      ],
-      "entry": "nav",
-      "nodes": {
-        "nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-{{side}}-button",
-          "next": "press-side"
-        },
-        "press-side": {
-          "action": "press",
-          "test_id": "perps-market-details-{{side}}-button",
-          "next": "wait-form"
-        },
-        "wait-form": {
-          "action": "wait_for",
-          "test_id": "perps-order-header-order-type-button",
-          "next": "press-order-type"
-        },
-        "press-order-type": {
-          "action": "press",
-          "test_id": "perps-order-header-order-type-button",
-          "next": "wait-type-sheet"
-        },
-        "wait-type-sheet": {
-          "action": "wait_for",
-          "test_id": "perps-order-type-limit",
-          "next": "press-limit"
-        },
-        "press-limit": {
-          "action": "press",
-          "test_id": "perps-order-type-limit",
-          "next": "wait-limit-form"
-        },
-        "wait-limit-form": {
-          "action": "wait_for",
-          "test_id": "perps-order-view-limit-price-row",
-          "next": "press-limit-price-row"
-        },
-        "press-limit-price-row": {
-          "action": "press",
-          "test_id": "perps-order-view-limit-price-row",
-          "next": "wait-price-sheet"
-        },
-        "wait-price-sheet": {
-          "action": "wait_for",
-          "test_id": "keypad-delete-button",
-          "next": "clear-limit-keypad"
-        },
-        "clear-limit-keypad": {
-          "action": "clear_keypad",
-          "count": 12,
-          "next": "type-limit-price"
-        },
-        "type-limit-price": {
-          "action": "type_keypad",
-          "value": "{{limitPrice}}",
-          "next": "press-set"
-        },
-        "press-set": {
-          "action": "press",
-          "test_id": "perps-limit-price-confirm-button",
-          "next": "wait-price-set"
-        },
-        "wait-price-set": {
-          "action": "wait_for",
-          "test_id": "perps-amount-display-touchable",
-          "next": "press-amount"
-        },
-        "press-amount": {
-          "action": "press",
-          "test_id": "perps-amount-display-touchable",
-          "next": "wait-keypad"
-        },
-        "wait-keypad": {
-          "action": "wait_for",
-          "test_id": "keypad-delete-button",
-          "next": "clear-keypad"
-        },
-        "clear-keypad": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "type-amount"
-        },
-        "type-amount": {
-          "action": "type_keypad",
-          "value": "{{usdAmount}}",
-          "next": "assert-amount"
-        },
-        "assert-amount": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify((function(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook)return{v:null}; var found=null; function walk(f){if(!f)return; if(f.memoizedProps&&f.memoizedProps.testID==='perps-amount-display-amount'){found=f;return;} walk(f.child);if(!found)walk(f.sibling);} for(var [id] of hook.renderers){var roots=hook.getFiberRoots?hook.getFiberRoots(id):null;if(roots)roots.forEach(function(r){if(!found)walk(r.current);});} return {v: found&&found.memoizedProps?String(found.memoizedProps.children||''):null}; })())",
-          "assert": {
-            "operator": "contains",
-            "field": "v",
-            "value": "{{usdAmount}}"
-          },
-          "next": "press-done"
-        },
-        "press-done": {
-          "action": "press",
-          "test_id": "perps-order-view-keypad-done",
-          "next": "wait-summary"
-        },
-        "wait-summary": {
-          "action": "wait_for",
-          "test_id": "perps-order-view-place-order-button",
-          "next": "place-order"
-        },
-        "place-order": {
-          "action": "press",
-          "test_id": "perps-order-view-place-order-button",
-          "next": "wait-confirm"
-        },
-        "wait-confirm": {
-          "action": "wait_for",
-          "not_route": "RedesignedConfirmations",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/position-add-margin.json b/scripts/perps/agentic/teams/perps/flows/position-add-margin.json
deleted file mode 100644
index adc7057b4dbd..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/position-add-margin.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "title": "Position — add ${{marginAmount}} margin to {{symbol}}",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "description": "Market symbol of position to add margin to"
-    },
-    "marginAmount": {
-      "type": "string",
-      "description": "USD margin amount to add"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        {
-          "name": "perps.open_position",
-          "symbol": "{{symbol}}"
-        }
-      ],
-      "entry": "assert-position-exists",
-      "nodes": {
-        "assert-position-exists": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({margin:p?p.marginUsed:null})})",
-          "assert": {
-            "operator": "not_null",
-            "field": "margin"
-          },
-          "next": "nav-market-detail"
-        },
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "position-card-margin-chevron",
-          "next": "press-margin-chevron"
-        },
-        "press-margin-chevron": {
-          "action": "press",
-          "test_id": "position-card-margin-chevron",
-          "next": "wait-action-sheet"
-        },
-        "wait-action-sheet": {
-          "action": "wait_for",
-          "test_id": "perps-adjust-margin-add-btn",
-          "next": "press-add-margin-option"
-        },
-        "press-add-margin-option": {
-          "action": "press",
-          "test_id": "perps-adjust-margin-add-btn",
-          "next": "wait-margin-screen"
-        },
-        "wait-margin-screen": {
-          "action": "wait_for",
-          "route": "PerpsAdjustMargin",
-          "next": "press-amount-display"
-        },
-        "press-amount-display": {
-          "action": "press",
-          "test_id": "perps-amount-display-touchable",
-          "next": "wait-keypad"
-        },
-        "wait-keypad": {
-          "action": "wait_for",
-          "test_id": "keypad-delete-button",
-          "next": "clear-keypad"
-        },
-        "clear-keypad": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "type-amount"
-        },
-        "type-amount": {
-          "action": "type_keypad",
-          "value": "{{marginAmount}}",
-          "next": "press-done"
-        },
-        "press-done": {
-          "action": "press",
-          "test_id": "perps-adjust-margin-done-button",
-          "next": "wait-done"
-        },
-        "wait-done": {
-          "action": "wait_for",
-          "test_id": "perps-adjust-margin-confirm-button",
-          "next": "press-confirm"
-        },
-        "press-confirm": {
-          "action": "press",
-          "test_id": "perps-adjust-margin-confirm-button",
-          "next": "wait-confirm"
-        },
-        "wait-confirm": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({margin:p?p.marginUsed:null})})",
-          "assert": {
-            "operator": "not_null",
-            "field": "margin"
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/select-account.json b/scripts/perps/agentic/teams/perps/flows/select-account.json
deleted file mode 100644
index a99b1c4ac777..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/select-account.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "title": "Select — switch to account {{address}} and verify",
-  "inputs": {
-    "address": {
-      "type": "string",
-      "description": "Ethereum address to switch to"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked"
-      ],
-      "entry": "switch-account",
-      "nodes": {
-        "switch-account": {
-          "action": "select_account",
-          "address": "{{address}}",
-          "next": "wait-switch"
-        },
-        "wait-switch": {
-          "action": "wait_for",
-          "expression": "JSON.stringify({address:Engine.context.AccountsController.state.internalAccounts.accounts[Engine.context.AccountsController.state.internalAccounts.selectedAccount].address})",
-          "assert": {
-            "operator": "eq",
-            "field": "address",
-            "value": "{{address}}"
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/setup-testnet.json b/scripts/perps/agentic/teams/perps/flows/setup-testnet.json
deleted file mode 100644
index e087c16ce5a5..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/setup-testnet.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "title": "Setup — enable testnet and verify market data loads",
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.feature_enabled"
-      ],
-      "entry": "enable-testnet",
-      "nodes": {
-        "enable-testnet": {
-          "action": "toggle_testnet",
-          "enabled": true,
-          "next": "wait-reload"
-        },
-        "wait-reload": {
-          "action": "wait_for",
-          "expression": "JSON.stringify({isTestnet:Engine.context.PerpsController.state.isTestnet})",
-          "assert": {
-            "operator": "eq",
-            "field": "isTestnet",
-            "value": true
-          },
-          "next": "verify-markets"
-        },
-        "verify-markets": {
-          "action": "eval_ref",
-          "ref": "markets",
-          "assert": {
-            "operator": "not_null",
-            "field": null,
-            "value": null
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/tpsl-create.json b/scripts/perps/agentic/teams/perps/flows/tpsl-create.json
deleted file mode 100644
index c46634402604..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/tpsl-create.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "title": "TP/SL — create +{{tpPreset}}% TP / {{slPreset}}% SL for {{symbol}}",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "description": "Market symbol with open position"
-    },
-    "tpPreset": {
-      "type": "string",
-      "default": "25",
-      "description": "Take-profit RoE preset to press (10, 25, 50, 100)"
-    },
-    "slPreset": {
-      "type": "string",
-      "default": "-10",
-      "description": "Stop-loss RoE preset to press (-5, -10, -25, -50)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        {
-          "name": "perps.open_position",
-          "symbol": "{{symbol}}"
-        }
-      ],
-      "entry": "nav-market-detail",
-      "nodes": {
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-market-render"
-        },
-        "wait-market-render": {
-          "action": "wait_for",
-          "test_id": "position-card-auto-close-toggle",
-          "next": "press-auto-close"
-        },
-        "press-auto-close": {
-          "action": "press",
-          "test_id": "position-card-auto-close-toggle",
-          "next": "wait-tpsl-route"
-        },
-        "wait-tpsl-route": {
-          "action": "wait_for",
-          "route": "PerpsTPSL",
-          "next": "wait-tp-button"
-        },
-        "wait-tp-button": {
-          "action": "wait_for",
-          "test_id": "perps-tpsl-take-profit-percentage-button-{{tpPreset}}",
-          "next": "press-tp-preset"
-        },
-        "press-tp-preset": {
-          "action": "press",
-          "test_id": "perps-tpsl-take-profit-percentage-button-{{tpPreset}}",
-          "next": "wait-sl-button"
-        },
-        "wait-sl-button": {
-          "action": "wait_for",
-          "test_id": "perps-tpsl-stop-loss-percentage-button-{{slPreset}}",
-          "next": "press-sl-preset"
-        },
-        "press-sl-preset": {
-          "action": "press",
-          "test_id": "perps-tpsl-stop-loss-percentage-button-{{slPreset}}",
-          "next": "assert-tpsl-screen-intact"
-        },
-        "assert-tpsl-screen-intact": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify({route:globalThis.__AGENTIC__.getRoute().name})",
-          "assert": {
-            "operator": "eq",
-            "field": "route",
-            "value": "PerpsTPSL"
-          },
-          "next": "press-set-tpsl"
-        },
-        "press-set-tpsl": {
-          "action": "press",
-          "test_id": "perps-tpsl-set-button",
-          "next": "wait-tpsl-created"
-        },
-        "wait-tpsl-created": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({hasTp:!!(p&&p.takeProfitPrice),hasSl:!!(p&&p.stopLossPrice)})})",
-          "assert": {
-            "operator": "eq",
-            "field": "hasTp",
-            "value": true
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/tpsl-edit.json b/scripts/perps/agentic/teams/perps/flows/tpsl-edit.json
deleted file mode 100644
index 59ce2b474714..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/tpsl-edit.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  "title": "TP/SL — edit to +{{tpPreset}}% TP / {{slPreset}}% SL for {{symbol}}",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "description": "Market symbol with open position and existing TP/SL"
-    },
-    "tpPreset": {
-      "type": "string",
-      "default": "50",
-      "description": "Take-profit RoE preset to press (10, 25, 50, 100)"
-    },
-    "slPreset": {
-      "type": "string",
-      "default": "-25",
-      "description": "Stop-loss RoE preset to press (-5, -10, -25, -50)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        {
-          "name": "perps.open_position_tpsl",
-          "symbol": "{{symbol}}"
-        }
-      ],
-      "entry": "nav-market-detail",
-      "nodes": {
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "position-card-auto-close-toggle",
-          "next": "press-modify-tpsl"
-        },
-        "press-modify-tpsl": {
-          "action": "press",
-          "test_id": "position-card-auto-close-toggle",
-          "next": "wait-tpsl-route"
-        },
-        "wait-tpsl-route": {
-          "action": "wait_for",
-          "route": "PerpsTPSL",
-          "next": "wait-tp-button"
-        },
-        "wait-tp-button": {
-          "action": "wait_for",
-          "test_id": "perps-tpsl-take-profit-percentage-button-{{tpPreset}}",
-          "next": "press-tp-preset"
-        },
-        "press-tp-preset": {
-          "action": "press",
-          "test_id": "perps-tpsl-take-profit-percentage-button-{{tpPreset}}",
-          "next": "wait-sl-button"
-        },
-        "wait-sl-button": {
-          "action": "wait_for",
-          "test_id": "perps-tpsl-stop-loss-percentage-button-{{slPreset}}",
-          "next": "press-sl-preset"
-        },
-        "press-sl-preset": {
-          "action": "press",
-          "test_id": "perps-tpsl-stop-loss-percentage-button-{{slPreset}}",
-          "next": "assert-tpsl-screen-intact"
-        },
-        "assert-tpsl-screen-intact": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify({route:globalThis.__AGENTIC__.getRoute().name})",
-          "assert": {
-            "operator": "eq",
-            "field": "route",
-            "value": "PerpsTPSL"
-          },
-          "next": "press-set-tpsl"
-        },
-        "press-set-tpsl": {
-          "action": "press",
-          "test_id": "perps-tpsl-set-button",
-          "next": "wait-tpsl-updated"
-        },
-        "wait-tpsl-updated": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({hasTp:!!(p&&p.takeProfitPrice),hasSl:!!(p&&p.stopLossPrice)})})",
-          "assert": {
-            "operator": "eq",
-            "field": "hasTp",
-            "value": true
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/trade-close-position.json b/scripts/perps/agentic/teams/perps/flows/trade-close-position.json
deleted file mode 100644
index c8b95859dfac..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/trade-close-position.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  "title": "Trade — close position for {{symbol}}",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "description": "Market symbol of position to close"
-    },
-    "closePercent": {
-      "type": "string",
-      "default": "100",
-      "description": "Percentage of position to close (reserved for future partial close)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        {
-          "name": "perps.open_position",
-          "symbol": "{{symbol}}"
-        }
-      ],
-      "entry": "assert-position-exists",
-      "nodes": {
-        "assert-position-exists": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({found:!!p})})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": true
-          },
-          "next": "nav-market-detail"
-        },
-        "nav-market-detail": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-close-button",
-          "next": "press-close"
-        },
-        "press-close": {
-          "action": "press",
-          "test_id": "perps-market-details-close-button",
-          "next": "wait-close-screen"
-        },
-        "wait-close-screen": {
-          "action": "wait_for",
-          "route": "PerpsClosePosition",
-          "next": "press-confirm-close"
-        },
-        "press-confirm-close": {
-          "action": "press",
-          "test_id": "close-position-confirm-button",
-          "next": "wait-position-closed"
-        },
-        "wait-position-closed": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({found:!!p})})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": false
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/trade-open-market-controller.json b/scripts/perps/agentic/teams/perps/flows/trade-open-market-controller.json
deleted file mode 100644
index 60b1206e57e5..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/trade-open-market-controller.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "title": "Trade (controller) — market {{side}} {{symbol}} ${{usdAmount}}",
-  "description": "Controller-level market order via PerpsController.placeOrder(). Bypasses UI deposit flow (depositWithOrder → RedesignedConfirmations) which breaks in dev mode. Navigates to market screen for context, then places order directly via controller API.",
-  "inputs": {
-    "side": {
-      "type": "string",
-      "default": "long",
-      "description": "Trade side (long/short)"
-    },
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol"
-    },
-    "usdAmount": {
-      "type": "string",
-      "default": "10",
-      "description": "USD notional amount"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.ready_to_trade",
-        "perps.sufficient_balance"
-      ],
-      "entry": "nav",
-      "nodes": {
-        "nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-{{side}}-button",
-          "next": "place-order-controller"
-        },
-        "place-order-controller": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.placeOrder({symbol:'{{symbol}}',isBuy:'{{side}}'==='long',orderType:'market',size:'0.0001',leverage:2,usdAmount:'{{usdAmount}}',maxSlippageBps:500}).then(function(r){return JSON.stringify(r)})",
-          "assert": { "operator": "eq", "field": "success", "value": true },
-          "timeout_ms": 30000,
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/flows/trade-open-market.json b/scripts/perps/agentic/teams/perps/flows/trade-open-market.json
deleted file mode 100644
index ba379c2e7deb..000000000000
--- a/scripts/perps/agentic/teams/perps/flows/trade-open-market.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  "title": "Trade — market {{side}} {{symbol}} ${{usdAmount}}",
-  "inputs": {
-    "side": {
-      "type": "string",
-      "default": "long",
-      "description": "Trade side (long/short)"
-    },
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol"
-    },
-    "usdAmount": {
-      "type": "string",
-      "default": "10",
-      "description": "USD notional amount"
-    },
-    "leverage": {
-      "type": "string",
-      "default": "2",
-      "description": "Leverage multiplier (reserved, not wired yet)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": [
-        "wallet.unlocked",
-        "perps.ready_to_trade",
-        "perps.sufficient_balance"
-      ],
-      "entry": "nav",
-      "nodes": {
-        "nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "{{symbol}}",
-              "name": "{{symbol}}",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "wait-render"
-        },
-        "wait-render": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-{{side}}-button",
-          "next": "press-side"
-        },
-        "press-side": {
-          "action": "press",
-          "test_id": "perps-market-details-{{side}}-button",
-          "next": "wait-form"
-        },
-        "wait-form": {
-          "action": "wait_for",
-          "test_id": "perps-amount-display-touchable",
-          "timeout_ms": 10000,
-          "next": "press-amount"
-        },
-        "press-amount": {
-          "action": "press",
-          "test_id": "perps-amount-display-touchable",
-          "next": "wait-keypad"
-        },
-        "wait-keypad": {
-          "action": "wait_for",
-          "test_id": "perps-order-view-keypad",
-          "timeout_ms": 5000,
-          "next": "clear-keypad"
-        },
-        "clear-keypad": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "type-amount"
-        },
-        "type-amount": {
-          "action": "type_keypad",
-          "value": "{{usdAmount}}",
-          "next": "press-done"
-        },
-        "press-done": {
-          "action": "press",
-          "test_id": "perps-order-view-keypad-done",
-          "next": "wait-place-order"
-        },
-        "wait-place-order": {
-          "action": "wait_for",
-          "test_id": "perps-order-view-place-order-button",
-          "timeout_ms": 15000,
-          "next": "place-order"
-        },
-        "place-order": {
-          "action": "press",
-          "test_id": "perps-order-view-place-order-button",
-          "next": "wait-order-placed"
-        },
-        "wait-order-placed": {
-          "action": "wait_for",
-          "not_route": "RedesignedConfirmations",
-          "timeout_ms": 30000,
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/pre-conditions.js b/scripts/perps/agentic/teams/perps/pre-conditions.js
deleted file mode 100644
index 8a146b87d16f..000000000000
--- a/scripts/perps/agentic/teams/perps/pre-conditions.js
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env node
-/**
- * pre-conditions.js — Registry of named, executable pre-condition checks.
- *
- * Each entry defines a CDP eval expression (sync or async) and an assertion
- * that must pass before a flow is allowed to run. If a check fails the runner
- * aborts immediately with a clear message and actionable hint instead of
- * letting the flow limp forward and die on step 4 with a cryptic error.
- *
- * Usage in flow JSON:
- *   "pre_conditions": [
- *     "wallet.unlocked",
- *     "perps.ready_to_trade",
- *     { "name": "perps.open_position", "symbol": "BTC" }
- *   ]
- *
- * String entries are looked up by name with no params.
- * Object entries pass remaining fields as params to the expression builder.
- *
- * Keys use dot-notation namespaces (wallet.*, perps.*, ui.*) to signal
- * ownership and avoid collisions across teams.
- *
- * Adding a new check:
- *   1. Add an entry to REGISTRY below.
- *   2. If the expression needs params (e.g. symbol), make `expression` a
- *      function(params) => string instead of a plain string.
- *   3. Set `async: true` if the expression returns a Promise.
- *   4. Update your flow's pre_conditions array.
- *   5. Run `node validate-flow-schema.js` — it validates names against this file.
- */
-
-'use strict';
-
-/**
- * @typedef {Object} PreCondition
- * @property {string}   description  Human-readable description shown on failure.
- * @property {boolean}  async        true if expression returns a Promise.
- * @property {string | ((params: object) => string)} expression
- *   CDP JS expression (ES5 only). String for fixed checks, function for
- *   parameterised checks (receives the spec object minus "name").
- * @property {{ operator: string, field?: string, value?: unknown }} assert
- *   Same operators as recipe step assertions.
- * @property {string}   hint         What to do when the check fails.
- * @property {{ pass: string, fail: string }} fixtures
- *   Inline test fixtures for offline assertion correctness checks.
- */
-
-/** @type {Record<string, PreCondition>} */
-const REGISTRY = {
-  'wallet.unlocked': {
-    description: 'Wallet is unlocked and app is navigable',
-    async: false,
-    expression: '(function(){ var r=globalThis.__AGENTIC__.getRoute().name; return JSON.stringify({route:r,unlocked:r!=="Login"&&r!=="LoginView"&&r!=="Onboarding"}); })()',
-    assert: { operator: 'eq', field: 'unlocked', value: true },
-    hint: 'Unlock the wallet first:\n  bash scripts/perps/agentic/app-state.sh unlock <password>',
-    fixtures: {
-      pass: '{"route":"WalletView","unlocked":true}',
-      fail: '{"route":"Login","unlocked":false}',
-    },
-  },
-
-  'perps.feature_enabled': {
-    description: 'PerpsController is available on Engine.context',
-    async: false,
-    expression: 'JSON.stringify({enabled: !!(Engine.context && Engine.context.PerpsController)})',
-    assert: { operator: 'eq', field: 'enabled', value: true },
-    hint: 'Enable the Perps feature flag for this account/environment.',
-    fixtures: {
-      pass: '{"enabled":true}',
-      fail: '{"enabled":false}',
-    },
-  },
-
-  'perps.ready_to_trade': {
-    description: 'Perps provider is ready to trade',
-    async: true,
-    expression: '(function(){ var c=Engine.context.PerpsController; var id=c.state.activeProvider; var p=c.providers.get(id); if(!p) return Promise.resolve(JSON.stringify({isAuthenticated:false,error:"no active provider"})); return p.isReadyToTrade().then(function(r){ return JSON.stringify({isAuthenticated:r.ready}); }); })()',
-    assert: { operator: 'eq', field: 'isAuthenticated', value: true },
-    hint: 'Complete Perps authentication/onboarding before running this flow.',
-    fixtures: {
-      pass: '{"isAuthenticated":true}',
-      fail: '{"isAuthenticated":false}',
-    },
-  },
-
-  '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.withdrawableBalance||"0")}); })',
-    assert: { operator: 'gt', field: 'balance', value: 0 },
-    hint: 'Deposit funds into your Perps account before placing orders.',
-    fixtures: {
-      pass: '{"balance":100}',
-      fail: '{"balance":0}',
-    },
-  },
-
-  'perps.open_position': {
-    description: 'At least one open position exists (optionally filtered by symbol)',
-    async: true,
-    expression: (params) => {
-      const filter = params && params.symbol
-        ? `function(x){ return x.symbol === '${params.symbol}'; }`
-        : `function(){ return true; }`;
-      return `Engine.context.PerpsController.getPositions().then(function(ps){ var filtered=ps.filter(${filter}); return JSON.stringify({count:filtered.length}); })`;
-    },
-    assert: { operator: 'gt', field: 'count', value: 0 },
-    hint: 'Open a position first using the trade-open-market flow.',
-    fixtures: {
-      pass: '{"count":2}',
-      fail: '{"count":0}',
-    },
-  },
-
-  'perps.open_position_tpsl': {
-    description: 'At least one open position with TP or SL set (optionally filtered by symbol)',
-    async: true,
-    expression: (params) => {
-      const symbolClause = params && params.symbol
-        ? `x.symbol === '${params.symbol}' && `
-        : '';
-      return `Engine.context.PerpsController.getPositions().then(function(ps){ var filtered=ps.filter(function(x){ return ${symbolClause}!!(x.takeProfitPrice||x.stopLossPrice); }); return JSON.stringify({count:filtered.length}); })`;
-    },
-    assert: { operator: 'gt', field: 'count', value: 0 },
-    hint: 'Create a TP/SL first using the tpsl-create flow.',
-    fixtures: {
-      pass: '{"count":1}',
-      fail: '{"count":0}',
-    },
-  },
-
-  'perps.open_limit_order': {
-    description: 'At least one open limit order exists (optionally filtered by symbol)',
-    async: true,
-    expression: (params) => {
-      const filter = params && params.symbol
-        ? `function(x){ return x.symbol === '${params.symbol}'; }`
-        : `function(){ return true; }`;
-      return `Engine.context.PerpsController.getOpenOrders().then(function(orders){ var filtered=orders.filter(${filter}); return JSON.stringify({count:filtered.length}); })`;
-    },
-    assert: { operator: 'gt', field: 'count', value: 0 },
-    hint: 'Place a limit order first using the order-limit-place flow.',
-    fixtures: {
-      pass: '{"count":1}',
-      fail: '{"count":0}',
-    },
-  },
-
-  'perps.not_in_watchlist': {
-    description: 'Symbol is not already in the watchlist',
-    async: false,
-    expression: (params) => {
-      const symbol = (params && params.symbol) || '';
-      return `(function(){ var s=Engine.context.PerpsController.state; var markets=s.isTestnet?s.watchlistMarkets.testnet:s.watchlistMarkets.mainnet; var inList=(markets||[]).some(function(m){ return (m.symbol||m)==='${symbol}'; }); return JSON.stringify({inWatchlist:inList}); })()`;
-    },
-    assert: { operator: 'eq', field: 'inWatchlist', value: false },
-    hint: 'Remove the symbol from the watchlist first, or use a symbol not already in it.',
-    fixtures: {
-      pass: '{"inWatchlist":false}',
-      fail: '{"inWatchlist":true}',
-    },
-  },
-
-  'perps.trading_flag': {
-    description: 'Perps trading remote feature flag is enabled',
-    async: false,
-    expression: '(function(){ var f=Engine.context.RemoteFeatureFlagController.state.remoteFeatureFlags.perpsPerpTradingEnabled; var enabled=f===true||(f&&f.enabled===true); return JSON.stringify({enabled:!!enabled}); })()',
-    assert: { operator: 'eq', field: 'enabled', value: true },
-    hint: 'Enable the perps trading flag: Settings → Experimental → Feature Flags → perpsPerpTradingEnabled.',
-    fixtures: {
-      pass: '{"enabled":true}',
-      fail: '{"enabled":false}',
-    },
-  },
-
-};
-
-module.exports = REGISTRY;
diff --git a/scripts/perps/agentic/teams/perps/recipes/app-lifecycle.json b/scripts/perps/agentic/teams/perps/recipes/app-lifecycle.json
deleted file mode 100644
index 0942619934fe..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/app-lifecycle.json
+++ /dev/null
@@ -1,181 +0,0 @@
-{
-  "title": "App Lifecycle — validate data survives background, long background, and restart",
-  "description": "Reference recipe demonstrating three lifecycle stress levels: short background (within WS grace period), long background (exceeds grace period, forces full WS reconnection), and full app restart. Use as a template for PR recipes that need lifecycle validation.",
-  "inputs": {
-    "symbol": {
-      "type": "string",
-      "default": "BTC",
-      "description": "Market symbol to verify price recovery"
-    },
-    "short_background_ms": {
-      "type": "number",
-      "default": 5000,
-      "description": "Short background duration — within WS grace period (cache preserved)"
-    },
-    "long_background_ms": {
-      "type": "number",
-      "default": 30000,
-      "description": "Long background duration — exceeds WS grace period (forces full reconnection)"
-    },
-    "test_short_background": {
-      "type": "boolean",
-      "default": true,
-      "description": "Test short background/foreground cycle"
-    },
-    "test_long_background": {
-      "type": "boolean",
-      "default": true,
-      "description": "Test long background that triggers WS reconnection"
-    },
-    "test_restart": {
-      "type": "boolean",
-      "default": false,
-      "description": "Test full app restart (slower, needs ~20s boot + possible unlock)"
-    }
-  },
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "entry": "nav-market-list",
-      "nodes": {
-        "nav-market-list": {
-          "action": "navigate",
-          "target": "PerpsTrendingView",
-          "next": "wait-markets"
-        },
-        "wait-markets": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){return JSON.stringify({count:ms.length})})",
-          "assert": { "operator": "gt", "field": "count", "value": 0 },
-          "next": "baseline-price"
-        },
-        "baseline-price": {
-          "action": "eval_async",
-          "description": "Baseline — confirm markets and price data loaded",
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){var m=ms.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({found:!!m,price:m?m.price:'0'})})",
-          "assert": { "operator": "neq", "field": "price", "value": "0" },
-          "next": "short-background"
-        },
-
-        "short-background": {
-          "action": "app_background",
-          "description": "Short background — within WS grace period, cache should be preserved",
-          "when": { "operator": "eq", "field": "inputs.test_short_background", "value": true },
-          "duration_ms": "{{short_background_ms}}",
-          "next": "short-foreground"
-        },
-        "short-foreground": {
-          "action": "app_foreground",
-          "when": { "operator": "eq", "field": "inputs.test_short_background", "value": true },
-          "next": "wait-post-short"
-        },
-        "wait-post-short": {
-          "action": "wait_for",
-          "when": { "operator": "eq", "field": "inputs.test_short_background", "value": true },
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){return JSON.stringify({count:ms.length})})",
-          "assert": { "operator": "gt", "field": "count", "value": 0 },
-          "timeout_ms": 15000,
-          "next": "verify-post-short"
-        },
-        "verify-post-short": {
-          "action": "eval_async",
-          "description": "Confirm markets + price survive short background",
-          "when": { "operator": "eq", "field": "inputs.test_short_background", "value": true },
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){var m=ms.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({found:!!m,price:m?m.price:'0'})})",
-          "assert": { "operator": "neq", "field": "price", "value": "0" },
-          "next": "long-background"
-        },
-
-        "long-background": {
-          "action": "app_background",
-          "description": "Long background — exceeds WS grace period, forces full reconnection",
-          "when": { "operator": "eq", "field": "inputs.test_long_background", "value": true },
-          "duration_ms": "{{long_background_ms}}",
-          "next": "long-foreground"
-        },
-        "long-foreground": {
-          "action": "app_foreground",
-          "when": { "operator": "eq", "field": "inputs.test_long_background", "value": true },
-          "next": "wait-post-long"
-        },
-        "wait-post-long": {
-          "action": "wait_for",
-          "when": { "operator": "eq", "field": "inputs.test_long_background", "value": true },
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){return JSON.stringify({count:ms.length})})",
-          "assert": { "operator": "gt", "field": "count", "value": 0 },
-          "timeout_ms": 30000,
-          "next": "verify-post-long"
-        },
-        "verify-post-long": {
-          "action": "eval_async",
-          "description": "Confirm markets + DEXs recover after full WS reconnection",
-          "when": { "operator": "eq", "field": "inputs.test_long_background", "value": true },
-          "expression": "(function(){return Promise.all([Engine.context.PerpsController.getMarketDataWithPrices(),Engine.context.PerpsController.getAvailableDexs()]).then(function(r){var m=r[0].find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({markets:r[0].length,dexs:r[1].length,price:m?m.price:'0'})})})()",
-          "assert": { "operator": "neq", "field": "price", "value": "0" },
-          "next": "restart-app"
-        },
-
-        "restart-app": {
-          "action": "app_restart",
-          "when": { "operator": "eq", "field": "inputs.test_restart", "value": true },
-          "boot_wait_ms": 20000,
-          "next": "detect-post-restart"
-        },
-        "detect-post-restart": {
-          "action": "eval_sync",
-          "description": "Detect login vs wallet after restart",
-          "when": { "operator": "eq", "field": "inputs.test_restart", "value": true },
-          "expression": "(function(){try{var r=globalThis.__AGENTIC__.getRoute();return JSON.stringify({route:r.name})}catch(e){return JSON.stringify({route:'unknown'})}})()",
-          "next": "check-needs-unlock"
-        },
-        "check-needs-unlock": {
-          "action": "switch",
-          "when": { "operator": "eq", "field": "inputs.test_restart", "value": true },
-          "cases": [
-            {
-              "label": "needs-login",
-              "when": { "operator": "eq", "field": "nodes.detect-post-restart.result.route", "value": "Login" },
-              "next": "enter-password"
-            }
-          ],
-          "default": "nav-after-restart"
-        },
-        "enter-password": {
-          "action": "set_input",
-          "test_id": "login-password-input",
-          "value": "qwerasdf",
-          "next": "press-login"
-        },
-        "press-login": {
-          "action": "press",
-          "test_id": "log-in-button",
-          "next": "nav-after-restart"
-        },
-        "nav-after-restart": {
-          "action": "navigate",
-          "when": { "operator": "eq", "field": "inputs.test_restart", "value": true },
-          "target": "PerpsTrendingView",
-          "next": "wait-post-restart"
-        },
-        "wait-post-restart": {
-          "action": "wait_for",
-          "when": { "operator": "eq", "field": "inputs.test_restart", "value": true },
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){return JSON.stringify({count:ms.length})})",
-          "assert": { "operator": "gt", "field": "count", "value": 0 },
-          "timeout_ms": 30000,
-          "next": "verify-post-restart"
-        },
-        "verify-post-restart": {
-          "action": "eval_async",
-          "description": "Confirm markets reload cleanly after full restart",
-          "when": { "operator": "eq", "field": "inputs.test_restart", "value": true },
-          "expression": "Engine.context.PerpsController.getMarketDataWithPrices().then(function(ms){var m=ms.find(function(x){return x.symbol==='{{symbol}}'});return JSON.stringify({found:!!m,price:m?m.price:'0'})})",
-          "assert": { "operator": "neq", "field": "price", "value": "0" },
-          "next": "done"
-        },
-
-        "done": { "action": "end", "status": "pass" }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perf-add-funds.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perf-add-funds.json
deleted file mode 100644
index 97b4587c09f7..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perf-add-funds.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "title": "Benchmark: Perf — Perps add funds flow timing",
-  "schema_version": 1,
-  "description": "Mirrors performance/login/perps-add-funds.spec.ts. Ensures tutorial is completed via setup, then navigates to Perps, opens Add Funds, and types amount. Teardown navigates back to PerpsHome.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "setup": [
-        {
-          "id": "setup-complete-tutorial",
-          "action": "eval_sync",
-          "expression": "(function(){Engine.context.PerpsController.markTutorialCompleted();return JSON.stringify({done:true})})()",
-          "assert": { "operator": "eq", "field": "done", "value": true }
-        }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "nav-perps"
-        },
-        "nav-perps": {
-          "action": "navigate",
-          "target": "PerpsHomeView",
-          "next": "wait-add-funds"
-        },
-        "wait-add-funds": {
-          "action": "wait_for",
-          "test_id": "perps-market-add-funds-button",
-          "timeout_ms": 20000,
-          "next": "press-add-funds"
-        },
-        "press-add-funds": {
-          "action": "press",
-          "test_id": "perps-market-add-funds-button",
-          "next": "wait-deposit"
-        },
-        "wait-deposit": {
-          "action": "wait_for",
-          "test_id": "deposit-keyboard",
-          "timeout_ms": 15000,
-          "next": "clear-keypad"
-        },
-        "clear-keypad": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "type-amount"
-        },
-        "type-amount": {
-          "action": "type_keypad",
-          "value": "2",
-          "next": "screenshot-amount"
-        },
-        "screenshot-amount": {
-          "action": "screenshot",
-          "filename": "evidence-perf-add-funds.png",
-          "note": "Perf benchmark: deposit screen reached with $2 entered — captures end of timed nav-to-amount path",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perf-position-management.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perf-position-management.json
deleted file mode 100644
index e2487c9d00e4..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perf-position-management.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "title": "Benchmark: Perf — Perps position open and close BTC",
-  "schema_version": 1,
-  "description": "Mirrors performance/login/perps-position-management.spec.ts. Opens a BTC long position and closes it. Performance spec measures timing with 40x leverage; recipe uses default leverage via trade-open-market flow.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade", "perps.sufficient_balance"],
-      "setup": [
-        { "id": "setup-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "clear-btc-position"
-        },
-        "clear-btc-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});if(!p)return JSON.stringify({cleared:true});return Engine.context.PerpsController.closePosition({symbol:'BTC'}).then(function(){return JSON.stringify({cleared:true})})})",
-          "assert": { "operator": "eq", "field": "cleared", "value": true },
-          "next": "open-long-btc"
-        },
-        "open-long-btc": {
-          "action": "call",
-          "ref": "trade-open-market",
-          "params": { "symbol": "BTC", "side": "long", "usdAmount": "10" },
-          "next": "wait-position"
-        },
-        "wait-position": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});return JSON.stringify({found:!!p})})",
-          "assert": { "operator": "eq", "field": "found", "value": true },
-          "timeout_ms": 15000,
-          "next": "screenshot-open"
-        },
-        "screenshot-open": {
-          "action": "screenshot",
-          "filename": "evidence-perf-btc-open.png",
-          "note": "Perf benchmark: BTC long opened — captured before close timer starts",
-          "next": "close-position"
-        },
-        "close-position": {
-          "action": "call",
-          "ref": "trade-close-position",
-          "params": { "symbol": "BTC" },
-          "next": "verify-closed"
-        },
-        "verify-closed": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});return JSON.stringify({found:!!p})})",
-          "assert": { "operator": "eq", "field": "found", "value": false },
-          "timeout_ms": 10000,
-          "next": "screenshot-closed"
-        },
-        "screenshot-closed": {
-          "action": "screenshot",
-          "filename": "evidence-perf-btc-closed.png",
-          "note": "Perf benchmark: BTC position closed — getPositions empty, end of timed open-then-close path",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-close-btc",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});if(!p)return JSON.stringify({clean:true});return Engine.context.PerpsController.closePosition({symbol:'BTC'}).then(function(){return JSON.stringify({clean:true})})})",
-          "assert": { "operator": "not_null" }
-        },
-        { "id": "teardown-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-add-funds.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-add-funds.json
deleted file mode 100644
index 08704e1f38b4..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-add-funds.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "title": "Benchmark: Perps Add Funds — navigate to deposit screen and enter amount",
-  "schema_version": 1,
-  "description": "Mirrors smoke/perps/perps-add-funds.spec.ts. Navigates to Perps, taps Add Funds, and enters amount via keypad. Detox spec also confirms deposit via mock server; recipe validates the UI flow up to amount entry (deposit execution requires E2E mock infrastructure).",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade"],
-      "setup": [
-        {
-          "id": "setup-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "nav-perps-home"
-        },
-        "nav-perps-home": {
-          "action": "navigate",
-          "target": "PerpsHomeView",
-          "next": "wait-perps-loaded"
-        },
-        "wait-perps-loaded": {
-          "action": "wait_for",
-          "expression": "(function(){var el=globalThis.__AGENTIC__.findFiberByTestId('perps-market-add-funds-button');return JSON.stringify({visible:!!el})})()",
-          "assert": { "operator": "eq", "field": "visible", "value": true },
-          "timeout_ms": 20000,
-          "next": "screenshot-perps-home"
-        },
-        "screenshot-perps-home": {
-          "action": "screenshot",
-          "filename": "evidence-perps-home.png",
-          "note": "PerpsHomeView loaded with Add Funds CTA visible — entry point for deposit flow",
-          "next": "press-add-funds"
-        },
-        "press-add-funds": {
-          "action": "press",
-          "test_id": "perps-market-add-funds-button",
-          "next": "wait-deposit-screen"
-        },
-        "wait-deposit-screen": {
-          "action": "wait_for",
-          "test_id": "deposit-keyboard",
-          "timeout_ms": 15000,
-          "next": "clear-keypad"
-        },
-        "clear-keypad": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "type-amount"
-        },
-        "type-amount": {
-          "action": "type_keypad",
-          "value": "80",
-          "next": "screenshot-amount-entered"
-        },
-        "screenshot-amount-entered": {
-          "action": "screenshot",
-          "filename": "evidence-deposit-amount.png",
-          "note": "Deposit screen with $80 entered via keypad — UI flow up to amount confirmation (deposit execution requires E2E mock)",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-limit-long-fill.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-limit-long-fill.json
deleted file mode 100644
index a9f9ccd29701..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-limit-long-fill.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "title": "Benchmark: Perps Limit Long Fill — limit long ETH at Mid, verify order and fill",
-  "schema_version": 1,
-  "description": "Mirrors smoke/perps/perps-limit-long-fill.spec.ts. Creates an ETH limit long at mid price via controller API, verifies the order appears, then waits for fill. Uses order-limit-place-controller flow (bypasses UI deposit path broken in dev mode).",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade", "perps.sufficient_balance"],
-      "setup": [
-        { "id": "setup-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "clear-eth-position"
-        },
-        "clear-eth-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({cleared:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({cleared:true})})})",
-          "assert": { "operator": "eq", "field": "cleared", "value": true },
-          "next": "cancel-eth-orders"
-        },
-        "cancel-eth-orders": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getOpenOrders().then(function(os){var eth=os.filter(function(o){return o.symbol==='ETH'&&!o.isTrigger});if(!eth.length)return JSON.stringify({cancelled:0});return Promise.all(eth.map(function(o){return Engine.context.PerpsController.cancelOrder({orderId:o.oid})})).then(function(){return JSON.stringify({cancelled:eth.length})})})",
-          "assert": { "operator": "not_null" },
-          "next": "place-limit-order"
-        },
-        "place-limit-order": {
-          "action": "call",
-          "ref": "order-limit-place-controller",
-          "params": { "symbol": "ETH", "side": "long", "usdAmount": "10" },
-          "next": "screenshot-order"
-        },
-        "screenshot-order": {
-          "action": "screenshot",
-          "filename": "evidence-limit-order-placed.png",
-          "note": "ETH limit long order placed at mid price — order present in PerpsController.getOpenOrders pre-fill",
-          "next": "verify-order-or-fill"
-        },
-        "verify-order-or-fill": {
-          "action": "eval_async",
-          "expression": "Promise.all([Engine.context.PerpsController.getOpenOrders(),Engine.context.PerpsController.getPositions()]).then(function(r){var orders=r[0].filter(function(o){return o.symbol==='ETH'&&!o.isTrigger});var pos=r[1].find(function(p){return p.symbol==='ETH'});return JSON.stringify({hasOrder:orders.length>0,hasPosition:!!pos})})",
-          "assert": {
-            "any": [
-              { "operator": "eq", "field": "hasOrder", "value": true },
-              { "operator": "eq", "field": "hasPosition", "value": true }
-            ]
-          },
-          "next": "wait-fill"
-        },
-        "wait-fill": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p})})",
-          "assert": { "operator": "eq", "field": "found", "value": true },
-          "timeout_ms": 120000,
-          "next": "screenshot-filled"
-        },
-        "screenshot-filled": {
-          "action": "screenshot",
-          "filename": "evidence-limit-order-filled.png",
-          "note": "ETH limit order filled — position now in PerpsController.getPositions, order removed from open orders",
-          "next": "cleanup"
-        },
-        "cleanup": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({closed:true})}).catch(function(){return JSON.stringify({closed:true})})",
-          "assert": { "operator": "not_null" },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-close-eth",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({clean:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({clean:true})}).catch(function(){return JSON.stringify({clean:true})})})",
-          "assert": { "operator": "not_null" }
-        },
-        {
-          "id": "teardown-cancel-eth-orders",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getOpenOrders().then(function(os){var eth=os.filter(function(o){return o.symbol==='ETH'&&!o.isTrigger});if(!eth.length)return JSON.stringify({cancelled:0});return Promise.all(eth.map(function(o){return Engine.context.PerpsController.cancelOrder({orderId:o.oid})})).then(function(){return JSON.stringify({cancelled:eth.length})})})",
-          "assert": { "operator": "not_null" }
-        },
-        { "id": "teardown-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-no-funds-tutorial.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-no-funds-tutorial.json
deleted file mode 100644
index c585f5ba41d1..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-no-funds-tutorial.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
-  "title": "Benchmark: Perps No Funds Tutorial — walk through onboarding tutorial",
-  "schema_version": 1,
-  "description": "Mirrors smoke/perps/perps-no-funds-tutorial.spec.ts. Resets first-time-user state and navigates to Perps. If tutorial shows, walks through 6 continue steps. If user already onboarded (funded account), verifies market list is visible. Teardown marks tutorial completed and navigates to PerpsHome for clean state.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "setup": [
-        {
-          "id": "setup-reset-tutorial",
-          "action": "eval_sync",
-          "expression": "(function(){Engine.context.PerpsController.resetFirstTimeUserState();return JSON.stringify({reset:true})})()",
-          "assert": { "operator": "eq", "field": "reset", "value": true }
-        },
-        {
-          "id": "setup-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "nav-perps"
-        },
-        "nav-perps": {
-          "action": "navigate",
-          "target": "PerpsHomeView",
-          "next": "wait-perps-screen"
-        },
-        "wait-perps-screen": {
-          "action": "wait_for",
-          "expression": "(function(){var route=globalThis.__AGENTIC__.getRoute().name;return JSON.stringify({route:route})})()",
-          "assert": { "operator": "not_null", "field": "route" },
-          "timeout_ms": 15000,
-          "next": "check-tutorial"
-        },
-        "check-tutorial": {
-          "action": "eval_sync",
-          "expression": "(function(){var el=globalThis.__AGENTIC__.findFiberByTestId('perps-tutorial-continue-button');return JSON.stringify({hasTutorial:!!el})})()",
-          "save_as": "tutorialCheck",
-          "assert": { "operator": "not_null" },
-          "next": "decide-path"
-        },
-        "decide-path": {
-          "action": "switch",
-          "cases": [
-            {
-              "label": "tutorial visible",
-              "when": { "operator": "eq", "field": "vars.tutorialCheck.hasTutorial", "value": true },
-              "next": "press-continue-1"
-            }
-          ],
-          "default": "screenshot-already-onboarded"
-        },
-        "press-continue-1": {
-          "action": "press",
-          "test_id": "perps-tutorial-continue-button",
-          "next": "wait-1"
-        },
-        "wait-1": { "action": "wait", "duration_ms": 500, "next": "press-continue-2" },
-        "press-continue-2": {
-          "action": "press",
-          "test_id": "perps-tutorial-continue-button",
-          "next": "wait-2"
-        },
-        "wait-2": { "action": "wait", "duration_ms": 500, "next": "press-continue-3" },
-        "press-continue-3": {
-          "action": "press",
-          "test_id": "perps-tutorial-continue-button",
-          "next": "wait-3"
-        },
-        "wait-3": { "action": "wait", "duration_ms": 500, "next": "press-continue-4" },
-        "press-continue-4": {
-          "action": "press",
-          "test_id": "perps-tutorial-continue-button",
-          "next": "wait-4"
-        },
-        "wait-4": { "action": "wait", "duration_ms": 500, "next": "press-continue-5" },
-        "press-continue-5": {
-          "action": "press",
-          "test_id": "perps-tutorial-continue-button",
-          "next": "wait-5"
-        },
-        "wait-5": { "action": "wait", "duration_ms": 500, "next": "press-continue-6" },
-        "press-continue-6": {
-          "action": "press",
-          "test_id": "perps-tutorial-continue-button",
-          "next": "screenshot-tutorial-complete"
-        },
-        "screenshot-tutorial-complete": {
-          "action": "screenshot",
-          "filename": "evidence-tutorial-complete.png",
-          "note": "Onboarding tutorial completed — final continue button dismissed and market list ready",
-          "next": "verify-market-view"
-        },
-        "screenshot-already-onboarded": {
-          "action": "screenshot",
-          "filename": "evidence-already-onboarded.png",
-          "note": "Already-onboarded path — tutorial skipped, market list visible directly",
-          "next": "verify-market-view"
-        },
-        "verify-market-view": {
-          "action": "eval_sync",
-          "expression": "(function(){var route=globalThis.__AGENTIC__.getRoute().name;return JSON.stringify({route:route,isPerps:route.indexOf('Perps')!==-1||route.indexOf('perps')!==-1})})()",
-          "assert": { "operator": "eq", "field": "isPerps", "value": true },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-mark-tutorial-done",
-          "action": "eval_sync",
-          "expression": "(function(){Engine.context.PerpsController.markTutorialCompleted();return JSON.stringify({completed:true})})()",
-          "assert": { "operator": "eq", "field": "completed", "value": true }
-        },
-        {
-          "id": "teardown-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-liquidation.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-liquidation.json
deleted file mode 100644
index 58bb4f1bdf75..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-liquidation.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "title": "Benchmark: Perps Position Liquidation — open long ETH, verify position exists",
-  "schema_version": 1,
-  "description": "Mirrors smoke/perps/perps-position-liquidation.spec.ts. Opens a long ETH position and verifies it exists. Detox spec pushes price to trigger liquidation via commandQueueServer; recipe validates position open (liquidation trigger requires E2E mock infrastructure for price manipulation).",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade", "perps.sufficient_balance"],
-      "setup": [
-        { "id": "setup-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "clear-eth-position"
-        },
-        "clear-eth-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({cleared:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({cleared:true})})})",
-          "assert": { "operator": "eq", "field": "cleared", "value": true },
-          "next": "open-long-eth"
-        },
-        "open-long-eth": {
-          "action": "call",
-          "ref": "trade-open-market",
-          "params": { "symbol": "ETH", "side": "long", "usdAmount": "10" },
-          "next": "wait-position"
-        },
-        "wait-position": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p,side:p?p.side:null,entryPrice:p?p.entryPrice:null})})",
-          "assert": { "operator": "eq", "field": "found", "value": true },
-          "timeout_ms": 15000,
-          "next": "verify-on-market-details"
-        },
-        "verify-on-market-details": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": { "symbol": "ETH", "name": "ETH", "price": "0", "change24h": "0", "change24hPercent": "0", "volume": "0", "maxLeverage": "100" }
-          },
-          "next": "wait-close-button"
-        },
-        "wait-close-button": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-close-button",
-          "timeout_ms": 15000,
-          "next": "screenshot-position"
-        },
-        "screenshot-position": {
-          "action": "screenshot",
-          "filename": "evidence-position-open-for-liquidation.png",
-          "note": "ETH long position open on PerpsMarketDetails with close button visible — liquidation precondition (price-trigger requires E2E mock)",
-          "next": "cleanup"
-        },
-        "cleanup": {
-          "action": "call",
-          "ref": "trade-close-position",
-          "params": { "symbol": "ETH" },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-close-eth",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({clean:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({clean:true})})})",
-          "assert": { "operator": "not_null" }
-        },
-        { "id": "teardown-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-stop-loss.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-stop-loss.json
deleted file mode 100644
index 289c470e9362..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position-stop-loss.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "title": "Benchmark: Perps Position Stop Loss — open long ETH with SL, verify SL set",
-  "schema_version": 1,
-  "description": "Mirrors smoke/perps/perps-position-stop-loss.spec.ts. Opens a long ETH position, sets a stop loss via tpsl-create flow. Detox spec uses custom SL price (2300) and pushes price to trigger; recipe uses SL preset and verifies SL is set (price trigger requires E2E mock).",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade", "perps.sufficient_balance"],
-      "setup": [
-        { "id": "setup-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "clear-eth-position"
-        },
-        "clear-eth-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({cleared:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({cleared:true})})})",
-          "assert": { "operator": "eq", "field": "cleared", "value": true },
-          "next": "open-long-eth"
-        },
-        "open-long-eth": {
-          "action": "call",
-          "ref": "trade-open-market-controller",
-          "params": { "symbol": "ETH", "side": "long", "usdAmount": "10" },
-          "next": "wait-position"
-        },
-        "wait-position": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p})})",
-          "assert": { "operator": "eq", "field": "found", "value": true },
-          "timeout_ms": 15000,
-          "next": "create-sl"
-        },
-        "create-sl": {
-          "action": "call",
-          "ref": "tpsl-create",
-          "params": { "symbol": "ETH", "tpPreset": "50", "slPreset": "-25" },
-          "next": "verify-sl"
-        },
-        "verify-sl": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({hasSl:!!(p&&p.stopLossPrice),slPrice:p?p.stopLossPrice:null})})",
-          "assert": { "operator": "eq", "field": "hasSl", "value": true },
-          "timeout_ms": 10000,
-          "next": "screenshot-sl-set"
-        },
-        "screenshot-sl-set": {
-          "action": "screenshot",
-          "filename": "evidence-stop-loss-set.png",
-          "note": "ETH long position with stopLossPrice attached via tpsl-create — SL trigger live (price-based liquidation requires E2E mock)",
-          "next": "cleanup"
-        },
-        "cleanup": {
-          "action": "call",
-          "ref": "trade-close-position",
-          "params": { "symbol": "ETH" },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-close-eth",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({clean:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({clean:true})})})",
-          "assert": { "operator": "not_null" }
-        },
-        { "id": "teardown-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position.json b/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position.json
deleted file mode 100644
index 39e71ed25f7a..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/benchmark/perps-position.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "title": "Benchmark: Perps Position — open long ETH with TP, close position",
-  "schema_version": 1,
-  "description": "Mirrors smoke/perps/perps-position.spec.ts. Opens a long ETH position, sets TP/SL, then closes it. Detox spec sets custom TP during order; recipe uses tpsl-create flow after position open (equivalent coverage, reuses existing flow).",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.ready_to_trade", "perps.sufficient_balance"],
-      "setup": [
-        { "id": "setup-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "clear-eth-position"
-        },
-        "clear-eth-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({cleared:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({cleared:true})})})",
-          "assert": { "operator": "eq", "field": "cleared", "value": true },
-          "next": "open-long-eth"
-        },
-        "open-long-eth": {
-          "action": "call",
-          "ref": "trade-open-market-controller",
-          "params": { "symbol": "ETH", "side": "long", "usdAmount": "10" },
-          "next": "wait-position"
-        },
-        "wait-position": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p,side:p?p.side:null})})",
-          "assert": { "operator": "eq", "field": "found", "value": true },
-          "timeout_ms": 30000,
-          "next": "screenshot-position-open"
-        },
-        "screenshot-position-open": {
-          "action": "screenshot",
-          "filename": "evidence-position-open.png",
-          "note": "ETH long market position opened — appears in PerpsController.getPositions before TP/SL is attached",
-          "next": "create-tpsl"
-        },
-        "create-tpsl": {
-          "action": "call",
-          "ref": "tpsl-create",
-          "params": { "symbol": "ETH", "tpPreset": "25", "slPreset": "-10" },
-          "next": "verify-tpsl"
-        },
-        "verify-tpsl": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({hasTp:!!(p&&p.takeProfitPrice),hasSl:!!(p&&p.stopLossPrice)})})",
-          "assert": { "operator": "eq", "field": "hasTp", "value": true },
-          "timeout_ms": 10000,
-          "next": "close-position"
-        },
-        "close-position": {
-          "action": "call",
-          "ref": "trade-close-position",
-          "params": { "symbol": "ETH" },
-          "next": "verify-closed"
-        },
-        "verify-closed": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p})})",
-          "assert": { "operator": "eq", "field": "found", "value": false },
-          "timeout_ms": 10000,
-          "next": "screenshot-closed"
-        },
-        "screenshot-closed": {
-          "action": "screenshot",
-          "filename": "evidence-position-closed.png",
-          "note": "ETH position closed — getPositions no longer returns ETH after trade-close-position completes",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-close-eth",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p)return JSON.stringify({clean:true});return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({clean:true})})})",
-          "assert": { "operator": "not_null" }
-        },
-        { "id": "teardown-nav-home", "action": "navigate", "target": "PerpsHomeView" }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/capabilities/performance-metrics-smoke.json b/scripts/perps/agentic/teams/perps/recipes/capabilities/performance-metrics-smoke.json
deleted file mode 100644
index bed42dd6c1fc..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/capabilities/performance-metrics-smoke.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  "title": "Capability: Hermes performance metrics snapshot",
-  "description": "Proof recipe for mobile performance metrics capture. Captures global.performance.now() + HermesInternal.getInstrumentedStats() before and after a bounded navigation workload via eval_sync. No new runner primitive required — this validates the existing eval_sync can serve as the mobile analog to extension's 'performance' capability.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "setup": [
-        {
-          "id": "setup-complete-tutorial",
-          "action": "eval_sync",
-          "expression": "(function(){try{Engine.context.PerpsController.markTutorialCompleted()}catch(e){}return JSON.stringify({done:true})})()",
-          "assert": { "operator": "eq", "field": "done", "value": true }
-        }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "nav-perps"
-        },
-        "nav-perps": {
-          "action": "navigate",
-          "target": "PerpsHomeView",
-          "next": "wait-markets"
-        },
-        "wait-markets": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-ETH",
-          "timeout_ms": 20000,
-          "next": "snapshot-before"
-        },
-        "snapshot-before": {
-          "action": "eval_sync",
-          "expression": "(function(){var hasHermes=typeof HermesInternal==='object'&&HermesInternal!==null;var stats=hasHermes&&typeof HermesInternal.getInstrumentedStats==='function'?HermesInternal.getInstrumentedStats():null;var statKeys=stats?Object.keys(stats):[];return JSON.stringify({ts:typeof performance!=='undefined'&&performance.now?performance.now():Date.now(),hasHermes:hasHermes,statCount:statKeys.length,sampleStatKeys:statKeys.slice(0,5),jsNumGCs:stats?stats.js_numGCs||null:null,jsHeapSize:stats?stats.js_allocatedBytes||stats.js_heapSize||null:null})})()",
-          "assert": {
-            "all": [
-              { "operator": "eq", "field": "hasHermes", "value": true },
-              { "operator": "gt", "field": "statCount", "value": 0 },
-              { "operator": "gt", "field": "ts", "value": 0 }
-            ]
-          },
-          "next": "nav-market-detail"
-        },
-        "nav-market-detail": {
-          "action": "press",
-          "test_id": "perps-market-row-item-ETH",
-          "next": "wait-detail"
-        },
-        "wait-detail": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "timeout_ms": 15000,
-          "next": "snapshot-after"
-        },
-        "snapshot-after": {
-          "action": "eval_sync",
-          "expression": "(function(){var hasHermes=typeof HermesInternal==='object'&&HermesInternal!==null;var stats=hasHermes&&typeof HermesInternal.getInstrumentedStats==='function'?HermesInternal.getInstrumentedStats():null;var statKeys=stats?Object.keys(stats):[];return JSON.stringify({ts:typeof performance!=='undefined'&&performance.now?performance.now():Date.now(),hasHermes:hasHermes,statCount:statKeys.length,sampleStatKeys:statKeys.slice(0,5),jsNumGCs:stats?stats.js_numGCs||null:null,jsHeapSize:stats?stats.js_allocatedBytes||stats.js_heapSize||null:null})})()",
-          "assert": {
-            "all": [
-              { "operator": "eq", "field": "hasHermes", "value": true },
-              { "operator": "gt", "field": "statCount", "value": 0 },
-              { "operator": "gt", "field": "ts", "value": 0 }
-            ]
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass",
-          "message": "Mobile performance metrics snapshot proven via Hermes getInstrumentedStats + performance.now"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/capabilities/profiler-trace-smoke.json b/scripts/perps/agentic/teams/perps/recipes/capabilities/profiler-trace-smoke.json
deleted file mode 100644
index 7761ed741132..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/capabilities/profiler-trace-smoke.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "title": "Capability: Hermes sampling profiler trace",
-  "description": "Proof recipe for mobile trace capture. Exercises trace_start -> bounded navigation workload -> trace_stop, asserting the Chrome-compatible .cpuprofile artifact is written and non-empty. This is the mobile mirror of extension's trace_start/trace_stop capability, backed by the Hermes Profiler domain over CDP. Artifact path is under artifacts.tracesDir (see ensureRunArtifacts in validate-recipe.js).",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "setup": [
-        {
-          "id": "setup-complete-tutorial",
-          "action": "eval_sync",
-          "expression": "(function(){try{Engine.context.PerpsController.markTutorialCompleted()}catch(e){}return JSON.stringify({done:true})})()",
-          "assert": { "operator": "eq", "field": "done", "value": true }
-        }
-      ],
-      "entry": "ensure-testnet",
-      "nodes": {
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "nav-perps"
-        },
-        "nav-perps": {
-          "action": "navigate",
-          "target": "PerpsHomeView",
-          "next": "wait-markets"
-        },
-        "wait-markets": {
-          "action": "wait_for",
-          "test_id": "perps-market-row-item-ETH",
-          "timeout_ms": 20000,
-          "next": "start-trace"
-        },
-        "start-trace": {
-          "action": "trace_start",
-          "label": "perps-nav-smoke",
-          "assert": { "operator": "eq", "field": "started", "value": true },
-          "next": "press-market"
-        },
-        "press-market": {
-          "action": "press",
-          "test_id": "perps-market-row-item-ETH",
-          "next": "wait-detail"
-        },
-        "wait-detail": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "timeout_ms": 15000,
-          "next": "stop-trace"
-        },
-        "stop-trace": {
-          "action": "trace_stop",
-          "label": "perps-nav-smoke",
-          "assert": {
-            "all": [
-              { "operator": "eq", "field": "ok", "value": true },
-              { "operator": "gt", "field": "sizeBytes", "value": 0 },
-              { "operator": "not_null", "field": "path" }
-            ]
-          },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass",
-          "message": "Mobile Hermes sampling profiler trace captured as Chrome-compatible .cpuprofile"
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-nav-home",
-          "action": "navigate",
-          "target": "PerpsHomeView"
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/capabilities/recipe-issues-smoke.json b/scripts/perps/agentic/teams/perps/recipes/capabilities/recipe-issues-smoke.json
deleted file mode 100644
index f3f26f256e5c..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/capabilities/recipe-issues-smoke.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "title": "Capability: Recipe issue-review automatic capture",
-  "description": "Proof recipe for the automatic recipe-issues feature. Emits exactly one warning, one error, and one uncaught exception via the in-app console hook; the runner must capture all three into the synthesized recipe-issues-review artifacts without any log_watch node wired by the recipe. Marker strings are deliberately unique so the validation wrapper can grep them back out.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked"],
-      "entry": "emit-warning",
-      "nodes": {
-        "emit-warning": {
-          "action": "eval_sync",
-          "expression": "(function(){console.warn('recipe-watcher-mobile-warning MARKER_WARN_42');return JSON.stringify({emitted:'warn'})})()",
-          "assert": { "operator": "eq", "field": "emitted", "value": "warn" },
-          "next": "emit-error"
-        },
-        "emit-error": {
-          "action": "eval_sync",
-          "expression": "(function(){console.error('recipe-watcher-mobile-error MARKER_ERR_42');return JSON.stringify({emitted:'error'})})()",
-          "assert": { "operator": "eq", "field": "emitted", "value": "error" },
-          "next": "emit-exception"
-        },
-        "emit-exception": {
-          "action": "eval_async",
-          "expression": "new Promise(function(resolve){setTimeout(function(){try{throw new Error('recipe-watcher-mobile-exception MARKER_EXN_42')}catch(e){if(typeof ErrorUtils!=='undefined'&&ErrorUtils.reportFatalError){try{ErrorUtils.reportFatalError(e)}catch(_){}}else if(typeof globalThis!=='undefined'&&typeof globalThis.dispatchEvent==='function'){try{var ev=new Event('error');ev.error=e;ev.message=e.message;globalThis.dispatchEvent(ev)}catch(_){}}if(typeof globalThis!=='undefined'&&Array.isArray(globalThis.__AGENTIC_ISSUES__)){globalThis.__AGENTIC_ISSUES__.push({t:Date.now(),level:'exception',text:String(e.stack||e.message||e)})}}setTimeout(function(){resolve(JSON.stringify({emitted:'exception'}))},200)},0)})",
-          "assert": { "operator": "eq", "field": "emitted", "value": "exception" },
-          "next": "settle"
-        },
-        "settle": {
-          "action": "wait",
-          "duration_ms": 500,
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass",
-          "message": "Emitted 3 marker signals; runner must synthesize recipe-issues-review artifacts"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json b/scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json
deleted file mode 100644
index 1af13f081457..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/full-trade-lifecycle.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "title": "Full BTC trade lifecycle — mainnet start, testnet switch, open, TP/SL, close",
-  "description": "Starts from wallet home on mainnet, navigates to Perps, switches to testnet, then chains 4 flows: market open, TP/SL creation, position close. Proves full end-to-end composability.",
-  "validate": {
-    "workflow": {
-      "entry": "nav-wallet-home",
-      "nodes": {
-        "nav-wallet-home": {
-          "action": "navigate",
-          "target": "WalletView",
-          "next": "switch-mainnet"
-        },
-        "switch-mainnet": {
-          "action": "toggle_testnet",
-          "enabled": false,
-          "next": "wait-mainnet"
-        },
-        "wait-mainnet": {
-          "action": "wait_for",
-          "expression": "JSON.stringify({isTestnet:Engine.context.PerpsController.state.isTestnet})",
-          "assert": {
-            "operator": "eq",
-            "field": "isTestnet",
-            "value": false
-          },
-          "next": "nav-perps-home"
-        },
-        "nav-perps-home": {
-          "action": "navigate",
-          "target": "PerpsHomeView",
-          "next": "wait-perps-home"
-        },
-        "wait-perps-home": {
-          "action": "wait_for",
-          "route": "PerpsMarketListView",
-          "next": "ensure-testnet"
-        },
-        "ensure-testnet": {
-          "action": "call",
-          "ref": "setup-testnet",
-          "next": "verify-provider"
-        },
-        "verify-provider": {
-          "action": "eval_ref",
-          "ref": "providers",
-          "assert": {
-            "operator": "contains",
-            "value": "hyperliquid"
-          },
-          "next": "clear-btc-position"
-        },
-        "clear-btc-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});if(!p)return JSON.stringify({cleared:true});return Engine.context.PerpsController.closePosition({symbol:'BTC'}).then(function(){return JSON.stringify({cleared:true})})})",
-          "assert": {
-            "operator": "eq",
-            "field": "cleared",
-            "value": true
-          },
-          "next": "wait-no-btc"
-        },
-        "wait-no-btc": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});return JSON.stringify({found:!!p})})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": false
-          },
-          "timeout_ms": 10000,
-          "next": "open-long-btc"
-        },
-        "open-long-btc": {
-          "action": "call",
-          "ref": "trade-open-market",
-          "params": {
-            "symbol": "BTC",
-            "side": "long",
-            "usdAmount": "10",
-            "leverage": "2"
-          },
-          "next": "wait-position"
-        },
-        "wait-position": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});return JSON.stringify({found:!!p,side:p?p.side:null})})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": true
-          },
-          "timeout_ms": 10000,
-          "next": "create-tpsl"
-        },
-        "create-tpsl": {
-          "action": "call",
-          "ref": "tpsl-create",
-          "params": {
-            "symbol": "BTC"
-          },
-          "next": "close-position"
-        },
-        "close-position": {
-          "action": "call",
-          "ref": "trade-close-position",
-          "params": {
-            "symbol": "BTC"
-          },
-          "next": "wait-closed"
-        },
-        "wait-closed": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='BTC'});return JSON.stringify({found:!!p})})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": false
-          },
-          "timeout_ms": 10000,
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json b/scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json
deleted file mode 100644
index dd0d67325320..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/hl-balance-contract.json
+++ /dev/null
@@ -1,375 +0,0 @@
-{
-  "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/perps/agentic/teams/perps/recipes/provider-smoke.json b/scripts/perps/agentic/teams/perps/recipes/provider-smoke.json
deleted file mode 100644
index ae939c4ce5da..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/provider-smoke.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "title": "Provider smoke — verify active provider and branch on testnet mode",
-  "description": "Demonstrates switch branching: checks testnet state, branches to enable it if needed, then verifies providers are registered.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "entry": "check-testnet",
-      "nodes": {
-        "check-testnet": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify({isTestnet: Engine.context.PerpsController.state.isTestnet})",
-          "assert": { "operator": "not_null" },
-          "save_as": "testnetState",
-          "next": "decide-testnet"
-        },
-        "decide-testnet": {
-          "action": "switch",
-          "description": "Branch based on current testnet mode",
-          "cases": [
-            {
-              "label": "already testnet",
-              "when": { "operator": "eq", "field": "vars.testnetState.isTestnet", "value": true },
-              "next": "verify-providers"
-            }
-          ],
-          "default": "enable-testnet"
-        },
-        "enable-testnet": {
-          "action": "toggle_testnet",
-          "enabled": true,
-          "next": "wait-testnet"
-        },
-        "wait-testnet": {
-          "action": "wait_for",
-          "expression": "JSON.stringify({isTestnet: Engine.context.PerpsController.state.isTestnet})",
-          "assert": { "operator": "eq", "field": "isTestnet", "value": true },
-          "timeout_ms": 5000,
-          "next": "verify-providers"
-        },
-        "verify-providers": {
-          "action": "eval_ref",
-          "ref": "providers",
-          "assert": { "operator": "not_null" },
-          "next": "verify-markets"
-        },
-        "verify-markets": {
-          "action": "eval_ref",
-          "ref": "markets",
-          "assert": { "operator": "length_gt", "value": 0 },
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass"
-        }
-      }
-    }
-  }
-}
diff --git a/scripts/perps/agentic/teams/perps/recipes/reference-decimal-key-screens.json b/scripts/perps/agentic/teams/perps/recipes/reference-decimal-key-screens.json
deleted file mode 100644
index 25a28739c3b0..000000000000
--- a/scripts/perps/agentic/teams/perps/recipes/reference-decimal-key-screens.json
+++ /dev/null
@@ -1,638 +0,0 @@
-{
-  "title": "Reference decimal key screens",
-  "description": "Canonical reusable value-extraction recipe for perps decimal formatting across the main mobile key screens. Uses tracked generic flows for setup/trade state and keeps screen-specific extraction inline here instead of adding more one-off committed flows.",
-  "validate": {
-    "workflow": {
-      "pre_conditions": ["wallet.unlocked", "perps.feature_enabled"],
-      "setup": [
-        {
-          "id": "setup-account",
-          "action": "call",
-          "ref": "perps/select-account",
-          "params": {
-            "address": "0x8dc623e964475d4d669da601fd15ea9125469003"
-          }
-        },
-        {
-          "id": "setup-testnet",
-          "action": "call",
-          "ref": "perps/setup-testnet"
-        },
-        {
-          "id": "setup-clear-eth",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p){return JSON.stringify({cleared:true});}return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({cleared:true});});})",
-          "assert": {
-            "operator": "eq",
-            "field": "cleared",
-            "value": true
-          }
-        },
-        {
-          "id": "setup-wait-no-eth",
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p});})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": false
-          },
-          "timeout_ms": 10000
-        }
-      ],
-      "entry": "btc-market-nav",
-      "nodes": {
-        "btc-market-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "BTC",
-              "name": "BTC",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "btc-market-wait"
-        },
-        "btc-market-wait": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "next": "btc-market-extract"
-        },
-        "btc-market-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-market-header')); return JSON.stringify({symbol:'BTC',screen:'market_detail',price:firstMatch(header,/^\\$/),change:firstMatch(header,/%$/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "btc_market",
-          "next": "btc-order-mode"
-        },
-        "btc-order-mode": {
-          "action": "eval_sync",
-          "expression": "(function(){ function ids(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; var out=[]; if(!hook||!hook.renderers||!hook.getFiberRoots) return out; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.testID) out.push(String(p.testID)); walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(r.current) walk(r.current); }); } step=it.next(); } return Array.from(new Set(out)); } var all=ids(); return JSON.stringify({hasLong:all.indexOf('perps-market-details-long-button')!==-1,hasModify:all.indexOf('perps-market-details-modify-button')!==-1}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "hasLong"
-          },
-          "save_as": "btc_order_mode",
-          "next": "btc-order-mode-branch"
-        },
-        "btc-order-mode-branch": {
-          "action": "switch",
-          "cases": [
-            {
-              "when": {
-                "field": "vars.btc_order_mode.hasLong",
-                "operator": "truthy"
-              },
-              "next": "btc-order-open"
-            },
-            {
-              "when": {
-                "field": "vars.btc_order_mode.hasModify",
-                "operator": "truthy"
-              },
-              "next": "btc-order-open-modify"
-            }
-          ],
-          "default": "btc-order-open"
-        },
-        "btc-order-open": {
-          "action": "press",
-          "test_id": "perps-market-details-long-button",
-          "next": "btc-order-wait"
-        },
-        "btc-order-open-modify": {
-          "action": "press",
-          "test_id": "perps-market-details-modify-button",
-          "next": "btc-order-wait-modify-sheet"
-        },
-        "btc-order-wait-modify-sheet": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-modify-action-sheet-add_to_position",
-          "next": "btc-order-select-add-to-position"
-        },
-        "btc-order-select-add-to-position": {
-          "action": "press",
-          "test_id": "perps-market-details-modify-action-sheet-add_to_position",
-          "next": "btc-order-wait"
-        },
-        "btc-order-wait": {
-          "action": "wait_for",
-          "route": "RedesignedConfirmations",
-          "next": "btc-order-amount"
-        },
-        "btc-order-amount": {
-          "action": "press",
-          "test_id": "perps-amount-display-touchable",
-          "next": "btc-order-keypad"
-        },
-        "btc-order-keypad": {
-          "action": "wait_for",
-          "test_id": "keypad-delete-button",
-          "next": "btc-order-clear"
-        },
-        "btc-order-clear": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "btc-order-type"
-        },
-        "btc-order-type": {
-          "action": "type_keypad",
-          "value": "11",
-          "next": "btc-order-done"
-        },
-        "btc-order-done": {
-          "action": "press",
-          "test_id": "perps-order-view-keypad-done",
-          "next": "btc-order-extract"
-        },
-        "btc-order-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function collectAll(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; var out=[]; if(!hook||!hook.renderers||!hook.getFiberRoots) return out; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(r.current) walk(r.current); }); } step=it.next(); } return out; } function firstAfter(arr,label,re){ var idx=arr.indexOf(label); if(idx===-1)return null; for(var i=idx+1;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-order-header')); var all=collectAll(); return JSON.stringify({symbol:'BTC',screen:'order_entry',price:firstMatch(header,/^\\$\\d/),change:firstMatch(header,/%$/),margin:firstAfter(all,'Margin',/^\\$|^-/),liquidationPrice:firstAfter(all,'Liquidation price',/^\\$|^-/),fees:firstAfter(all,'Fees',/^\\$|^-/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "btc_order",
-          "next": "eth-market-nav"
-        },
-        "eth-market-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "ETH",
-              "name": "ETH",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "eth-market-wait"
-        },
-        "eth-market-wait": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "next": "eth-market-extract"
-        },
-        "eth-market-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-market-header')); return JSON.stringify({symbol:'ETH',screen:'market_detail',price:firstMatch(header,/^\\$/),change:firstMatch(header,/%$/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "eth_market",
-          "next": "eth-order-mode"
-        },
-        "eth-order-mode": {
-          "action": "eval_sync",
-          "expression": "(function(){ function ids(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; var out=[]; if(!hook||!hook.renderers||!hook.getFiberRoots) return out; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.testID) out.push(String(p.testID)); walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(r.current) walk(r.current); }); } step=it.next(); } return Array.from(new Set(out)); } var all=ids(); return JSON.stringify({hasLong:all.indexOf('perps-market-details-long-button')!==-1,hasModify:all.indexOf('perps-market-details-modify-button')!==-1}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "hasLong"
-          },
-          "save_as": "eth_order_mode",
-          "next": "eth-order-mode-branch"
-        },
-        "eth-order-mode-branch": {
-          "action": "switch",
-          "cases": [
-            {
-              "when": {
-                "field": "vars.eth_order_mode.hasLong",
-                "operator": "truthy"
-              },
-              "next": "eth-order-open"
-            },
-            {
-              "when": {
-                "field": "vars.eth_order_mode.hasModify",
-                "operator": "truthy"
-              },
-              "next": "eth-order-open-modify"
-            }
-          ],
-          "default": "eth-order-open"
-        },
-        "eth-order-open": {
-          "action": "press",
-          "test_id": "perps-market-details-long-button",
-          "next": "eth-order-wait"
-        },
-        "eth-order-open-modify": {
-          "action": "press",
-          "test_id": "perps-market-details-modify-button",
-          "next": "eth-order-wait-modify-sheet"
-        },
-        "eth-order-wait-modify-sheet": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-modify-action-sheet-add_to_position",
-          "next": "eth-order-select-add-to-position"
-        },
-        "eth-order-select-add-to-position": {
-          "action": "press",
-          "test_id": "perps-market-details-modify-action-sheet-add_to_position",
-          "next": "eth-order-wait"
-        },
-        "eth-order-wait": {
-          "action": "wait_for",
-          "route": "RedesignedConfirmations",
-          "next": "eth-order-amount"
-        },
-        "eth-order-amount": {
-          "action": "press",
-          "test_id": "perps-amount-display-touchable",
-          "next": "eth-order-keypad"
-        },
-        "eth-order-keypad": {
-          "action": "wait_for",
-          "test_id": "keypad-delete-button",
-          "next": "eth-order-clear"
-        },
-        "eth-order-clear": {
-          "action": "clear_keypad",
-          "count": 8,
-          "next": "eth-order-type"
-        },
-        "eth-order-type": {
-          "action": "type_keypad",
-          "value": "11",
-          "next": "eth-order-done"
-        },
-        "eth-order-done": {
-          "action": "press",
-          "test_id": "perps-order-view-keypad-done",
-          "next": "eth-order-extract"
-        },
-        "eth-order-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function collectAll(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; var out=[]; if(!hook||!hook.renderers||!hook.getFiberRoots) return out; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(r.current) walk(r.current); }); } step=it.next(); } return out; } function firstAfter(arr,label,re){ var idx=arr.indexOf(label); if(idx===-1)return null; for(var i=idx+1;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-order-header')); var all=collectAll(); return JSON.stringify({symbol:'ETH',screen:'order_entry',price:firstMatch(header,/^\\$\\d/),change:firstMatch(header,/%$/),margin:firstAfter(all,'Margin',/^\\$|^-/),liquidationPrice:firstAfter(all,'Liquidation price',/^\\$|^-/),fees:firstAfter(all,'Fees',/^\\$|^-/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "eth_order",
-          "next": "sol-market-nav"
-        },
-        "sol-market-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "SOL",
-              "name": "SOL",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "sol-market-wait"
-        },
-        "sol-market-wait": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "next": "sol-market-extract"
-        },
-        "sol-market-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-market-header')); return JSON.stringify({symbol:'SOL',screen:'market_detail',price:firstMatch(header,/^\\$/),change:firstMatch(header,/%$/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "sol_market",
-          "next": "fart-market-nav"
-        },
-        "fart-market-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "FARTCOIN",
-              "name": "FARTCOIN",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "fart-market-wait"
-        },
-        "fart-market-wait": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "next": "fart-market-extract"
-        },
-        "fart-market-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-market-header')); return JSON.stringify({symbol:'FARTCOIN',screen:'market_detail',price:firstMatch(header,/^\\$/),change:firstMatch(header,/%$/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "fartcoin_market",
-          "next": "pump-market-nav"
-        },
-        "pump-market-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "PUMP",
-              "name": "PUMP",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "pump-market-wait"
-        },
-        "pump-market-wait": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "next": "pump-market-extract"
-        },
-        "pump-market-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function find(testId){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===testId){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } return found; } function collect(root){ var out=[]; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } walk(root); return out; } function firstMatch(arr,re){ for(var i=0;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var header=collect(find('perps-market-header')); return JSON.stringify({symbol:'PUMP',screen:'market_detail',price:firstMatch(header,/^\\$/),change:firstMatch(header,/%$/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "price"
-          },
-          "save_as": "pump_market",
-          "next": "check-eth-position"
-        },
-        "check-eth-position": {
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p});})",
-          "assert": {
-            "operator": "not_null",
-            "field": "found"
-          },
-          "save_as": "eth_position_present",
-          "next": "branch-eth-position"
-        },
-        "branch-eth-position": {
-          "action": "switch",
-          "cases": [
-            {
-              "when": {
-                "field": "vars.eth_position_present.found",
-                "operator": "truthy"
-              },
-              "next": "eth-position-nav"
-            }
-          ],
-          "default": "open-eth-position"
-        },
-        "open-eth-position": {
-          "action": "call",
-          "ref": "perps/trade-open-market",
-          "params": {
-            "symbol": "ETH",
-            "side": "long",
-            "usdAmount": "11",
-            "leverage": "2"
-          },
-          "next": "wait-eth-position"
-        },
-        "wait-eth-position": {
-          "action": "wait_for",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});return JSON.stringify({found:!!p});})",
-          "assert": {
-            "operator": "eq",
-            "field": "found",
-            "value": true
-          },
-          "timeout_ms": 10000,
-          "next": "eth-position-nav"
-        },
-        "eth-position-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "ETH",
-              "name": "ETH",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "eth-position-wait"
-        },
-        "eth-position-wait": {
-          "action": "wait_for",
-          "route": "PerpsMarketDetails",
-          "next": "eth-position-extract"
-        },
-        "eth-position-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function collectAll(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; var out=[]; if(!hook||!hook.renderers||!hook.getFiberRoots) return out; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(r.current) walk(r.current); }); } step=it.next(); } return out; } function firstAfter(arr,label,re){ var idx=arr.indexOf(label); if(idx===-1)return null; for(var i=idx+1;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var all=collectAll(); return JSON.stringify({symbol:'ETH',screen:'position_detail',size:firstAfter(all,'Size',/^\\$|^[0-9.]/),margin:firstAfter(all,'Margin',/^\\$|^[0-9.]/),entry:firstAfter(all,'Entry price',/^\\$|^[0-9.]/),liquidationPrice:firstAfter(all,'Liquidation price',/^\\$|^[0-9.]/),funding:firstAfter(all,'Funding payments',/^\\$|^-\\$|^[0-9.]/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "entry"
-          },
-          "save_as": "eth_position",
-          "next": "eth-reverse-open-menu"
-        },
-        "eth-reverse-open-menu": {
-          "action": "press",
-          "test_id": "perps-market-details-modify-button",
-          "next": "eth-reverse-wait-menu"
-        },
-        "eth-reverse-wait-menu": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-modify-action-sheet-flip_position",
-          "next": "eth-reverse-open"
-        },
-        "eth-reverse-open": {
-          "action": "press",
-          "test_id": "perps-market-details-modify-action-sheet-flip_position",
-          "next": "eth-reverse-wait"
-        },
-        "eth-reverse-wait": {
-          "action": "wait_for",
-          "test_id": "perps-flip-position-cancel-button",
-          "next": "eth-reverse-extract"
-        },
-        "eth-reverse-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function t(id){var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; if(!hook||!hook.renderers||!hook.getFiberRoots)return null; var found=null; function walk(f){ if(!f||found)return; var p=f.memoizedProps; if(p&&p.testID===id){ found=f; return; } walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(!found&&r.current) walk(r.current); }); } if(found) break; step=it.next(); } if(!found||!found.memoizedProps) return null; var c=found.memoizedProps.children; if(Array.isArray(c)) return c.join('').trim()||null; return String(c||'').trim()||null; } return JSON.stringify({symbol:'ETH',screen:'reverse_modal',estSize:t('perps-flip-position-est-size-value'),fees:t('perps-flip-position-fees-value')}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "estSize"
-          },
-          "save_as": "eth_reverse",
-          "next": "eth-reverse-close"
-        },
-        "eth-reverse-close": {
-          "action": "press",
-          "test_id": "perps-flip-position-cancel-button",
-          "next": "eth-margin-nav"
-        },
-        "eth-margin-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "ETH",
-              "name": "ETH",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "eth-margin-open"
-        },
-        "eth-margin-open": {
-          "action": "wait_for",
-          "test_id": "position-card-margin-chevron",
-          "next": "eth-margin-press"
-        },
-        "eth-margin-press": {
-          "action": "press",
-          "test_id": "position-card-margin-chevron",
-          "next": "eth-margin-reduce"
-        },
-        "eth-margin-reduce": {
-          "action": "wait_for",
-          "test_id": "perps-adjust-margin-reduce-btn",
-          "next": "eth-margin-reduce-press"
-        },
-        "eth-margin-reduce-press": {
-          "action": "press",
-          "test_id": "perps-adjust-margin-reduce-btn",
-          "next": "eth-margin-view"
-        },
-        "eth-margin-view": {
-          "action": "wait_for",
-          "route": "PerpsAdjustMargin",
-          "next": "eth-margin-extract"
-        },
-        "eth-margin-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){ function flat(v,out){ if(v===null||v===undefined)return; if(typeof v==='string'||typeof v==='number'){ var s=String(v).trim(); if(s) out.push(s); return; } if(Array.isArray(v)){ for(var i=0;i<v.length;i++) flat(v[i],out); return; } if(v&&v.props&&v.props.children!==undefined){ flat(v.props.children,out); } } function collectAll(){ var hook=globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__; var out=[]; if(!hook||!hook.renderers||!hook.getFiberRoots) return out; function walk(f){ if(!f)return; var p=f.memoizedProps; if(p&&p.children!==undefined) flat(p.children,out); walk(f.child); walk(f.sibling); } var it=hook.renderers.entries(); var step=it.next(); while(!step.done){ var roots=hook.getFiberRoots(step.value[0]); if(roots){ roots.forEach(function(r){ if(r.current) walk(r.current); }); } step=it.next(); } return out; } function firstAfter(arr,label,re){ var idx=arr.indexOf(label); if(idx===-1)return null; for(var i=idx+1;i<arr.length;i++){ if(re.test(arr[i])) return arr[i]; } return null; } var all=collectAll(); return JSON.stringify({symbol:'ETH',screen:'remove_margin',available:firstAfter(all,'Margin available to remove',/^\\$|^[0-9.]/),liquidationPrice:firstAfter(all,'Liquidation price',/^\\$|^[0-9.]/),liquidationDistance:firstAfter(all,'Liquidation distance',/^[0-9.]+%/)}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "liquidationPrice"
-          },
-          "save_as": "eth_remove_margin",
-          "next": "eth-close-nav"
-        },
-        "eth-close-nav": {
-          "action": "navigate",
-          "target": "PerpsMarketDetails",
-          "params": {
-            "market": {
-              "symbol": "ETH",
-              "name": "ETH",
-              "price": "0",
-              "change24h": "0",
-              "change24hPercent": "0",
-              "volume": "0",
-              "maxLeverage": "100"
-            }
-          },
-          "next": "eth-close-open"
-        },
-        "eth-close-open": {
-          "action": "wait_for",
-          "test_id": "perps-market-details-close-button",
-          "next": "eth-close-press"
-        },
-        "eth-close-press": {
-          "action": "press",
-          "test_id": "perps-market-details-close-button",
-          "next": "eth-close-view"
-        },
-        "eth-close-view": {
-          "action": "wait_for",
-          "route": "PerpsClosePosition",
-          "next": "eth-close-extract"
-        },
-        "eth-close-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){var a=globalThis.__AGENTIC__; return JSON.stringify({symbol:'ETH',screen:'close_position',closeAmount:a?a.getTextByTestId('perps-amount-display-amount'):null,margin:a?a.getTextByTestId('close-position-margin-value'):null,fees:a?a.getTextByTestId('close-position-fees-value'):null,receive:a?a.getTextByTestId('close-position-receive-value'):null}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "closeAmount"
-          },
-          "save_as": "eth_close",
-          "next": "withdraw-nav"
-        },
-        "withdraw-nav": {
-          "action": "navigate",
-          "target": "PerpsWithdraw",
-          "next": "withdraw-wait"
-        },
-        "withdraw-wait": {
-          "action": "wait_for",
-          "route": "PerpsWithdraw",
-          "next": "withdraw-press-25"
-        },
-        "withdraw-press-25": {
-          "action": "eval_sync",
-          "expression": "JSON.stringify(globalThis.__AGENTIC__?.pressText('25%',{maxTexts:4}))",
-          "assert": {
-            "operator": "eq",
-            "field": "ok",
-            "value": true
-          },
-          "next": "withdraw-settle"
-        },
-        "withdraw-settle": {
-          "action": "wait",
-          "ms": 500,
-          "next": "withdraw-extract"
-        },
-        "withdraw-extract": {
-          "action": "eval_sync",
-          "expression": "(function(){var a=globalThis.__AGENTIC__; return JSON.stringify({screen:'withdraw',preset10:'10%',preset25:'25%',preset50:'50%',fee:a?a.getTextByTestId('perps-withdraw-fee-value'):null,time:a?a.getTextByTestId('perps-withdraw-time-value'):null,receive:a?a.getTextByTestId('perps-withdraw-receive-value'):null}); })()",
-          "assert": {
-            "operator": "not_null",
-            "field": "fee"
-          },
-          "save_as": "withdraw",
-          "next": "done"
-        },
-        "done": {
-          "action": "end",
-          "status": "pass",
-          "message": "Captured reusable mobile decimal/value reference data across key perps screens."
-        }
-      },
-      "teardown": [
-        {
-          "id": "teardown-close-eth",
-          "action": "eval_async",
-          "expression": "Engine.context.PerpsController.getPositions().then(function(ps){var p=ps.find(function(x){return x.symbol==='ETH'});if(!p){return JSON.stringify({cleared:true});}return Engine.context.PerpsController.closePosition({symbol:'ETH'}).then(function(){return JSON.stringify({cleared:true});});})",
-          "assert": {
-            "operator": "eq",
-            "field": "cleared",
-            "value": true
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/scripts/perps/agentic/timing-benchmark.md b/scripts/perps/agentic/timing-benchmark.md
deleted file mode 100644
index e0bf8e4f41de..000000000000
--- a/scripts/perps/agentic/timing-benchmark.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Perps Timing Benchmark
-
-Wall-clock comparison of Detox smoke specs vs their agentic recipes on a Detox debug build (`__DEV__=true`, `ios.sim.main`). Only 3 Detox smoke specs are active (not skipped); the other 5 recipes migrate skipped or Playwright specs.
-
-## Dual-simulator architecture
-
-Detox and recipes need different builds + env — run sequentially on two sims.
-
-| | Detox (phase 1) | Agentic (phase 2) |
-| --- | --- | --- |
-| Simulator | `detox-benchmark` (safe to wipe) | `mm-2` (dev wallet) |
-| Build | e2e debug (`yarn test:e2e:ios:debug:build`) | dev debug (`yarn a:setup:ios`) |
-| Metro port | shared `WATCHER_PORT` from `.js.env` (e.g. 8062) | same |
-| Metro env | `METAMASK_ENVIRONMENT=e2e` | `METAMASK_ENVIRONMENT=dev` |
-| Accounts | fixture-injected ($10k fake) | real wallet (testnet) |
-| API | mock server | real Hyperliquid testnet |
-
-Detox wipes app data per test (`launchApp({ delete: true })`), so the dedicated sim protects the dev wallet. Port is shared across phases with Metro restarted between them — running two Metros on different ports breaks Expo Dev Client deep links (the cached `WATCHER_PORT` from `.js.env` resolves to the wrong bundle).
-
-## Trade path difference
-
-Detox runs the full UI deposit form; the e2e env overrides `depositWithOrder()` to bypass real Arbitrum USDC infra. Dev has no such override — so recipes call `PerpsController.placeOrder()` directly via CDP. Different layers, same feature: Detox proves the UI flow with mocks, recipes prove the controller/API on real testnet.
-
-## Setup
-
-```bash
-xcrun simctl create "detox-benchmark" "iPhone 16 Pro"    # one-time
-yarn test:e2e:ios:debug:build                            # Detox build
-yarn a:setup:ios                                         # dev build + wallet
-bash scripts/perps/agentic/run-timing-benchmark.sh       # run benchmark
-# override sims: DETOX_SIMULATOR=... AGENTIC_SIMULATOR=... bash ...
-```
-
-## Results (2026-04-16)
-
-| Spec | Detox (s) | Agentic (s) | Delta | Speedup |
-| --- | --- | --- | --- | --- |
-| perps-position | 133 | 37 | 96 | 3.59x |
-| perps-position-stop-loss | 119 | 31 | 88 | 3.83x |
-| perps-limit-long-fill | 116 | 28 | 88 | 4.14x |
-| **TOTAL** | **368** | **96** | **272** | **3.83x** |
-
-Detox wall-clock includes app wipe + reinstall + fixture inject + mock server + test + teardown. Agentic wall-clock includes CDP connect + preflight + recipe + teardown.
diff --git a/scripts/perps/agentic/validate-flow-schema.js b/scripts/perps/agentic/validate-flow-schema.js
deleted file mode 100644
index 4c0e8bdacefd..000000000000
--- a/scripts/perps/agentic/validate-flow-schema.js
+++ /dev/null
@@ -1,420 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const path = require('node:path');
-
-const {
-  collectScenarioFiles,
-  getAppRoot,
-  inferTeamFromPath,
-  loadPreConditionRegistry,
-  parsePreConditionSpec,
-  readJsonFile,
-  resolveEvalRef,
-  resolveFlowRef,
-} = require('./lib/catalog');
-const {
-  ALL_WORKFLOW_ACTIONS,
-  CONTROL_ACTIONS,
-  EXECUTABLE_ACTIONS,
-  detectWorkflowCycles,
-  findMissingTargets,
-  findUnreachableNodes,
-  normalizeWorkflowDocument,
-} = require('./lib/workflow');
-
-const MUST_ASSERT = new Set(['eval_sync', 'eval_async', 'eval_ref']);
-const HOOK_ONLY_ACTIONS = new Set([...EXECUTABLE_ACTIONS]);
-const CURRENT_SCHEMA_VERSION = 1;
-
-function parseSchemaVersion(value) {
-  if (value == null || value === '') return 0;
-  const num = Number.parseInt(String(value), 10);
-  return Number.isFinite(num) && num >= 0 ? num : 0;
-}
-
-function requireFields(node, fields, issues) {
-  fields.forEach((field) => {
-    if (!Object.prototype.hasOwnProperty.call(node, field) || node[field] === '') {
-      issues.push(`  [${node.id || '?'}] action="${node.action}" requires "${field}"`);
-    }
-  });
-}
-
-function validateActionShape(node, issues, context = {}) {
-  const { schemaVersion = 1, fileLabel = '?' } = context;
-  switch (node.action) {
-    case 'navigate':
-      requireFields(node, ['target'], issues);
-      break;
-    case 'press':
-      requireFields(node, ['test_id'], issues);
-      break;
-    case 'set_input':
-      requireFields(node, ['test_id', 'value'], issues);
-      break;
-    case 'call':
-    case 'eval_ref':
-      requireFields(node, ['ref'], issues);
-      break;
-    case 'eval_sync':
-    case 'eval_async':
-      requireFields(node, ['expression'], issues);
-      break;
-    case 'type_keypad':
-      requireFields(node, ['value'], issues);
-      break;
-    case 'select_account':
-      requireFields(node, ['address'], issues);
-      break;
-    case 'switch_provider':
-      requireFields(node, ['provider'], issues);
-      break;
-    case 'screenshot': {
-      requireFields(node, ['filename'], issues);
-      const note = typeof node.note === 'string' ? node.note.trim() : '';
-      const noteOk = note.length >= 3;
-      if (!noteOk) {
-        if (schemaVersion >= 1) {
-          issues.push(
-            `  [${node.id || '?'}] action="screenshot" requires "note" (>= 3 chars) at schema_version ${schemaVersion}`
-          );
-        } else {
-          console.warn(
-            `  warning [${fileLabel}] [${node.id || '?'}] screenshot missing "note" — caption will fall back to filename. Add a note, then declare top-level "schema_version": ${CURRENT_SCHEMA_VERSION} to opt into strict validation.`
-          );
-        }
-      }
-      break;
-    }
-    case 'log_watch':
-      if (!(node.watch_for?.length || node.must_not_appear?.length)) {
-        issues.push(
-          `  [${node.id || '?'}] action="log_watch" requires watch_for or must_not_appear`
-        );
-      }
-      break;
-    case 'wait_for':
-      if (
-        !('assert' in node) &&
-        !('route' in node) &&
-        !('not_route' in node) &&
-        !('test_id' in node)
-      ) {
-        issues.push(
-          `  [${node.id || '?'}] wait_for requires an assert block or route/test_id sugar`
-        );
-      }
-      if (!node.route && !node.not_route && !node.test_id && !node.expression) {
-        issues.push(`  [${node.id || '?'}] action="wait_for" requires a condition`);
-      }
-      if ('timeout' in node && !('timeout_ms' in node)) {
-        issues.push(
-          `  [${node.id || '?'}] action="wait_for" uses unsupported field "timeout"; use "timeout_ms" instead`
-        );
-      }
-      break;
-    case 'switch':
-      if (!Array.isArray(node.cases) || node.cases.length === 0) {
-        issues.push(`  [${node.id || '?'}] action="switch" requires at least one case`);
-      }
-      (node.cases || []).forEach((entry, index) => {
-        if (!entry.when) {
-          issues.push(`  [${node.id || '?'}] switch case ${index + 1} requires "when"`);
-        }
-        if (!entry.next) {
-          issues.push(`  [${node.id || '?'}] switch case ${index + 1} requires "next"`);
-        }
-      });
-      break;
-    case 'end':
-      if (node.status && !['pass', 'fail'].includes(String(node.status))) {
-        issues.push(`  [${node.id || '?'}] end status must be "pass" or "fail"`);
-      }
-      break;
-    default:
-      break;
-  }
-}
-
-function collectUsedParams(value, usedParams) {
-  if (typeof value === 'string') {
-    const pattern = /\{\{([^|}]+)(?:\|[^}]*)?\}\}/g;
-    let match;
-    while ((match = pattern.exec(value)) !== null) {
-      usedParams.add(match[1]);
-    }
-    return;
-  }
-
-  if (Array.isArray(value)) {
-    value.forEach((item) => collectUsedParams(item, usedParams));
-    return;
-  }
-
-  if (value && typeof value === 'object') {
-    Object.values(value).forEach((item) => collectUsedParams(item, usedParams));
-  }
-}
-
-function validatePreConditions(preConditions, registry, issues) {
-  preConditions.forEach((spec) => {
-    const parsed = parsePreConditionSpec(spec);
-    const name = typeof parsed === 'string' ? parsed : parsed?.name;
-    if (!name) {
-      issues.push(`  pre_condition entry has no name: ${JSON.stringify(spec)}`);
-      return;
-    }
-
-    if (!registry[name]) {
-      issues.push(`  pre_condition "${name}" is not registered for this app`);
-    }
-  });
-}
-
-function validateReference(node, appRoot, defaultTeam, issues) {
-  if (node.action === 'call' && node.ref) {
-    try {
-      resolveFlowRef(node.ref, { appRoot, defaultTeam });
-    } catch (error) {
-      issues.push(`  [${node.id || '?'}] ${String(error.message || error)}`);
-    }
-  }
-
-  if (node.action === 'eval_ref' && node.ref) {
-    try {
-      resolveEvalRef(node.ref, { appRoot, defaultTeam });
-    } catch (error) {
-      issues.push(`  [${node.id || '?'}] ${String(error.message || error)}`);
-    }
-  }
-}
-
-function validateNodeCommon(node, issues, context = {}) {
-  const action = node.action || '';
-  const id = node.id || '?';
-
-  if (!ALL_WORKFLOW_ACTIONS.has(action)) {
-    issues.push(`  [${id}] unknown action "${action}"`);
-    return;
-  }
-
-  if (MUST_ASSERT.has(action) && !('assert' in node)) {
-    issues.push(`  [${id}] action="${action}" requires an assert block`);
-  }
-
-  if (node.save_as != null && String(node.save_as).trim() === '') {
-    issues.push(`  [${id}] save_as must be a non-empty string`);
-  }
-
-  validateActionShape(node, issues, context);
-}
-
-function validateHookSection(sectionName, steps, appRoot, defaultTeam, issues, seenIds, context = {}) {
-  steps.forEach((step, index) => {
-    const node = {
-      ...step,
-      action: String(step.action || step.type || ''),
-      id: String(step.id || `${sectionName}-${index + 1}`),
-    };
-
-    if (!step.id) {
-      issues.push(`  [${node.id}] every step must define an id`);
-    } else if (seenIds.has(node.id)) {
-      issues.push(`  [${node.id}] duplicate step id`);
-    } else {
-      seenIds.add(node.id);
-    }
-
-    if (!HOOK_ONLY_ACTIONS.has(node.action)) {
-      issues.push(
-        `  [${node.id}] ${sectionName} hooks only support executable actions, got "${node.action}"`
-      );
-      return;
-    }
-
-    validateNodeCommon(node, issues, context);
-    validateReference(node, appRoot, defaultTeam, issues);
-  });
-}
-
-function validateWorkflowNodes(normalizedDocument, appRoot, defaultTeam, issues, seenIds, context = {}) {
-  const workflow = normalizedDocument.workflow;
-
-  if (!workflow.entry) {
-    issues.push('  validate.workflow.entry is required');
-    return;
-  }
-
-  if (!workflow.nodes || Object.keys(workflow.nodes).length === 0) {
-    issues.push('  validate.workflow.nodes must define at least one node');
-    return;
-  }
-
-  if (!workflow.nodes[workflow.entry]) {
-    issues.push(`  validate.workflow.entry "${workflow.entry}" does not exist`);
-  }
-
-  let endNodeCount = 0;
-
-  for (const [nodeId, node] of Object.entries(workflow.nodes)) {
-    if (seenIds.has(nodeId)) {
-      issues.push(`  [${nodeId}] duplicate node id`);
-    } else {
-      seenIds.add(nodeId);
-    }
-
-    if (node.id !== nodeId) {
-      issues.push(`  [${nodeId}] node id must match its object key`);
-    }
-
-    if (CONTROL_ACTIONS.has(node.action) && (node.when || node.unless)) {
-      issues.push(`  [${nodeId}] control nodes cannot use when/unless guards`);
-    }
-
-    validateNodeCommon(node, issues, context);
-    validateReference(node, appRoot, defaultTeam, issues);
-
-    if (node.action === 'end') {
-      endNodeCount += 1;
-      continue;
-    }
-
-    if (node.action === 'switch') {
-      continue;
-    }
-
-    if (!node.next) {
-      issues.push(`  [${nodeId}] action="${node.action}" requires "next"`);
-    }
-  }
-
-  if (endNodeCount === 0) {
-    issues.push('  validate.workflow must define at least one end node');
-  }
-
-  findMissingTargets(workflow).forEach((edge) => {
-    issues.push(`  [${edge.from}] transition targets missing node "${edge.to}"`);
-  });
-
-  findUnreachableNodes(workflow).forEach((nodeId) => {
-    issues.push(`  [${nodeId}] unreachable node`);
-  });
-
-  detectWorkflowCycles(workflow).forEach((cycle) => {
-    issues.push(`  cycle detected: ${cycle.join(' -> ')}`);
-  });
-}
-
-function validateScenario(filePath, registry) {
-  const appRoot = getAppRoot();
-  const issues = [];
-  let document;
-
-  try {
-    document = readJsonFile(filePath);
-  } catch (error) {
-    return [`  parse error: ${error.message}`];
-  }
-
-  const defaultTeam = inferTeamFromPath(filePath, appRoot);
-  let normalizedDocument;
-
-  try {
-    normalizedDocument = normalizeWorkflowDocument(document, {
-      sourcePath: filePath,
-    });
-  } catch (error) {
-    return [`  ${String(error.message || error)}`];
-  }
-
-  const seenIds = new Set();
-  const schemaVersion = parseSchemaVersion(document.schema_version);
-  if (schemaVersion > CURRENT_SCHEMA_VERSION) {
-    issues.push(
-      `  [schema_version] declared "${document.schema_version}" exceeds validator's known max (${CURRENT_SCHEMA_VERSION}). Update validator or fix the recipe.`
-    );
-  }
-  const context = { schemaVersion, fileLabel: path.basename(filePath) };
-
-  validatePreConditions(normalizedDocument.hooks.pre_conditions || [], registry, issues);
-  validateHookSection(
-    'setup',
-    normalizedDocument.hooks.setup || [],
-    appRoot,
-    defaultTeam,
-    issues,
-    seenIds,
-    context
-  );
-  validateHookSection(
-    'teardown',
-    normalizedDocument.hooks.teardown || [],
-    appRoot,
-    defaultTeam,
-    issues,
-    seenIds,
-    context
-  );
-  validateWorkflowNodes(normalizedDocument, appRoot, defaultTeam, issues, seenIds, context);
-
-  const inputs = document.inputs || {};
-  const inputKeys = new Set(Object.keys(inputs));
-  const usedParams = new Set();
-
-  collectUsedParams(document.title || '', usedParams);
-  collectUsedParams(document.description || '', usedParams);
-  collectUsedParams(document.validate || {}, usedParams);
-
-  for (const param of usedParams) {
-    if (!inputKeys.has(param)) {
-      issues.push(`  [inputs] param "{{${param}}}" is used but not declared in inputs`);
-    }
-  }
-
-  for (const key of inputKeys) {
-    if (!usedParams.has(key)) {
-      console.warn(
-        `  warning [${path.basename(filePath)}] input "${key}" is declared but unused`
-      );
-    }
-  }
-
-  return issues;
-}
-
-function main() {
-  const appRoot = getAppRoot();
-  const registry = loadPreConditionRegistry(appRoot);
-  const inputFiles = process.argv.slice(2);
-  const files =
-    inputFiles.length > 0
-      ? inputFiles.map((filePath) => path.resolve(filePath))
-      : collectScenarioFiles(appRoot);
-
-  let totalViolations = 0;
-
-  files.forEach((filePath) => {
-    const issues = validateScenario(filePath, registry);
-    const relative = path.relative(appRoot, filePath);
-    if (issues.length === 0) {
-      console.log(`PASS ${relative}`);
-      return;
-    }
-
-    console.log(`FAIL ${relative}`);
-    issues.forEach((issue) => console.log(issue));
-    totalViolations += issues.length;
-  });
-
-  console.log('');
-  if (totalViolations === 0) {
-    console.log(`All ${files.length} scenario file(s) pass schema validation.`);
-    process.exit(0);
-  }
-
-  console.log(`${totalViolations} violation(s) across ${files.length} scenario file(s).`);
-  process.exit(1);
-}
-
-main();
diff --git a/scripts/perps/agentic/validate-myx.sh b/scripts/perps/agentic/validate-myx.sh
deleted file mode 100755
index 91a648c95a08..000000000000
--- a/scripts/perps/agentic/validate-myx.sh
+++ /dev/null
@@ -1,576 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-# scripts/perps/agentic/validate-myx.sh
-# Comprehensive MYX provider validation — tests each method category on testnet/mainnet.
-# Shows raw data previews for every call so a human can assess what's working.
-#
-# Prerequisites:
-#   - Metro running, device connected, app open
-#   - Engine exposed on globalThis (dev builds via __AGENTIC__ bridge)
-#   - MYX provider enabled (MM_PERPS_MYX_PROVIDER_ENABLED=true)
-#
-# Usage:
-#   scripts/perps/agentic/validate-myx.sh                    # Both networks
-#   scripts/perps/agentic/validate-myx.sh --network testnet  # Testnet only
-#   scripts/perps/agentic/validate-myx.sh --network mainnet  # Mainnet only
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-cd "$SCRIPT_DIR/../../.."
-
-# ── Args ────────────────────────────────────────────────────────────
-NETWORK="both"
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --network) NETWORK="$2"; shift 2 ;;
-    *) echo "Unknown option: $1"; exit 1 ;;
-  esac
-done
-
-# ── Helpers ─────────────────────────────────────────────────────────
-eval_sync() {
-  "$SCRIPT_DIR/app-state.sh" eval "$@" 2>&1
-}
-
-eval_async() {
-  "$SCRIPT_DIR/app-state.sh" eval-async "$@" 2>&1
-}
-
-# Counters
-PASS_COUNT=0
-FAIL_COUNT=0
-SKIP_COUNT=0
-UNVERIFIED_COUNT=0
-
-RESULTS=""
-
-record() {
-  local category="$1" test_name="$2" result="$3" details="${4:-}"
-  local icon
-  case "$result" in
-    PASS)       icon="✓"; PASS_COUNT=$((PASS_COUNT + 1)) ;;
-    FAIL)       icon="✗"; FAIL_COUNT=$((FAIL_COUNT + 1)) ;;
-    SKIP)       icon="⊘"; SKIP_COUNT=$((SKIP_COUNT + 1)) ;;
-    UNVERIFIED) icon="?"; UNVERIFIED_COUNT=$((UNVERIFIED_COUNT + 1)) ;;
-  esac
-  RESULTS="${RESULTS}$(printf '%-16s %-28s %s %-10s  %s\n' "$category" "$test_name" "$icon" "$result" "$details")\n"
-}
-
-# Print indented data preview (truncated to keep output scannable)
-preview() {
-  local label="$1" raw="$2" max_len="${3:-200}"
-  local trimmed
-  if [ ${#raw} -gt "$max_len" ]; then
-    trimmed="${raw:0:$max_len}..."
-  else
-    trimmed="$raw"
-  fi
-  echo "         ↳ $label: $trimmed"
-}
-
-print_report() {
-  local net_label="$1" chain_id="$2"
-  echo ""
-  echo "═══════════════════════════════════════════════════════════════════════"
-  echo "  MYX Provider Validation Report"
-  echo "  Network: $net_label (chainId: $chain_id)"
-  echo "  Timestamp: $(date -u +%Y-%m-%dT%H:%M:%SZ)"
-  echo "═══════════════════════════════════════════════════════════════════════"
-  echo ""
-  printf '%-16s %-28s   %-11s %s\n' "Category" "Test" "Result" "Details"
-  echo "───────────────────────────────────────────────────────────────────────"
-  echo -e "$RESULTS"
-  echo ""
-  local total=$((PASS_COUNT + FAIL_COUNT + SKIP_COUNT + UNVERIFIED_COUNT))
-  echo "Summary: ${PASS_COUNT} passed, ${FAIL_COUNT} failed, ${SKIP_COUNT} skipped, ${UNVERIFIED_COUNT} unverified  (${total} total)"
-  if [ "$UNVERIFIED_COUNT" -gt 0 ]; then
-    echo ""
-    echo "⚠ UNVERIFIED = API returned data but auth was never validated."
-    echo "  myxClient.auth() is sync (stores callbacks, sets #authenticatedAddress=<addr>)."
-    echo "  MYX API may not auth-gate read endpoints — empty results prove nothing."
-  fi
-  echo "═══════════════════════════════════════════════════════════════════════"
-}
-
-# Parse JSON field with python3 (handles double-encoded strings)
-json_field() {
-  local json="$1" field="$2"
-  echo "$json" | python3 -c "
-import sys, json
-raw = json.load(sys.stdin)
-if isinstance(raw, str):
-    raw = json.loads(raw)
-print(raw.get('$field', ''))
-" 2>/dev/null || echo ""
-}
-
-# Pretty-print decoded JSON (handles double-encoding)
-json_decode() {
-  echo "$1" | python3 -c "
-import sys, json
-raw = json.load(sys.stdin)
-if isinstance(raw, str):
-    try: raw = json.loads(raw)
-    except: pass
-print(json.dumps(raw, indent=2, ensure_ascii=False))
-" 2>/dev/null || echo "$1"
-}
-
-# ── Pre-flight ──────────────────────────────────────────────────────
-echo "[pre-flight] Checking Engine availability..."
-ENGINE_CHECK=$(eval_sync 'Boolean(Engine && Engine.context)') || ENGINE_CHECK="false"
-if [ "$ENGINE_CHECK" != "true" ]; then
-  echo "ERROR: Engine not available. Make sure app is running a dev build with agentic bridge."
-  exit 1
-fi
-echo "  Engine available"
-
-# Save initial testnet state so we can restore later
-INITIAL_TESTNET=$(eval_sync "JSON.stringify(Engine.context.PerpsController.state.isTestnet)") || INITIAL_TESTNET="unknown"
-echo "  Current isTestnet: $INITIAL_TESTNET"
-
-# ── Run validation for a given network ──────────────────────────────
-run_validation() {
-  local target_testnet="$1"  # "true" or "false"
-  local net_label
-  local chain_id
-
-  if [ "$target_testnet" = "true" ]; then
-    net_label="testnet"
-    chain_id="97"
-  else
-    net_label="mainnet"
-    chain_id="56"
-  fi
-
-  RESULTS=""
-  PASS_COUNT=0
-  FAIL_COUNT=0
-  SKIP_COUNT=0
-  UNVERIFIED_COUNT=0
-
-  echo ""
-  echo "━━━ Validating $net_label (chainId: $chain_id) ━━━"
-
-  # Switch network if needed
-  local current_testnet
-  current_testnet=$(eval_sync "JSON.stringify(Engine.context.PerpsController.state.isTestnet)") || current_testnet="unknown"
-  if [ "$current_testnet" != "\"$target_testnet\"" ]; then
-    echo "[setup] Switching to $net_label..."
-    eval_async "Engine.context.PerpsController.toggleTestnet().then(function(r) { return JSON.stringify(r); })" >/dev/null 2>&1 || true
-    sleep 2
-  fi
-
-  # ── SDK config probe ──
-  echo "[probe] Checking SDK internal config..."
-  local sdk_probe
-  sdk_probe=$(eval_async '
-    (function() {
-      var provider = Engine.context.PerpsController.providers.get("myx");
-      if (provider === null || provider === undefined) return JSON.stringify({error: "no provider"});
-      var cs = provider.__private_621_clientService;
-      if (cs === null || cs === undefined) return JSON.stringify({error: "no clientService"});
-      var myxClient = cs.__private_635_myxClient;
-      var config = myxClient.configManager.config;
-      var authConfig = cs.__private_639_authConfig;
-      return JSON.stringify({
-        sdkChainId: config.chainId,
-        sdkIsTestnet: config.isTestnet,
-        sdkIsBetaMode: config.isBetaMode,
-        authenticatedAddress: cs.__private_640_authenticatedAddress,
-        appId: authConfig ? authConfig.appId : null,
-        hasApiSecret: Boolean(authConfig && authConfig.apiSecret),
-        brokerAddress: authConfig && authConfig.brokerAddress ? authConfig.brokerAddress : ""
-      });
-    })()
-  ') || sdk_probe='{"error":"probe failed"}'
-  preview "SDK config" "$(json_decode "$sdk_probe")" 500
-
-  # ── 1. Init: Provider registered ──
-  echo "[test] Init: Provider registered..."
-  local provider_check
-  provider_check=$(eval_async '
-    Promise.resolve().then(function() {
-      var p = Engine.context.PerpsController.providers.get("myx");
-      return JSON.stringify({registered: Boolean(p)});
-    })
-  ') || provider_check='{"registered":false}'
-  local registered
-  registered=$(json_field "$provider_check" "registered")
-  if [ "$registered" = "True" ] || [ "$registered" = "true" ]; then
-    record "Init" "Provider registered" "PASS"
-  else
-    record "Init" "Provider registered" "FAIL" "not found in providers map"
-    print_report "$net_label" "$chain_id"
-    return
-  fi
-
-  # ── 2. Init: Markets load ──
-  echo "[test] Init: Markets load..."
-  local markets_result
-  markets_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").getMarkets().then(function(m) {
-      return JSON.stringify({
-        count: m.length,
-        names: m.map(function(x) { return x.name; }),
-        sampleKeys: m[0] ? Object.keys(m[0]) : []
-      });
-    })
-  ') || markets_result='{"error":"getMarkets failed"}'
-  local market_count
-  market_count=$(json_field "$markets_result" "count")
-  preview "markets" "$(json_decode "$markets_result")" 400
-  local first_symbol=""
-  if [ -n "$market_count" ] && [ "$market_count" != "0" ] && [ "$market_count" != "" ]; then
-    record "Init" "Markets loaded" "PASS" "${market_count} markets"
-    first_symbol=$(echo "$markets_result" | python3 -c "
-import sys, json
-raw = json.load(sys.stdin)
-if isinstance(raw, str): raw = json.loads(raw)
-names = raw.get('names', [])
-print(names[0] if names else '')
-" 2>/dev/null || echo "")
-  else
-    record "Init" "Markets loaded" "FAIL" "0 markets"
-  fi
-
-  # ── 3. Init: Market shape ──
-  echo "[test] Init: Market shape..."
-  local shape_result
-  shape_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").getMarkets().then(function(m) {
-      if (m.length === 0) return JSON.stringify({ok: false, reason: "empty"});
-      var s = m[0];
-      return JSON.stringify({
-        name: s.name, maxLeverage: s.maxLeverage, szDecimals: s.szDecimals,
-        providerId: s.providerId, keys: Object.keys(s)
-      });
-    })
-  ') || shape_result='{"ok":false}'
-  preview "first market" "$(json_decode "$shape_result")" 400
-  local has_name
-  has_name=$(echo "$shape_result" | python3 -c "
-import sys, json
-raw = json.load(sys.stdin)
-if isinstance(raw, str): raw = json.loads(raw)
-n = raw.get('name', '')
-print('true' if n and n != 'None' else 'false')
-" 2>/dev/null || echo "false")
-  if [ "$has_name" = "true" ]; then
-    record "Init" "Markets have name" "PASS"
-  else
-    record "Init" "Markets have name" "FAIL" "name is empty/missing"
-  fi
-
-  # ── 4a. Prices: Raw ticker probe (API values before adapter) ──
-  echo "[test] Prices: Raw ticker probe..."
-  local raw_ticker_result
-  raw_ticker_result=$(eval_async '
-    (function() {
-      var provider = Engine.context.PerpsController.providers.get("myx");
-      var cs = provider.__private_621_clientService;
-      var myxClient = cs.__private_635_myxClient;
-      return myxClient.getTickers().then(function(resp) {
-        var tickers = resp.data || [];
-        return JSON.stringify({
-          apiCount: tickers.length,
-          samples: tickers.slice(0, 5).map(function(t) {
-            return {symbol: t.baseSymbol || t.symbol, price: t.price, change: t.change, volume: t.volume};
-          })
-        });
-      });
-    })()
-  ') || raw_ticker_result='{"error":"probe failed"}'
-  preview "raw API tickers" "$(json_decode "$raw_ticker_result")" 600
-
-  # ── 4b. Prices: Formatted tickers (after adapter) ──
-  echo "[test] Prices: Formatted tickers..."
-  local tickers_result
-  tickers_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").getMarketDataWithPrices().then(function(d) {
-      return JSON.stringify({
-        count: d.length,
-        samples: d.slice(0, 3).map(function(x) {
-          return {name: x.name, price: x.price, markPrice: x.markPrice, oraclePrice: x.oraclePrice, volume: x.volume, openInterest: x.openInterest, fundingRate: x.fundingRate};
-        })
-      });
-    })
-  ') || tickers_result='{"count":0}'
-  local ticker_count
-  ticker_count=$(json_field "$tickers_result" "count")
-  preview "formatted tickers" "$(json_decode "$tickers_result")" 500
-  if [ -n "$ticker_count" ] && [ "$ticker_count" != "0" ]; then
-    # Check if prices are actually non-zero
-    local has_real_price
-    has_real_price=$(echo "$tickers_result" | python3 -c "
-import sys, json
-raw = json.load(sys.stdin)
-if isinstance(raw, str): raw = json.loads(raw)
-samples = raw.get('samples', [])
-real = [s for s in samples if s.get('price') and s['price'] not in ('0', '\$0', '<\$0.01', '\$0.00', None)]
-print('true' if real else 'false')
-" 2>/dev/null || echo "false")
-    if [ "$has_real_price" = "true" ]; then
-      record "Prices" "Tickers with real prices" "PASS" "${ticker_count} tickers"
-    else
-      record "Prices" "Tickers returned" "FAIL" "${ticker_count} tickers but ALL prices are \$0"
-    fi
-  else
-    record "Prices" "Tickers returned" "FAIL" "0 tickers"
-  fi
-
-  # ── 5-7. Candles REST ──
-  local intervals="1h 1D 5m"
-  for interval in $intervals; do
-    echo "[test] Candles REST: ${interval} historical..."
-    if [ -n "$first_symbol" ] && [ "$first_symbol" != "" ]; then
-      local candle_result
-      candle_result=$(eval_async '
-        (function() {
-          var provider = Engine.context.PerpsController.providers.get("myx");
-          return provider.getMarkets().then(function(markets) {
-            var sym = markets[0] ? markets[0].name : null;
-            if (sym === null) return JSON.stringify({error: "no markets"});
-            var result = null;
-            var err = null;
-            provider.subscribeToCandles({symbol: sym, interval: "'"${interval}"'", callback: function(d) { result = d; }, onError: function(e) { err = String(e); }});
-            return new Promise(function(resolve) {
-              setTimeout(function() {
-                var candles = result && result.candles ? result.candles : [];
-                var first = candles[0];
-                var last = candles[candles.length - 1];
-                resolve(JSON.stringify({
-                  symbol: sym, interval: "'"${interval}"'", count: candles.length, error: err,
-                  first: first ? {time: first.time, open: first.open, close: first.close, vol: first.volume} : null,
-                  last: last ? {time: last.time, open: last.open, close: last.close, vol: last.volume} : null
-                }));
-              }, 8000);
-            });
-          });
-        })()
-      ') || candle_result='{"count":0,"error":"eval failed"}'
-      local candle_count candle_error
-      candle_count=$(json_field "$candle_result" "count")
-      candle_error=$(json_field "$candle_result" "error")
-      preview "candles ${interval}" "$(json_decode "$candle_result")" 400
-      if [ -n "$candle_count" ] && [ "$candle_count" != "0" ] && [ "$candle_count" != "" ]; then
-        record "Candles REST" "${interval} historical" "PASS" "${candle_count} candles"
-      else
-        record "Candles REST" "${interval} historical" "FAIL" "count=${candle_count:-0} err=${candle_error:-none}"
-      fi
-    else
-      record "Candles REST" "${interval} historical" "SKIP" "no markets available"
-    fi
-  done
-
-  # ── 5b. Candles WS: Live updates (sustained) ──
-  # Subscribe and wait for multiple WS callbacks over time to prove the socket
-  # stays open and delivers data at intervals (not just one burst).
-  # Callback 1 = REST snapshot, callbacks 2+ = WS live updates.
-  echo "[test] Candles WS: Sustained kline updates..."
-  if [ -n "$first_symbol" ] && [ "$first_symbol" != "" ]; then
-    local ws_candle_result
-    ws_candle_result=$(eval_async '
-      new Promise(function(resolve) {
-        var callCount = 0;
-        var firstCount = 0;
-        var timestamps = [];
-        var targetWsCallbacks = 3;
-        var timer = setTimeout(function() {
-          if (typeof unsub === "function") unsub();
-          resolve(JSON.stringify({wsReceived: callCount > 1, callbackCount: callCount, restCount: firstCount, wsCallbacks: callCount - 1, timestamps: timestamps}));
-        }, 65000);
-        var unsub;
-        var provider = Engine.context.PerpsController.providers.get("myx");
-        unsub = provider.subscribeToCandles({symbol: "'"${first_symbol}"'", interval: "1m", limit: 5, callback: function(d) {
-          callCount++;
-          if (callCount === 1) { firstCount = d.candles.length; return; }
-          timestamps.push(Date.now());
-          if (callCount - 1 >= targetWsCallbacks) {
-            clearTimeout(timer);
-            if (typeof unsub === "function") unsub();
-            resolve(JSON.stringify({wsReceived: true, callbackCount: callCount, restCount: firstCount, wsCallbacks: callCount - 1, timestamps: timestamps}));
-          }
-        }, onError: function(e) {
-          clearTimeout(timer);
-          if (typeof unsub === "function") unsub();
-          resolve(JSON.stringify({wsReceived: false, error: String(e), callbackCount: callCount}));
-        }});
-      })
-    ') || ws_candle_result='{"wsReceived":false,"error":"eval failed"}'
-    preview "WS kline" "$(json_decode "$ws_candle_result")" 500
-    local ws_received ws_callbacks
-    ws_received=$(json_field "$ws_candle_result" "wsReceived")
-    ws_callbacks=$(json_field "$ws_candle_result" "wsCallbacks")
-    if [ "$ws_received" = "True" ] || [ "$ws_received" = "true" ]; then
-      record "Candles WS" "Sustained kline updates" "PASS" "${ws_callbacks} WS callbacks received"
-    else
-      local ws_error
-      ws_error=$(json_field "$ws_candle_result" "error")
-      record "Candles WS" "Sustained kline updates" "FAIL" "got ${ws_callbacks:-0} WS callbacks in 65s ${ws_error:+err=$ws_error}"
-    fi
-  else
-    record "Candles WS" "Sustained kline updates" "SKIP" "no markets available"
-  fi
-
-  # ── 5c. Prices WS: Live ticker updates ──
-  # Check if subscribeToPrices delivers a second (WS-driven) callback
-  echo "[test] Prices WS: Live ticker update..."
-  if [ -n "$first_symbol" ] && [ "$first_symbol" != "" ]; then
-    local ws_price_result
-    ws_price_result=$(eval_async '
-      new Promise(function(resolve) {
-        var callCount = 0;
-        var timer = setTimeout(function() { resolve(JSON.stringify({wsReceived: false, callbackCount: callCount})); }, 15000);
-        var unsub;
-        var provider = Engine.context.PerpsController.providers.get("myx");
-        unsub = provider.subscribeToPrices({symbols: ["'"${first_symbol}"'"], callback: function(d) {
-          callCount++;
-          if (callCount >= 2) {
-            clearTimeout(timer);
-            if (typeof unsub === "function") unsub();
-            var sample = d[0] ? {symbol: d[0].symbol, price: d[0].price} : null;
-            resolve(JSON.stringify({wsReceived: true, callbackCount: callCount, sample: sample}));
-          }
-        }});
-      })
-    ') || ws_price_result='{"wsReceived":false,"error":"eval failed"}'
-    preview "WS prices" "$(json_decode "$ws_price_result")" 400
-    local ws_price_received
-    ws_price_received=$(json_field "$ws_price_result" "wsReceived")
-    if [ "$ws_price_received" = "True" ] || [ "$ws_price_received" = "true" ]; then
-      record "Prices WS" "Live ticker update" "PASS" "received multiple callbacks"
-    else
-      record "Prices WS" "Live ticker update" "FAIL" "no 2nd callback in 15s (REST poll only?)"
-    fi
-  else
-    record "Prices WS" "Live ticker update" "SKIP" "no markets available"
-  fi
-
-  # ── 8. Auth: isReadyToTrade ──
-  # NOTE: myxClient.auth() is sync — it just stores signer + getAccessToken callback.
-  # It sets #authenticatedAddress=<addr> immediately, no API call. So "ready:true" proves nothing.
-  echo "[test] Auth: isReadyToTrade..."
-  echo "         ⚠ WARNING: myxClient.auth() is sync — ready:true does NOT mean credentials are valid"
-  local ready_result
-  ready_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").isReadyToTrade().then(function(r) {
-      return JSON.stringify(r);
-    }).catch(function(e) { return JSON.stringify({ready: false, error: e.message}); })
-  ') || ready_result='{"ready":false,"error":"eval failed"}'
-  preview "isReadyToTrade" "$(json_decode "$ready_result")" 300
-  local is_ready
-  is_ready=$(json_field "$ready_result" "ready")
-  if [ "$is_ready" = "True" ] || [ "$is_ready" = "true" ]; then
-    record "Auth" "isReadyToTrade" "UNVERIFIED" "returns ready:true but auth is never validated"
-  else
-    local ready_error
-    ready_error=$(json_field "$ready_result" "error")
-    record "Auth" "isReadyToTrade" "FAIL" "${ready_error:-not ready}"
-  fi
-
-  # ── 9. Positions: getPositions ──
-  echo "[test] Positions: getPositions..."
-  local positions_result
-  positions_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").getPositions().then(function(p) {
-      return JSON.stringify({count: p.length, sample: p[0] ? p[0] : null});
-    }).catch(function(e) { return JSON.stringify({error: e.message}); })
-  ') || positions_result='{"error":"eval failed"}'
-  preview "positions" "$(json_decode "$positions_result")" 300
-  local pos_error
-  pos_error=$(json_field "$positions_result" "error")
-  if [ -n "$pos_error" ] && [ "$pos_error" != "" ]; then
-    record "Positions" "getPositions" "FAIL" "$pos_error"
-  else
-    local pos_count
-    pos_count=$(json_field "$positions_result" "count")
-    record "Positions" "getPositions" "UNVERIFIED" "returned ${pos_count} (auth not validated)"
-  fi
-
-  # ── 10. Orders: getOrders ──
-  echo "[test] Orders: getOrders..."
-  local orders_result
-  orders_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").getOrders().then(function(o) {
-      return JSON.stringify({count: o.length, sample: o[0] ? o[0] : null});
-    }).catch(function(e) { return JSON.stringify({error: e.message}); })
-  ') || orders_result='{"error":"eval failed"}'
-  preview "orders" "$(json_decode "$orders_result")" 300
-  local ord_error
-  ord_error=$(json_field "$orders_result" "error")
-  if [ -n "$ord_error" ] && [ "$ord_error" != "" ]; then
-    record "Orders" "getOrders" "FAIL" "$ord_error"
-  else
-    local ord_count
-    ord_count=$(json_field "$orders_result" "count")
-    record "Orders" "getOrders" "UNVERIFIED" "returned ${ord_count} (auth not validated)"
-  fi
-
-  # ── 11. Account: getAccountState ──
-  echo "[test] Account: getAccountState..."
-  local account_result
-  account_result=$(eval_async '
-    Engine.context.PerpsController.providers.get("myx").getAccountState().then(function(a) {
-      return JSON.stringify(a || {});
-    }).catch(function(e) { return JSON.stringify({error: e.message}); })
-  ') || account_result='{"error":"eval failed"}'
-  preview "accountState" "$(json_decode "$account_result")" 400
-  local acct_error
-  acct_error=$(json_field "$account_result" "error")
-  if [ -n "$acct_error" ] && [ "$acct_error" != "" ]; then
-    record "Account" "getAccountState" "FAIL" "$acct_error"
-  else
-    record "Account" "getAccountState" "UNVERIFIED" "returned data (auth not validated)"
-  fi
-
-  # ── 12. Ping: Health check ──
-  echo "[test] Ping: Health check..."
-  local ping_result
-  ping_result=$(eval_async '
-    (function() {
-      var provider = Engine.context.PerpsController.providers.get("myx");
-      if (typeof provider.ping === "function") {
-        return provider.ping().then(function() { return JSON.stringify({ok: true}); }).catch(function(e) { return JSON.stringify({ok: false, error: e.message}); });
-      }
-      return Promise.resolve(JSON.stringify({ok: false, error: "ping not implemented"}));
-    })()
-  ') || ping_result='{"ok":false,"error":"eval failed"}'
-  preview "ping" "$(json_decode "$ping_result")" 200
-  local ping_ok
-  ping_ok=$(json_field "$ping_result" "ok")
-  if [ "$ping_ok" = "True" ] || [ "$ping_ok" = "true" ]; then
-    record "Ping" "Health check" "PASS"
-  else
-    record "Ping" "Health check" "FAIL" "$(json_field "$ping_result" "error")"
-  fi
-
-  print_report "$net_label" "$chain_id"
-}
-
-# ── Main ────────────────────────────────────────────────────────────
-
-# Ensure MYX provider is initialized
-echo "[init] Initializing PerpsController..."
-eval_async 'Engine.context.PerpsController.init().then(function() { return JSON.stringify({ok: true}); })' >/dev/null 2>&1 || true
-sleep 2
-
-case "$NETWORK" in
-  testnet) run_validation "true" ;;
-  mainnet) run_validation "false" ;;
-  both)
-    run_validation "true"
-    run_validation "false"
-    ;;
-  *) echo "Invalid --network value: $NETWORK (use testnet, mainnet, or both)"; exit 1 ;;
-esac
-
-# Restore initial network state
-echo ""
-echo "[cleanup] Restoring initial network state..."
-CURRENT_TESTNET=$(eval_sync "JSON.stringify(Engine.context.PerpsController.state.isTestnet)") || CURRENT_TESTNET="unknown"
-if [ "$CURRENT_TESTNET" != "$INITIAL_TESTNET" ]; then
-  eval_async 'Engine.context.PerpsController.toggleTestnet().then(function(r) { return JSON.stringify(r); })' >/dev/null 2>&1 || true
-  echo "  Restored to isTestnet=$INITIAL_TESTNET"
-else
-  echo "  Already at isTestnet=$INITIAL_TESTNET"
-fi
diff --git a/scripts/perps/agentic/validate-pre-conditions.js b/scripts/perps/agentic/validate-pre-conditions.js
deleted file mode 100644
index 1d88c77700e3..000000000000
--- a/scripts/perps/agentic/validate-pre-conditions.js
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const { checkAssert } = require('./lib/assert');
-const {
-  getAppRoot,
-  loadPreConditionRegistry,
-  renderTemplate,
-} = require('./lib/catalog');
-
-function main() {
-  const appRoot = getAppRoot();
-  const registry = loadPreConditionRegistry(appRoot);
-  const failures = [];
-
-  Object.entries(registry).forEach(([name, entry]) => {
-    const fixtures = entry.fixtures;
-    if (!fixtures) {
-      failures.push(`  ${name}: missing fixtures.pass and fixtures.fail`);
-      return;
-    }
-
-    if (!Object.prototype.hasOwnProperty.call(fixtures, 'pass')) {
-      failures.push(`  ${name}: missing fixtures.pass`);
-      return;
-    }
-
-    if (!Object.prototype.hasOwnProperty.call(fixtures, 'fail')) {
-      failures.push(`  ${name}: missing fixtures.fail`);
-      return;
-    }
-
-    const params = fixtures.params || {};
-    const assertSpec = renderTemplate(entry.assert, params);
-
-    const passResult = checkAssert(fixtures.pass, assertSpec);
-    if (!passResult) {
-      failures.push(
-        `  ${name}: pass fixture did not satisfy assert\n` +
-          `    fixture: ${fixtures.pass}\n` +
-          `    assert:  ${JSON.stringify(assertSpec)}`
-      );
-    }
-
-    const failResult = checkAssert(fixtures.fail, assertSpec);
-    if (failResult) {
-      failures.push(
-        `  ${name}: fail fixture unexpectedly satisfied assert\n` +
-          `    fixture: ${fixtures.fail}\n` +
-          `    assert:  ${JSON.stringify(assertSpec)}`
-      );
-    }
-  });
-
-  if (failures.length > 0) {
-    console.error(`Pre-condition assertion check FAILED:\n${failures.join('\n')}`);
-    process.exit(1);
-  }
-
-  console.log(
-    `All ${Object.keys(registry).length} pre-condition(s) pass assertion correctness checks.`
-  );
-}
-
-main();
diff --git a/scripts/perps/agentic/validate-recipe.js b/scripts/perps/agentic/validate-recipe.js
deleted file mode 100644
index 7c29b1ebfea8..000000000000
--- a/scripts/perps/agentic/validate-recipe.js
+++ /dev/null
@@ -1,1929 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const fs = require('node:fs');
-const path = require('node:path');
-const readline = require('node:readline');
-const { spawnSync } = require('node:child_process');
-
-const { checkAssert, evaluateAssert, parseRaw } = require('./lib/assert');
-const { ensureParentDir, sanitizeFileSegment } = require('./lib/screenshot');
-const {
-  EXECUTABLE_ACTIONS,
-  deepClone,
-  normalizeWorkflowDocument,
-  renderWorkflowMermaid,
-} = require('./lib/workflow');
-const { backgroundApp, foregroundApp, restartApp } = require('./lib/app-lifecycle');
-const {
-  applyAllowlist,
-  captureFromMetro,
-  computeReview,
-  countByLevel,
-  dedupeIssues,
-  normalizeAppBufferEntries,
-  writeArtifacts: writeIssueArtifacts,
-} = require('./lib/recipe-issues');
-const {
-  getAppRoot,
-  getTeamsDir,
-  inferTeamFromPath,
-  listEvalRefs,
-  loadPreConditionRegistry,
-  parsePreConditionSpec,
-  renderTemplate,
-  renderTemplateString,
-  resolveEvalRef,
-  resolveFlowRef,
-} = require('./lib/catalog');
-
-const DEFAULT_LOG_LINES = 400;
-
-function validateSchemaOrThrow(appRoot, recipePath) {
-  const validatorPath = path.join(__dirname, 'validate-flow-schema.js');
-  const result = spawnSync('node', [validatorPath, recipePath], {
-    cwd: appRoot,
-    encoding: 'utf8',
-  });
-
-  if (result.status === 0) {
-    return;
-  }
-
-  const output = [result.stdout || '', result.stderr || '']
-    .join('\n')
-    .trim();
-  throw new Error(`Schema validation failed for ${recipePath}\n${output}`);
-}
-
-function timestampSlug() {
-  return new Date()
-    .toISOString()
-    .replaceAll(/[:.]/g, '-')
-    .replaceAll('T', '_')
-    .slice(0, 19);
-}
-
-function parseArgs(argv) {
-  const options = {
-    artifactsDir: '',
-    dryRun: false,
-    hud: true,
-    inputOverrides: {},
-    log: true,
-    recipe: '',
-    singleStep: '',
-    skipManual: false,
-    account: '',
-    testnet: false,
-  };
-
-  for (let i = 0; i < argv.length; i += 1) {
-    const arg = argv[i];
-    switch (arg) {
-      case '--artifacts-dir':
-        options.artifactsDir = argv[i + 1] || '';
-        i += 1;
-        break;
-      case '--dry-run':
-        options.dryRun = true;
-        break;
-      case '--no-hud':
-        options.hud = false;
-        break;
-      case '--no-log':
-        options.log = false;
-        break;
-      case '--skip-manual':
-        options.skipManual = true;
-        break;
-      case '--step':
-        options.singleStep = argv[i + 1] || '';
-        i += 1;
-        break;
-      case '--account':
-        options.account = argv[i + 1] || '';
-        i += 1;
-        break;
-      case '--testnet':
-        options.testnet = true;
-        break;
-      case '--input': {
-        const kv = argv[i + 1] || '';
-        const eq = kv.indexOf('=');
-        if (eq < 1) throw new Error('--input expects key=value (e.g. --input test_restart=true)');
-        const k = kv.slice(0, eq);
-        const raw = kv.slice(eq + 1);
-        // Parse booleans and numbers
-        options.inputOverrides[k] = raw === 'true' ? true : raw === 'false' ? false : raw !== '' && Number.isFinite(Number(raw)) ? Number(raw) : raw;
-        i += 1;
-        break;
-      }
-      case '--help':
-      case '-h':
-        printHelp();
-        process.exit(0);
-        break;
-      default:
-        if (arg.startsWith('-')) {
-          throw new Error(`Unknown flag: ${arg}`);
-        }
-        if (options.recipe) {
-          throw new Error(`Unexpected extra argument: ${arg}`);
-        }
-        options.recipe = arg;
-        break;
-    }
-  }
-
-  if (!options.recipe) {
-    printHelp();
-    process.exit(1);
-  }
-
-  return options;
-}
-
-function printHelp() {
-  console.log(`Usage:
-  validate-recipe.sh <workflow-folder-or-json>
-    [--step <id>]
-    [--skip-manual]
-    [--no-hud]
-    [--account <address>]
-    [--testnet]
-    [--artifacts-dir <path>]
-    [--dry-run]
-    [--no-log]
-
-The runner executes workflow files stored under:
-  scripts/perps/agentic/teams/<team>/{flows,recipes}
-
-Runtime features:
-  - HUD is enabled by default during live execution. Use --no-hud to disable it.
-  - Scenarios use validate.workflow with explicit nodes, transitions, switch branches, and end nodes.
-  - setup / teardown hooks live under validate.workflow.setup / validate.workflow.teardown.
-  - Failures capture screenshots, route/state snapshots, eval refs, and recent logs.
-  - Successful runs emit workflow.json, workflow.mmd, trace.json, summary.json, and run.log artifacts.
-  - Console output is teed to run.log by default. Use --no-log to disable.`);
-}
-
-function resolveRecipeInput(appRoot, inputPath) {
-  const absolute = path.resolve(inputPath);
-  if (fs.existsSync(absolute) && fs.statSync(absolute).isDirectory()) {
-    const recipeFile = path.join(absolute, 'recipe.json');
-    if (!fs.existsSync(recipeFile)) {
-      throw new Error(`recipe.json not found in directory: ${absolute}`);
-    }
-    return { recipePath: recipeFile, recipeDir: absolute };
-  }
-
-  if (!fs.existsSync(absolute)) {
-    throw new Error(`Recipe not found: ${inputPath}`);
-  }
-
-  return { recipePath: absolute, recipeDir: path.dirname(absolute) };
-}
-
-function collectDefaultInputs(document) {
-  return Object.fromEntries(
-    Object.entries(document.inputs || {})
-      .filter(([, value]) => value && Object.prototype.hasOwnProperty.call(value, 'default'))
-      .map(([key, value]) => [key, value.default])
-  );
-}
-
-function renderDocument(recipePath, inputParams = {}) {
-  const source = fs.readFileSync(recipePath, 'utf8');
-  const parsed = JSON.parse(source);
-  const defaults = collectDefaultInputs(parsed);
-  const params = { ...defaults, ...inputParams };
-
-  let rendered = renderTemplateString(source, params);
-  rendered = rendered.replace(/\{\{[^|}]+\|([^}]+)\}\}/g, '$1');
-
-  return {
-    document: JSON.parse(rendered),
-    params,
-  };
-}
-
-function formatResultPreview(result) {
-  if (result == null) {
-    return '';
-  }
-
-  const text = typeof result === 'string' ? result : JSON.stringify(result);
-  return text.length > 220 ? `${text.slice(0, 220)}...` : text;
-}
-
-function rawResultString(result) {
-  if (typeof result === 'string') {
-    return result;
-  }
-  return JSON.stringify(result);
-}
-
-// ---------------------------------------------------------------------------
-// CDP bridge helpers
-// ---------------------------------------------------------------------------
-
-const SD = path.resolve(__dirname);
-
-function spawnBridge(appRoot, bridgeArgs) {
-  const bridgePath = path.join(SD, 'cdp-bridge.js');
-
-  const result = spawnSync('node', [bridgePath, ...bridgeArgs], {
-    cwd: appRoot,
-    env: { ...process.env, APP_ROOT: appRoot },
-    encoding: 'utf8',
-  });
-
-  if (result.status !== 0) {
-    throw new Error((result.stderr || result.stdout || 'Bridge command failed').trim());
-  }
-
-  const stdout = (result.stdout || '').trim();
-  if (!stdout) {
-    return '';
-  }
-
-  try {
-    return JSON.parse(stdout);
-  } catch {
-    return stdout;
-  }
-}
-
-function trySpawnBridge(appRoot, bridgeArgs) {
-  try {
-    return { ok: true, result: spawnBridge(appRoot, bridgeArgs) };
-  } catch (error) {
-    return { ok: false, error: String(error.message || error) };
-  }
-}
-
-let hudWarningPrinted = false;
-
-function publishHudStep(appRoot, step, options = {}) {
-  if (options.hud === false) {
-    return;
-  }
-
-  try {
-    spawnBridge(appRoot, ['show-step', String(step.id || '?'), step.description || '']);
-  } catch (error) {
-    if (!hudWarningPrinted) {
-      hudWarningPrinted = true;
-      console.warn(`HUD warning: ${String(error.message || error)}`);
-    }
-  }
-}
-
-function clearHudStep(appRoot, options = {}) {
-  if (options.hud === false) {
-    return;
-  }
-
-  try {
-    spawnBridge(appRoot, ['hide-step']);
-  } catch (error) {
-    if (!hudWarningPrinted) {
-      hudWarningPrinted = true;
-      console.warn(`HUD warning: ${String(error.message || error)}`);
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Log scanning
-// ---------------------------------------------------------------------------
-
-function readRecentLines(filePath, maxLines = DEFAULT_LOG_LINES) {
-  if (!fs.existsSync(filePath)) {
-    return [];
-  }
-
-  return fs.readFileSync(filePath, 'utf8').split('\n').slice(-maxLines);
-}
-
-function scanLog(step, metroLogPath) {
-  const recentLines = readRecentLines(metroLogPath, 500);
-  const mustNotAppear = step.must_not_appear || [];
-  const watchFor = step.watch_for || [];
-
-  const mustNotFound = mustNotAppear.filter((needle) =>
-    recentLines.some((line) => line.toLowerCase().includes(String(needle).toLowerCase()))
-  );
-  const watchCounts = Object.fromEntries(
-    watchFor.map((needle) => [
-      needle,
-      recentLines.filter((line) =>
-        line.toLowerCase().includes(String(needle).toLowerCase())
-      ).length,
-    ])
-  );
-
-  return {
-    pass: mustNotFound.length === 0,
-    must_not_found: mustNotFound,
-    watch_counts: watchCounts,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// Step description
-// ---------------------------------------------------------------------------
-
-function describeStep(step) {
-  if (step.description) {
-    return step.description;
-  }
-
-  switch (step.action) {
-    case 'navigate':
-      return `navigate to ${step.target}`;
-    case 'wait':
-      return `wait ${step.ms || 1000}ms`;
-    case 'wait_for':
-      return `wait for ${step.test_id || step.route || step.not_route || 'condition'}`;
-    case 'press':
-      return `press ${step.test_id}`;
-    case 'scroll':
-      return `scroll ${step.test_id || 'view'}`;
-    case 'set_input':
-      return `set ${step.test_id}`;
-    case 'screenshot':
-      return step.note || `capture screenshot ${step.id || step.filename || ''}`.trim();
-    case 'call':
-      return `call ${step.ref}`;
-    case 'eval_ref':
-      return `eval ref ${step.ref}`;
-    case 'eval_sync':
-    case 'eval_async':
-      return step.action;
-    case 'type_keypad':
-      return `type ${step.value}`;
-    case 'clear_keypad':
-      return `clear keypad x${step.count || 8}`;
-    case 'select_account':
-      return `select account ${step.address}`;
-    case 'toggle_testnet':
-      return `toggle testnet=${step.enabled !== undefined ? step.enabled : 'true'}`;
-    case 'switch_provider':
-      return `switch provider ${step.provider}`;
-    case 'app_background':
-      return `background app ${step.duration_ms || 5000}ms`;
-    case 'app_foreground':
-      return 'foreground app';
-    case 'app_restart':
-      return 'restart app';
-    case 'switch':
-      return step.description || 'evaluate branch';
-    case 'end':
-      return `${step.status || 'pass'} end`;
-    case 'manual':
-      return step.note || 'manual step';
-    case 'log_watch':
-      return 'scan metro log';
-    default:
-      return step.action;
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Manual prompt
-// ---------------------------------------------------------------------------
-
-async function promptManual(note) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  if (note) {
-    console.log(`  note: ${note}`);
-  }
-
-  const answer = await new Promise((resolve) => {
-    rl.question('  Press ENTER when done, or type "s" to skip: ', resolve);
-  });
-  rl.close();
-  return String(answer || '').trim().toLowerCase() !== 's';
-}
-
-// ---------------------------------------------------------------------------
-// wait_for
-// ---------------------------------------------------------------------------
-
-function buildWaitForSpec(step) {
-  if (step.route) {
-    return {
-      expression: 'JSON.stringify({route:globalThis.__AGENTIC__.getRoute().name})',
-      assert: { operator: 'eq', field: 'route', value: step.route },
-      label: `route=${step.route}`,
-      async: false,
-    };
-  }
-
-  if (step.not_route) {
-    return {
-      expression: 'JSON.stringify({route:globalThis.__AGENTIC__.getRoute().name})',
-      assert: { operator: 'neq', field: 'route', value: step.not_route },
-      label: `not_route=${step.not_route}`,
-      async: false,
-    };
-  }
-
-  if (step.test_id) {
-    return {
-      expression: `JSON.stringify({visible:globalThis.__AGENTIC__.findFiberByTestId(${JSON.stringify(step.test_id)})})`,
-      assert: { operator: 'eq', field: 'visible', value: step.visible !== false },
-      label: `test_id=${step.test_id}`,
-      async: false,
-    };
-  }
-
-  return {
-    expression: step.expression || '',
-    assert: step.assert || null,
-    label: 'expression',
-    async: step.async === true || String(step.expression || '').includes('.then('),
-  };
-}
-
-async function waitForCondition(step, appRoot) {
-  const waitSpec = buildWaitForSpec(step);
-  const timeoutMs = Number(step.timeout_ms || 10000);
-  const pollMs = Number(step.poll_ms || 500);
-  const deadline = Date.now() + timeoutMs;
-  let lastResult = '';
-
-  while (Date.now() < deadline) {
-    try {
-      const bridgeResult = spawnBridge(
-        appRoot,
-        [waitSpec.async ? 'eval-async' : 'eval', waitSpec.expression]
-      );
-      lastResult = rawResultString(bridgeResult);
-      if (checkAssert(lastResult, waitSpec.assert)) {
-        return { ok: true, result: bridgeResult, label: waitSpec.label };
-      }
-    } catch (error) {
-      lastResult = String(error.message || error);
-    }
-
-    await new Promise((resolve) => setTimeout(resolve, pollMs));
-  }
-
-  return { ok: false, result: lastResult, label: waitSpec.label };
-}
-
-// ---------------------------------------------------------------------------
-// Pre-conditions
-// ---------------------------------------------------------------------------
-
-function evaluatePreConditions(document, appRoot) {
-  const registry = loadPreConditionRegistry(appRoot);
-  const normalized = normalizeWorkflowDocument(document);
-  const preConditions = normalized.hooks.pre_conditions || [];
-  const failures = [];
-  const passed = [];
-
-  preConditions.forEach((spec) => {
-    const parsed = parsePreConditionSpec(spec);
-    const name = typeof parsed === 'string' ? parsed : parsed?.name;
-    const params =
-      typeof parsed === 'string'
-        ? {}
-        : Object.fromEntries(
-            Object.entries(parsed).filter(([key]) => key !== 'name')
-          );
-
-    const entry = registry[name];
-    if (!entry) {
-      failures.push({ name, error: `Unknown pre-condition "${name}"` });
-      return;
-    }
-
-    const expression =
-      typeof entry.expression === 'function'
-        ? entry.expression(params)
-        : renderTemplate(entry.expression, params);
-    const assertSpec = renderTemplate(entry.assert, params);
-
-    try {
-      const bridgeResult = spawnBridge(
-        appRoot,
-        [entry.async ? 'eval-async' : 'eval', expression]
-      );
-      const raw = rawResultString(bridgeResult);
-      if (checkAssert(raw, assertSpec)) {
-        passed.push(name);
-        return;
-      }
-
-      failures.push({
-        name,
-        description: entry.description || '',
-        got: formatResultPreview(bridgeResult),
-        hint: entry.hint || '',
-      });
-    } catch (error) {
-      failures.push({
-        name,
-        description: entry.description || '',
-        error: String(error.message || error),
-        hint: entry.hint || '',
-      });
-    }
-  });
-
-  return { ok: failures.length === 0, passed, failures };
-}
-
-// ---------------------------------------------------------------------------
-// Execution state & artifacts
-// ---------------------------------------------------------------------------
-
-function ensureExecutionState(runOptions) {
-  if (!runOptions.executionState) {
-    runOptions.executionState = {
-      artifacts: null,
-      failureArtifacts: [],
-      referencedEvalRefs: new Set(),
-    };
-  }
-  return runOptions.executionState;
-}
-
-function ensureRunArtifacts(runOptions, recipePath) {
-  const state = ensureExecutionState(runOptions);
-  if (state.artifacts || runOptions.dryRun) {
-    return state.artifacts;
-  }
-
-  const explicitArtifactsDir = runOptions.artifactsDir
-    ? path.resolve(runOptions.artifactsDir)
-    : '';
-  const baseDir =
-    explicitArtifactsDir ||
-    path.join(runOptions.appRoot, '.agent', 'recipe-runs');
-  const recipeLabel = sanitizeFileSegment(path.basename(recipePath, path.extname(recipePath)));
-  const rootDir = explicitArtifactsDir || path.resolve(path.join(baseDir, `${timestampSlug()}_${recipeLabel}`));
-
-  const artifacts = {
-    rootDir,
-    screenshotsDir: path.join(rootDir, 'screenshots'),
-    failuresDir: path.join(rootDir, 'failures'),
-    logsDir: path.join(rootDir, 'logs'),
-    tracesDir: path.join(rootDir, 'traces'),
-    tracePath: path.join(rootDir, 'trace.json'),
-    workflowPath: path.join(rootDir, 'workflow.json'),
-    workflowMermaidPath: path.join(rootDir, 'workflow.mmd'),
-    summaryPath: path.join(rootDir, 'summary.json'),
-    runLogPath: path.join(rootDir, 'run.log'),
-  };
-
-  [artifacts.rootDir, artifacts.screenshotsDir, artifacts.failuresDir, artifacts.logsDir, artifacts.tracesDir]
-    .forEach((dirPath) => fs.mkdirSync(dirPath, { recursive: true }));
-
-  state.artifacts = artifacts;
-  return artifacts;
-}
-
-function resolveMetroLogPath(runOptions) {
-  if (process.env.METRO_LOG) {
-    return process.env.METRO_LOG;
-  }
-  return path.join(runOptions.appRoot, '.agent', 'metro.log');
-}
-
-function armIssueTracker(runOptions) {
-  const state = ensureExecutionState(runOptions);
-  if (state.issueTracker || runOptions.dryRun) {
-    return state.issueTracker;
-  }
-
-  const metroLogPath = resolveMetroLogPath(runOptions);
-  let startOffset = 0;
-  try {
-    startOffset = fs.existsSync(metroLogPath) ? fs.statSync(metroLogPath).size : 0;
-  } catch {
-    startOffset = 0;
-  }
-
-  // Install in-app console/exception hooks. Best-effort: if the CDP bridge
-  // isn't reachable yet (app booting, port not bound) we still fall back to
-  // metro-log scraping at collection time.
-  let armed = false;
-  try {
-    const armResponse = trySpawnBridge(runOptions.appRoot, ['issues-arm']);
-    if (armResponse && armResponse.ok && armResponse.result?.installed) {
-      armed = true;
-    }
-  } catch {
-    armed = false;
-  }
-
-  state.issueTracker = { metroLogPath, startOffset, armed };
-  return state.issueTracker;
-}
-
-function collectRecipeIssues(runOptions, document) {
-  const state = ensureExecutionState(runOptions);
-  const tracker = state.issueTracker;
-  if (!tracker || runOptions.dryRun) {
-    return null;
-  }
-
-  // Pull the in-app buffer (best-effort). Failures here don't mask the metro
-  // log — we still synthesize review from whatever channel reported.
-  let appEntries = [];
-  if (tracker.armed) {
-    try {
-      const resp = trySpawnBridge(runOptions.appRoot, ['issues-collect']);
-      if (resp && resp.ok && Array.isArray(resp.result?.entries)) {
-        appEntries = resp.result.entries;
-      }
-    } catch {
-      appEntries = [];
-    }
-  }
-
-  const metroIssues = captureFromMetro(tracker.metroLogPath, tracker.startOffset);
-  const appIssues = normalizeAppBufferEntries(appEntries);
-  const allIssues = [...appIssues, ...metroIssues];
-
-  const failOn =
-    document && typeof document.fail_on_unexpected === 'object'
-      ? document.fail_on_unexpected
-      : null;
-  const allowlist = failOn && Array.isArray(failOn.allowlist) ? failOn.allowlist : [];
-
-  const { unexpected, informational } = applyAllowlist(allIssues, allowlist);
-  const review = computeReview(unexpected, informational, failOn, {});
-
-  const runDir = state.artifacts?.rootDir;
-  let artifactFiles = {};
-  if (runDir) {
-    try {
-      artifactFiles = writeIssueArtifacts(runDir, { unexpected, informational, review });
-    } catch (error) {
-      console.error(`recipe-issues artifact write failed: ${String(error.message || error)}`);
-      artifactFiles = {};
-    }
-  }
-  review.artifactFiles = artifactFiles;
-
-  const captured = countByLevel(dedupeIssues(allIssues));
-  const unexpectedCounts = countByLevel(dedupeIssues(unexpected));
-
-  const recipeIssues = {
-    captured,
-    unexpected: unexpectedCounts,
-    failOn: {
-      levels: failOn && Array.isArray(failOn.levels) ? failOn.levels.slice() : [],
-      textMatches:
-        failOn && Array.isArray(failOn.textMatches)
-          ? failOn.textMatches.slice()
-          : [],
-    },
-    review,
-  };
-
-  state.recipeIssues = recipeIssues;
-  return recipeIssues;
-}
-
-function writeRunSummary(runOptions, summary) {
-  const state = ensureExecutionState(runOptions);
-  if (!state.artifacts) {
-    return;
-  }
-
-  fs.writeFileSync(state.artifacts.summaryPath, `${JSON.stringify(summary, null, 2)}\n`);
-}
-
-function serializeExecutionContext(executionContext) {
-  if (!executionContext) {
-    return null;
-  }
-
-  return {
-    env: deepClone(executionContext.env || {}),
-    inputs: deepClone(executionContext.inputs || {}),
-    last: deepClone(executionContext.last ?? null),
-    nodes: deepClone(executionContext.nodes || {}),
-    trace: deepClone(executionContext.trace || []),
-    vars: deepClone(executionContext.vars || {}),
-  };
-}
-
-function writeWorkflowArtifacts(context) {
-  if (context.runOptions.dryRun || context.depth !== 0) {
-    return;
-  }
-
-  const artifacts = ensureRunArtifacts(context.runOptions, context.recipePath);
-  if (!artifacts) {
-    return;
-  }
-
-  fs.writeFileSync(
-    artifacts.workflowPath,
-    `${JSON.stringify(
-      {
-        title: context.normalizedDocument.title || '',
-        description: context.normalizedDocument.description || '',
-        sourcePath: context.normalizedDocument.sourcePath,
-        hooks: context.hooks,
-        workflow: context.workflow,
-      },
-      null,
-      2
-    )}\n`
-  );
-  fs.writeFileSync(
-    artifacts.workflowMermaidPath,
-    renderWorkflowMermaid(context.normalizedDocument)
-  );
-}
-
-function writeTraceArtifacts(context) {
-  if (context.runOptions.dryRun || context.depth !== 0) {
-    return;
-  }
-
-  const artifacts = ensureRunArtifacts(context.runOptions, context.recipePath);
-  if (!artifacts) {
-    return;
-  }
-
-  fs.writeFileSync(
-    artifacts.tracePath,
-    `${JSON.stringify(serializeExecutionContext(context.executionContext), null, 2)}\n`
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Failure capture
-// ---------------------------------------------------------------------------
-
-function trackEvalRef(runOptions, ref) {
-  ensureExecutionState(runOptions).referencedEvalRefs.add(ref);
-}
-
-function collectRelevantEvalRefs(step, appRoot, defaultTeam, runOptions) {
-  const refs = Array.from(ensureExecutionState(runOptions).referencedEvalRefs);
-  if (step?.action === 'eval_ref' && step.ref) {
-    try {
-      const resolved = resolveEvalRef(step.ref, { appRoot, defaultTeam });
-      if (!refs.includes(resolved.ref)) {
-        refs.push(resolved.ref);
-      }
-    } catch {
-      // Ignore ref resolution failures while collecting diagnostics.
-    }
-  }
-
-  return refs.slice(-8);
-}
-
-function snapshotEvalRefs(appRoot, refs) {
-  const snapshots = {};
-  refs.forEach((ref) => {
-    const response = trySpawnBridge(appRoot, ['eval-ref', ref]);
-    snapshots[ref] = response.ok ? response.result : { error: response.error };
-  });
-  return snapshots;
-}
-
-function captureRecentLogs(appRoot, targetDir) {
-  const metroLogPath = process.env.METRO_LOG || path.join(appRoot, '.agent', 'metro.log');
-  const captured = [];
-
-  if (fs.existsSync(metroLogPath)) {
-    const filename = sanitizeFileSegment(path.basename(metroLogPath));
-    const destination = path.join(targetDir, filename);
-    const excerpt = readRecentLines(metroLogPath, DEFAULT_LOG_LINES).join('\n');
-    fs.writeFileSync(destination, `${excerpt}\n`);
-    captured.push({ source: path.resolve(metroLogPath), excerpt: path.resolve(destination) });
-  }
-
-  return captured;
-}
-
-function captureFailureArtifacts(context) {
-  const {
-    appRoot,
-    runOptions,
-    recipePath,
-    document,
-    defaultTeam,
-    step,
-    depth,
-    error,
-    executionContext,
-  } = context;
-
-  const artifacts = ensureRunArtifacts(runOptions, recipePath);
-  if (!artifacts) {
-    return null;
-  }
-
-  const state = ensureExecutionState(runOptions);
-  const failureIndex = state.failureArtifacts.length + 1;
-  const failureLabel = sanitizeFileSegment(step?.id || step?.action || 'failure');
-  const failureDir = path.join(
-    artifacts.failuresDir,
-    `${String(failureIndex).padStart(2, '0')}_${failureLabel}`
-  );
-  fs.mkdirSync(failureDir, { recursive: true });
-
-  const route = trySpawnBridge(appRoot, ['get-route']);
-  const currentState = trySpawnBridge(appRoot, ['get-state']);
-
-  // Screenshot via screenshot.sh
-  let screenshotPath = '';
-  try {
-    const screenshotResult = spawnSync('bash', [path.join(SD, 'screenshot.sh'), `failure-${failureLabel}`], {
-      cwd: appRoot, encoding: 'utf8',
-    });
-    const spath = (screenshotResult.stdout || '').trim();
-    if (spath && fs.existsSync(spath)) {
-      const dest = path.join(failureDir, path.basename(spath));
-      fs.copyFileSync(spath, dest);
-      screenshotPath = path.resolve(dest);
-    }
-  } catch {
-    // Screenshot is best-effort
-  }
-
-  const evalRefs = snapshotEvalRefs(
-    appRoot,
-    collectRelevantEvalRefs(step, appRoot, defaultTeam, runOptions)
-  );
-  const logs = captureRecentLogs(appRoot, failureDir);
-
-  const payload = {
-    capturedAt: new Date().toISOString(),
-    depth,
-    recipePath,
-    recipeTitle: document.title || '',
-    step: step || null,
-    error: String(error.message || error),
-    route: route.ok ? route.result : { error: route.error },
-    state: currentState.ok ? currentState.result : { error: currentState.error },
-    workflowState: serializeExecutionContext(executionContext),
-    evalRefs,
-    logs,
-    screenshot: screenshotPath,
-  };
-
-  const payloadPath = path.join(failureDir, 'failure.json');
-  fs.writeFileSync(payloadPath, `${JSON.stringify(payload, null, 2)}\n`);
-
-  const record = {
-    dir: failureDir,
-    details: payloadPath,
-    stepId: step?.id || '',
-    error: payload.error,
-  };
-  state.failureArtifacts.push(record);
-  return record;
-}
-
-// ---------------------------------------------------------------------------
-// Interaction failure check
-// ---------------------------------------------------------------------------
-
-function buildInteractionFailureMessage(step, result) {
-  if (result && typeof result === 'object' && result.ok === false) {
-    return result.error || `${step.action} returned ok=false`;
-  }
-  return '';
-}
-
-// ---------------------------------------------------------------------------
-// Runtime context
-// ---------------------------------------------------------------------------
-
-function buildRuntimeContext(recipePath, runOptions, flowParams, depth) {
-  const rendered = renderDocument(recipePath, flowParams);
-  const document = rendered.document;
-  const resolvedInputs = rendered.params;
-  const appRoot = runOptions.appRoot;
-  const defaultTeam = inferTeamFromPath(recipePath, appRoot);
-  const normalizedDocument = normalizeWorkflowDocument(document, { sourcePath: recipePath });
-  const stats = { total: 0, passed: 0, skipped: 0 };
-
-  return {
-    appRoot,
-    defaultTeam,
-    depth,
-    document,
-    executionContext: {
-      env: { appRoot, recipePath, team: defaultTeam || '' },
-      inputs: deepClone(resolvedInputs),
-      last: null,
-      nodes: {},
-      trace: [],
-      vars: {},
-    },
-    hooks: normalizedDocument.hooks,
-    normalizedDocument,
-    recipeDir: path.dirname(recipePath),
-    recipePath,
-    runOptions,
-    stats,
-    workflow: normalizedDocument.workflow,
-    currentStepRef: { current: null },
-  };
-}
-
-// ---------------------------------------------------------------------------
-// Node execution helpers
-// ---------------------------------------------------------------------------
-
-function shouldCountNode(node) {
-  return node.action !== 'end';
-}
-
-function shouldSkipForSingleStep(node, context, options = {}) {
-  const { applySingleStep = false } = options;
-  const { depth, runOptions } = context;
-
-  return (
-    applySingleStep &&
-    runOptions.singleStep &&
-    depth === 0 &&
-    EXECUTABLE_ACTIONS.has(node.action) &&
-    node.id !== runOptions.singleStep
-  );
-}
-
-function buildConditionPayload(context) {
-  return {
-    env: context.executionContext.env,
-    inputs: context.executionContext.inputs,
-    last: context.executionContext.last,
-    nodes: context.executionContext.nodes,
-    trace: context.executionContext.trace,
-    vars: context.executionContext.vars,
-  };
-}
-
-function evaluateWorkflowCondition(condition, context) {
-  if (!condition) {
-    return true;
-  }
-
-  return evaluateAssert(buildConditionPayload(context), condition);
-}
-
-function finalizeNodeRecord(context, node, details = {}) {
-  const finishedAt = new Date().toISOString();
-  const entry = {
-    action: node.action,
-    description: describeStep(node),
-    finishedAt,
-    id: node.id,
-    status: details.status || 'pass',
-  };
-
-  if (details.startedAt) {
-    entry.startedAt = details.startedAt;
-    entry.durationMs =
-      new Date(finishedAt).getTime() - new Date(details.startedAt).getTime();
-  }
-
-  if (Object.prototype.hasOwnProperty.call(details, 'next')) {
-    entry.next = details.next || '';
-  }
-
-  if (Object.prototype.hasOwnProperty.call(details, 'note')) {
-    entry.note = details.note;
-  }
-
-  if (Object.prototype.hasOwnProperty.call(details, 'branch')) {
-    entry.branch = deepClone(details.branch);
-  }
-
-  if (Object.prototype.hasOwnProperty.call(details, 'result')) {
-    entry.result = deepClone(details.result);
-    context.executionContext.last = deepClone(details.result);
-    if (node.save_as) {
-      context.executionContext.vars[node.save_as] = deepClone(details.result);
-    }
-  }
-
-  context.executionContext.nodes[node.id] = entry;
-  context.executionContext.trace.push(entry);
-  return entry;
-}
-
-function markNodeSkipped(node, context, reason, details = {}) {
-  if (shouldCountNode(node)) {
-    context.stats.total += 1;
-    context.stats.skipped += 1;
-  }
-
-  console.log(`[${node.id || '?'}] ${describeStep(node)}`);
-  console.log(`  [SKIPPED - ${reason}]`);
-  console.log('');
-
-  finalizeNodeRecord(context, node, {
-    ...details,
-    note: reason,
-    status: 'skipped',
-  });
-}
-
-function printPassWithResult(result, prefix = 'result') {
-  if (typeof result !== 'undefined') {
-    console.log(`  ${prefix}: ${formatResultPreview(result)}`);
-  }
-  console.log('  PASS');
-  console.log('');
-}
-
-// ---------------------------------------------------------------------------
-// MetaMask-specific action handlers
-// ---------------------------------------------------------------------------
-
-function handleTypeKeypad(node, appRoot) {
-  const value = String(node.value || '');
-  for (let i = 0; i < value.length; i++) {
-    const c = value[i];
-    let keyId;
-    if (c >= '0' && c <= '9') {
-      keyId = `keypad-key-${c}`;
-    } else if (c === '.') {
-      keyId = 'keypad-key-dot';
-    } else {
-      continue;
-    }
-    spawnBridge(appRoot, ['press-test-id', keyId]);
-  }
-  return { ok: true, value };
-}
-
-function handleClearKeypad(node, appRoot) {
-  const count = Number(node.count || 8);
-  for (let i = 0; i < count; i++) {
-    try {
-      spawnBridge(appRoot, ['press-test-id', 'keypad-delete-button']);
-    } catch {
-      // best-effort
-    }
-  }
-  return { ok: true, deleted: count };
-}
-
-function handleSelectAccount(node, appRoot) {
-  return spawnBridge(appRoot, ['switch-account', node.address]);
-}
-
-function handleToggleTestnet(node, appRoot) {
-  const desired = node.enabled !== undefined ? String(node.enabled) : 'true';
-  const current = rawResultString(
-    spawnBridge(appRoot, ['eval', 'Engine.context.PerpsController.state.isTestnet'])
-  );
-  if (current === desired) {
-    return { ok: true, already: true };
-  }
-  return spawnBridge(appRoot, [
-    'eval-async',
-    'Engine.context.PerpsController.toggleTestnet().then(function(r){return JSON.stringify(r)})',
-  ]);
-}
-
-function handleSwitchProvider(node, appRoot) {
-  return spawnBridge(appRoot, [
-    'eval-async',
-    `Engine.context.PerpsController.switchProvider('${node.provider}').then(function(r){return JSON.stringify(r)})`,
-  ]);
-}
-
-// ---------------------------------------------------------------------------
-// Core node executor
-// ---------------------------------------------------------------------------
-
-async function runExecutableNode(node, context, options = {}) {
-  const { appRoot, defaultTeam, depth, document, runOptions, stats } = context;
-  const startedAt = new Date().toISOString();
-
-  if (shouldSkipForSingleStep(node, context, options)) {
-    markNodeSkipped(node, context, 'single-step mode', { next: node.next || '', startedAt });
-    return { next: node.next || '' };
-  }
-
-  context.currentStepRef.current = node;
-  if (shouldCountNode(node)) {
-    stats.total += 1;
-  }
-  console.log(`[${node.id || '?'}] ${describeStep(node)}`);
-
-  if (runOptions.dryRun) {
-    stats.skipped += 1;
-    console.log('  [DRY RUN - not executed]');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', note: 'dry run', startedAt, status: 'dry_run',
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  if (node.when && !evaluateWorkflowCondition(node.when, context)) {
-    if (shouldCountNode(node)) {
-      stats.skipped += 1;
-    }
-    console.log('  [SKIPPED - when condition did not match]');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', note: 'when condition did not match', startedAt, status: 'skipped',
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  if (node.unless && evaluateWorkflowCondition(node.unless, context)) {
-    if (shouldCountNode(node)) {
-      stats.skipped += 1;
-    }
-    console.log('  [SKIPPED - unless condition matched]');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', note: 'unless condition matched', startedAt, status: 'skipped',
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  if (!(node.action === 'manual' && runOptions.skipManual)) {
-    publishHudStep(appRoot, {
-      id: String(node.id || '?'),
-      action: String(node.action || ''),
-      description: describeStep(node),
-      recipe: document.title || '',
-      depth,
-    }, runOptions);
-  }
-
-  // --- Manual ---
-  if (node.action === 'manual') {
-    if (runOptions.skipManual) {
-      stats.skipped += 1;
-      console.log('  [SKIPPED - manual step]');
-      console.log('');
-      finalizeNodeRecord(context, node, {
-        next: node.next || '', note: 'manual step skipped', startedAt, status: 'skipped',
-      });
-      context.currentStepRef.current = null;
-      return { next: node.next || '' };
-    }
-
-    const accepted = await promptManual(node.note || '');
-    if (!accepted) {
-      stats.skipped += 1;
-      console.log('  [SKIPPED]');
-      finalizeNodeRecord(context, node, {
-        next: node.next || '', result: { accepted: false }, startedAt, status: 'skipped',
-      });
-    } else {
-      stats.passed += 1;
-      console.log('  PASS');
-      finalizeNodeRecord(context, node, {
-        next: node.next || '', result: { accepted: true }, startedAt,
-      });
-    }
-    console.log('');
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- Wait ---
-  if (node.action === 'wait') {
-    const ms = Number(node.ms || 1000);
-    await new Promise((resolve) => setTimeout(resolve, ms));
-    stats.passed += 1;
-    console.log(`  waited ${ms}ms`);
-    console.log('  PASS');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result: { waitedMs: ms }, startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- Wait for ---
-  if (node.action === 'wait_for') {
-    const waitResult = await waitForCondition(node, appRoot);
-    if (!waitResult.ok) {
-      throw new Error(
-        `wait_for timed out after ${node.timeout_ms || 10000}ms (${waitResult.label})\n  last result: ${formatResultPreview(waitResult.result)}`
-      );
-    }
-
-    stats.passed += 1;
-    printPassWithResult(waitResult.result);
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result: parseRaw(rawResultString(waitResult.result)), startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- App lifecycle (delegated to lib/app-lifecycle.js) ---
-  if (node.action === 'app_background') {
-    const { bundleId } = backgroundApp();
-    const durationMs = Number(node.duration_ms || 5000);
-    await new Promise((resolve) => setTimeout(resolve, durationMs));
-    stats.passed += 1;
-    console.log(`  backgrounded for ${durationMs}ms`);
-    console.log('  PASS');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result: { backgrounded: true, durationMs, bundleId }, startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  if (node.action === 'app_foreground') {
-    const { bundleId } = foregroundApp();
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-    stats.passed += 1;
-    console.log(`  foregrounded (${bundleId})`);
-    console.log('  PASS');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result: { foregrounded: true, bundleId }, startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  if (node.action === 'app_restart') {
-    const { bundleId } = restartApp();
-    const bootWaitMs = Number(node.boot_wait_ms || 15000);
-    console.log(`  waiting ${bootWaitMs}ms for app boot + Metro reconnect...`);
-    await new Promise((resolve) => setTimeout(resolve, bootWaitMs));
-    stats.passed += 1;
-    console.log(`  restarted (${bundleId})`);
-    console.log('  PASS');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result: { restarted: true, bundleId }, startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- Log watch ---
-  if (node.action === 'log_watch') {
-    const metroLogPath = process.env.METRO_LOG || path.join(appRoot, '.agent', 'metro.log');
-    const result = scanLog(node, metroLogPath);
-    if (!result.pass) {
-      throw new Error(`must_not_appear strings were found: ${result.must_not_found.join(', ')}`);
-    }
-    stats.passed += 1;
-    printPassWithResult(result.watch_counts, 'watch_for');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result, startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- Call (flow) ---
-  if (node.action === 'call') {
-    const flow = resolveFlowRef(node.ref, { appRoot, defaultTeam });
-    const summary = await runRecipe(
-      flow.filePath,
-      { ...runOptions, singleStep: '' },
-      node.params || {},
-      depth + 1
-    );
-    stats.passed += 1;
-    console.log(`  flow: ${flow.ref}`);
-    console.log('  PASS');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '',
-      result: { ref: flow.ref, title: summary.title, counts: summary.counts },
-      startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- Screenshot ---
-  if (node.action === 'screenshot') {
-    const label = sanitizeFileSegment(node.filename || node.id || 'recipe');
-    let screenshotPath = '';
-    try {
-      const screenshotResult = spawnSync('bash', [path.join(SD, 'screenshot.sh'), label], {
-        cwd: appRoot, encoding: 'utf8',
-      });
-      screenshotPath = (screenshotResult.stdout || '').trim();
-    } catch {
-      // best-effort
-    }
-
-    const artifacts = ensureRunArtifacts(runOptions, context.recipePath);
-    if (screenshotPath && artifacts && fs.existsSync(screenshotPath)) {
-      const dest = path.join(artifacts.screenshotsDir, path.basename(screenshotPath));
-      fs.copyFileSync(screenshotPath, dest);
-      if (typeof node.note === 'string' && node.note.trim().length > 0) {
-        fs.writeFileSync(
-          `${dest}.json`,
-          `${JSON.stringify({ note: node.note, nodeId: node.id }, null, 2)}\n`,
-        );
-      }
-    }
-
-    stats.passed += 1;
-    console.log(`  screenshot: ${screenshotPath || 'none'}`);
-    console.log('  PASS');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.next || '', result: { screenshot: screenshotPath }, startedAt,
-    });
-    context.currentStepRef.current = null;
-    return { next: node.next || '' };
-  }
-
-  // --- MetaMask-specific actions ---
-  let bridgeResult;
-
-  switch (node.action) {
-    case 'navigate': {
-      const navArgs = ['navigate', node.target];
-      if (node.params) {
-        navArgs.push(JSON.stringify(node.params));
-      }
-      bridgeResult = spawnBridge(appRoot, navArgs);
-      break;
-    }
-    case 'eval_sync':
-      bridgeResult = spawnBridge(appRoot, ['eval', node.expression]);
-      break;
-    case 'eval_async':
-      bridgeResult = spawnBridge(appRoot, ['eval-async', node.expression]);
-      break;
-    case 'eval_ref': {
-      const evalRef = resolveEvalRef(node.ref, { appRoot, defaultTeam });
-      trackEvalRef(runOptions, evalRef.ref);
-      bridgeResult = spawnBridge(appRoot, ['eval-ref', evalRef.ref]);
-      break;
-    }
-    case 'press':
-      bridgeResult = spawnBridge(appRoot, ['press-test-id', node.test_id]);
-      break;
-    case 'scroll': {
-      const scrollArgs = ['scroll-view'];
-      if (node.test_id) {
-        scrollArgs.push('--test-id', node.test_id);
-      }
-      scrollArgs.push('--offset', String(node.offset ?? 300));
-      scrollArgs.push(node.animated === true ? '--animated' : '--no-animated');
-      bridgeResult = spawnBridge(appRoot, scrollArgs);
-      break;
-    }
-    case 'set_input':
-      bridgeResult = spawnBridge(appRoot, ['set-input', node.test_id, String(node.value ?? '')]);
-      break;
-    case 'type_keypad':
-      bridgeResult = handleTypeKeypad(node, appRoot);
-      break;
-    case 'clear_keypad':
-      bridgeResult = handleClearKeypad(node, appRoot);
-      break;
-    case 'select_account':
-      bridgeResult = handleSelectAccount(node, appRoot);
-      break;
-    case 'toggle_testnet':
-      bridgeResult = handleToggleTestnet(node, appRoot);
-      break;
-    case 'switch_provider':
-      bridgeResult = handleSwitchProvider(node, appRoot);
-      break;
-    case 'trace_start':
-      bridgeResult = spawnBridge(appRoot, ['profiler-start']);
-      break;
-    case 'trace_stop': {
-      const artifacts = ensureRunArtifacts(runOptions, context.recipePath);
-      const traceLabel = sanitizeFileSegment(node.label || node.id || 'trace');
-      const outPath = artifacts && artifacts.tracesDir
-        ? path.join(artifacts.tracesDir, `trace-${traceLabel}.cpuprofile`)
-        : '';
-      const stopArgs = ['profiler-stop', '--label', traceLabel];
-      if (outPath) {
-        stopArgs.push('--out', outPath);
-      }
-      bridgeResult = spawnBridge(appRoot, stopArgs);
-      break;
-    }
-    default:
-      throw new Error(`Unknown action "${node.action}"`);
-  }
-
-  const failureMessage = buildInteractionFailureMessage(node, bridgeResult);
-  if (failureMessage) {
-    throw new Error(failureMessage);
-  }
-
-  const raw = rawResultString(bridgeResult);
-  if (node.assert && !checkAssert(raw, node.assert)) {
-    throw new Error(
-      `Assertion failed for step "${node.id || '?'}"\n  result: ${formatResultPreview(parseRaw(raw))}\n  assert: ${JSON.stringify(node.assert)}`
-    );
-  }
-
-  stats.passed += 1;
-  printPassWithResult(bridgeResult);
-  finalizeNodeRecord(context, node, {
-    next: node.next || '', result: parseRaw(raw), startedAt,
-  });
-  context.currentStepRef.current = null;
-  return { next: node.next || '' };
-}
-
-// ---------------------------------------------------------------------------
-// Switch & End nodes
-// ---------------------------------------------------------------------------
-
-async function executeSwitchNode(node, context) {
-  const startedAt = new Date().toISOString();
-  context.currentStepRef.current = node;
-  context.stats.total += 1;
-  console.log(`[${node.id || '?'}] ${describeStep(node)}`);
-
-  const cases = Array.isArray(node.cases) ? node.cases : [];
-  let selected = null;
-
-  for (const entry of cases) {
-    if (!entry.when || evaluateWorkflowCondition(entry.when, context)) {
-      selected = { assumed: false, label: entry.label || '', next: entry.next };
-      break;
-    }
-  }
-
-  if (!selected && context.runOptions.dryRun && cases[0]?.next) {
-    selected = { assumed: true, label: cases[0].label || '', next: cases[0].next };
-  }
-
-  if (!selected && node.default) {
-    selected = { assumed: false, label: 'default', next: node.default };
-  }
-
-  if (!selected?.next) {
-    throw new Error(`Switch node "${node.id}" did not resolve a branch target`);
-  }
-
-  const label = selected.label ? ` (${selected.label})` : '';
-  if (selected.assumed) {
-    context.stats.skipped += 1;
-    console.log(`  [DRY RUN - assuming${label || ' first branch'} -> ${selected.next}]`);
-  } else {
-    context.stats.passed += 1;
-    console.log(`  branch -> ${selected.next}${label}`);
-  }
-  console.log('  PASS');
-  console.log('');
-
-  finalizeNodeRecord(context, node, {
-    branch: selected,
-    next: selected.next,
-    note: selected.assumed ? 'dry run branch assumption' : '',
-    startedAt,
-    status: selected.assumed ? 'dry_run' : 'pass',
-  });
-  context.currentStepRef.current = null;
-  return { next: selected.next };
-}
-
-async function executeEndNode(node, context) {
-  context.currentStepRef.current = node;
-  finalizeNodeRecord(context, node, {
-    note: node.message || '',
-    result: { message: node.message || '', status: node.status || 'pass' },
-    status: node.status || 'pass',
-  });
-
-  context.currentStepRef.current = null;
-  if (String(node.status || 'pass').toLowerCase() === 'fail') {
-    throw new Error(node.message || `Workflow terminated at end node "${node.id}"`);
-  }
-
-  return { done: true };
-}
-
-async function executeWorkflowNode(node, context, options = {}) {
-  // Handle when-guard for switch/end nodes (runExecutableNode handles its own)
-  if ((node.action === 'switch' || node.action === 'end') && node.when && !evaluateWorkflowCondition(node.when, context)) {
-    const startedAt = new Date().toISOString();
-    context.currentStepRef.current = node;
-    if (shouldCountNode(node)) {
-      context.stats.total += 1;
-      context.stats.skipped += 1;
-    }
-    console.log(`[${node.id || '?'}] ${describeStep(node)}`);
-    console.log('  [SKIPPED - when condition did not match]');
-    console.log('');
-    finalizeNodeRecord(context, node, {
-      next: node.default || node.next || '',
-      note: 'when condition did not match',
-      startedAt,
-      status: 'skipped',
-    });
-    context.currentStepRef.current = null;
-    return { next: node.default || node.next || '' };
-  }
-
-  if (node.action === 'end') {
-    return executeEndNode(node, context);
-  }
-
-  if (node.action === 'switch') {
-    return executeSwitchNode(node, context);
-  }
-
-  return runExecutableNode(node, context, options);
-}
-
-// ---------------------------------------------------------------------------
-// Linear step collection (for setup/teardown hooks)
-// ---------------------------------------------------------------------------
-
-async function executeLinearStepCollection(steps, context, options = {}) {
-  if (!Array.isArray(steps) || steps.length === 0) {
-    return;
-  }
-
-  if (options.label) {
-    console.log(`${options.label}:`);
-  }
-
-  for (let index = 0; index < steps.length; index += 1) {
-    const step = steps[index];
-    const node = {
-      ...step,
-      action: String(step.action || step.type || ''),
-      id: String(step.id || `${options.label || 'hook'}-${index + 1}`),
-    };
-    await runExecutableNode(node, context, { applySingleStep: false });
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Workflow graph execution
-// ---------------------------------------------------------------------------
-
-async function executeWorkflowGraph(context, options = {}) {
-  const { workflow } = context;
-  let currentNodeId = workflow.entry;
-  let traversed = 0;
-  const maxTraversals = Math.max(Object.keys(workflow.nodes || {}).length * 20, 20);
-
-  while (currentNodeId) {
-    traversed += 1;
-    if (traversed > maxTraversals) {
-      throw new Error(
-        `Workflow traversal exceeded ${maxTraversals} nodes. Refusing to continue.`
-      );
-    }
-
-    const node = workflow.nodes[currentNodeId];
-    if (!node) {
-      throw new Error(`Workflow references missing node "${currentNodeId}"`);
-    }
-
-    const resolution = await executeWorkflowNode(node, context, options);
-    if (resolution?.done) {
-      return;
-    }
-
-    if (!resolution?.next) {
-      throw new Error(`Node "${node.id}" did not resolve a next transition`);
-    }
-
-    currentNodeId = resolution.next;
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Recipe runner
-// ---------------------------------------------------------------------------
-
-async function runRecipe(recipePath, runOptions, flowParams = {}, depth = 0) {
-  const context = buildRuntimeContext(recipePath, runOptions, flowParams, depth);
-  const {
-    appRoot,
-    defaultTeam,
-    document,
-    executionContext,
-    hooks,
-    normalizedDocument,
-    stats,
-    workflow,
-  } = context;
-  const prefix = depth > 0 ? `${'  '.repeat(depth)}> ` : '';
-  const state = ensureExecutionState(runOptions);
-  let currentStep = null;
-  let failureError = null;
-
-  if (!runOptions.dryRun) {
-    ensureRunArtifacts(runOptions, recipePath);
-    writeWorkflowArtifacts(context);
-    if (depth === 0) {
-      armIssueTracker(runOptions);
-    }
-  }
-
-  console.log(`${prefix}Running recipe: ${document.title || 'Untitled'}`);
-  if (defaultTeam) {
-    console.log(`${prefix}Team: ${defaultTeam}`);
-  }
-  if (hooks.pre_conditions?.length) {
-    const pcLabels = hooks.pre_conditions.map((spec) =>
-      typeof spec === 'string' ? spec : spec.name || JSON.stringify(spec)
-    );
-    console.log(`${prefix}Pre-conditions: ${pcLabels.join(', ')}`);
-  }
-  if (hooks.setup?.length) {
-    console.log(`${prefix}Setup: ${hooks.setup.length} step(s)`);
-  }
-  if (hooks.teardown?.length) {
-    console.log(`${prefix}Teardown: ${hooks.teardown.length} step(s)`);
-  }
-  console.log(`${prefix}Workflow nodes: ${Object.keys(workflow.nodes || {}).length}`);
-  console.log('');
-
-  try {
-    if (!runOptions.dryRun && hooks.pre_conditions?.length) {
-      currentStep = { id: 'pre-conditions', action: 'pre_conditions', description: 'evaluate pre-conditions' };
-      const preConditionsResult = evaluatePreConditions(document, appRoot);
-      if (!preConditionsResult.ok) {
-        console.log('PRE-CONDITIONS FAILED');
-        preConditionsResult.failures.forEach((failure) => {
-          console.log(`  - ${failure.name}${failure.description ? `: ${failure.description}` : ''}`);
-          if (failure.error) {
-            console.log(`    error: ${failure.error}`);
-          }
-          if (failure.got) {
-            console.log(`    got: ${failure.got}`);
-          }
-          if (failure.hint) {
-            console.log(`    hint: ${failure.hint}`);
-          }
-        });
-        throw new Error('Recipe pre-conditions failed');
-      }
-
-      console.log('Pre-conditions: PASS');
-      console.log('');
-      currentStep = null;
-    }
-
-    if (hooks.setup?.length) {
-      currentStep = { id: 'setup', action: 'setup', description: 'run setup hooks' };
-      await executeLinearStepCollection(hooks.setup, context, { label: 'Setup hooks' });
-      currentStep = null;
-    }
-
-    await executeWorkflowGraph(context, { applySingleStep: true });
-
-    console.log('----------------------------------------');
-    if (runOptions.dryRun) {
-      console.log(`Results: ${stats.total} node(s) dry-run only`);
-      console.log('Recipe: DRY RUN');
-    } else {
-      console.log(
-        `Results: ${stats.passed}/${stats.total} passed${stats.skipped ? `, ${stats.skipped} skipped` : ''}`
-      );
-      console.log('Recipe: PASS');
-    }
-    console.log('');
-  } catch (error) {
-    failureError = error;
-    if (!runOptions.dryRun) {
-      captureFailureArtifacts({
-        appRoot,
-        defaultTeam,
-        depth,
-        document,
-        error,
-        executionContext,
-        normalizedDocument,
-        recipePath,
-        runOptions,
-        step: context.currentStepRef.current || currentStep,
-      });
-    }
-  }
-
-  // Teardown runs regardless of success/failure
-  let pendingTeardownError = null;
-  try {
-    if (!runOptions.dryRun && hooks.teardown?.length) {
-      currentStep = { id: 'teardown', action: 'teardown', description: 'run teardown hooks' };
-      await executeLinearStepCollection(hooks.teardown, context, { label: 'Teardown hooks' });
-    }
-  } catch (teardownError) {
-    if (!runOptions.dryRun) {
-      captureFailureArtifacts({
-        appRoot,
-        defaultTeam,
-        depth,
-        document,
-        error: teardownError,
-        executionContext,
-        normalizedDocument,
-        recipePath,
-        runOptions,
-        step: context.currentStepRef.current || currentStep,
-      });
-    }
-    if (!failureError) {
-      pendingTeardownError = teardownError;
-    } else {
-      console.error(`Teardown warning: ${String(teardownError.message || teardownError)}`);
-    }
-  }
-
-  if (depth === 0 && !runOptions.dryRun) {
-    clearHudStep(appRoot, runOptions);
-    writeTraceArtifacts(context);
-    const recipeIssues = collectRecipeIssues(runOptions, document);
-    const gatingTriggered =
-      !!recipeIssues && recipeIssues.review?.status === 'gating';
-    if (gatingTriggered && !failureError) {
-      failureError = new Error(
-        `Recipe issue review gating: ${recipeIssues.review?.note || 'fail_on_unexpected matched'}`
-      );
-    }
-    writeRunSummary(runOptions, {
-      status: failureError ? 'FAIL' : 'PASS',
-      title: document.title || '',
-      recipePath,
-      counts: stats,
-      failures: state.failureArtifacts,
-      tracePath: state.artifacts?.tracePath || '',
-      workflowMermaidPath: state.artifacts?.workflowMermaidPath || '',
-      workflowPath: state.artifacts?.workflowPath || '',
-      availableEvalRefs: listEvalRefs(appRoot).map((entry) => entry.ref),
-      ...(recipeIssues ? { recipeIssues } : {}),
-    });
-    if (recipeIssues) {
-      const { review } = recipeIssues;
-      if (review.status === 'review') {
-        console.log(
-          `recipe-issues: review — ${review.observed.total} unexpected event(s). See ${review.artifactFiles?.reviewMd || ''}`
-        );
-      } else if (review.status === 'gating') {
-        console.log(
-          `recipe-issues: GATING — ${review.gating.total} event(s) matched fail_on_unexpected. See ${review.artifactFiles?.reviewMd || ''}`
-        );
-      }
-    }
-  }
-
-  if (failureError) {
-    throw failureError;
-  }
-  if (pendingTeardownError) {
-    throw pendingTeardownError;
-  }
-
-  return {
-    title: document.title || '',
-    counts: stats,
-    artifactDir: state.artifacts?.rootDir || '',
-    failures: state.failureArtifacts,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// Main
-// ---------------------------------------------------------------------------
-
-async function main() {
-  let teardownLog = null;
-  try {
-    const options = parseArgs(process.argv.slice(2));
-    const appRoot = getAppRoot();
-    const recipeInput = resolveRecipeInput(appRoot, options.recipe);
-    const teamsDir = getTeamsDir(appRoot);
-
-    if (!fs.existsSync(teamsDir)) {
-      throw new Error(`No recipe teams directory found: ${teamsDir}`);
-    }
-
-    validateSchemaOrThrow(appRoot, recipeInput.recipePath);
-
-    const runOptions = {
-      appRoot,
-      artifactsDir: options.artifactsDir,
-      dryRun: options.dryRun,
-      hud: options.hud,
-      inputOverrides: options.inputOverrides,
-      log: options.log,
-      singleStep: options.singleStep,
-      skipManual: options.skipManual,
-    };
-
-    // Set up log capture — tee stdout/stderr to a sanitized log file.
-    // Redacts tokens, secrets, passwords, and bearer strings before writing
-    // to avoid CodeQL clear-text-logging alerts.
-    if (options.log && !options.dryRun) {
-      const artifacts = ensureRunArtifacts(runOptions, recipeInput.recipePath);
-      if (artifacts) {
-        const REDACT_KEYS =
-          /token|secret|password|passwd|authorization|api[_-]?key|client[_-]?key|id[_-]?token|refresh[_-]?token|access[_-]?token/i;
-        const redactValue = (key, value) => {
-          if (REDACT_KEYS.test(String(key))) {
-            return '[REDACTED]';
-          }
-          return value;
-        };
-        const sanitizeArg = (arg) => {
-          if (arg instanceof Error) {
-            return `[${arg.name}] ${arg.message}`;
-          }
-          if (typeof arg === 'string') {
-            return arg.replace(
-              /(bearer\s+)[a-z0-9\-._~+/]+=*/gi,
-              '$1[REDACTED]',
-            );
-          }
-          if (arg && typeof arg === 'object') {
-            try {
-              return JSON.stringify(arg, redactValue);
-            } catch (_) {
-              return '[Unserializable Object]';
-            }
-          }
-          return String(arg);
-        };
-        const formatArgs = (args) => args.map(sanitizeArg).join(' ');
-
-        const logStream = fs.createWriteStream(artifacts.runLogPath, { flags: 'w' });
-        const origLog = console.log.bind(console);
-        const origError = console.error.bind(console);
-        console.log = (...args) => {
-          const formatted = formatArgs(args);
-          origLog(formatted);
-          logStream.write(formatted + '\n');
-        };
-        console.error = (...args) => {
-          const formatted = formatArgs(args);
-          origError(formatted);
-          logStream.write(formatted + '\n');
-        };
-        teardownLog = () => {
-          console.log = origLog;
-          console.error = origError;
-          logStream.end();
-        };
-      }
-    }
-
-    // Apply CLI initial conditions before running the recipe
-    if (!options.dryRun) {
-      if (options.account) {
-        console.log(`[setup] switch-account ${options.account}`);
-        trySpawnBridge(appRoot, ['switch-account', options.account]);
-      }
-      if (options.testnet) {
-        const current = rawResultString(
-          trySpawnBridge(appRoot, ['eval', 'Engine.context.PerpsController.state.isTestnet']).result || ''
-        );
-        if (current !== 'true') {
-          console.log('[setup] toggle_testnet (enabling testnet)');
-          trySpawnBridge(appRoot, [
-            'eval-async',
-            'Engine.context.PerpsController.toggleTestnet().then(function(r){return JSON.stringify(r)})',
-          ]);
-        }
-      }
-    }
-
-    await runRecipe(recipeInput.recipePath, runOptions, runOptions.inputOverrides);
-    if (teardownLog) {
-      teardownLog();
-    }
-  } catch (error) {
-    console.error(String(error.message || error));
-    if (teardownLog) {
-      teardownLog();
-    }
-    process.exit(1);
-  }
-}
-
-main();
diff --git a/scripts/perps/agentic/validate-recipe.sh b/scripts/perps/agentic/validate-recipe.sh
deleted file mode 100755
index 9ad324973cad..000000000000
--- a/scripts/perps/agentic/validate-recipe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# validate-recipe.sh — Thin wrapper that delegates to the Node.js runner.
-#
-# Usage:
-#   validate-recipe.sh <recipe-folder-or-json> [--dry-run] [--step <id>] [--skip-manual] [--no-hud]
-#
-# See validate-recipe.js for full documentation.
-set -euo pipefail
-cd "$(dirname "$0")/../../.."
-
-# Source port config so WATCHER_PORT is in env for cdp-bridge.js.
-if [ -f .js.env ]; then
-  while IFS= read -r _line || [ -n "$_line" ]; do
-    [[ "$_line" =~ ^[[:space:]]*(#|$) ]] && continue
-    _line="${_line#export }"
-    _key="${_line%%=*}"
-    _key="${_key//[[:space:]]/}"
-    [[ -n "$_key" && -z "${!_key+x}" ]] && eval "export $_line" 2>/dev/null || true
-  done < .js.env
-  unset _line _key
-fi
-export WATCHER_PORT="${WATCHER_PORT:-8081}"
-
-exec node scripts/perps/agentic/validate-recipe.js "$@"
diff --git a/scripts/perps/agentic/wallet-fixture.example.json b/scripts/perps/agentic/wallet-fixture.example.json
index de4ebdbaebea..e859a626c3f3 100644
--- a/scripts/perps/agentic/wallet-fixture.example.json
+++ b/scripts/perps/agentic/wallet-fixture.example.json
@@ -1,14 +1,43 @@
 {
   "password": "your-password-here",
   "accounts": [
-    { "type": "mnemonic", "value": "your twelve word seed phrase goes here replace with real words" },
-    { "type": "privateKey", "value": "0xYourPrivateKeyHex", "name": "Trading" }
+    {
+      "type": "mnemonic",
+      "value": "your twelve word seed phrase goes here replace with real words",
+      "name": "Primary",
+      "count": 3,
+      "names": [
+        "Primary",
+        "SRP Account 2",
+        "SRP Account 3"
+      ]
+    },
+    {
+      "type": "mnemonic",
+      "value": "optional second seed phrase goes here replace with real words",
+      "name": "Team SRP 1",
+      "count": 2,
+      "names": [
+        "Team SRP 1",
+        "Team SRP 2"
+      ]
+    },
+    {
+      "type": "privateKey",
+      "value": "0xYourPrivateKeyHex",
+      "name": "Trading"
+    },
+    {
+      "type": "privateKey",
+      "value": "0xYourSecondPrivateKeyHex",
+      "name": "MYXTrading"
+    }
   ],
   "settings": {
-    "metametrics": false,
+    "metametrics": true,
     "skipGtmModals": true,
     "skipPerpsTutorial": true,
     "autoLockNever": true,
-    "deviceAuthEnabled": false
+    "deviceAuthEnabled": true
   }
 }
diff --git a/tests/component-view/mocks.ts b/tests/component-view/mocks.ts
index a075983f8a05..aea6a9c48907 100644
--- a/tests/component-view/mocks.ts
+++ b/tests/component-view/mocks.ts
@@ -33,6 +33,13 @@ jest.mock('../../app/core/Engine', () => {
       AccountTreeController: {
         setAccountGroupName: jest.fn(),
         setSelectedAccountGroup: jest.fn(),
+        getAccountsFromSelectedAccountGroup: jest.fn().mockReturnValue([
+          {
+            id: 'acc-1',
+            address: '0x0000000000000000000000000000000000000001',
+            type: 'eip155:eoa',
+          },
+        ]),
       },
       MultichainAccountService: {
         alignWallets: jest.fn().mockResolvedValue(undefined),
@@ -266,7 +273,8 @@ jest.mock('../../app/core/Engine', () => {
           .mockResolvedValue({ nextNonce: 0, releaseLock: jest.fn() }),
       },
       NetworkController: {
-        state: { networksMetadata: {} },
+        state: { networksMetadata: {}, networkConfigurationsByChainId: {} },
+        addNetwork: jest.fn().mockResolvedValue(undefined),
         getProviderAndBlockTracker() {
           return {
             provider: {
@@ -330,6 +338,11 @@ jest.mock('../../app/core/Engine', () => {
           .mockResolvedValue({ markets: [], totalResults: 0 }),
         getMarket: jest.fn().mockResolvedValue(null),
         getBalance: jest.fn().mockResolvedValue(0),
+        getAccountState: jest.fn().mockResolvedValue({
+          address: '0x0000000000000000000000000000000000000001',
+          walletType: 'metamask',
+        }),
+        getActivity: jest.fn().mockResolvedValue([]),
         getPositions: jest.fn().mockResolvedValue([]),
         getPrices: jest.fn().mockResolvedValue({ providerId: '', results: [] }),
         getMarketSeries: jest.fn().mockResolvedValue([]),
@@ -343,7 +356,11 @@ jest.mock('../../app/core/Engine', () => {
         trackBannerAction: jest.fn(),
         trackMarketDetailsOpened: jest.fn(),
         trackGeoBlockTriggered: jest.fn(),
+        trackActivityViewed: jest.fn(),
         refreshEligibility: jest.fn().mockResolvedValue(undefined),
+        claimWithConfirmation: jest.fn().mockResolvedValue(undefined),
+        depositWithConfirmation: jest.fn().mockResolvedValue(undefined),
+        prepareWithdraw: jest.fn().mockResolvedValue(undefined),
       },
       // Perps: stub so hooks (usePerpsClosePosition, usePerpsMarkets, etc.) do not throw
       // getMarkets returns one market so PerpsTabView explore section renders "See all perps"
diff --git a/tests/component-view/renderers/predictPositions.tsx b/tests/component-view/renderers/predictPositions.tsx
new file mode 100644
index 000000000000..d6a01ba3bb1a
--- /dev/null
+++ b/tests/component-view/renderers/predictPositions.tsx
@@ -0,0 +1,62 @@
+import '../mocks';
+import React from 'react';
+import type { DeepPartial } from '../../../app/util/test/renderWithProvider';
+import type { RootState } from '../../../app/reducers';
+import { renderComponentViewScreen, renderScreenWithRoutes } from '../render';
+import Routes from '../../../app/constants/navigation/Routes';
+import PredictPositionsView from '../../../app/components/UI/Predict/views/PredictPositionsView';
+import { initialStatePredict } from '../presets/predict';
+
+interface RenderPredictPositionsViewOptions {
+  overrides?: DeepPartial<RootState>;
+  initialParams?: Record<string, unknown>;
+}
+
+const createWrappedPredictPositionsView = (): React.ComponentType =>
+  function WrappedPredictPositionsView(props: Record<string, unknown>) {
+    return <PredictPositionsView {...(props as object)} />;
+  };
+
+export function renderPredictPositionsView(
+  options: RenderPredictPositionsViewOptions = {},
+): ReturnType<typeof renderComponentViewScreen> {
+  const { overrides, initialParams } = options;
+
+  const builder = initialStatePredict();
+  if (overrides) {
+    builder.withOverrides(overrides);
+  }
+  const state = builder.build();
+
+  return renderComponentViewScreen(
+    createWrappedPredictPositionsView(),
+    { name: Routes.PREDICT.POSITIONS },
+    { state },
+    initialParams,
+  );
+}
+
+interface RenderPredictPositionsViewWithRoutesOptions
+  extends RenderPredictPositionsViewOptions {
+  extraRoutes?: { name: string; Component?: React.ComponentType<object> }[];
+}
+
+export function renderPredictPositionsViewWithRoutes(
+  options: RenderPredictPositionsViewWithRoutesOptions = {},
+): ReturnType<typeof renderScreenWithRoutes> {
+  const { overrides, initialParams, extraRoutes = [] } = options;
+
+  const builder = initialStatePredict();
+  if (overrides) {
+    builder.withOverrides(overrides);
+  }
+  const state = builder.build();
+
+  return renderScreenWithRoutes(
+    createWrappedPredictPositionsView(),
+    { name: Routes.PREDICT.POSITIONS },
+    extraRoutes,
+    { state },
+    initialParams,
+  );
+}
diff --git a/tests/flows/perps.flow.ts b/tests/flows/perps.flow.ts
index ddb068d862bf..979a6dda72f4 100644
--- a/tests/flows/perps.flow.ts
+++ b/tests/flows/perps.flow.ts
@@ -3,13 +3,70 @@ import {
   asPlaywrightElement,
   Assertions,
   encapsulatedAction,
+  PlaywrightGestures,
 } from '../framework';
 import PerpsMarketDetailsView from '../page-objects/Perps/PerpsMarketDetailsView';
 import PerpsHomeView from '../page-objects/Perps/PerpsHomeView';
 import PerpsMarketListView from '../page-objects/Perps/PerpsMarketListView';
+import PerpsOnboarding from '../page-objects/Perps/PerpsOnboarding';
 import PerpsOrderView from '../page-objects/Perps/PerpsOrderView';
 import WalletView from '../page-objects/wallet/WalletView';
 
+const PERPS_GTM_MODAL_FALLBACK_WAIT_MS = 10_000;
+
+/**
+ * Resolves whether the Perps GTM onboarding tutorial should be handled.
+ * Uses feature flags when available; otherwise polls the tutorial for up to 10s.
+ */
+export const resolvePerpsGtmOnboardingModalEnabled = async (
+  productionFeatureFlags: Record<string, unknown> | null,
+): Promise<boolean> => {
+  const flagsSayEnabled =
+    productionFeatureFlags != null &&
+    (
+      productionFeatureFlags.perpsPerpGtmOnboardingModalEnabled as {
+        enabled?: boolean;
+      }
+    )?.enabled === true;
+
+  if (flagsSayEnabled) {
+    return true;
+  }
+
+  // Flags missing or disabled — tutorial may still appear; detect in UI.
+  try {
+    await (await asPlaywrightElement(PerpsOnboarding.tutorialTitle))
+      .unwrap()
+      .waitForDisplayed({ timeout: PERPS_GTM_MODAL_FALLBACK_WAIT_MS });
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+/**
+ * Skips the Perps onboarding tutorial when it is on screen. No-op if not shown.
+ */
+export const dismissPerpsOnboardingTutorialIfPresent =
+  async (): Promise<void> => {
+    try {
+      const skipButton = await asPlaywrightElement(PerpsOnboarding.skipButton);
+      await skipButton
+        .unwrap()
+        .waitForDisplayed({ timeout: PERPS_GTM_MODAL_FALLBACK_WAIT_MS });
+      await PlaywrightGestures.waitAndTap(skipButton, {
+        checkForDisplayed: true,
+        checkForEnabled: true,
+        timeout: 10_000,
+      });
+      await skipButton
+        .unwrap()
+        .waitForDisplayed({ reverse: true, timeout: 10_000 });
+    } catch {
+      // Tutorial not shown or already dismissed.
+    }
+  };
+
 /**
  * Checks if the position is open by checking if the close button is visible.
  * @returns {Promise<boolean>} True if the position is open, false otherwise.
diff --git a/tests/flows/wallet.flow.ts b/tests/flows/wallet.flow.ts
index 554e6c83e9e8..22a206a85400 100644
--- a/tests/flows/wallet.flow.ts
+++ b/tests/flows/wallet.flow.ts
@@ -41,6 +41,7 @@ import AccountListBottomSheet from '../page-objects/wallet/AccountListBottomShee
 import MetaMetricsOptInView from '../page-objects/Onboarding/MetaMetricsOptInView';
 import PredictModalView from '../page-objects/Predict/PredictModalView';
 import OnboardingInterestQuestionnaireView from '../page-objects/Onboarding/OnboardingInterestQuestionnaireView';
+import { fetchProductionFeatureFlags } from '../performance/feature-flag-helper';
 const logger = createLogger({
   name: 'WalletFlow',
 });
@@ -49,6 +50,7 @@ const validAccount = Accounts.getValidAccount();
 const SEEDLESS_ONBOARDING_ENABLED =
   process.env.SEEDLESS_ONBOARDING_ENABLED === 'true' ||
   process.env.SEEDLESS_ONBOARDING_ENABLED === undefined;
+const testEnvironment = process.env.E2E_PERFORMANCE_BUILD_VARIANT || 'rc';
 
 /**
  * Gets the localhost URL for Ganache/Anvil network connection.
@@ -492,7 +494,86 @@ export const selectAccountByDevice = async (
     await asPlaywrightElement(AccountListBottomSheet.accountList),
   );
   await AccountListBottomSheet.waitForAccountSyncToComplete();
-  await AccountListBottomSheet.tapAccountByNameV2(accountName);
+  const isAccount3 = accountName === 'Account 3'; // Due to an issue with the account 3 being displayed as Account 3 (2)
+  await AccountListBottomSheet.tapAccountByNameV2(accountName, !isAccount3);
+};
+
+/** Max wait for the optional interest questionnaire to appear after MetaMetrics. */
+const ONBOARDING_INTEREST_QUESTIONNAIRE_POLL_MS = 3_000;
+const ONBOARDING_INTEREST_QUESTIONNAIRE_POLL_INTERVAL_MS = 250;
+
+/**
+ * Advances past the optional onboarding interest questionnaire (Playwright / Appium only).
+ * No-op when the app navigates straight to onboarding success (common on some builds/flags).
+ */
+export const dismissOnboardingInterestQuestionnaire =
+  async (): Promise<void> => {
+    const deadline = Date.now() + ONBOARDING_INTEREST_QUESTIONNAIRE_POLL_MS;
+
+    while (Date.now() < deadline) {
+      try {
+        const successDoneButton = await asPlaywrightElement(
+          OnboardingSuccessView.doneButton,
+        );
+        if (await successDoneButton.unwrap().isExisting()) {
+          logger.debug(
+            'Onboarding success already visible; skipping interest questionnaire',
+          );
+          return;
+        }
+
+        const continueButton = await asPlaywrightElement(
+          OnboardingInterestQuestionnaireView.continueButton,
+        );
+        if (await continueButton.unwrap().isExisting()) {
+          await PlaywrightGestures.waitAndTap(continueButton, {
+            timeout: 10_000,
+            checkForDisplayed: true,
+            checkForEnabled: true,
+          });
+          await continueButton
+            .unwrap()
+            .waitForDisplayed({ reverse: true, timeout: 10_000 });
+          return;
+        }
+      } catch {
+        // Stale element / screen transition while the next route loads.
+      }
+      await sleep(ONBOARDING_INTEREST_QUESTIONNAIRE_POLL_INTERVAL_MS);
+    }
+
+    logger.debug(
+      'Onboarding Interest Questionnaire not shown within poll window; continuing',
+    );
+  };
+
+const PREDICT_GTM_MODAL_FALLBACK_WAIT_MS = 10_000;
+
+/**
+ * Resolves whether the Predict GTM onboarding modal should be handled.
+ * Uses feature flags when available; otherwise polls the modal for up to 10s.
+ */
+export const resolvePredictGtmOnboardingModalEnabled = async (
+  productionFeatureFlags: Record<string, unknown> | null,
+): Promise<boolean> => {
+  if (productionFeatureFlags != null) {
+    return (
+      (
+        productionFeatureFlags.predictGtmOnboardingModalEnabled as {
+          enabled?: boolean;
+        }
+      )?.enabled === true
+    );
+  }
+
+  try {
+    await (await asPlaywrightElement(PredictModalView.notNowButton))
+      .unwrap()
+      .waitForDisplayed({ timeout: PREDICT_GTM_MODAL_FALLBACK_WAIT_MS });
+    return true;
+  } catch {
+    return false;
+  }
 };
 
 /**
@@ -501,14 +582,31 @@ export const selectAccountByDevice = async (
  * @function dismisspredictionsModalPlaywright
  * @returns {Promise<void>} Resolves when the predictions modal is dismissed.
  */
-export const dismisspredictionsModalPlaywright = async (): Promise<void> => {
-  try {
-    await PlaywrightAssertions.expectElementToBeVisible(
-      await asPlaywrightElement(PredictModalView.notNowButton),
-    );
-    await PredictModalView.tapNotNowButton();
-  } catch {
-    logger.error('Predict Modal Not Now Button is not visible');
+export const dismisspredictionsModalPlaywright = async (
+  maxRetries = 3,
+): Promise<void> => {
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      const btn = await asPlaywrightElement(PredictModalView.notNowButton);
+      await PlaywrightGestures.waitAndTap(btn, {
+        timeout: 10_000,
+        checkForDisplayed: true,
+        checkForEnabled: true,
+      });
+      const dismissedCheck = await asPlaywrightElement(
+        PredictModalView.notNowButton,
+      );
+      await dismissedCheck
+        .unwrap()
+        .waitForDisplayed({ reverse: true, timeout: 10_000 });
+      return;
+    } catch {
+      if (attempt === maxRetries) {
+        logger.error(
+          `Predict modal not dismissed after ${maxRetries} attempts`,
+        );
+      }
+    }
   }
 };
 
@@ -537,9 +635,6 @@ export const onboardingFlowImportSRPPlaywright = async (
   await ImportWalletView.typeSecretRecoveryPhrase(srp, true);
 
   await ImportWalletView.tapContinueButton();
-  await PlaywrightAssertions.expectElementToBeVisible(
-    await asPlaywrightElement(CreatePasswordView.newPasswordInput),
-  );
 
   await CreatePasswordView.enterPassword(
     getPasswordForScenario('onboarding') ?? '',
@@ -549,17 +644,27 @@ export const onboardingFlowImportSRPPlaywright = async (
   );
   await CreatePasswordView.tapIUnderstandCheckBox();
   await CreatePasswordView.tapCreatePasswordButton();
-
   await PlaywrightAssertions.expectElementToBeVisible(
-    await asPlaywrightElement(MetaMetricsOptInView.screenTitle),
+    await asPlaywrightElement(MetaMetricsOptInView.iAgreeButton),
   );
   await MetaMetricsOptInView.tapIAgreeButton();
-
+  await dismissOnboardingInterestQuestionnaire();
   await PlaywrightAssertions.expectElementToBeVisible(
     await asPlaywrightElement(OnboardingSuccessView.doneButton),
+    { timeout: 30_000 },
   );
   await OnboardingSuccessView.tapDone();
-  await dismisspredictionsModalPlaywright();
+  const productionFeatureFlags = await fetchProductionFeatureFlags(
+    'main',
+    testEnvironment,
+  );
+
+  const predictGtmOnboardingModalEnabled =
+    await resolvePredictGtmOnboardingModalEnabled(productionFeatureFlags);
+  if (predictGtmOnboardingModalEnabled) {
+    await dismisspredictionsModalPlaywright();
+  }
+
   await PlaywrightAssertions.expectElementToBeVisible(
     await asPlaywrightElement(WalletView.container),
   );
diff --git a/tests/framework/Constants.ts b/tests/framework/Constants.ts
index 2ac00297754f..332bf0765cf8 100644
--- a/tests/framework/Constants.ts
+++ b/tests/framework/Constants.ts
@@ -12,9 +12,23 @@ export const LOCAL_NODE_RPC_URL = `http://localhost:${DEFAULT_ANVIL_PORT}`;
 // Kept low to enable fast retries in polling loops; use withImplicitWait() for longer waits.
 export const DEFAULT_IMPLICIT_WAIT_MS = 3_500;
 
+// Default WDA snapshot settings — must match the values in the Appium capability configs.
+export const DEFAULT_SNAPSHOT_MAX_DEPTH = 62;
+export const DEFAULT_SNAPSHOT_MAX_CHILDREN = 50;
+export const DEFAULT_CUSTOM_SNAPSHOT_TIMEOUT = 15;
+
 // Default action timeout for Playwright/WebDriverIO actions (tap, click, type, etc.) in ms.
 export const DEFAULT_ACTION_TIMEOUT_MS = 5_000;
 
+/** WebDriver HTTP timeout for BrowserStack session creation (grid can take several minutes). */
+export const DEFAULT_BROWSERSTACK_CONNECTION_RETRY_TIMEOUT_MS = 300_000;
+
+/** BrowserStack maximum allowed idle timeout between WebDriver commands, in seconds. */
+export const DEFAULT_BROWSERSTACK_IDLE_TIMEOUT_SECONDS = 300;
+
+/** Appium new command timeout for BrowserStack sessions, in seconds. */
+export const DEFAULT_BROWSERSTACK_NEW_COMMAND_TIMEOUT_SECONDS = 300;
+
 // Port Constants
 // Fallback ports - used in fixture data (app's persisted state)
 // Android: These ports are mapped to actual PortManager-allocated ports via adb reverse
diff --git a/tests/framework/GestureStrategy.ts b/tests/framework/GestureStrategy.ts
index 73bc20c05b4a..564b8a34c4db 100644
--- a/tests/framework/GestureStrategy.ts
+++ b/tests/framework/GestureStrategy.ts
@@ -32,6 +32,12 @@ export interface UnifiedGestureOptions {
   checkForDisplayed?: boolean;
   /** Check if the element is enabled — Appium only; Detox ignores this */
   checkForEnabled?: boolean;
+  /** Stricter enabled polling (Android attrs + stable reads) — Appium only */
+  waitForInteractive?: boolean;
+  /** Consecutive interactive polls required before tap — Appium only */
+  enabledStableReads?: number;
+  /** Extra wait (ms) after enabled/interactive, before click — Appium only */
+  postEnabledSettleMs?: number;
 }
 
 /**
@@ -333,11 +339,23 @@ export class AppiumGestureStrategy implements GestureStrategy {
   /**
    * Wait for an element to be visible and then tap it
    * @param elem - The element to wait and tap
+   * @param opts - The options for the wait and tap
    * @returns A promise that resolves when the wait and tap is complete
    */
-  async waitAndTap(elem: EncapsulatedElementType): Promise<void> {
+  async waitAndTap(
+    elem: EncapsulatedElementType,
+    opts?: UnifiedGestureOptions,
+  ): Promise<void> {
     const el = await asPlaywrightElement(elem);
-    await PlaywrightGestures.waitAndTap(el);
+    await PlaywrightGestures.waitAndTap(el, {
+      timeout: opts?.timeout,
+      delay: opts?.delay,
+      checkForDisplayed: opts?.checkForDisplayed,
+      checkForEnabled: opts?.checkForEnabled,
+      waitForInteractive: opts?.waitForInteractive,
+      enabledStableReads: opts?.enabledStableReads,
+      postEnabledSettleMs: opts?.postEnabledSettleMs,
+    });
   }
 
   /**
diff --git a/tests/framework/PlaywrightAdapter.ts b/tests/framework/PlaywrightAdapter.ts
index 17ea61ba29ab..4e198cffc98e 100644
--- a/tests/framework/PlaywrightAdapter.ts
+++ b/tests/framework/PlaywrightAdapter.ts
@@ -86,6 +86,14 @@ export class PlaywrightElement {
     return await this.elem.isEnabled();
   }
 
+  /**
+   * Check if elem is displayed and enabled (WebdriverIO isClickable).
+   */
+  @boxedStep
+  async isClickable(): Promise<boolean> {
+    return await this.elem.isClickable();
+  }
+
   /**
    * Get attribute value (Playwright-style)
    * Maps to WebdriverIO's getAttribute()
diff --git a/tests/framework/PlaywrightAssertions.ts b/tests/framework/PlaywrightAssertions.ts
index c859a7363708..f9183f80570c 100644
--- a/tests/framework/PlaywrightAssertions.ts
+++ b/tests/framework/PlaywrightAssertions.ts
@@ -2,22 +2,140 @@ import { BASE_DEFAULTS, sleep } from './Utilities.ts';
 import { AssertionOptions } from './types.ts';
 import type { PlaywrightElement } from './PlaywrightAdapter.ts';
 import PlaywrightMatchers from './PlaywrightMatchers.ts';
+import PlaywrightGestures from './PlaywrightGestures.ts';
+import {
+  addOverhead,
+  isOverheadTrackingActive,
+} from './PlaywrightUtilities.ts';
 
 export interface VisibilityWithSettleOptions extends AssertionOptions {
   settleMs?: number;
 }
 
+/**
+ * Assertion helpers that integrate with TimerHelper's automatic overhead
+ * tracking so performance measurements reflect real app latency.
+ *
+ * ## How overhead compensation works
+ *
+ * Every Appium WebDriver command (findElement, isExisting, etc.) carries a
+ * round-trip cost that on BrowserStack can be 3-18 s per call.  When a
+ * `measure()` block wraps an assertion the raw wall-clock duration would be
+ * dominated by that infrastructure latency, not by the app.
+ *
+ * To compensate we track two kinds of overhead:
+ *
+ * 1. **Element resolution** — the initial `$('~id')` HTTP call that locates
+ * the element selector. Tracked in `expectElementToBeVisible`.
+ *
+ * 2. **Overhead probe** — after the element is confirmed visible we
+ * immediately call `isExisting()` once more. Because the element is
+ * already on-screen the entire call duration is pure Appium/network
+ * overhead. This is the best single-call estimate we can get.
+ *
+ * `addOverhead()` is a no-op when no `measure()` is active, so these calls
+ * are zero-cost for tests that don't use TimerHelper.
+ */
 export default class PlaywrightAssertions {
   private static getTimeout(options: AssertionOptions): number {
     return options.timeout ?? BASE_DEFAULTS.timeout;
   }
 
+  /**
+   * Polls for element existence using a single WebDriver command per attempt
+   * (`isExisting`).  This avoids the multiple internal HTTP round-trips that
+   * WebdriverIO's `waitForDisplayed` performs on each iteration.
+   *
+   * Overhead tracking logic:
+   * - If the **first** `isExisting()` already returns `true`, the element
+   * was visible before or during the network round-trip. The entire call
+   * duration is infra overhead (BrowserStack latency, WDA snapshot) so
+   * it is registered via `addOverhead`.
+   * - Subsequent failed calls (element not yet visible) are NOT overhead
+   * — the app is genuinely still loading during those calls.
+   * - After detection a {@link probeOverhead} call measures the pure
+   * per-command cost and registers it for subtraction.
+   */
+  private static async pollUntilVisible(
+    el: PlaywrightElement,
+    timeout: number,
+  ): Promise<void> {
+    const interval = 300;
+    const start = Date.now();
+    let attempt = 0;
+    while (Date.now() - start < timeout - interval) {
+      try {
+        attempt++;
+        const t0 = Date.now();
+        const exists = await el.unwrap().isExisting();
+        if (exists) {
+          if (isOverheadTrackingActive()) {
+            await this.probeOverhead(el);
+          }
+          return;
+        }
+      } catch {
+        // element not ready yet
+      }
+      await sleep(interval);
+    }
+    await el.waitForDisplayed({
+      timeout: Math.max(interval, timeout - (Date.now() - start)),
+    });
+    if (isOverheadTrackingActive()) {
+      await this.probeOverhead(el);
+    }
+  }
+
+  /**
+   * Measures pure Appium/network overhead by running `isExisting()` on an
+   * element that is already visible.  The entire call duration is infra cost
+   * (network round-trip + WDA snapshot) with no app-loading component.
+   */
+  private static async probeOverhead(el: PlaywrightElement): Promise<void> {
+    const t0 = Date.now();
+    await el.unwrap().isExisting();
+    addOverhead(Date.now() - t0);
+  }
+
+  /**
+   * Asserts that a target element eventually becomes visible.
+   *
+   * When called inside a `TimerHelper.measure()` block two overhead sources
+   * are automatically tracked and later subtracted:
+   * - Element resolution (`await targetElement`) — the initial WebDriver
+   * `findElement` call that resolves the selector.
+   * - Post-detection probe — one extra `isExisting()` call after the element
+   * is confirmed visible (see {@link probeOverhead}).
+   */
   static async expectElementToBeVisible(
     targetElement: PlaywrightElement | Promise<PlaywrightElement>,
     options: AssertionOptions = {},
   ): Promise<void> {
+    const t0 = Date.now();
     const el = await targetElement;
-    await el.waitForDisplayed({ timeout: this.getTimeout(options) });
+    if (isOverheadTrackingActive()) {
+      addOverhead(Date.now() - t0);
+    }
+    await this.pollUntilVisible(el, this.getTimeout(options));
+  }
+
+  /**
+   * Waits until an element stays enabled (and on Android, native attrs are not false).
+   * Prefer waitForInteractive on waitAndTap for tap flows.
+   */
+  static async expectElementToBeInteractive(
+    targetElement: PlaywrightElement | Promise<PlaywrightElement>,
+    options: AssertionOptions = {},
+  ): Promise<void> {
+    const el = await targetElement;
+    await PlaywrightGestures.waitUntilInteractive(
+      el,
+      this.getTimeout(options),
+      {
+        requiredStableReads: 3,
+      },
+    );
   }
 
   static async expectElementToBeVisibleWithSettle(
@@ -33,6 +151,71 @@ export default class PlaywrightAssertions {
     }
   }
 
+  /**
+   * Asserts that multiple elements become visible.
+   *
+   * Checks run sequentially because a WebDriver session serialises all
+   * commands — `Promise.all` would not actually parallelise anything and
+   * instead causes timeout and overhead-tracking issues.
+   *
+   * Sequential execution lets each element keep its full timeout and
+   * reuses the per-element overhead tracking that already works for
+   * single-element assertions.
+   */
+  static async expectAllElementsToBeVisible(
+    elements: (PlaywrightElement | Promise<PlaywrightElement>)[],
+    options: AssertionOptions = {},
+  ): Promise<void> {
+    for (const el of elements) {
+      await this.expectElementToBeVisible(el, options);
+    }
+  }
+
+  /**
+   * Polls until an element's text content matches the expected value.
+   *
+   * Overhead tracking follows the same pattern as {@link pollUntilVisible}:
+   * if the text already matches on the first attempt the entire call
+   * duration is registered as infra overhead; a post-match probe captures
+   * the per-command cost.
+   */
+  static async expectElementText(
+    targetElement: PlaywrightElement | Promise<PlaywrightElement>,
+    expected: string,
+    options: AssertionOptions = {},
+  ): Promise<void> {
+    const t0Resolve = Date.now();
+    const el = await targetElement;
+    if (isOverheadTrackingActive()) {
+      addOverhead(Date.now() - t0Resolve);
+    }
+
+    const timeout = this.getTimeout(options);
+    const interval = 300;
+    const start = Date.now();
+    let attempt = 0;
+    while (Date.now() - start < timeout) {
+      try {
+        attempt++;
+        const t0 = Date.now();
+        const text = await el.textContent();
+        if (text === expected) {
+          if (attempt === 1) {
+            addOverhead(Date.now() - t0);
+          }
+          if (isOverheadTrackingActive()) {
+            await this.probeOverhead(el);
+          }
+          return;
+        }
+      } catch {
+        // element not ready yet
+      }
+      await sleep(interval);
+    }
+    throw new Error(`Expected element text "${expected}" within ${timeout}ms`);
+  }
+
   static async expectElementToNotBeVisible(
     targetElement: PlaywrightElement | Promise<PlaywrightElement>,
     options: AssertionOptions = {},
diff --git a/tests/framework/PlaywrightGestures.ts b/tests/framework/PlaywrightGestures.ts
index 026d6810647e..7cd103f06c6d 100644
--- a/tests/framework/PlaywrightGestures.ts
+++ b/tests/framework/PlaywrightGestures.ts
@@ -76,6 +76,71 @@ export default class PlaywrightGestures {
     }
   }
 
+  private static async isAndroidSession(): Promise<boolean> {
+    const drv = getDriver();
+    const platform = String(
+      (await drv.capabilities)?.platformName ?? '',
+    ).toLowerCase();
+    return platform.includes('android');
+  }
+
+  /**
+   * Android often reports isEnabled=true while the RN control is still disabled.
+   * Uses isEnabled plus native clickable/enabled attributes only — isClickable()
+   * is a Web/DOM API and is not implemented on Appium Android (always fails).
+   */
+  private static async isElementInteractive(
+    elem: PlaywrightElement,
+  ): Promise<boolean> {
+    if (!(await elem.isEnabled())) {
+      return false;
+    }
+
+    if (!(await this.isAndroidSession())) {
+      return true;
+    }
+
+    try {
+      const [clickableAttr, enabledAttr] = await Promise.all([
+        elem.getAttribute('clickable'),
+        elem.getAttribute('enabled'),
+      ]);
+      return clickableAttr !== 'false' && enabledAttr !== 'false';
+    } catch {
+      return true;
+    }
+  }
+
+  /**
+   * Polls until the element stays interactive for consecutive reads.
+   */
+  static async waitUntilInteractive(
+    elem: PlaywrightElement,
+    timeout: number,
+    options?: { requiredStableReads?: number; interval?: number },
+  ): Promise<void> {
+    const interval = options?.interval ?? 250;
+    const requiredStableReads = options?.requiredStableReads ?? 6;
+    const start = Date.now();
+    let consecutiveInteractive = 0;
+
+    while (Date.now() - start < timeout - interval) {
+      if (await this.isElementInteractive(elem)) {
+        consecutiveInteractive += 1;
+        if (consecutiveInteractive >= requiredStableReads) {
+          return;
+        }
+      } else {
+        consecutiveInteractive = 0;
+      }
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+
+    throw new Error(
+      `Element was not interactive for ${requiredStableReads} consecutive checks within ${timeout}ms`,
+    );
+  }
+
   @boxedStep
   static async waitAndTap(
     elem: PlaywrightElement,
@@ -84,23 +149,40 @@ export default class PlaywrightGestures {
       timeout?: number;
       checkForDisplayed?: boolean;
       checkForEnabled?: boolean;
+      /** Stricter Android enabled polling (login unlock, etc.) */
+      waitForInteractive?: boolean;
       checkForStable?: boolean;
+      enabledStableReads?: number;
+      postEnabledSettleMs?: number;
     },
   ): Promise<void> {
     const {
+      timeout = 10000,
       delay = 500,
-      timeout,
       checkForDisplayed = true,
       checkForEnabled = true,
+      waitForInteractive = false,
       checkForStable = false,
+      enabledStableReads = 3,
+      postEnabledSettleMs,
     } = options || {};
 
     if (checkForDisplayed) {
-      await elem.unwrap().waitForDisplayed({ timeout: timeout ?? 10000 });
+      await elem.unwrap().waitForDisplayed({ timeout });
     }
 
     if (checkForEnabled) {
-      await elem.unwrap().waitForEnabled({ timeout: timeout ?? 5000 });
+      if (waitForInteractive) {
+        await this.waitUntilInteractive(elem, timeout, {
+          requiredStableReads: enabledStableReads,
+        });
+        const settleMs = postEnabledSettleMs ?? 0;
+        if (settleMs > 0) {
+          await new Promise((resolve) => setTimeout(resolve, settleMs));
+        }
+      } else {
+        await elem.waitForEnabled({ timeout });
+      }
     }
 
     if (checkForStable) {
@@ -385,17 +467,14 @@ export default class PlaywrightGestures {
     if (PlatformDetector.isAndroid()) {
       await drv.hideKeyboard();
     } else {
-      // iOS - try pressKey strategy first, fallback to tap outside
+      // iOS - tapOutside dismisses the keyboard by tapping outside the focused
+      // element, which works regardless of keyboard type (password, numeric, etc.)
       try {
         await drv.executeScript('mobile: hideKeyboard', [
-          {
-            strategy: 'pressKey',
-            key: keyName,
-          },
+          { strategy: 'pressKey', key: keyName },
         ]);
       } catch {
-        // Fallback: tap outside the keyboard area (top of screen)
-        await drv.tap({ x: 100, y: 150 });
+        // Keyboard may already be hidden
       }
     }
   }
diff --git a/tests/framework/PlaywrightMatchers.ts b/tests/framework/PlaywrightMatchers.ts
index 7037bc93d201..1df588b910a9 100644
--- a/tests/framework/PlaywrightMatchers.ts
+++ b/tests/framework/PlaywrightMatchers.ts
@@ -51,7 +51,7 @@ export default class PlaywrightMatchers {
     elementId: string,
     options: MatcherOptions = {},
   ): Promise<PlaywrightElement> {
-    const { exact = false } = options;
+    const { exact = true } = options;
 
     let locator: string;
     const isAndroid = await PlatformDetector.isAndroid();
@@ -61,10 +61,9 @@ export default class PlaywrightMatchers {
         ? `${locator}.resourceId("${elementId}")`
         : `${locator}.resourceIdMatches(".*${elementId}.*")`;
     } else {
-      locator = '-ios predicate string:';
       locator = exact
-        ? `${locator}name == "${elementId}"`
-        : `${locator}name CONTAINS "${elementId}"`;
+        ? `~${elementId}`
+        : `-ios predicate string:name CONTAINS "${elementId}"`;
     }
 
     const drv = getDriver();
@@ -78,15 +77,15 @@ export default class PlaywrightMatchers {
    * @param text - The text to search for
    * @returns The wrapped element
    */
-  static async getElementByText(text: string): Promise<PlaywrightElement> {
-    const isAndroid = await PlatformDetector.isAndroid();
-
-    if (isAndroid) {
-      return await this.getElementByAndroidUIAutomator(`.text("${text}")`);
+  static async getElementByText(
+    text: string,
+    exactMatch: boolean = false,
+  ): Promise<PlaywrightElement> {
+    let xpath = `//*[contains(@name,'${text}') or contains(@label,'${text}') or contains(@text,'${text}')]`;
+    if (exactMatch) {
+      xpath = `//*[@name='${text}' or @label='${text}' or @text='${text}']`;
     }
-    return await this.getElementByXPath(
-      `//*[contains(@name,'${text}') or contains(@label,'${text}') or contains(@text,'${text}')]`,
-    );
+    return await this.getElementByXPath(xpath);
   }
 
   /**
diff --git a/tests/framework/PlaywrightUtilities.ts b/tests/framework/PlaywrightUtilities.ts
index c70e484b4a1d..e6b6e6b18c28 100644
--- a/tests/framework/PlaywrightUtilities.ts
+++ b/tests/framework/PlaywrightUtilities.ts
@@ -5,6 +5,9 @@ import { PlaywrightElement } from './PlaywrightAdapter';
 import {
   CHROME_PACKAGE,
   DEFAULT_IMPLICIT_WAIT_MS,
+  DEFAULT_SNAPSHOT_MAX_DEPTH,
+  DEFAULT_SNAPSHOT_MAX_CHILDREN,
+  DEFAULT_CUSTOM_SNAPSHOT_TIMEOUT,
   FALLBACK_FIXTURE_SERVER_PORT,
   FALLBACK_COMMAND_QUEUE_SERVER_PORT,
   FALLBACK_MOCKSERVER_PORT,
@@ -57,6 +60,35 @@ export async function withImplicitWait<T>(
   }
 }
 
+export interface SnapshotSettings {
+  snapshotMaxDepth?: number;
+  snapshotMaxChildren?: number;
+  customSnapshotTimeout?: number;
+}
+
+/**
+ * Runs a callback with temporarily adjusted WDA snapshot settings.
+ * Restores defaults afterward, even if the callback throws.
+ * Use this for heavy screens (e.g. token selector lists) where
+ * a smaller depth/children limit speeds up element lookups.
+ */
+export async function withSnapshotSettings<T>(
+  settings: SnapshotSettings,
+  fn: () => Promise<T>,
+): Promise<T> {
+  const drv = getDriver();
+  await drv.updateSettings(settings);
+  try {
+    return await fn();
+  } finally {
+    await drv.updateSettings({
+      snapshotMaxDepth: DEFAULT_SNAPSHOT_MAX_DEPTH,
+      snapshotMaxChildren: DEFAULT_SNAPSHOT_MAX_CHILDREN,
+      customSnapshotTimeout: DEFAULT_CUSTOM_SNAPSHOT_TIMEOUT,
+    });
+  }
+}
+
 /**
  * Run an async step with a timeout. Rejects after ms so callers can catch
  * and continue.
@@ -152,6 +184,50 @@ export function boxedStep<This, Args extends unknown[], Return>(
   return replacementMethod;
 }
 
+/**
+ * Lightweight Appium overhead accumulator for performance measurements.
+ *
+ * Problem: every WebDriver HTTP call (findElement, isExisting, click …) adds
+ * infrastructure latency — on BrowserStack this can be 3-18 s per command.
+ * Without compensation a 3 s app-load would be reported as 20+ s.
+ *
+ * Solution: framework methods call `addOverhead(ms)` for operations whose
+ * duration is *pure infra cost* (element resolution, post-detection probes).
+ * `TimerHelper.measure()` activates tracking before the action and subtracts
+ * the accumulated value after the timer stops.
+ *
+ * When no `measure()` is active (`_tracking === false`) all functions are
+ * no-ops, so regular (non-performance) tests pay zero cost.
+ */
+let _overheadMs = 0;
+let _tracking = false;
+
+export function startOverheadTracking(): void {
+  if (_tracking) {
+    console.warn(
+      'TimerHelper: startOverheadTracking() called while already active — nested measure() calls are not supported; inner call ignored',
+    );
+    return;
+  }
+  _overheadMs = 0;
+  _tracking = true;
+}
+
+export function addOverhead(ms: number): void {
+  if (_tracking) _overheadMs += ms;
+}
+
+export function stopOverheadTracking(): number {
+  _tracking = false;
+  const result = _overheadMs;
+  _overheadMs = 0;
+  return result;
+}
+
+export function isOverheadTrackingActive(): boolean {
+  return _tracking;
+}
+
 class PlaywrightUtilities {
   /**
    * Get the device screen size.
@@ -185,7 +261,7 @@ class PlaywrightUtilities {
         mapping[device.name] = 'Account 3';
       } else if (device.category === 'low') {
         // Low category Android devices use default Account 1
-        mapping[device.name] = null;
+        mapping[device.name] = 'Account 1';
       }
     });
 
diff --git a/tests/framework/TimerHelper.ts b/tests/framework/TimerHelper.ts
index d37aa502fe3e..71e204bbf07a 100644
--- a/tests/framework/TimerHelper.ts
+++ b/tests/framework/TimerHelper.ts
@@ -1,4 +1,8 @@
 import TimerStore from './TimerStore';
+import {
+  startOverheadTracking,
+  stopOverheadTracking,
+} from './PlaywrightUtilities';
 
 /** Platform-specific threshold values in milliseconds. */
 export interface PlatformThreshold {
@@ -15,6 +19,7 @@ const THRESHOLD_MARGIN = 0.1; // 10% margin
 class TimerHelper {
   private _id: string;
   private _baseThreshold: number | null;
+  private readonly _platform?: 'android' | 'ios';
 
   /**
    * Creates a new TimerHelper and registers a timer in the store.
@@ -28,6 +33,7 @@ class TimerHelper {
     currentPlatform?: 'android' | 'ios',
   ) {
     this._id = id;
+    this._platform = currentPlatform;
     this._baseThreshold = this._resolveThreshold(threshold, currentPlatform);
     TimerStore.createTimer(this.id);
   }
@@ -118,11 +124,53 @@ class TimerHelper {
 
   /**
    * Measures the execution time of an async action.
-   * Starts the timer before the action and stops it after completion (or failure).
+   *
+   * - **iOS**: subtracts Appium infrastructure overhead (see {@link measureWithOverhead}).
+   * - **Android**: wall-clock only (see {@link measureRaw}) — overhead cannot be
+   * separated reliably when taps overlap with app loading.
+   *
+   * Pass `currentPlatform` in the constructor so the correct strategy is chosen.
+   *
    * @param action - Async function to measure
    * @returns This TimerHelper instance for chaining
    */
   async measure(action: () => Promise<void>): Promise<TimerHelper> {
+    if (this._platform === 'android') {
+      return this.measureRaw(action);
+    }
+    return this.measureWithOverhead(action);
+  }
+
+  /**
+   * iOS-only measurement path: subtracts Appium overhead from the recorded duration.
+   *
+   * @param action - Async function to measure
+   * @returns This TimerHelper instance for chaining
+   */
+  async measureWithOverhead(action: () => Promise<void>): Promise<TimerHelper> {
+    startOverheadTracking();
+    this.start();
+    try {
+      await action();
+    } finally {
+      this.stop();
+    }
+    const overhead = stopOverheadTracking();
+    if (overhead > 0) {
+      this.subtractOverhead(overhead);
+    }
+    return this;
+  }
+
+  /**
+   * Android-oriented wall-clock measurement (no Appium overhead subtraction).
+   *
+   * Prefer {@link measure} in specs — it selects this path on Android automatically.
+   *
+   * @param action - Async function to measure
+   * @returns This TimerHelper instance for chaining
+   */
+  async measureRaw(action: () => Promise<void>): Promise<TimerHelper> {
     this.start();
     try {
       await action();
@@ -150,6 +198,21 @@ class TimerHelper {
     return this._baseThreshold !== null;
   }
 
+  /**
+   * Subtracts a measured overhead (e.g. Appium roundtrip) from the recorded duration.
+   * Useful to isolate real app performance from test framework latency.
+   * @param overheadMs - Overhead in milliseconds to subtract
+   */
+  subtractOverhead(overheadMs: number): void {
+    const timer = TimerStore.getTimer(this.id);
+    if (timer.duration === null) {
+      throw new Error(
+        `Timer "${this.id}" has no duration yet. Call stop() first.`,
+      );
+    }
+    timer.duration = Math.max(0, timer.duration - overheadMs);
+  }
+
   /** The unique identifier for this timer. */
   get id(): string {
     return this._id;
diff --git a/tests/framework/config/ConfigHandler.ts b/tests/framework/config/ConfigHandler.ts
index a11d5dcab79a..65f2764d9588 100644
--- a/tests/framework/config/ConfigHandler.ts
+++ b/tests/framework/config/ConfigHandler.ts
@@ -23,7 +23,7 @@ const defaultConfig: PlaywrightTestConfig<WebDriverConfig> = {
   // used across tests in a file where they run sequentially
   fullyParallel: false,
   forbidOnly: false,
-  retries: isCI ? 1 : 0,
+  retries: isCI ? 2 : 0,
   workers: 1,
   reporter: [['list'], ['html', { open: 'always' }]],
   timeout: 300_000,
diff --git a/tests/framework/fixture/index.ts b/tests/framework/fixture/index.ts
index 42513164a1d3..ba9d2db95d17 100644
--- a/tests/framework/fixture/index.ts
+++ b/tests/framework/fixture/index.ts
@@ -19,6 +19,7 @@ import {
   hasQualityGateFailure,
   markQualityGateFailure,
   QualityGatesValidator,
+  QualityGateError,
 } from '../quality-gates';
 import { getTeamInfoFromTags } from '../utils/teams';
 import { publishPerformanceScenarioToSentry } from '../../reporters/providers/sentry/PerformanceSentryPublisher';
@@ -247,21 +248,21 @@ export const test = base.extend<TestLevelFixtures>({
     const isSystemTestMode = process.env.SYSTEM_TEST_MODE === 'true';
     const testId = getTestId(testInfo);
 
-    // Skip retry if previous attempt failed due to quality gates
-    // Quality gate failures should NOT be retried - the measurement was valid, only threshold exceeded
+    // Abort retry if previous attempt failed due to quality gates.
+    // Quality gate failures should NOT be retried - the measurement was valid,
+    // only the threshold was exceeded. We throw (not skip) so Playwright counts
+    // all attempts as failed and reports the test as "failed" rather than "flaky".
     if (
       !isSystemTestMode &&
       testInfo.retry > 0 &&
       hasQualityGateFailure(testId)
     ) {
       console.log(
-        `⏭️ Skipping retry for "${testInfo.title}" - previous attempt failed due to Quality Gates (threshold exceeded, not a test execution error)`,
+        `⏭️ Aborting retry for "${testInfo.title}" - previous attempt failed due to Quality Gates (threshold exceeded, not a test execution error)`,
       );
-      testInfo.skip(
-        true,
-        'Skipped retry: Quality Gates failed in previous attempt. Performance threshold was exceeded but test execution was successful.',
+      throw new QualityGateError(
+        `Quality Gates failed on a previous attempt for "${testInfo.title}". Retries are not allowed for quality gate failures.`,
       );
-      return;
     }
 
     const performanceTracker = new PerformanceTracker();
@@ -292,6 +293,13 @@ export const test = base.extend<TestLevelFixtures>({
       console.log('⚠️ No timers found in performance tracker');
     }
 
+    // Propagate BrowserStack session creation time (infra overhead, not counted in total)
+    if (deviceProvider.sessionCreationDurationMs !== undefined) {
+      performanceTracker.setSessionCreationDuration(
+        deviceProvider.sessionCreationDurationMs,
+      );
+    }
+
     // Always try to attach performance metrics, even if test failed
     let metrics: MetricsOutput | null = null;
     try {
diff --git a/tests/framework/index.ts b/tests/framework/index.ts
index d6179b1e74b3..92f911a7f332 100644
--- a/tests/framework/index.ts
+++ b/tests/framework/index.ts
@@ -12,7 +12,15 @@ export {
   deriveEventNamesForFetch,
   shouldRunAnalyticsExpectations,
 } from '../helpers/analytics/runAnalyticsExpectations.ts';
-export { boxedStep, getDriver } from './PlaywrightUtilities.ts';
+export {
+  boxedStep,
+  getDriver,
+  withSnapshotSettings,
+  startOverheadTracking,
+  addOverhead,
+  stopOverheadTracking,
+  isOverheadTrackingActive,
+} from './PlaywrightUtilities.ts';
 
 // Mock server utilities
 export { safeGetBodyText } from '../api-mocking/MockServerE2E.ts';
diff --git a/tests/framework/quality-gates/QualityGatesReportFormatter.ts b/tests/framework/quality-gates/QualityGatesReportFormatter.ts
index 6ec03094917d..f3acc056e3c8 100644
--- a/tests/framework/quality-gates/QualityGatesReportFormatter.ts
+++ b/tests/framework/quality-gates/QualityGatesReportFormatter.ts
@@ -12,7 +12,10 @@ class QualityGatesReportFormatter {
   /**
    * Format validation result as a console report
    */
-  formatConsoleReport(result: QualityGatesResult): string {
+  formatConsoleReport(
+    result: QualityGatesResult,
+    sessionCreationDurationMs?: number,
+  ): string {
     if (!result.hasThresholds) {
       return `⚠️ No quality gates defined for: ${result.summary.testName}`;
     }
@@ -28,6 +31,11 @@ class QualityGatesReportFormatter {
     );
     lines.push(`Test: ${result.summary.testName}`);
     lines.push(`Status: ${result.passed ? '✅ PASSED' : '❌ FAILED'}`);
+    if (sessionCreationDurationMs !== undefined) {
+      lines.push(
+        `BrowserStack Session Creation: ${sessionCreationDurationMs}ms (${(sessionCreationDurationMs / 1000).toFixed(2)}s) — infra overhead`,
+      );
+    }
     lines.push(
       '───────────────────────────────────────────────────────────────',
     );
diff --git a/tests/framework/services/common/base/BaseServiceProvider.ts b/tests/framework/services/common/base/BaseServiceProvider.ts
index acd58af633ac..005aca41423f 100644
--- a/tests/framework/services/common/base/BaseServiceProvider.ts
+++ b/tests/framework/services/common/base/BaseServiceProvider.ts
@@ -9,6 +9,7 @@ import { createLogger, type Logger } from '../../../logger';
  */
 export abstract class BaseServiceProvider implements ServiceProvider {
   sessionId?: string;
+  sessionCreationDurationMs?: number;
   protected readonly project: ProjectConfig;
   protected readonly logger: Logger;
 
diff --git a/tests/framework/services/common/interfaces/ServiceProvider.ts b/tests/framework/services/common/interfaces/ServiceProvider.ts
index a234db6397c4..4da4b7a97713 100644
--- a/tests/framework/services/common/interfaces/ServiceProvider.ts
+++ b/tests/framework/services/common/interfaces/ServiceProvider.ts
@@ -10,6 +10,12 @@ export interface ServiceProvider {
    */
   sessionId?: string;
 
+  /**
+   * Time in milliseconds from session creation request to session ready.
+   * Only populated by providers that involve remote session allocation (e.g. BrowserStack).
+   */
+  sessionCreationDurationMs?: number;
+
   /**
    * Global setup - validates configuration before tests run
    */
diff --git a/tests/framework/services/common/types.ts b/tests/framework/services/common/types.ts
index d03faac6a15d..241df3043df2 100644
--- a/tests/framework/services/common/types.ts
+++ b/tests/framework/services/common/types.ts
@@ -19,5 +19,8 @@ export interface CommonCapabilities {
   'appium:fullReset'?: boolean;
   'appium:deviceOrientation'?: string;
   'appium:settings[snapshotMaxDepth]'?: number;
+  'appium:settings[snapshotMaxChildren]'?: number;
+  'appium:settings[useFirstMatch]'?: boolean;
+  'appium:settings[pageSourceExcludedAttributes]'?: string;
   platformName?: string;
 }
diff --git a/tests/framework/services/providers/browserstack/BrowserStackConfigBuilder.ts b/tests/framework/services/providers/browserstack/BrowserStackConfigBuilder.ts
index 4f866f982408..3b640bcde95e 100644
--- a/tests/framework/services/providers/browserstack/BrowserStackConfigBuilder.ts
+++ b/tests/framework/services/providers/browserstack/BrowserStackConfigBuilder.ts
@@ -2,6 +2,11 @@
 import path from 'path';
 import type { BrowserStackConfig } from '../../../types';
 import type { ProjectConfig } from '../../common/types';
+import {
+  DEFAULT_BROWSERSTACK_CONNECTION_RETRY_TIMEOUT_MS,
+  DEFAULT_BROWSERSTACK_IDLE_TIMEOUT_SECONDS,
+  DEFAULT_BROWSERSTACK_NEW_COMMAND_TIMEOUT_SECONDS,
+} from '../../../Constants';
 import { createLogger, LogLevel } from '../../../logger';
 
 const logger = createLogger({
@@ -63,6 +68,21 @@ export class BrowserStackConfigBuilder {
       `Building BrowserStack config with device build identifier: ${process.env.GITHUB_ACTIONS === 'true' ? `CI ${process.env.GITHUB_RUN_ID}` : process.env.USER}`,
     );
 
+    const connectionRetryTimeoutMs = Number.parseInt(
+      process.env.BROWSERSTACK_CONNECTION_RETRY_TIMEOUT_MS ?? '',
+      10,
+    );
+    const connectionRetryTimeout = Number.isFinite(connectionRetryTimeoutMs)
+      ? connectionRetryTimeoutMs
+      : DEFAULT_BROWSERSTACK_CONNECTION_RETRY_TIMEOUT_MS;
+
+    logger.info(
+      `BrowserStack WebDriver connectionRetryTimeout: ${connectionRetryTimeout}ms`,
+    );
+    logger.info(
+      `BrowserStack idleTimeout: ${DEFAULT_BROWSERSTACK_IDLE_TIMEOUT_SECONDS}s, newCommandTimeout: ${DEFAULT_BROWSERSTACK_NEW_COMMAND_TIMEOUT_SECONDS}s`,
+    );
+
     return {
       port: 443,
       path: '/wd/hub',
@@ -71,6 +91,9 @@ export class BrowserStackConfigBuilder {
       user: username,
       key: accessKey,
       hostname: 'hub.browserstack.com',
+      // Default webdriver is 120s; BS session POST often exceeds that on busy grids.
+      connectionRetryTimeout,
+      connectionRetryCount: 3,
       capabilities: {
         'bstack:options': {
           debug: true,
@@ -81,13 +104,13 @@ export class BrowserStackConfigBuilder {
           },
           networkLogs: true,
           appiumVersion: '3.1.0',
-          idleTimeout: 180,
+          idleTimeout: DEFAULT_BROWSERSTACK_IDLE_TIMEOUT_SECONDS,
           deviceName: device.name,
           osVersion: device.osVersion,
           platformName,
           deviceOrientation: device.orientation,
           projectName:
-            process.env.BROWSERSTACK_BUILD_NAME ||
+            process.env.BROWSERSTACK_PROJECT_NAME ||
             `${projectName} ${platformName}`,
           buildName:
             process.env.BROWSERSTACK_BUILD_NAME ||
@@ -113,11 +136,16 @@ export class BrowserStackConfigBuilder {
           ? {
               'appium:appPackage': this.project.use.app?.packageName,
               'appium:appActivity': this.project.use.app?.launchableActivity,
+              'appium:disableIdLocatorAutocompletion': true,
             }
           : {
               'appium:bundleId': this.project.use.app?.appId,
+              'appium:shouldUseCompactResponses': true,
+              'appium:elementResponseAttributes':
+                'name,label,value,type,enabled,visible,rect',
             }),
-        'appium:newCommandTimeout': 300,
+        'appium:newCommandTimeout':
+          DEFAULT_BROWSERSTACK_NEW_COMMAND_TIMEOUT_SECONDS,
         'appium:automationName':
           platformName === 'android' ? 'UiAutomator2' : 'XCUITest',
         'appium:autoGrantPermissions': true,
@@ -133,7 +161,7 @@ export class BrowserStackConfigBuilder {
         'appium:waitForQuiescence': false, // Don't wait for app idle
         'appium:animationCoolOffTimeout': 0, // Skip animation wait
         'appium:reduceMotion': true, // Reduce iOS animations
-        'appium:customSnapshotTimeout': 15, // Snapshot timeout in seconds"
+        'appium:customSnapshotTimeout': 15,
         'appium:waitForIdleTimeout': 0, // Don't wait for idle
         'appium:disableWindowAnimation': true, // Disable animations
         'appium:skipDeviceInitialization': true, // Skip init (faster startup)
@@ -141,7 +169,7 @@ export class BrowserStackConfigBuilder {
           enable: true,
           samplesX: 3,
           samplesY: 3,
-          maxDepth: 15,
+          maxDepth: 100,
         },
       },
     };
diff --git a/tests/framework/services/providers/browserstack/BrowserStackProvider.ts b/tests/framework/services/providers/browserstack/BrowserStackProvider.ts
index e3d34beae00c..f1550e952cc3 100644
--- a/tests/framework/services/providers/browserstack/BrowserStackProvider.ts
+++ b/tests/framework/services/providers/browserstack/BrowserStackProvider.ts
@@ -28,16 +28,20 @@ export class BrowserStackProvider extends BaseServiceProvider {
    * Create and return WebDriver browser instance for BrowserStack
    */
   async getDriver(): Promise<Browser> {
-    this.logger.debug('Creating driver for BrowserStack');
+    this.logger.info(
+      'Creating BrowserStack session (this can take several minutes on a busy grid)…',
+    );
 
     const configBuilder = new BrowserStackConfigBuilder(this.project);
     const config = configBuilder.build();
 
+    const sessionCreationStart = Date.now();
     const browser = await remote(config);
+    this.sessionCreationDurationMs = Date.now() - sessionCreationStart;
     this.sessionId = browser.sessionId;
 
     this.logger.info(
-      `Driver created for BrowserStack with session: ${this.sessionId}`,
+      `Driver created for BrowserStack with session: ${this.sessionId} (session creation took ${this.sessionCreationDurationMs}ms)`,
     );
     return browser;
   }
diff --git a/tests/framework/services/providers/emulator/EmulatorConfigBuilder.ts b/tests/framework/services/providers/emulator/EmulatorConfigBuilder.ts
index 52a5cec4b989..5b9bd94a89a3 100644
--- a/tests/framework/services/providers/emulator/EmulatorConfigBuilder.ts
+++ b/tests/framework/services/providers/emulator/EmulatorConfigBuilder.ts
@@ -65,17 +65,17 @@ export class EmulatorConfigBuilder {
         'appium:fullReset': false,
         'appium:noReset': true,
         'appium:settings[snapshotMaxDepth]': 62,
+        'appium:waitForQuiescence': false, // Don't wait for app idle
+        'appium:animationCoolOffTimeout': 0, // Skip animation wait
+        'appium:reduceMotion': true, // Reduce iOS animations
+        'appium:waitForIdleTimeout': 0, // Don't wait for idle
         'appium:wdaLaunchTimeout': 300_000,
         'appium:includeSafariInWebviews': true,
         'appium:settings[actionAcknowledgmentTimeout]': 3000,
         'appium:settings[ignoreUnimportantViews]': true,
         'appium:settings[waitForSelectorTimeout]': 1000,
         'appium:chromedriverAutodownload': true,
-        'appium:waitForQuiescence': false, // Don't wait for app idle
-        'appium:animationCoolOffTimeout': 0, // Skip animation wait
-        'appium:reduceMotion': true, // Reduce iOS animations
-        'appium:customSnapshotTimeout': 15, // Snapshot timeout in seconds"
-        'appium:waitForIdleTimeout': 0, // Don't wait for idle
+        'appium:customSnapshotTimeout': 15, // Snapshot timeout in seconds
         'appium:disableWindowAnimation': true, // Disable animations
         'appium:skipDeviceInitialization': true, // Skip init (faster startup)
       },
diff --git a/tests/framework/utils/TestConstants.js b/tests/framework/utils/TestConstants.js
index 04ffbd7e83ad..394e605e463d 100644
--- a/tests/framework/utils/TestConstants.js
+++ b/tests/framework/utils/TestConstants.js
@@ -32,6 +32,7 @@ export const TEST_SRP = {
   SRP_1: process.env.TEST_SRP_1,
   SRP_2: process.env.TEST_SRP_2,
   SRP_3: process.env.TEST_SRP_3,
+  SRP_4: process.env.TEST_SRP_4,
 };
 
 function getRequiredLoginPassword() {
diff --git a/tests/page-objects/Confirmation/TransactionPayConfirmation.ts b/tests/page-objects/Confirmation/TransactionPayConfirmation.ts
index 20e5303c3bce..e889aa4cac44 100644
--- a/tests/page-objects/Confirmation/TransactionPayConfirmation.ts
+++ b/tests/page-objects/Confirmation/TransactionPayConfirmation.ts
@@ -2,6 +2,7 @@ import {
   ConfirmationRowComponentIDs,
   TransactionPayComponentIDs,
 } from '../../../app/components/Views/confirmations/ConfirmationView.testIds';
+import { getAssetTestId } from '../../selectors/Wallet/WalletView.selectors';
 import { getNetworkFilterTestId } from '../../../app/components/Views/confirmations/components/network-filter/network-filter.testIds';
 import { TEXTFIELDSEARCH_TEST_ID } from '../../../app/component-library/components/Form/TextFieldSearch/TextFieldSearch.constants';
 import enContent from '../../../locales/languages/en.json';
@@ -198,6 +199,14 @@ class TransactionPayConfirmation {
     });
   }
 
+  getTokenBySymbol(symbol: string): EncapsulatedElementType {
+    const testId = getAssetTestId(symbol);
+    return encapsulated({
+      detox: () => Matchers.getElementByID(testId),
+      appium: () => PlaywrightMatchers.getElementById(testId, { exact: true }),
+    });
+  }
+
   getTokenOptionAt(
     tokenSymbol: string,
     index: number,
@@ -250,10 +259,16 @@ class TransactionPayConfirmation {
   getKeypadButton(key: string): EncapsulatedElementType {
     return encapsulated({
       detox: () => Matchers.getElementByText(key),
-      appium: () =>
-        PlaywrightMatchers.getElementById(getKeypadKeyTestId(key), {
-          exact: true,
-        }),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(getKeypadKeyTestId(key), {
+            exact: true,
+          }),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            getKeypadKeyTestId(key),
+          ),
+      },
     });
   }
 
@@ -328,19 +343,24 @@ class TransactionPayConfirmation {
 
         if (await PlatformDetector.isIOS()) {
           await PlaywrightGestures.dblTap(resolvedFilter);
-          return;
+        } else {
+          await PlaywrightGestures.waitAndTap(resolvedFilter, {
+            checkForDisplayed: true,
+            checkForEnabled: true,
+          });
         }
 
-        await PlaywrightGestures.waitAndTap(resolvedFilter, {
-          checkForDisplayed: true,
-          checkForEnabled: true,
+        await PlaywrightGestures.waitForElementStable(resolvedFilter, {
+          timeout: 3000,
+          interval: 200,
+          stableCount: 4,
         });
       },
     });
   }
 
   async tapFirstUsdc(tokenName: string): Promise<void> {
-    const tokenElement = this.getFirstTokenOption(tokenName);
+    const tokenElement = this.getTokenBySymbol(tokenName);
 
     await encapsulatedAction({
       detox: async () => {
diff --git a/tests/page-objects/MMConnect/UniswapDapp.ts b/tests/page-objects/MMConnect/UniswapDapp.ts
index c585d87c2956..018bee1da451 100644
--- a/tests/page-objects/MMConnect/UniswapDapp.ts
+++ b/tests/page-objects/MMConnect/UniswapDapp.ts
@@ -54,9 +54,7 @@ class UniswapDapp {
             '//android.widget.Button[@text="MetaMask MetaMask"]',
           ),
         ios: () =>
-          PlaywrightMatchers.getElementById('MetaMask MetaMask', {
-            exact: true,
-          }),
+          PlaywrightMatchers.getElementByAccessibilityId('MetaMaskMetaMask'),
       },
     });
   }
diff --git a/tests/page-objects/Onboarding/CreatePasswordView.ts b/tests/page-objects/Onboarding/CreatePasswordView.ts
index f6088f40832b..99c6445d88be 100644
--- a/tests/page-objects/Onboarding/CreatePasswordView.ts
+++ b/tests/page-objects/Onboarding/CreatePasswordView.ts
@@ -13,6 +13,7 @@ import { encapsulatedAction } from '../../framework/encapsulatedAction';
 import PlaywrightAssertions from '../../framework/PlaywrightAssertions';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
 import UnifiedGestures from '../../framework/UnifiedGestures';
+import { PlatformDetector } from '../../framework/PlatformLocator';
 import { ImportFromSeedSelectorsIDs } from '../../../app/components/Views/ImportFromSecretRecoveryPhrase/ImportFromSeed.testIds';
 
 class CreatePasswordView {
@@ -53,7 +54,6 @@ class CreatePasswordView {
           PlaywrightMatchers.getElementById(
             ImportFromSeedSelectorsIDs.NEW_PASSWORD_VISIBILITY_ID,
           ),
-
         ios: () =>
           PlaywrightMatchers.getElementByCatchAll(
             ImportFromSeedSelectorsIDs.NEW_PASSWORD_VISIBILITY_ID,
@@ -62,6 +62,19 @@ class CreatePasswordView {
     });
   }
 
+  get confirmPasswordVisibilityIcon(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(
+          ImportFromSeedSelectorsIDs.CONFIRM_PASSWORD_VISIBILITY_ID,
+        ),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          ImportFromSeedSelectorsIDs.CONFIRM_PASSWORD_VISIBILITY_ID,
+        ),
+    });
+  }
+
   get confirmPasswordInput(): EncapsulatedElementType {
     return encapsulated({
       detox: () =>
@@ -137,13 +150,19 @@ class CreatePasswordView {
     return encapsulated({
       detox: () =>
         Matchers.getElementByID(ChoosePasswordSelectorsIDs.SUBMIT_BUTTON_ID),
-      appium: () =>
-        PlaywrightMatchers.getElementById(
-          ChoosePasswordSelectorsIDs.SUBMIT_BUTTON_ID,
-          {
-            exact: true,
-          },
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            ChoosePasswordSelectorsIDs.SUBMIT_BUTTON_ID,
+            {
+              exact: true,
+            },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            ChoosePasswordSelectorsIDs.SUBMIT_BUTTON_ID,
+          ),
+      },
     });
   }
 
@@ -179,11 +198,15 @@ class CreatePasswordView {
         );
       },
       appium: async () => {
-        await UnifiedGestures.typeText(this.newPasswordInput, password, {
-          // once merged, remove me and create a typeText in Playwright Gestures
-
-          description: 'Create Password New Password Input',
-        });
+        const isIOS = await PlatformDetector.isIOS();
+        await UnifiedGestures.typeText(
+          this.newPasswordInput,
+          isIOS ? `${password}\n` : password,
+          {
+            // once merged, remove me and create a typeText in Playwright Gestures
+            description: 'Create Password New Password Input',
+          },
+        );
       },
     });
   }
@@ -203,9 +226,14 @@ class CreatePasswordView {
         );
       },
       appium: async () => {
-        await UnifiedGestures.typeText(this.confirmPasswordInput, password, {
-          description: 'Create Password Confirm Password Input',
-        });
+        const isIOS = await PlatformDetector.isIOS();
+        await UnifiedGestures.typeText(
+          this.confirmPasswordInput,
+          isIOS ? `${password}\n` : password,
+          {
+            description: 'Create Password Confirm Password Input',
+          },
+        );
       },
     });
   }
@@ -256,6 +284,21 @@ class CreatePasswordView {
     });
   }
 
+  async tapConfirmPasswordVisibilityIcon(): Promise<void> {
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.tap(asDetoxElement(this.confirmPasswordVisibilityIcon), {
+          elemDescription: 'Create Password Confirm Password Visibility Icon',
+        });
+      },
+      appium: async () => {
+        await UnifiedGestures.waitAndTap(this.confirmPasswordVisibilityIcon, {
+          description: 'Create Password Confirm Password Visibility Icon',
+        });
+      },
+    });
+  }
+
   async isVisible(): Promise<void> {
     await encapsulatedAction({
       detox: async () => {
diff --git a/tests/page-objects/Onboarding/ImportWalletView.ts b/tests/page-objects/Onboarding/ImportWalletView.ts
index 998a65c30e8c..26e106187fdc 100644
--- a/tests/page-objects/Onboarding/ImportWalletView.ts
+++ b/tests/page-objects/Onboarding/ImportWalletView.ts
@@ -75,7 +75,7 @@ class ImportWalletView {
         android: () =>
           PlaywrightMatchers.getElementById(
             index === 0
-              ? ImportFromSeedSelectorsIDs.SEED_PHRASE_INPUT_FIELD
+              ? ImportFromSeedSelectorsIDs.SEED_PHRASE_INPUT_ID
               : `${ImportFromSeedSelectorsIDs.SEED_PHRASE_INPUT_ID}_${index}`,
             {
               exact: true,
diff --git a/tests/page-objects/Onboarding/MetaMetricsOptInView.ts b/tests/page-objects/Onboarding/MetaMetricsOptInView.ts
index e278d195a9fb..75f02be8f3c4 100644
--- a/tests/page-objects/Onboarding/MetaMetricsOptInView.ts
+++ b/tests/page-objects/Onboarding/MetaMetricsOptInView.ts
@@ -4,12 +4,15 @@ import Matchers from '../../framework/Matchers';
 import Gestures from '../../framework/Gestures';
 import {
   asDetoxElement,
+  asPlaywrightElement,
   encapsulated,
   EncapsulatedElementType,
 } from '../../framework/EncapsulatedElement';
 import { encapsulatedAction } from '../../framework/encapsulatedAction';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import { PlatformDetector } from '../../framework/PlatformLocator';
 import UnifiedGestures from '../../framework/UnifiedGestures';
+import { PlaywrightGestures } from '../../framework';
 
 class MetaMetricsOptIn {
   get container(): DetoxElement {
@@ -88,9 +91,17 @@ class MetaMetricsOptIn {
         });
       },
       appium: async () => {
-        await UnifiedGestures.tap(this.iAgreeButton, {
-          description: 'Opt-in Metrics Continue Button',
-        });
+        if (await PlatformDetector.isAndroid()) {
+          await PlaywrightGestures.hideKeyboard();
+        }
+        await PlaywrightGestures.waitAndTap(
+          await asPlaywrightElement(this.iAgreeButton),
+          {
+            checkForDisplayed: true,
+            checkForEnabled: true,
+            timeout: 15_000,
+          },
+        );
       },
     });
   }
diff --git a/tests/page-objects/Onboarding/OnboardingInterestQuestionnaireView.ts b/tests/page-objects/Onboarding/OnboardingInterestQuestionnaireView.ts
index 7f32ba515705..e47d1773a7e1 100644
--- a/tests/page-objects/Onboarding/OnboardingInterestQuestionnaireView.ts
+++ b/tests/page-objects/Onboarding/OnboardingInterestQuestionnaireView.ts
@@ -51,14 +51,16 @@ class OnboardingInterestQuestionnaireView {
   }
 
   async tapContinueButton(): Promise<void> {
-    await UnifiedGestures.waitAndTap(this.continueButton, {
+    await UnifiedGestures.tap(this.continueButton, {
       description: 'Onboarding Interest Questionnaire Continue Button',
+      timeout: 2000,
     });
   }
 
   async tapOption(id: InterestOptionId): Promise<void> {
     await UnifiedGestures.waitAndTap(this.getOptionById(id), {
       description: `Onboarding Interest Questionnaire Option: ${id}`,
+      timeout: 2000,
     });
   }
 }
diff --git a/tests/page-objects/Onboarding/OnboardingSuccessView.ts b/tests/page-objects/Onboarding/OnboardingSuccessView.ts
index 19fbaa53fbd5..a7e50f12441e 100644
--- a/tests/page-objects/Onboarding/OnboardingSuccessView.ts
+++ b/tests/page-objects/Onboarding/OnboardingSuccessView.ts
@@ -30,6 +30,7 @@ class OnboardingSuccessView {
   async tapDone(): Promise<void> {
     await UnifiedGestures.waitAndTap(this.doneButton, {
       description: 'Onboarding Success Done Button',
+      timeout: 15_000,
     });
   }
 }
diff --git a/tests/page-objects/Onboarding/ProtectYourWalletView.ts b/tests/page-objects/Onboarding/ProtectYourWalletView.ts
index b2560bfe8547..c477e1dceb68 100644
--- a/tests/page-objects/Onboarding/ProtectYourWalletView.ts
+++ b/tests/page-objects/Onboarding/ProtectYourWalletView.ts
@@ -1,11 +1,16 @@
 import { ManualBackUpStepsSelectorsIDs } from '../../../app/components/Views/ManualBackupStep1/ManualBackUpSteps.testIds';
 import Matchers from '../../framework/Matchers';
+import Gestures from '../../framework/Gestures';
 import {
+  asDetoxElement,
+  asPlaywrightElement,
   encapsulated,
   EncapsulatedElementType,
 } from '../../framework/EncapsulatedElement';
+import { encapsulatedAction } from '../../framework/encapsulatedAction';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
-import UnifiedGestures from '../../framework/UnifiedGestures';
+import { PlatformDetector } from '../../framework/PlatformLocator';
 
 class ProtectYourWalletView {
   get container(): DetoxElement {
@@ -20,22 +25,33 @@ class ProtectYourWalletView {
         Matchers.getElementByID(
           ManualBackUpStepsSelectorsIDs.REMIND_ME_LATER_BUTTON,
         ),
-      appium: {
-        android: () => PlaywrightMatchers.getElementByText('Remind me later'),
-        ios: () =>
-          PlaywrightMatchers.getElementByXPath(
-            '(//XCUIElementTypeStaticText[@name="Remind me later"])[2]',
-            {
-              exact: true,
-            },
-          ),
-      },
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          ManualBackUpStepsSelectorsIDs.REMIND_ME_LATER_BUTTON,
+          { exact: true },
+        ),
     });
   }
 
   async tapOnRemindMeLaterButton(): Promise<void> {
-    await UnifiedGestures.waitAndTap(this.remindMeLaterButton, {
-      description: 'Protect Your Wallet Remind Me Later Button',
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.waitAndTap(asDetoxElement(this.remindMeLaterButton), {
+          elemDescription: 'Protect Your Wallet Remind Me Later Button',
+        });
+      },
+      appium: async () => {
+        if (await PlatformDetector.isIOS()) {
+          await PlaywrightGestures.hideKeyboard();
+        }
+        const button = await asPlaywrightElement(this.remindMeLaterButton);
+        await PlaywrightGestures.scrollIntoView(button);
+        await PlaywrightGestures.waitAndTap(button, {
+          checkForDisplayed: true,
+          checkForEnabled: true,
+          timeout: 15_000,
+        });
+      },
     });
   }
 
diff --git a/tests/page-objects/Onboarding/SocialLoginView.ts b/tests/page-objects/Onboarding/SocialLoginView.ts
index a423634791c9..a470e45062f0 100644
--- a/tests/page-objects/Onboarding/SocialLoginView.ts
+++ b/tests/page-objects/Onboarding/SocialLoginView.ts
@@ -3,6 +3,7 @@ import {
   Gestures,
   Matchers,
   PlaywrightAssertions,
+  PlaywrightGestures,
   PlaywrightMatchers,
   UnifiedGestures,
   asDetoxElement,
@@ -350,6 +351,48 @@ class SocialLoginView {
       },
     });
   }
+  get updateModalContinueButton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByID('Continue'),
+      appium: () =>
+        PlaywrightMatchers.getElementById('Continue', { exact: true }),
+    });
+  }
+
+  /**
+   * Dismiss the "iOS Update Required" modal if present by tapping "Continue".
+   * Silently does nothing if the modal is not showing.
+   */
+  async dismissUpdateModalIfPresent(): Promise<void> {
+    await encapsulatedAction({
+      detox: async () => {
+        try {
+          await Assertions.expectElementToBeVisible(
+            asDetoxElement(this.updateModalContinueButton),
+            { timeout: 3000, description: 'iOS update modal' },
+          );
+          await Gestures.waitAndTap(
+            asDetoxElement(this.updateModalContinueButton),
+            { elemDescription: 'Continue button on iOS update modal' },
+          );
+        } catch {
+          // Modal not present
+        }
+      },
+      appium: async () => {
+        try {
+          const btn = asPlaywrightElement(this.updateModalContinueButton);
+          await PlaywrightAssertions.expectElementToBeVisible(btn, {
+            timeout: 3000,
+            description: 'iOS update modal',
+          });
+          await PlaywrightGestures.waitAndTap(await btn);
+        } catch {
+          // Modal not present
+        }
+      },
+    });
+  }
 }
 
 export default new SocialLoginView();
diff --git a/tests/page-objects/Perps/PerpsDepositView.ts b/tests/page-objects/Perps/PerpsDepositView.ts
index 86c2bc5d8d6f..6f255d4703f3 100644
--- a/tests/page-objects/Perps/PerpsDepositView.ts
+++ b/tests/page-objects/Perps/PerpsDepositView.ts
@@ -67,9 +67,21 @@ class PerpsDepositView {
     return Matchers.getElementByID('confirm-button');
   }
 
+  get infoRow(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByText('Info'),
+      appium: () =>
+        PlaywrightMatchers.getElementById('info-row', { exact: true }),
+    });
+  }
+
   // Pay with row (open selector)
-  get payWithRow(): DetoxElement {
-    return Matchers.getElementByText('Pay with');
+  get payWithRow(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByText('Pay with'),
+      appium: () =>
+        PlaywrightMatchers.getElementById('pay-with', { exact: true }),
+    });
   }
 
   get usdcOption(): DetoxElement {
diff --git a/tests/page-objects/Perps/PerpsMarketDetailsView.ts b/tests/page-objects/Perps/PerpsMarketDetailsView.ts
index c79badb4ba56..456e59d4560e 100644
--- a/tests/page-objects/Perps/PerpsMarketDetailsView.ts
+++ b/tests/page-objects/Perps/PerpsMarketDetailsView.ts
@@ -167,16 +167,23 @@ class PerpsMarketDetailsView {
     });
   }
 
-  // Trading action buttons
+  // Trading action buttons — On Android, Reanimated's AnimatedPressable
+  // inside ButtonSemantic doesn't propagate testID to resource-id, so Appium
+  // targets the plain View wrapper (LONG/SHORT_BUTTON_WRAPPER) instead.
   get longButton(): EncapsulatedElementType {
     return encapsulated({
       detox: () =>
         Matchers.getElementByID(PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON),
-      appium: () =>
-        PlaywrightMatchers.getElementById(
-          PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON,
-          { exact: true },
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON,
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementById(
+            PerpsMarketDetailsViewSelectorsIDs.LONG_BUTTON,
+          ),
+      },
     });
   }
 
@@ -186,11 +193,16 @@ class PerpsMarketDetailsView {
         Matchers.getElementByID(
           PerpsMarketDetailsViewSelectorsIDs.SHORT_BUTTON,
         ),
-      appium: () =>
-        PlaywrightMatchers.getElementById(
-          PerpsMarketDetailsViewSelectorsIDs.SHORT_BUTTON,
-          { exact: true },
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            PerpsMarketDetailsViewSelectorsIDs.SHORT_BUTTON,
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementById(
+            PerpsMarketDetailsViewSelectorsIDs.SHORT_BUTTON,
+          ),
+      },
     });
   }
 
@@ -236,8 +248,14 @@ class PerpsMarketDetailsView {
         });
       },
       appium: async () => {
+        console.log('tapLongButton appium');
         await PlaywrightGestures.waitAndTap(
           await asPlaywrightElement(this.longButton),
+          {
+            checkForDisplayed: true,
+            checkForEnabled: true,
+            checkForStable: true,
+          },
         );
       },
     });
@@ -251,6 +269,11 @@ class PerpsMarketDetailsView {
       appium: async () => {
         await PlaywrightGestures.waitAndTap(
           await asPlaywrightElement(this.shortButton),
+          {
+            checkForDisplayed: true,
+            checkForEnabled: true,
+            checkForStable: true,
+          },
         );
       },
     });
diff --git a/tests/page-objects/Perps/PerpsMarketListView.ts b/tests/page-objects/Perps/PerpsMarketListView.ts
index b3fe30acddbc..1516ddebdf7a 100644
--- a/tests/page-objects/Perps/PerpsMarketListView.ts
+++ b/tests/page-objects/Perps/PerpsMarketListView.ts
@@ -7,6 +7,7 @@ import {
 import Gestures from '../../framework/Gestures';
 import Matchers from '../../framework/Matchers';
 import {
+  asPlaywrightElement,
   encapsulated,
   EncapsulatedElementType,
 } from '../../framework/EncapsulatedElement';
@@ -71,16 +72,38 @@ class PerpsMarketListView {
 
   get header(): EncapsulatedElementType {
     return encapsulated({
-      appium: () =>
-        // TODO: Create a testIds.ts const with this selector
-        PlaywrightMatchers.getElementById('perps-home', { exact: true }),
+      detox: () =>
+        Matchers.getElementByID(PerpsMarketListViewSelectorsIDs.MARKET_LIST),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            PerpsMarketListViewSelectorsIDs.MARKET_LIST,
+            { exact: true },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            PerpsMarketListViewSelectorsIDs.MARKET_LIST,
+          ),
+      },
     });
   }
 
-  get marketRowItemBTC() {
-    return Matchers.getElementByID(
-      getPerpsMarketRowItemSelector.rowItem('BTC'),
-    );
+  get marketRowItemBTC(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(getPerpsMarketRowItemSelector.rowItem('BTC')),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            getPerpsMarketRowItemSelector.rowItem('BTC'),
+            { exact: true },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            getPerpsMarketRowItemSelector.rowItem('BTC'),
+          ),
+      },
+    });
   }
 
   // Generic selector for first market row item (regardless of coin)
@@ -107,18 +130,12 @@ class PerpsMarketListView {
 
   // Actions
   async tapMarketRowItemBTC() {
-    await Gestures.scrollToElement(
-      this.marketRowItemBTC,
-      this.scrollableContainer,
-      {
-        direction: 'down',
-        scrollAmount: 200,
-        elemDescription: 'Perps Market Row BTC',
+    await encapsulatedAction({
+      appium: async () => {
+        const marketElement = await asPlaywrightElement(this.marketRowItemBTC);
+        await PlaywrightGestures.scrollIntoView(marketElement);
+        await PlaywrightGestures.waitAndTap(marketElement);
       },
-    );
-    await Gestures.waitAndTap(this.marketRowItemBTC, {
-      elemDescription: 'Perps Market Row BTC',
-      checkStability: true,
     });
   }
 
@@ -150,7 +167,6 @@ class PerpsMarketListView {
     await Gestures.waitAndTap(this.container);
   }
 
-  // Helper method to select a specific market by text
   async selectMarket(marketName: string) {
     await encapsulatedAction({
       detox: async () => {
@@ -160,12 +176,12 @@ class PerpsMarketListView {
         await Gestures.waitAndTap(marketElement);
       },
       appium: async () => {
-        // TODO: Create a testIds.ts const with this selector
         const marketSelector = `${PerpsMarketRowItemSelectorsIDs.ROW_ITEM}-${marketName}`;
         const marketElement = await PlaywrightMatchers.getElementById(
           marketSelector,
           { exact: true },
         );
+        await PlaywrightGestures.scrollIntoView(marketElement);
         await PlaywrightGestures.waitAndTap(marketElement);
       },
     });
diff --git a/tests/page-objects/Perps/PerpsOrderView.ts b/tests/page-objects/Perps/PerpsOrderView.ts
index c699fea5c314..36e0580f388a 100644
--- a/tests/page-objects/Perps/PerpsOrderView.ts
+++ b/tests/page-objects/Perps/PerpsOrderView.ts
@@ -81,7 +81,7 @@ class PerpsOrderView {
     return Matchers.getElementByText('Set Leverage');
   }
 
-  async tapPlaceOrderButton() {
+  async tapPlaceOrderButton(): Promise<void> {
     await encapsulatedAction({
       detox: async () => {
         const el = asDetoxElement(this.placeOrderButton);
@@ -103,8 +103,10 @@ class PerpsOrderView {
       appium: async () => {
         const el = await asPlaywrightElement(this.placeOrderButton);
         await PlaywrightGestures.waitAndTap(el, {
+          checkForDisplayed: true,
           checkForEnabled: true,
           checkForStable: true,
+          delay: 1000,
         });
       },
     });
@@ -185,6 +187,7 @@ class PerpsOrderView {
       appium: () =>
         PlaywrightMatchers.getElementById(
           PerpsAmountDisplaySelectorsIDs.CONTAINER,
+          { exact: true },
         ),
     });
   }
@@ -196,33 +199,52 @@ class PerpsOrderView {
       appium: () =>
         PlaywrightMatchers.getElementById(
           PerpsAmountDisplaySelectorsIDs.AMOUNT_LABEL,
+          { exact: true },
         ),
     });
   }
 
-  async setAmountUSD(amount: string) {
+  getKeypadKey(key: string): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByText(key),
+      appium: () => PlaywrightMatchers.getElementByText(key),
+    });
+  }
+
+  getDoneButton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByText('Done'),
+      appium: () => PlaywrightMatchers.getElementByText('Done'),
+    });
+  }
+
+  // Required for next test
+  async setAmountUSD(amount: string): Promise<void> {
     await encapsulatedAction({
       detox: async () => {
-        const el = asDetoxElement(this.amountValue);
+        // Open keypad by tapping the value by ID (more reliable than tapping the container)
         await device.disableSynchronization();
-        await Assertions.expectElementToBeVisible(el, {
-          description: 'Amount value is visible',
-        });
-        await Gestures.waitAndTap(el, {
+        await Assertions.expectElementToBeVisible(
+          asDetoxElement(this.amountValue),
+          {
+            description: 'Amount value is visible',
+          },
+        );
+        await Gestures.waitAndTap(asDetoxElement(this.amountValue), {
           elemDescription: 'Open amount keypad by tapping amount label',
           checkEnabled: false,
           checkVisibility: false,
         });
+        // Type each character using the native keypad (buttons 0-9 and '.')
         for (const ch of amount) {
-          const key = Matchers.getElementByText(ch) as DetoxElement;
-          await Gestures.waitAndTap(key, {
+          await Gestures.waitAndTap(asDetoxElement(this.getKeypadKey(ch)), {
             elemDescription: `Keypad: ${ch}`,
             checkEnabled: false,
             checkVisibility: false,
           });
         }
-        const doneByText = Matchers.getElementByText('Done') as DetoxElement;
-        await Gestures.waitAndTap(doneByText, {
+        // Close the keypad using the Done button
+        await Gestures.waitAndTap(asDetoxElement(this.getDoneButton()), {
           elemDescription: 'Tap Done (by text) to close keypad',
           checkEnabled: false,
           checkVisibility: false,
@@ -230,22 +252,27 @@ class PerpsOrderView {
         await device.enableSynchronization();
       },
       appium: async () => {
-        const el = await asPlaywrightElement(this.amountValue);
-        await el.unwrap().waitForDisplayed({ timeout: 8000 });
-        await PlaywrightGestures.waitAndTap(el);
-        const deleteButton = await asPlaywrightElement(this.keypadDeleteButton);
-        await PlaywrightGestures.waitAndTap(deleteButton);
+        const amountEl = await asPlaywrightElement(this.amountValue);
+        await PlaywrightGestures.waitAndTap(amountEl, {
+          checkForDisplayed: true,
+          checkForEnabled: true,
+        });
+        // Type each character using the native keypad (buttons 0-9 and '.')
+        await UnifiedGestures.waitAndTap(this.keypadDeleteButton, {
+          checkForDisplayed: true,
+          checkForEnabled: true,
+        });
         for (const ch of amount) {
-          const key = await PlaywrightMatchers.getElementByText(ch);
-          await PlaywrightGestures.waitAndTap(key, {
-            checkForDisplayed: false,
-            checkForEnabled: false,
+          const keyEl = await asPlaywrightElement(this.getKeypadKey(ch));
+          await PlaywrightGestures.waitAndTap(keyEl, {
+            checkForDisplayed: true,
+            delay: 300,
           });
         }
-        const doneBtn = await PlaywrightMatchers.getElementByText('Done');
-        await PlaywrightGestures.waitAndTap(doneBtn, {
-          checkForDisplayed: false,
-          checkForEnabled: false,
+        // Close the keypad using the Done button
+        const doneEl = await asPlaywrightElement(this.getDoneButton());
+        await PlaywrightGestures.waitAndTap(doneEl, {
+          checkForDisplayed: true,
         });
       },
     });
@@ -388,16 +415,18 @@ class PerpsOrderView {
           await asPlaywrightElement(this.leverageRowLabel),
         );
 
-        // Tap the leverage option (e.g. "40x")
+        // Tap the leverage quick-select button (e.g. "40x")
+        const leverageSelector = `${leverageX}x`;
         let optionEl: PlaywrightElement;
-        if (await PlatformDetector.isIOS()) {
-          optionEl = await PlaywrightMatchers.getElementByText(`${leverageX}x`);
-        } else {
+        if (PlatformDetector.isAndroid()) {
           optionEl = await PlaywrightMatchers.getElementByXPath(
-            `//*[@content-desc="${leverageX}x"]`,
+            `//android.view.ViewGroup[@content-desc="${leverageSelector}"]`,
+          );
+        } else {
+          optionEl = await PlaywrightMatchers.getElementByAccessibilityId(
+            `quick-select-button-${leverageSelector}`,
           );
         }
-
         await PlaywrightGestures.waitAndTap(optionEl);
 
         // Tap confirm button (e.g. "Set 40x")
diff --git a/tests/page-objects/Predict/PredictDetailsPage.ts b/tests/page-objects/Predict/PredictDetailsPage.ts
index a7a69f24796c..0eca95abd77a 100644
--- a/tests/page-objects/Predict/PredictDetailsPage.ts
+++ b/tests/page-objects/Predict/PredictDetailsPage.ts
@@ -248,11 +248,13 @@ class PredictDetailsPage {
   async tapAboutTab(): Promise<void> {
     await UnifiedGestures.waitAndTap(this.aboutTab, {
       description: 'About tab',
+      checkForDisplayed: false,
     });
   }
   async tapOutcomesTab(): Promise<void> {
     await UnifiedGestures.waitAndTap(this.outcomesTab, {
       description: 'Outcomes tab',
+      checkForDisplayed: false,
     });
   }
   async tapCashOutButton(): Promise<void> {
diff --git a/tests/page-objects/Predict/PredictMarketList.ts b/tests/page-objects/Predict/PredictMarketList.ts
index e1d1cfee6c81..94038de5e6d0 100644
--- a/tests/page-objects/Predict/PredictMarketList.ts
+++ b/tests/page-objects/Predict/PredictMarketList.ts
@@ -9,6 +9,7 @@ import {
   PredictBalanceSelectorsIDs,
   PredictBalanceSelectorsText,
   PredictMarketListSelectorsIDs,
+  getPredictFeedSelector,
   getPredictMarketListSelector,
 } from '../../../app/components/UI/Predict/Predict.testIds';
 
@@ -105,6 +106,50 @@ class PredictMarketList {
     });
   }
 
+  get trendingSkeleton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(
+          getPredictFeedSelector.skeletonLoading('trending', 1),
+        ),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          getPredictFeedSelector.skeletonLoading('trending', 1),
+          { exact: true },
+        ),
+    });
+  }
+
+  get firstTrendingMarketCard(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(
+          getPredictMarketListSelector.marketCardByCategory('trending', 1),
+        ),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          getPredictMarketListSelector.marketCardByCategory('trending', 1),
+        ),
+    });
+  }
+
+  get firstYesButton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByText('Yes'),
+      appium: () => PlaywrightMatchers.getElementByText('Yes'),
+    });
+  }
+
+  get getIsraelXHezbollahCeasefireButton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () => Matchers.getElementByText('No'),
+      appium: () =>
+        PlaywrightMatchers.getElementByXPath(
+          '//*[contains(@content-desc, "Israel x Hezbollah ceasefire by")]',
+        ),
+    });
+  }
+
   getMarketCard(
     category: CategoryTab,
     cardIndex: number,
diff --git a/tests/page-objects/swaps/QuoteView.ts b/tests/page-objects/swaps/QuoteView.ts
index c2717014a084..a7120810c3ae 100644
--- a/tests/page-objects/swaps/QuoteView.ts
+++ b/tests/page-objects/swaps/QuoteView.ts
@@ -72,10 +72,28 @@ class QuoteView {
     });
   }
 
-  get searchToken(): Promise<Detox.IndexableNativeElement> {
-    return Matchers.getElementByID(
-      QuoteViewSelectorIDs.TOKEN_SEARCH_INPUT,
-    ) as Promise<Detox.IndexableNativeElement>;
+  get destinationTokenInput(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(QuoteViewSelectorIDs.DESTINATION_TOKEN_INPUT),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          QuoteViewSelectorIDs.DESTINATION_TOKEN_INPUT,
+          { exact: true },
+        ),
+    });
+  }
+
+  get searchToken(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(QuoteViewSelectorIDs.TOKEN_SEARCH_INPUT),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          QuoteViewSelectorIDs.TOKEN_SEARCH_INPUT,
+          { exact: true },
+        ),
+    });
   }
 
   get seeAllButton(): DetoxElement {
@@ -105,16 +123,30 @@ class QuoteView {
   /** Fee disclaimer (e.g. "Includes 0.875% MetaMask fee") - used for isQuoteDisplayed. */
   get feeDisclaimerLabel(): EncapsulatedElementType {
     return encapsulated({
-      detox: () => Matchers.getElementByID(QuoteViewSelectorIDs.FEE_DISCLAIMER),
+      detox: () =>
+        Matchers.getElementByID(QuoteViewSelectorIDs.PRICE_IMPACT_INFO_BUTTON),
       appium: () =>
-        PlaywrightMatchers.getElementById(QuoteViewSelectorIDs.FEE_DISCLAIMER, {
-          exact: true,
-        }),
+        PlaywrightMatchers.getElementById(
+          QuoteViewSelectorIDs.PRICE_IMPACT_INFO_BUTTON,
+          {
+            exact: true,
+          },
+        ),
     });
   }
 
-  get keypadDeleteButton(): DetoxElement {
-    return Matchers.getElementByID(QuoteViewSelectorIDs.KEYPAD_DELETE_BUTTON);
+  get keypadDeleteButton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(QuoteViewSelectorIDs.KEYPAD_DELETE_BUTTON),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          QuoteViewSelectorIDs.KEYPAD_DELETE_BUTTON,
+          {
+            exact: true,
+          },
+        ),
+    });
   }
 
   get maxLink(): DetoxElement {
@@ -148,8 +180,21 @@ class QuoteView {
   }
 
   async tapSearchToken(): Promise<void> {
-    await Gestures.waitAndTap(this.searchToken, {
-      elemDescription: 'Tap on token search input element',
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.waitAndTap(asDetoxElement(this.searchToken), {
+          elemDescription: 'Tap on token search input element',
+        });
+      },
+      appium: async () => {
+        await PlaywrightGestures.waitAndTap(
+          await asPlaywrightElement(this.searchToken),
+          {
+            checkForDisplayed: true,
+            checkForEnabled: true,
+          },
+        );
+      },
     });
   }
 
@@ -200,8 +245,16 @@ class QuoteView {
   }
 
   async typeSearchToken(symbol: string): Promise<void> {
-    await Gestures.typeText(this.searchToken, symbol, {
-      elemDescription: `Search Token with symbol ${symbol}`,
+    await encapsulatedAction({
+      detox: async () => {
+        await Gestures.typeText(asDetoxElement(this.searchToken), symbol, {
+          elemDescription: `Search Token with symbol ${symbol}`,
+        });
+      },
+      appium: async () => {
+        const searchField = await asPlaywrightElement(this.searchToken);
+        await searchField.fill(symbol);
+      },
     });
   }
 
@@ -357,8 +410,8 @@ class QuoteView {
   }
 
   /**
-   * Asserts the quote is displayed (fee disclaimer visible).
-   * BridgeScreen.isQuoteDisplayed equivalent.
+   * Asserts the quote is displayed by verifying the destination token input
+   * contains a numeric value (meaning a quote result has populated the field).
    */
   async isQuoteDisplayed(): Promise<void> {
     await encapsulatedAction({
@@ -366,18 +419,26 @@ class QuoteView {
         await Assertions.expectElementToBeVisible(
           asDetoxElement(this.feeDisclaimerLabel),
           {
+            description: 'Fee disclaimer label is visible (quote displayed)',
             timeout: TIMEOUT.QUOTE_DISPLAYED,
-            description: 'Fee disclaimer (quote) should be visible',
           },
         );
       },
       appium: async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(this.feeDisclaimerLabel),
-          {
-            timeout: TIMEOUT.QUOTE_DISPLAYED,
-            description: 'Fee disclaimer (quote) should be visible',
-          },
+        const el = await asPlaywrightElement(this.destinationTokenInput);
+        const timeout = TIMEOUT.QUOTE_DISPLAYED;
+        const interval = 300;
+        const start = Date.now();
+        while (Date.now() - start < timeout) {
+          const text = await el.textContent();
+          if (text && /\d/.test(text) && parseFloat(text) > 0) {
+            return;
+          }
+          await new Promise((r) => setTimeout(r, interval));
+        }
+        const finalText = await el.textContent();
+        throw new Error(
+          `Destination token input does not contain a numeric value after ${timeout}ms, got: "${finalText}"`,
         );
       },
     });
@@ -392,6 +453,7 @@ class QuoteView {
     if (network !== 'Ethereum') {
       await this.selectNetwork(network);
     }
+    await this.typeSearchToken(token);
     const chainId = getChainIdForNetwork(network);
     await this.tapToken(chainId, token);
   }
@@ -407,6 +469,14 @@ class QuoteView {
       },
       appium: async () => {
         await this.tapSourceAmountInput();
+        await PlaywrightGestures.waitAndTap(
+          await asPlaywrightElement(this.keypadDeleteButton),
+          {
+            checkForDisplayed: true,
+            checkForEnabled: true,
+            delay: 1000,
+          },
+        );
         const isAndroid = await PlatformDetector.isAndroid();
         for (const digit of amount.split('')) {
           const keyName =
diff --git a/tests/page-objects/wallet/AccountListBottomSheet.ts b/tests/page-objects/wallet/AccountListBottomSheet.ts
index e6e2375fe626..cc34ee3f3ea5 100644
--- a/tests/page-objects/wallet/AccountListBottomSheet.ts
+++ b/tests/page-objects/wallet/AccountListBottomSheet.ts
@@ -278,7 +278,10 @@ class AccountListBottomSheet {
     });
   }
 
-  async tapAccountByNameV2(accountName: string): Promise<void> {
+  async tapAccountByNameV2(
+    accountName: string,
+    exactMatch: boolean = false,
+  ): Promise<void> {
     await encapsulatedAction({
       detox: async () => {
         const accountEl = this.getAccountElementByAccountNameV2(accountName);
@@ -287,8 +290,10 @@ class AccountListBottomSheet {
         });
       },
       appium: async () => {
-        const accountEl =
-          await PlaywrightMatchers.getElementByText(accountName);
+        const accountEl = await PlaywrightMatchers.getElementByText(
+          accountName,
+          exactMatch,
+        );
         await PlaywrightGestures.scrollIntoView(accountEl);
         await PlaywrightGestures.waitAndTap(accountEl);
       },
@@ -360,7 +365,7 @@ class AccountListBottomSheet {
    * @param timeout - The timeout in milliseconds.
    * @returns {Promise<void>} Resolves when the account sync is complete.
    */
-  async waitForAccountSyncToComplete(timeout = 60000): Promise<void> {
+  async waitForAccountSyncToComplete(timeout = 90000): Promise<void> {
     logger.debug('⏳ waitForSyncingToComplete: Starting...');
     const startTime = Date.now();
     const pollInterval = 500;
diff --git a/tests/page-objects/wallet/LoginView.ts b/tests/page-objects/wallet/LoginView.ts
index a6b3f771725c..83046d0bbef6 100644
--- a/tests/page-objects/wallet/LoginView.ts
+++ b/tests/page-objects/wallet/LoginView.ts
@@ -1,7 +1,4 @@
-import {
-  LoginViewSelectors,
-  LoginViewSelectorText,
-} from '../../../app/components/Views/Login/LoginView.testIds';
+import { LoginViewSelectors } from '../../../app/components/Views/Login/LoginView.testIds';
 import Matchers from '../../framework/Matchers';
 import Gestures from '../../framework/Gestures';
 import { PlaywrightAssertions } from '../../framework';
@@ -12,7 +9,9 @@ import {
 } from '../../framework/EncapsulatedElement';
 import { encapsulatedAction } from '../../framework/encapsulatedAction';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
 import UnifiedGestures from '../../framework/UnifiedGestures';
+import Utilities from '../../framework/Utilities';
 
 class LoginView {
   get container(): EncapsulatedElementType {
@@ -34,8 +33,8 @@ class LoginView {
         Matchers.getElementByLabel(LoginViewSelectors.PASSWORD_INPUT),
       appium: {
         android: () =>
-          PlaywrightMatchers.getElementByAccessibilityId(
-            LoginViewSelectors.PASSWORD_INPUT,
+          PlaywrightMatchers.getElementByAndroidUIAutomator(
+            `.description("${LoginViewSelectors.PASSWORD_INPUT}")`,
           ),
         ios: () =>
           PlaywrightMatchers.getElementById(LoginViewSelectors.PASSWORD_INPUT, {
@@ -57,9 +56,9 @@ class LoginView {
     return encapsulated({
       detox: () => Matchers.getElementByID(LoginViewSelectors.LOGIN_BUTTON_ID),
       appium: () =>
-        PlaywrightMatchers.getElementByText(
-          LoginViewSelectorText.UNLOCK_BUTTON,
-        ),
+        PlaywrightMatchers.getElementById(LoginViewSelectors.LOGIN_BUTTON_ID, {
+          exact: true,
+        }),
     });
   }
 
@@ -74,8 +73,18 @@ class LoginView {
   }
 
   async enterPassword(password: string): Promise<void> {
-    await UnifiedGestures.typeText(this.passwordInput, password, {
-      description: 'Password Input',
+    await encapsulatedAction({
+      detox: async () => {
+        await UnifiedGestures.typeText(this.passwordInput, password, {
+          description: 'Password Input',
+        });
+      },
+      appium: async () => {
+        await UnifiedGestures.typeText(this.passwordInput, password, {
+          description: 'Password Input',
+        });
+        await PlaywrightGestures.hideKeyboard();
+      },
     });
   }
 
@@ -92,8 +101,23 @@ class LoginView {
   }
 
   async tapLoginButton(): Promise<void> {
-    await UnifiedGestures.waitAndTap(this.loginButton, {
-      description: 'Login Button',
+    await encapsulatedAction({
+      detox: async () => {
+        await UnifiedGestures.waitAndTap(this.loginButton, {
+          description: 'Login Button',
+        });
+      },
+      appium: async () => {
+        await UnifiedGestures.waitAndTap(this.loginButton, {
+          description: 'Login Button',
+          checkForDisplayed: true,
+          checkForEnabled: true,
+          waitForInteractive: true,
+          timeout: 20_000,
+          enabledStableReads: 4,
+          postEnabledSettleMs: 1500,
+        });
+      },
     });
   }
 
diff --git a/tests/page-objects/wallet/TokenOverview.ts b/tests/page-objects/wallet/TokenOverview.ts
index 2f4a7452731f..a42ae755d728 100644
--- a/tests/page-objects/wallet/TokenOverview.ts
+++ b/tests/page-objects/wallet/TokenOverview.ts
@@ -59,12 +59,34 @@ class TokenOverview {
   get todaysChange(): EncapsulatedElementType {
     return encapsulated({
       detox: () =>
-        Matchers.getElementByText(
-          TokenOverviewSelectorsText.TODAYS_CHANGE_SUFFIX,
+        Matchers.getElementByID(TokenOverviewSelectorsIDs.TODAYS_CHANGE),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          TokenOverviewSelectorsIDs.TODAYS_CHANGE,
+        ),
+    });
+  }
+
+  get priceChartDotEnd(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(TokenOverviewSelectorsIDs.PRICE_CHART_DOT_END),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          TokenOverviewSelectorsIDs.TOKEN_PRICE,
+        ),
+    });
+  }
+
+  get priceChartContainer(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(
+          TokenOverviewSelectorsIDs.PRICE_CHART_CONTAINER,
         ),
       appium: () =>
-        PlaywrightMatchers.getElementByCatchAll(
-          TokenOverviewSelectorsText.TODAYS_CHANGE_SUFFIX,
+        PlaywrightMatchers.getElementById(
+          TokenOverviewSelectorsIDs.PRICE_CHART_CONTAINER,
         ),
     });
   }
diff --git a/tests/page-objects/wallet/WalletActionsBottomSheet.ts b/tests/page-objects/wallet/WalletActionsBottomSheet.ts
index ff891f1e770d..333a3ed67e8d 100644
--- a/tests/page-objects/wallet/WalletActionsBottomSheet.ts
+++ b/tests/page-objects/wallet/WalletActionsBottomSheet.ts
@@ -53,11 +53,17 @@ class WalletActionsBottomSheet {
         Matchers.getElementByID(
           WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON,
         ),
-      appium: () =>
-        PlaywrightMatchers.getElementById(
-          WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON,
-          { exact: true },
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON,
+            { exact: true },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            WalletActionsBottomSheetSelectorsIDs.PERPS_BUTTON,
+          ),
+      },
     });
   }
 
@@ -67,11 +73,17 @@ class WalletActionsBottomSheet {
         Matchers.getElementByID(
           WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON,
         ),
-      appium: () =>
-        PlaywrightMatchers.getElementById(
-          WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON,
-          { exact: true },
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON,
+            { exact: true },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            WalletActionsBottomSheetSelectorsIDs.PREDICT_BUTTON,
+          ),
+      },
     });
   }
 
diff --git a/tests/page-objects/wallet/WalletView.ts b/tests/page-objects/wallet/WalletView.ts
index f80eea1c0fcf..69bfdd5b3339 100644
--- a/tests/page-objects/wallet/WalletView.ts
+++ b/tests/page-objects/wallet/WalletView.ts
@@ -37,13 +37,19 @@ class WalletView {
     return encapsulated({
       detox: () =>
         Matchers.getElementByID(WalletViewSelectorsIDs.WALLET_CONTAINER),
-      appium: () =>
-        PlaywrightMatchers.getElementById(
-          WalletViewSelectorsIDs.WALLET_CONTAINER,
-          {
-            exact: true,
-          },
-        ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            WalletViewSelectorsIDs.WALLET_CONTAINER,
+            {
+              exact: true,
+            },
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            WalletViewSelectorsIDs.EYE_SLASH_ICON,
+          ),
+      },
     });
   }
 
@@ -232,6 +238,17 @@ class WalletView {
     );
   }
 
+  async checkActiveAccount(
+    expectedName: string,
+    timeout = 10_000,
+  ): Promise<void> {
+    await PlaywrightAssertions.expectElementText(
+      asPlaywrightElement(this.accountNameLabelText),
+      expectedName,
+      { timeout },
+    );
+  }
+
   get accountNameLabelInput(): EncapsulatedElementType {
     return encapsulated({
       detox: () =>
@@ -303,8 +320,16 @@ class WalletView {
     );
   }
   // Wallet-specific action buttons (from AssetDetailsActions in Wallet view)
-  get walletBuyButton(): DetoxElement {
-    return Matchers.getElementByID(WalletViewSelectorsIDs.WALLET_BUY_BUTTON);
+  get walletBuyButton(): EncapsulatedElementType {
+    return encapsulated({
+      detox: () =>
+        Matchers.getElementByID(WalletViewSelectorsIDs.WALLET_BUY_BUTTON),
+      appium: () =>
+        PlaywrightMatchers.getElementById(
+          WalletViewSelectorsIDs.WALLET_BUY_BUTTON,
+          { exact: true },
+        ),
+    });
   }
 
   get walletSwapButton(): EncapsulatedElementType {
@@ -455,10 +480,17 @@ class WalletView {
   tokenRow(token: string, index = 0): EncapsulatedElementType {
     return encapsulated({
       detox: () => Matchers.getElementByText(token, index),
-      appium: () =>
-        PlaywrightMatchers.getElementById(getAssetTestId(token), {
-          exact: true,
-        }),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(getAssetTestId(token), {
+            exact: true,
+          }),
+        // iOS: TokenListItem sets accessibilityLabel to "Name, $fiat, balance"
+        // so the iOS predicate `name` (= accessibilityLabel) differs from testID.
+        // Use `~testID` which maps to accessibilityIdentifier (= testID).
+        ios: () =>
+          PlaywrightMatchers.getElementByNameiOS(getAssetTestId(token)),
+      },
     });
   }
 
@@ -473,7 +505,7 @@ class WalletView {
         // Wait for the token list to finish loading/reordering before tapping.
         // New tokens appearing asynchronously can shift positions mid-tap.
         await Utilities.waitForElementToStopMoving(elem, {
-          timeout: 10000,
+          timeout: 20000,
           interval: 500,
           stableCount: 6,
         });
@@ -798,11 +830,19 @@ class WalletView {
   get tokensSection(): EncapsulatedElementType {
     return encapsulated({
       detox: () =>
-        Matchers.getElementByText(WalletViewSelectorsText.TOKENS_SECTION),
-      appium: () =>
-        PlaywrightMatchers.getElementByText(
-          WalletViewSelectorsText.TOKENS_SECTION,
+        Matchers.getElementByID(
+          WalletViewSelectorsIDs.TOKENS_SECTION_CONTAINER,
         ),
+      appium: {
+        android: () =>
+          PlaywrightMatchers.getElementById(
+            WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens'),
+          ),
+        ios: () =>
+          PlaywrightMatchers.getElementByAccessibilityId(
+            `${WalletViewSelectorsIDs.HOMEPAGE_SECTION_TITLE('tokens')}`,
+          ),
+      },
     });
   }
 
diff --git a/tests/performance/README.md b/tests/performance/README.md
index 4190b2967a15..575f0d2336e2 100644
--- a/tests/performance/README.md
+++ b/tests/performance/README.md
@@ -623,6 +623,7 @@ BROWSERSTACK_IOS_CLEAN_APP_URL=bs://your-clean-ios-app-id
 TEST_SRP_1="your test recovery phrase 1"
 TEST_SRP_2="your test recovery phrase 2"
 TEST_SRP_3="your test recovery phrase 3"
+TEST_SRP_4='your test recovery phrase 4" // user for Perps
 BROWSERSTACK_USERNAME='YOUR_BS_USERNAME'
 BROWSERSTACK_ACCESS_KEY='YOUR_BS_ACCESS_KEY'
 E2E_PASSWORD='WALLET_PASSWORD' // 1Password
@@ -630,6 +631,13 @@ E2E_PASSWORD='WALLET_PASSWORD' // 1Password
 # Test Passwords (can be found in 1Password)
 TEST_PASSWORD_LOGIN="your test password"
 TEST_PASSWORD_ONBOARDING="your onboarding password"
+
+# Feature flags for performance tests (client-config API: rc | exp | test; not e2e)
+E2E_PERFORMANCE_BUILD_VARIANT=rc
+
+# CI note: scheduled/feature-branch performance workflows use build_variant=e2e
+# (GitHub environment build-e2e). E2E_PERFORMANCE_BUILD_VARIANT=rc is set separately
+# in performance-test-runner for the flags API. Release workflows use build_variant=rc.
 ```
 
 ### Sentry Performance Instrumentation (Optional)
diff --git a/tests/performance/device-matrix.json b/tests/performance/device-matrix.json
index 4e8cdac9de23..f6b1348810c0 100644
--- a/tests/performance/device-matrix.json
+++ b/tests/performance/device-matrix.json
@@ -4,7 +4,7 @@
       "name": "Samsung Galaxy S25 Ultra",
       "os_version": "15.0",
       "category": "high",
-      "description": "High-end Samsung flagship device with Android 13"
+      "description": "High-end Samsung flagship device with Android 15"
     },
     {
       "name": "Google Pixel 8 Pro",
diff --git a/tests/performance/feature-flag-helper.ts b/tests/performance/feature-flag-helper.ts
index d84fb8817d0d..a5e0756256d5 100644
--- a/tests/performance/feature-flag-helper.ts
+++ b/tests/performance/feature-flag-helper.ts
@@ -1,37 +1,164 @@
-import axios from 'axios';
+import axios, { isAxiosError } from 'axios';
 import { createLogger } from '../framework/logger';
+import { sleep } from '../framework/Utilities.ts';
 
 const CLIENT_CONFIG_URL = 'https://client-config.api.cx.metamask.io/v1/flags';
 
+const MAX_RETRIES_ON_4XX = 3;
+const RETRY_DELAY_MS = 1_000;
+
 const logger = createLogger({ name: 'feature-flag-helper' });
 
+function is4xxStatus(status: number): boolean {
+  return status >= 400 && status < 500;
+}
+
+function buildFeatureFlagUrl(
+  distribution: string,
+  environment: string,
+): string {
+  const params = new URLSearchParams({
+    client: 'mobile',
+    distribution,
+    environment,
+  });
+  return `${CLIENT_CONFIG_URL}?${params.toString()}`;
+}
+
+function formatResponseBody(data: unknown): string {
+  if (data === undefined || data === null) {
+    return '(empty)';
+  }
+  if (typeof data === 'string') {
+    return data.slice(0, 500);
+  }
+  try {
+    return JSON.stringify(data).slice(0, 500);
+  } catch {
+    return String(data);
+  }
+}
+
+function toFeatureFlagRequestError(
+  error: unknown,
+  distribution: string,
+  environment: string,
+): Error {
+  const url = buildFeatureFlagUrl(distribution, environment);
+  const context = `distribution="${distribution}", environment="${environment}", url=${url}`;
+
+  if (isAxiosError(error)) {
+    const status = error.response?.status;
+    const statusText = error.response?.statusText ?? '';
+    const responseBody = formatResponseBody(error.response?.data);
+    const axiosCode = error.code ? `, code=${error.code}` : '';
+
+    const message =
+      `Feature flags request failed: HTTP ${status ?? 'unknown'} ${statusText}${axiosCode}. ` +
+      `${context}. ` +
+      `Response body: ${responseBody}`;
+    const wrapped = new Error(message);
+    (wrapped as Error & { cause?: unknown }).cause = error;
+    return wrapped;
+  }
+
+  if (error instanceof Error) {
+    const wrapped = new Error(
+      `Feature flags request failed: ${error.message}. ${context}`,
+    );
+    (wrapped as Error & { cause?: unknown }).cause = error;
+    return wrapped;
+  }
+
+  return new Error(
+    `Feature flags request failed: ${String(error)}. ${context}`,
+  );
+}
+
+function mergeFeatureFlagPayload(
+  data: Record<string, unknown>[] | Record<string, unknown>,
+): Record<string, unknown> {
+  // The API returns an array of single-key objects like [{ "flagName": { ... } }, ...]
+  // Merge into a single flat object so consumers can access flags by name directly
+  if (Array.isArray(data)) {
+    return Object.assign({}, ...data) as Record<string, unknown>;
+  }
+  return data;
+}
+
 /**
  * Fetches the current production feature flags from the MetaMask client-config API.
+ * Retries up to {@link MAX_RETRIES_ON_4XX} times when the API responds with HTTP 4xx.
+ * Returns `null` when the request fails or the payload is empty (callers may fall back to UI).
  * @param distribution - The distribution channel (e.g. 'main').
  * @param environment - The environment (e.g. 'prod').
- * @returns The production feature flags as a JSON object.
+ * @returns The production feature flags, or `null` if unavailable.
  */
 export const fetchProductionFeatureFlags = async (
   distribution: string,
   environment: string,
-): Promise<Record<string, unknown>> => {
+): Promise<Record<string, unknown> | null> => {
   logger.info(
     `Fetching feature flags for distribution: ${distribution} and environment: ${environment}`,
   );
   logger.info(
-    `Feature flag url: ${CLIENT_CONFIG_URL}?client=mobile&distribution=${distribution}&environment=${environment}`,
+    `Feature flag url: ${buildFeatureFlagUrl(distribution, environment)}`,
   );
-  const { data } = await axios.get<
-    Record<string, unknown>[] | Record<string, unknown>
-  >(CLIENT_CONFIG_URL, {
-    params: { client: 'mobile', distribution, environment },
-    headers: { Accept: 'application/json' },
-  });
 
-  // The API returns an array of single-key objects like [{ "flagName": { ... } }, ...]
-  // Merge into a single flat object so consumers can access flags by name directly
-  if (Array.isArray(data)) {
-    return Object.assign({}, ...data) as Record<string, unknown>;
+  let lastError: unknown;
+
+  for (let attempt = 1; attempt <= MAX_RETRIES_ON_4XX; attempt++) {
+    try {
+      const { data } = await axios.get<
+        Record<string, unknown>[] | Record<string, unknown>
+      >(CLIENT_CONFIG_URL, {
+        params: { client: 'mobile', distribution, environment },
+        headers: { Accept: 'application/json' },
+      });
+
+      const flags = mergeFeatureFlagPayload(data);
+      if (!flags || Object.keys(flags).length === 0) {
+        logger.warn(
+          `Feature flags response empty for distribution="${distribution}", environment="${environment}"`,
+        );
+        return null;
+      }
+      return flags;
+    } catch (error) {
+      lastError = error;
+
+      const status = isAxiosError(error) ? error.response?.status : undefined;
+      const shouldRetry =
+        status !== undefined &&
+        is4xxStatus(status) &&
+        attempt < MAX_RETRIES_ON_4XX;
+
+      if (!shouldRetry) {
+        const detailedError = toFeatureFlagRequestError(
+          error,
+          distribution,
+          environment,
+        );
+        logger.warn(detailedError.message);
+        return null;
+      }
+
+      const responseBody = isAxiosError(error)
+        ? formatResponseBody(error.response?.data)
+        : '';
+      logger.warn(
+        `Feature flags request returned HTTP ${status}; retrying (${attempt}/${MAX_RETRIES_ON_4XX}). ` +
+          `Response body: ${responseBody}`,
+      );
+      await sleep(RETRY_DELAY_MS * attempt);
+    }
   }
-  return data;
+
+  const detailedError = toFeatureFlagRequestError(
+    lastError,
+    distribution,
+    environment,
+  );
+  logger.warn(detailedError.message);
+  return null;
 };
diff --git a/tests/performance/login/asset-balances.spec.ts b/tests/performance/login/asset-balances.spec.ts
index e1266b2b6347..99ffba434e98 100644
--- a/tests/performance/login/asset-balances.spec.ts
+++ b/tests/performance/login/asset-balances.spec.ts
@@ -22,7 +22,7 @@ test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceAssetLo
 
       const balanceStableTimer = new TimerHelper(
         'Time since the user navigates to wallet tab until the balance stabilizes',
-        { ios: 25000, android: 15000 },
+        { ios: 40000, android: 20000 },
         currentDeviceDetails.platform,
       );
       await balanceStableTimer.measure(async () => {
diff --git a/tests/performance/login/asset-view.spec.ts b/tests/performance/login/asset-view.spec.ts
index 588245772d53..bb4a663b1839 100644
--- a/tests/performance/login/asset-view.spec.ts
+++ b/tests/performance/login/asset-view.spec.ts
@@ -25,27 +25,19 @@ perfTest.describe(
 
         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 },
+          { ios: 6000, android: 2500 },
           currentDeviceDetails.platform,
         );
 
         await WalletView.tapOnTokensSection();
-        await WalletView.tapOnToken('USDC');
+        await WalletView.tapOnToken('ETH');
 
         await assetViewScreen.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(TokenOverview.container),
+            asPlaywrightElement(TokenOverview.priceChartContainer),
           );
           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,
-            },
+            asPlaywrightElement(TokenOverview.container),
           );
         });
 
diff --git a/tests/performance/login/cross-chain-swap-flow.spec.ts b/tests/performance/login/cross-chain-swap-flow.spec.ts
index 8800844fe0fe..ee66c2c786a9 100644
--- a/tests/performance/login/cross-chain-swap-flow.spec.ts
+++ b/tests/performance/login/cross-chain-swap-flow.spec.ts
@@ -7,6 +7,7 @@ import {
   PerformanceSwaps,
 } from '../../tags.performance.js';
 import { loginToAppPlaywright } from '../../flows/wallet.flow.js';
+import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
 import WalletView from '../../page-objects/wallet/WalletView.js';
 import QuoteView from '../../page-objects/swaps/QuoteView.js';
 import { checkSwapActivity } from '../../helpers/swap/swap-unified-ui';
@@ -17,6 +18,11 @@ test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`
     'Cross-chain swap flow - ETH to SOL - 50+ accounts, SRP 1 + SRP 2 + SRP 3',
     { tag: '@swap-bridge-dev-team' },
     async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
+      test.skip(
+        currentDeviceDetails.platform === 'ios',
+        'Skipped on iOS — cross-chain swap flow under investigation',
+      );
+
       await loginToAppPlaywright();
 
       const timer1 = new TimerHelper(
@@ -26,10 +32,15 @@ test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`
       );
 
       await WalletView.tapWalletSwapButton();
-      await timer1.measure(() => QuoteView.isVisible());
+
+      await timer1.measure(async () => {
+        await PlaywrightAssertions.expectElementToBeVisibleWithSettle(
+          asPlaywrightElement(QuoteView.amountInput),
+        );
+      });
 
       await QuoteView.selectNetworkAndTokenTo('Solana', 'SOL');
-      await QuoteView.enterSourceTokenAmount('1');
+      await QuoteView.enterSourceTokenAmount('0.1');
 
       const timer2 = new TimerHelper(
         'Time since the user enters the amount until the quote is displayed',
diff --git a/tests/performance/login/eth-swap-flow.spec.ts b/tests/performance/login/eth-swap-flow.spec.ts
index a1abf798e2bf..eae7a7174ed4 100644
--- a/tests/performance/login/eth-swap-flow.spec.ts
+++ b/tests/performance/login/eth-swap-flow.spec.ts
@@ -18,6 +18,11 @@ test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`
     'Swap flow - ETH to LINK, SRP 1 + SRP 2 + SRP 3',
     { tag: '@swap-bridge-dev-team' },
     async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
+      test.skip(
+        currentDeviceDetails.platform === 'ios',
+        'Skipped on iOS — swap flow under investigation',
+      );
+
       await loginToAppPlaywright();
 
       const swapLoadTimer = new TimerHelper(
@@ -27,6 +32,7 @@ test.describe(`${Performance} ${System} ${PerformanceLogin} ${PerformanceSwaps}`
       );
 
       await WalletView.tapWalletSwapButton();
+
       await swapLoadTimer.measure(() => QuoteView.isVisible());
 
       const swapTimer = new TimerHelper(
diff --git a/tests/performance/login/import-multiple-srps.spec.ts b/tests/performance/login/import-multiple-srps.spec.ts
index 24942bd68aea..6190940ad5a8 100644
--- a/tests/performance/login/import-multiple-srps.spec.ts
+++ b/tests/performance/login/import-multiple-srps.spec.ts
@@ -40,7 +40,7 @@ perfTest.describe(
         );
         const addAccountTimer = new TimerHelper(
           'Time since the user clicks on "Add account" button until the next modal is visible',
-          { ios: 1000, android: 1700 },
+          { ios: 1000, android: 1200 },
           currentDeviceDetails.platform,
         );
         const importSrpTimer = new TimerHelper(
@@ -66,11 +66,13 @@ perfTest.describe(
 
         await AccountListBottomSheet.waitForAccountSyncToComplete();
         await AccountListBottomSheet.tapAddAccountButton();
+
         await addAccountTimer.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
             asPlaywrightElement(AddAccountBottomSheet.importSrpButton),
             {
               description: 'Add account bottom sheet should be visible',
+              timeout: 60000,
             },
           );
         });
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 08c59502c1da..64d2800e6215 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
@@ -50,7 +50,7 @@ perfTest.describe(
 
         const timer1 = new TimerHelper(
           'Time since the the app is launched, until login screen appears',
-          { ios: 3000, android: 4000 },
+          { ios: 3000, android: 4500 },
           currentDeviceDetails.platform,
         );
 
diff --git a/tests/performance/login/perps-add-funds.spec.ts b/tests/performance/login/perps-add-funds.spec.ts
index 90076f244f89..52407181d15c 100644
--- a/tests/performance/login/perps-add-funds.spec.ts
+++ b/tests/performance/login/perps-add-funds.spec.ts
@@ -19,17 +19,17 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
 
       const selectPerpsMainScreenTimer = new TimerHelper(
         'Select Perps Main Screen',
-        { ios: 1500, android: 2500 },
+        { ios: 1500, android: 4200 },
         currentDeviceDetails.platform,
       );
       const openAddFundsTimer = new TimerHelper(
         'Open Add Funds',
-        { ios: 5000, android: 4500 },
+        { ios: 5000, android: 3500 },
         currentDeviceDetails.platform,
       );
       const getQuoteTimer = new TimerHelper(
         'Get Quote',
-        { ios: 6000, android: 8000 },
+        { ios: 6000, android: 7000 },
         currentDeviceDetails.platform,
       );
 
@@ -54,7 +54,7 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
         );
       });
 
-      await PerpsDepositView.typeUSD('2');
+      await PerpsDepositView.typeUSD('1');
       await PerpsDepositView.tapContinue();
 
       // Get quote
@@ -63,7 +63,10 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
           await asPlaywrightElement(PerpsDepositView.addFundsButton),
         );
         await PlaywrightAssertions.expectElementToBeVisible(
-          await asPlaywrightElement(PerpsDepositView.totalText),
+          await asPlaywrightElement(PerpsDepositView.infoRow),
+        );
+        await PlaywrightAssertions.expectElementToBeVisible(
+          await asPlaywrightElement(PerpsDepositView.payWithRow),
         );
       });
 
diff --git a/tests/performance/login/predict/predict-available-balance.spec.ts b/tests/performance/login/predict/predict-available-balance.spec.ts
index 3d23de4dbac8..1d668e785bf8 100644
--- a/tests/performance/login/predict/predict-available-balance.spec.ts
+++ b/tests/performance/login/predict/predict-available-balance.spec.ts
@@ -28,22 +28,20 @@ perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
     async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
       // Login to the app
       await loginToAppPlaywright();
-
+      perfTest.setTimeout(15 * 60 * 1000);
       // Timer 1: Navigate to Predict tab and verify available balance
       const timer1 = new TimerHelper(
         'Time since user taps Predict button until Available Balance is displayed',
-        { ios: 4500, android: 8000 },
+        { ios: 4500, android: 5000 },
         currentDeviceDetails.platform,
       );
-
       await TabBarComponent.tapActions();
+
       await WalletActionsBottomSheet.tapPredictButton();
       await timer1.measure(async () => {
         await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(PredictMarketList.balanceCard),
-        );
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(PredictMarketList.availableBalanceLabel),
+          asPlaywrightElement(PredictMarketList.container),
+          { timeout: 60000 },
         );
       });
 
diff --git a/tests/performance/login/predict/predict-deposit.spec.ts b/tests/performance/login/predict/predict-deposit.spec.ts
index 64720f868d16..4c3e5336df8b 100644
--- a/tests/performance/login/predict/predict-deposit.spec.ts
+++ b/tests/performance/login/predict/predict-deposit.spec.ts
@@ -49,7 +49,7 @@ perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
       // Timer 2: Open deposit screen
       const timer2 = new TimerHelper(
         'Time since user taps Add Funds button until Predict Deposit screen is visible',
-        { ios: 1000, android: 4500 },
+        { ios: 2500, android: 6000 },
         currentDeviceDetails.platform,
       );
 
@@ -60,23 +60,6 @@ perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
         );
       });
 
-      // Timer 3: Change default asset
-      const timer3 = new TimerHelper(
-        'Time since user taps Pay with button until select payment method modal is displayed',
-        { ios: 5000, android: 1500 },
-        currentDeviceDetails.platform,
-      );
-
-      await TransactionPayConfirmation.tapPayWithRow();
-      await timer3.measure(async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          asPlaywrightElement(TransactionPayConfirmation.payWithTokenList),
-        );
-      });
-
-      await TransactionPayConfirmation.searchToken('USDC');
-      await TransactionPayConfirmation.tapByNetworkFilter('Arbitrum');
-      await TransactionPayConfirmation.tapFirstUsdc('USDC');
       await TransactionPayConfirmation.tapKeyboardAmount('1');
 
       // Timer 4: Proceed to confirmation screen
@@ -97,20 +80,18 @@ perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
       });
 
       // Add all timers to performance tracker
-      performanceTracker.addTimers(timer1, timer2, timer3, timer4);
+      performanceTracker.addTimers(timer1, timer2, timer4);
 
       // Attach performance metrics to test report
 
       console.log('Predict Deposit Performance Test completed');
       console.log(`Navigate to Predict: ${timer1.getDuration()}ms`);
       console.log(`Open Deposit Screen: ${timer2.getDuration()}ms`);
-      console.log(`Change Asset: ${timer3.getDuration()}ms`);
       console.log(`Open Confirmation: ${timer4.getDuration()}ms`);
       console.log(
         `Total Time: ${
           (timer1.getDuration() ?? 0) +
           (timer2.getDuration() ?? 0) +
-          (timer3.getDuration() ?? 0) +
           (timer4.getDuration() ?? 0)
         }ms`,
       );
diff --git a/tests/performance/login/predict/predict-market-details.spec.ts b/tests/performance/login/predict/predict-market-details.spec.ts
index 7d28502496d6..b4892b8e4095 100644
--- a/tests/performance/login/predict/predict-market-details.spec.ts
+++ b/tests/performance/login/predict/predict-market-details.spec.ts
@@ -23,8 +23,8 @@ import { Performance, PerformancePredict } from '../../../tags.performance.js';
  * 3. Time to open About tab content
  * 4. Time to open Outcomes tab content when available
  */
-perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
-  perfTest.setTimeout(10 * 60 * 1000);
+perfTest.describe(PerformancePredict, () => {
+  perfTest.setTimeout(15 * 60 * 1000);
 
   perfTest(
     'Predict Market Details - Complete Flow Performance',
@@ -36,7 +36,7 @@ perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
       // Timer 1: Navigate to Predict tab
       const timer1 = new TimerHelper(
         'Time since user taps Predict button until Predict Market List is displayed',
-        { ios: 8000, android: 8000 },
+        { ios: 8000, android: 5000 },
         currentDeviceDetails.platform,
       );
 
@@ -65,7 +65,7 @@ perfTest.describe(`${Performance} ${PerformancePredict}`, () => {
       // Timer 3: Open About tab
       const timer3 = new TimerHelper(
         'Time since user taps About tab until About tab is visible',
-        { ios: 750, android: 1800 },
+        { ios: 750, android: 2500 },
         currentDeviceDetails.platform,
       );
 
diff --git a/tests/performance/login/uniswap-interaction.spec.ts b/tests/performance/login/uniswap-interaction.spec.ts
index abbdf3f6563f..ba5fc829569e 100644
--- a/tests/performance/login/uniswap-interaction.spec.ts
+++ b/tests/performance/login/uniswap-interaction.spec.ts
@@ -25,13 +25,13 @@ perfTest.describe(`${PerformanceLogin}`, () => {
 
       const metamaskTimer = new TimerHelper(
         'Time since the user selects Metamask until Metamask app is opened',
-        { ios: 15000, android: 20000 },
+        { ios: 18000, android: 20000 },
         platform,
       );
 
       const connectTimer = new TimerHelper(
         'Time since the user taps Connect in MetaMask until Uniswap is displayed',
-        { ios: 15000, android: 20000 },
+        { ios: 15000, android: 5000 },
         platform,
       );
       await loginToAppPlaywright();
diff --git a/tests/performance/mm-connect/connection-evm-account.spec.ts b/tests/performance/mm-connect/connection-evm-account.spec.ts
index 2f24ea72a7c7..fa02da64d1ba 100644
--- a/tests/performance/mm-connect/connection-evm-account.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-account.spec.ts
@@ -89,7 +89,8 @@ test.describe(Performance, () => {
   // 6. CLEANUP
   //    - Tap disconnect to reset dapp state
 
-  test('@metamask/connect-evm - Account switching and wallet-side verification', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-evm - Account switching and wallet-side verification', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/mm-connect/connection-evm-rejection.spec.ts b/tests/performance/mm-connect/connection-evm-rejection.spec.ts
index 22a6014a1df2..2895d3cbebc7 100644
--- a/tests/performance/mm-connect/connection-evm-rejection.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-rejection.spec.ts
@@ -80,7 +80,8 @@ test.describe(Performance, () => {
   // 6. CLEANUP
   //    - Tap disconnect to reset dapp state
 
-  test('@metamask/connect-evm - Rejection response value verification', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-evm - Rejection response value verification', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/mm-connect/connection-evm-sign.spec.ts b/tests/performance/mm-connect/connection-evm-sign.spec.ts
index 81d98dd8c23d..29d2fe699ad6 100644
--- a/tests/performance/mm-connect/connection-evm-sign.spec.ts
+++ b/tests/performance/mm-connect/connection-evm-sign.spec.ts
@@ -85,8 +85,8 @@ test.describe(Performance, () => {
   //
   // 7. CLEANUP
   //    - Tap disconnect to reset dapp state
-
-  test('@metamask/connect-evm - Sign and transaction cancel flows', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-evm - Sign and transaction cancel flows', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts b/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts
index 53ef06eafd59..d35912287d4f 100644
--- a/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts
+++ b/tests/performance/mm-connect/connection-multiclient-resilience.spec.ts
@@ -90,7 +90,8 @@ test.describe(Performance, () => {
   //
   // 4. CLEANUP
   //    - Tap Solana disconnect and legacy EVM disconnect
-  test('@metamask/connect-multichain (multiple clients) - Disconnect, reconnect, and resilience via Multichain API', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-multichain (multiple clients) - Disconnect, reconnect, and resilience via Multichain API', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/mm-connect/connection-multiclient.spec.ts b/tests/performance/mm-connect/connection-multiclient.spec.ts
index 178d712e1b61..83eecc487558 100644
--- a/tests/performance/mm-connect/connection-multiclient.spec.ts
+++ b/tests/performance/mm-connect/connection-multiclient.spec.ts
@@ -91,7 +91,8 @@ test.describe(Performance, () => {
   //    - 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 ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-multichain (multiple clients) - Connect multiple clients via Multichain API to Local Browser Playground', async ({
     currentDeviceDetails,
   }) => {
     // Get platform-specific URL
diff --git a/tests/performance/mm-connect/connection-wagmi-chains.spec.ts b/tests/performance/mm-connect/connection-wagmi-chains.spec.ts
index 3ac86fe3e591..707ad55f238e 100644
--- a/tests/performance/mm-connect/connection-wagmi-chains.spec.ts
+++ b/tests/performance/mm-connect/connection-wagmi-chains.spec.ts
@@ -93,7 +93,9 @@ test.describe(Performance, () => {
   //
   // 6. CLEANUP
   //    - Tap disconnect to clean up
-  test('@metamask/connect-evm (wagmi) - Chain switching via Wagmi', async ({
+  //
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-evm (wagmi) - Chain switching via Wagmi', async ({
     currentDeviceDetails,
     driver,
   }) => {
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 2561487efb24..69ff2dc4c204 100644
--- a/tests/performance/mm-connect/legacy-evm-rn-connect.spec.ts
+++ b/tests/performance/mm-connect/legacy-evm-rn-connect.spec.ts
@@ -19,7 +19,8 @@ async function returnToPlayground() {
 }
 
 test.describe(Performance, () => {
-  test('@metamask/connect-legacy-evm-rn - Connect via Legacy EVM, sign, send transaction, and switch chains', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-legacy-evm-rn - Connect via Legacy EVM, sign, send transaction, and switch chains', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/mm-connect/multichain-rn-evm.spec.ts b/tests/performance/mm-connect/multichain-rn-evm.spec.ts
index 250be3e0f8da..aa4ad048665a 100644
--- a/tests/performance/mm-connect/multichain-rn-evm.spec.ts
+++ b/tests/performance/mm-connect/multichain-rn-evm.spec.ts
@@ -79,7 +79,8 @@ async function returnToPlayground() {
 //    - Switch to MetaMask and unlock if needed to confirm no active session
 
 test.describe(Performance, () => {
-  test('@metamask/connect-multichain-rn-evm - Connect across 3 EVM chains, invoke read/write methods, and disconnect', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-multichain-rn-evm - Connect across 3 EVM chains, invoke read/write methods, and disconnect', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/mm-connect/multichain-rn-solana.spec.ts b/tests/performance/mm-connect/multichain-rn-solana.spec.ts
index 3db661cff790..90aef2714dca 100644
--- a/tests/performance/mm-connect/multichain-rn-solana.spec.ts
+++ b/tests/performance/mm-connect/multichain-rn-solana.spec.ts
@@ -67,7 +67,8 @@ async function returnToPlayground() {
 //    - Switch to MetaMask and unlock if needed to confirm no active session
 
 test.describe(Performance, () => {
-  test('@metamask/connect-multichain-rn-solana - Connect with Solana, invoke signMessage, and disconnect', async ({
+  // This test is currently being skipped as it is flaky - https://consensyssoftware.atlassian.net/browse/WAPI-1511
+  test.skip('@metamask/connect-multichain-rn-solana - Connect with Solana, invoke signMessage, and disconnect', async ({
     currentDeviceDetails,
     driver,
   }) => {
diff --git a/tests/performance/onboarding/import-wallet.spec.ts b/tests/performance/onboarding/import-wallet.spec.ts
index f5f434931770..0ddff418bd7a 100644
--- a/tests/performance/onboarding/import-wallet.spec.ts
+++ b/tests/performance/onboarding/import-wallet.spec.ts
@@ -5,6 +5,7 @@ import { Performance, PerformanceOnboarding } from '../../tags.performance.js';
 import OnboardingView from '../../page-objects/Onboarding/OnboardingView';
 import {
   asPlaywrightElement,
+  PlatformDetector,
   PlaywrightAssertions,
   PlaywrightGestures,
 } from '../../framework';
@@ -15,53 +16,63 @@ import MetaMetricsOptInView from '../../page-objects/Onboarding/MetaMetricsOptIn
 import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSuccessView';
 import PredictModalView from '../../page-objects/Predict/PredictModalView';
 import WalletView from '../../page-objects/wallet/WalletView';
-import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow';
+import {
+  dismissOnboardingInterestQuestionnaire,
+  dismisspredictionsModalPlaywright,
+  resolvePredictGtmOnboardingModalEnabled,
+} from '../../flows/wallet.flow';
 import { fetchProductionFeatureFlags } from '../feature-flag-helper';
 
 const testEnvironment = 'test'; // hard coding this for now. We need a new FF env in LD for e2e. An admin needs to create it..
 
 /* Scenario 4: Imported wallet with +50 accounts */
-test.describe(`${Performance} ${PerformanceOnboarding}`, () => {
-  test.setTimeout(240000);
+test.describe(PerformanceOnboarding, () => {
   test(
     'Onboarding Import SRP with +50 accounts, SRP 3',
     { tag: '@metamask-onboarding-team' },
-    async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
+    async ({ currentDeviceDetails, driver, performanceTracker }) => {
       const timer1 = new TimerHelper(
         'Time since the user clicks on "Create new wallet" button until "Social sign up" is visible',
-        { ios: 1000, android: 1800 },
+        { ios: 1500, android: 1800 },
         currentDeviceDetails.platform,
       );
       const timer2 = new TimerHelper(
         'Time since the user clicks on "Import using SRP" button until SRP field is displayed',
-        { ios: 1000, android: 1500 },
+        { ios: 2000, android: 1500 },
         currentDeviceDetails.platform,
       );
       const timer3 = new TimerHelper(
         'Time since the user clicks on "Continue" button on SRP screen until Password fields are visible',
-        { ios: 2500, android: 1800 },
+        { ios: 1000, android: 1500 },
         currentDeviceDetails.platform,
       );
       const timer4 = new TimerHelper(
         'Time since the user clicks on "Create Password" button until Metrics screen is displayed',
-        { ios: 1600, android: 1600 },
+        { ios: 2000, android: 1500 },
         currentDeviceDetails.platform,
       );
       const timer5 = new TimerHelper(
         'Time since the user clicks on "I agree" button on Metrics screen until Onboarding Success screen is visible',
-        { ios: 2200, android: 1700 },
+        { ios: 2000, android: 1500 },
         currentDeviceDetails.platform,
       );
       const timer6 = new TimerHelper(
         'Time since the user clicks on "Done" button until feature sheet is visible',
-        { ios: 2500, android: 3100 },
+        { ios: 3000, android: 3000 },
         currentDeviceDetails.platform,
       );
       const timer7 = new TimerHelper(
-        'Time since the user clicks on "Not now" button On feature sheet until native token is visible',
-        { ios: 90000, android: 90000 },
+        'Time since the user clicks on "Done" button until ETH and BTC are visible',
+        // +50 accounts on BrowserStack can take longer than local emulator.
+        { ios: 21000, android: 5000 },
         currentDeviceDetails.platform,
       );
+      const walletTokenLoadTimeoutMs = 60_000;
+
+      const productionFeatureFlags = await fetchProductionFeatureFlags(
+        'main',
+        testEnvironment,
+      );
 
       await OnboardingView.tapHaveAnExistingWallet();
       await timer1.measure(async () => {
@@ -96,7 +107,13 @@ test.describe(`${Performance} ${PerformanceOnboarding}`, () => {
       await CreatePasswordView.reEnterPassword(
         getPasswordForScenario('import') || '',
       );
+
+      await CreatePasswordView.tapPasswordVisibilityIcon();
+      await CreatePasswordView.tapConfirmPasswordVisibilityIcon();
       await CreatePasswordView.tapIUnderstandCheckBox();
+      if (await PlatformDetector.isAndroid()) {
+        await PlaywrightGestures.hideKeyboard();
+      }
       await CreatePasswordView.tapCreatePasswordButton();
 
       await timer4.measure(async () => {
@@ -106,52 +123,31 @@ test.describe(`${Performance} ${PerformanceOnboarding}`, () => {
       });
 
       await MetaMetricsOptInView.tapIAgreeButton();
+      await dismissOnboardingInterestQuestionnaire();
       await timer5.measure(async () => {
         await PlaywrightAssertions.expectElementToBeVisible(
           await asPlaywrightElement(OnboardingSuccessView.doneButton),
+          { timeout: 30_000 },
         );
       });
-
       await OnboardingSuccessView.tapDone();
 
-      const productionFeatureFlags = await fetchProductionFeatureFlags(
-        'main',
-        testEnvironment,
-      );
+      const predictGtmOnboardingModalEnabled =
+        await resolvePredictGtmOnboardingModalEnabled(productionFeatureFlags);
 
-      const predictGtmOnboardingModalEnabled = (
-        productionFeatureFlags?.predictGtmOnboardingModalEnabled as {
-          enabled?: boolean;
-        }
-      )?.enabled;
-      console.log(
-        `Predict GTM Onboarding Modal Enabled: ${predictGtmOnboardingModalEnabled}`,
-      );
-      if (
-        predictGtmOnboardingModalEnabled &&
-        predictGtmOnboardingModalEnabled === true
-      ) {
+      if (predictGtmOnboardingModalEnabled) {
         await timer6.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
             await asPlaywrightElement(PredictModalView.notNowButton),
           );
         });
-        await dismisspredictionsModalPlaywright();
       }
 
-      await PlaywrightAssertions.expectElementToBeVisible(
-        await asPlaywrightElement(WalletView.tokensSection),
-      );
-      await WalletView.tapOnTokensSection();
+      await dismisspredictionsModalPlaywright();
       await timer7.measure(async () => {
         await PlaywrightAssertions.expectElementToBeVisible(
-          await asPlaywrightElement(WalletView.tokenRow('BNB')),
-        );
-        await PlaywrightAssertions.expectElementToBeVisible(
-          await asPlaywrightElement(WalletView.tokenRow('SOL')),
-        );
-        await PlaywrightAssertions.expectElementToBeVisible(
-          await asPlaywrightElement(WalletView.tokenRow('BTC')),
+          await asPlaywrightElement(WalletView.tokensSection),
+          { timeout: walletTokenLoadTimeoutMs },
         );
       });
 
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 c6bcb5823273..2eb7b8e2403d 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
@@ -13,9 +13,8 @@ import {
   onboardingFlowImportSRPPlaywright,
 } from '../../../flows/wallet.flow';
 import TimerHelper from '../../../framework/TimerHelper';
-import WalletView from '../../../page-objects/wallet/WalletView';
-
-test.describe(`${Performance} ${PerformanceOnboarding} ${PerformanceLaunch}`, () => {
+import WalletView from '../../../page-objects/wallet/WalletView.js';
+test.describe(`${PerformanceOnboarding} ${PerformanceLaunch}`, () => {
   test(
     'Cold Start after importing a wallet',
     { tag: '@metamask-mobile-platform' },
@@ -36,14 +35,14 @@ test.describe(`${Performance} ${PerformanceOnboarding} ${PerformanceLaunch}`, ()
       const timer = new TimerHelper(
         'Time since the user clicks on unlock button, until the app unlocks',
         {
-          ios: 2000,
-          android: 2000,
+          ios: 21000, // this number is because Appium DOM screenshot in iOS takes too long, but visually the button is visible in just a few seconds, so we assume that this time is approximately 2 seconds, any change in the real time, will impact this as well.
+          android: 1500,
         },
         currentDeviceDetails.platform,
       );
       await timer.measure(async () => {
         await PlaywrightAssertions.expectElementToBeVisible(
-          await asPlaywrightElement(WalletView.hamburgerMenuButton),
+          await asPlaywrightElement(WalletView.walletBuyButton),
         );
       });
 
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 14f9a750018a..a24a916db232 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
@@ -16,7 +16,7 @@ test.describe(`${Performance} ${PerformanceOnboarding} ${PerformanceLaunch}`, ()
     async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
       const timer1 = new TimerHelper(
         'Time since the the app is installed, until onboarding screen appears',
-        { ios: 3000, android: 3900 },
+        { ios: 3000, android: 4000 },
         currentDeviceDetails.platform,
       );
       await timer1.measure(
diff --git a/tests/performance/onboarding/new-wallet-account-creation.spec.ts b/tests/performance/onboarding/new-wallet-account-creation.spec.ts
index 654db15a0c86..b5a62319e7ed 100644
--- a/tests/performance/onboarding/new-wallet-account-creation.spec.ts
+++ b/tests/performance/onboarding/new-wallet-account-creation.spec.ts
@@ -18,11 +18,15 @@ import CreatePasswordView from '../../page-objects/Onboarding/CreatePasswordView
 import ProtectYourWalletView from '../../page-objects/Onboarding/ProtectYourWalletView.js';
 import MetaMetricsOptInView from '../../page-objects/Onboarding/MetaMetricsOptInView.js';
 import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSuccessView.js';
-import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow.js';
+import {
+  dismissOnboardingInterestQuestionnaire,
+  dismisspredictionsModalPlaywright,
+} from '../../flows/wallet.flow.js';
 import WalletView from '../../page-objects/wallet/WalletView.js';
 import AccountListBottomSheet from '../../page-objects/wallet/AccountListBottomSheet.js';
 import { fetchProductionFeatureFlags } from '../feature-flag-helper';
 import PredictModalView from '../../page-objects/Predict/PredictModalView.js';
+import OnboardingInterestQuestionnaireView from '../../page-objects/Onboarding/OnboardingInterestQuestionnaireView.js';
 
 const testEnvironment = 'test'; // hard coding this for now. We need a new FF env in LD for e2e. An admin needs to create it..
 
@@ -36,7 +40,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding} ${PerformanceAc
       await PlaywrightAssertions.expectElementToBeVisible(
         await asPlaywrightElement(OnboardingSheet.importSeedButton),
       );
-
+      test.setTimeout(10 * 60 * 1000);
       await OnboardingSheet.tapImportSeedButton();
       await PlaywrightAssertions.expectElementToBeVisible(
         await asPlaywrightElement(CreatePasswordView.newPasswordInput),
@@ -56,6 +60,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding} ${PerformanceAc
         await asPlaywrightElement(MetaMetricsOptInView.screenTitle),
       );
       await MetaMetricsOptInView.tapAgreeButton();
+      await dismissOnboardingInterestQuestionnaire();
       await PlaywrightAssertions.expectElementToBeVisible(
         await asPlaywrightElement(OnboardingSuccessView.doneButton),
       );
@@ -81,26 +86,26 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding} ${PerformanceAc
         await dismisspredictionsModalPlaywright();
       }
 
-      await PlaywrightAssertions.expectElementToBeVisible(
-        await asPlaywrightElement(WalletView.container),
-      );
-
       const screen1Timer = new TimerHelper(
         'Time since the user clicks on "Account list" button until the account list is visible',
-        { ios: 3000, android: 3000 },
+        { ios: 2000, android: 2000 },
         currentDeviceDetails.platform,
       );
       const screen2Timer = new TimerHelper(
         'Time since the user clicks on "Create account" button until the account is in the account list',
-        { ios: 1300, android: 2000 },
+        { ios: 1800, android: 1500 },
         currentDeviceDetails.platform,
       );
       const screen3Timer = new TimerHelper(
         'Time since the user clicks on new account created until the Token list is visible',
-        { ios: 3000, android: 3000 },
+        { ios: 2000, android: 2000 },
         currentDeviceDetails.platform,
       );
 
+      await PlaywrightAssertions.expectElementToBeVisible(
+        await asPlaywrightElement(WalletView.walletBuyButton),
+      );
+
       await WalletView.tapIdenticon();
       await screen1Timer.measure(
         async () =>
@@ -122,22 +127,14 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding} ${PerformanceAc
 
       await AccountListBottomSheet.tapAccountByName('Account 2');
       await screen3Timer.measure(async () => {
-        const timeout = 10_000;
-        const interval = 100;
-        const start = Date.now();
-        while (Date.now() - start < timeout) {
-          try {
-            const accountEl = await asPlaywrightElement(
-              WalletView.accountNameLabelText,
-            );
-            const text = await accountEl.textContent();
-            if (text === 'Account 2') return;
-          } catch {
-            // Element not found yet, continue polling
-          }
-          await new Promise((resolve) => setTimeout(resolve, interval));
-        }
-        throw new Error('Expected account "Account 2" to be visible after 10s');
+        await WalletView.checkActiveAccount('Account 2');
+        await PlaywrightAssertions.expectElementToBeVisible(
+          await asPlaywrightElement(WalletView.tokensSection),
+          {
+            description:
+              'token list should be visible after selecting the new account',
+          },
+        );
       });
 
       performanceTracker.addTimers(screen1Timer, screen2Timer, screen3Timer);
diff --git a/tests/performance/login/perps-position-management.spec.ts b/tests/performance/onboarding/perps-position-management.spec.ts
similarity index 60%
rename from tests/performance/login/perps-position-management.spec.ts
rename to tests/performance/onboarding/perps-position-management.spec.ts
index 2e0622a0893f..01c867a018b3 100644
--- a/tests/performance/login/perps-position-management.spec.ts
+++ b/tests/performance/onboarding/perps-position-management.spec.ts
@@ -1,32 +1,35 @@
-import { test } from '../../framework/fixture';
+import { test } from '../../framework/fixture/index.js';
 
-import TimerHelper from '../../framework/TimerHelper';
+import TimerHelper from '../../framework/TimerHelper.js';
 import { Performance, PerformancePreps } from '../../tags.performance.js';
 import {
   loginToAppPlaywright,
+  onboardingFlowImportSRPPlaywright,
   selectAccountByDevice,
-} from '../../flows/wallet.flow';
-import TabBarComponent from '../../page-objects/wallet/TabBarComponent';
-import WalletActionsBottomSheet from '../../page-objects/wallet/WalletActionsBottomSheet';
-import PerpsOnboarding from '../../page-objects/Perps/PerpsOnboarding';
-import PerpsMarketListView from '../../page-objects/Perps/PerpsMarketListView';
-import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView';
-import PerpsOrderView from '../../page-objects/Perps/PerpsOrderView';
+} from '../../flows/wallet.flow.js';
+import TabBarComponent from '../../page-objects/wallet/TabBarComponent.js';
+import WalletActionsBottomSheet from '../../page-objects/wallet/WalletActionsBottomSheet.js';
+import PerpsOnboarding from '../../page-objects/Perps/PerpsOnboarding.js';
+import PerpsMarketListView from '../../page-objects/Perps/PerpsMarketListView.js';
+import PerpsMarketDetailsView from '../../page-objects/Perps/PerpsMarketDetailsView.js';
+import PerpsOrderView from '../../page-objects/Perps/PerpsOrderView.js';
 import {
+  dismissPerpsOnboardingTutorialIfPresent,
   isPositionOpen,
-  waitForOrderScreenVisible,
-  waitForPositionOpen,
-} from '../../flows/perps.flow';
-import PlaywrightAssertions from '../../framework/PlaywrightAssertions';
-import { asPlaywrightElement } from '../../framework/EncapsulatedElement';
-
+  resolvePerpsGtmOnboardingModalEnabled,
+} from '../../flows/perps.flow.js';
+import PlaywrightAssertions from '../../framework/PlaywrightAssertions.js';
+import { asPlaywrightElement } from '../../framework/EncapsulatedElement.js';
+import { fetchProductionFeatureFlags } from '../feature-flag-helper.js';
+const testEnvironment = process.env.E2E_PERFORMANCE_BUILD_VARIANT || 'rc';
 /* Scenario 5: Perps onboarding + add funds 10 USD ARB.USDC + Open Position + Close Position */
 test.describe(`${Performance} ${PerformancePreps}`, () => {
   test(
     'Perps open position and close it',
     { tag: '@mm-perps-engineering-team' },
     async ({ currentDeviceDetails, driver, performanceTracker }, testInfo) => {
-      test.setTimeout(10 * 60 * 1000); // 10 minutes
+      const timeoutMinutes = currentDeviceDetails.platform === 'ios' ? 15 : 10;
+      test.setTimeout(timeoutMinutes * 60 * 1000);
 
       const selectPerpsMainScreenTimer = new TimerHelper(
         'Perps tutorial screen visible',
@@ -36,17 +39,17 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
 
       const selectMarketTimer = new TimerHelper(
         'Market list screen visible',
-        { ios: 7500, android: 2000 },
+        { ios: 7500, android: 5000 },
         currentDeviceDetails.platform,
       );
       const openOrderScreenTimer = new TimerHelper(
         'Open Order Screen',
-        { ios: 1500, android: 3000 },
+        { ios: 3000, android: 5000 },
         currentDeviceDetails.platform,
       );
       const openPositionTimer = new TimerHelper(
         'Position opened',
-        { ios: 10500, android: 13000 },
+        { ios: 10500, android: 14000 },
         currentDeviceDetails.platform,
       );
 
@@ -56,30 +59,44 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
         currentDeviceDetails.platform,
       );
 
-      await loginToAppPlaywright();
+      await onboardingFlowImportSRPPlaywright(process.env.TEST_SRP_4 ?? '');
       // Perps requires independent account for each device to avoid clashes when running tests in parallel
       await selectAccountByDevice(currentDeviceDetails.deviceName);
 
       await TabBarComponent.tapActions();
+      await WalletActionsBottomSheet.checkModalVisibility();
       await WalletActionsBottomSheet.tapPerpsButton();
-      await selectPerpsMainScreenTimer.measure(async () => {
-        await PlaywrightAssertions.expectElementToBeVisible(
-          await asPlaywrightElement(PerpsOnboarding.tutorialTitle),
-        );
-      });
+      const productionFeatureFlags = await fetchProductionFeatureFlags(
+        'main',
+        testEnvironment,
+      );
+
+      const perpsGtmOnboardingModalEnabled =
+        await resolvePerpsGtmOnboardingModalEnabled(productionFeatureFlags);
+
+      if (perpsGtmOnboardingModalEnabled) {
+        await selectPerpsMainScreenTimer.measure(async () => {
+          await PlaywrightAssertions.expectElementToBeVisible(
+            await asPlaywrightElement(PerpsOnboarding.tutorialTitle),
+          );
+        });
+      }
+
+      await dismissPerpsOnboardingTutorialIfPresent();
 
-      await PerpsOnboarding.tapSkipButton();
       await selectMarketTimer.measure(async () => {
         await PlaywrightAssertions.expectElementToBeVisible(
           await asPlaywrightElement(PerpsMarketListView.header),
         );
       });
 
-      await PerpsMarketListView.selectMarket('BTC');
+      await PerpsMarketListView.tapMarketRowItemBTC();
 
-      await MarketDetailsScreenTimer.measure(
-        async () => await PerpsMarketDetailsView.isContainerDisplayed(),
-      );
+      await MarketDetailsScreenTimer.measure(async () => {
+        await PlaywrightAssertions.expectElementToBeVisible(
+          await asPlaywrightElement(PerpsMarketDetailsView.header),
+        );
+      });
       // Check if there's an existing position and close it before continuing
       if (await isPositionOpen()) {
         console.log(
@@ -92,20 +109,24 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
           console.error('❌ Error closing existing position:', error);
         }
       }
-
       await PerpsMarketDetailsView.tapLongButton();
       // Open Position
-      await openOrderScreenTimer.measure(
-        async () => await waitForOrderScreenVisible(),
-      );
+      await openOrderScreenTimer.measure(async () => {
+        await PlaywrightAssertions.expectElementToBeVisible(
+          await asPlaywrightElement(PerpsOrderView.placeOrderButton),
+        );
+      });
 
       await PerpsOrderView.setLeverageAppium(40);
       await PerpsOrderView.setAmountUSD('10');
       await PerpsOrderView.tapPlaceOrder();
 
-      await openPositionTimer.measure(
-        async () => await waitForPositionOpen(20000),
-      );
+      await openPositionTimer.measure(async () => {
+        await PlaywrightAssertions.expectElementToBeVisible(
+          await asPlaywrightElement(PerpsMarketDetailsView.closeButton),
+          { timeout: 30000 },
+        );
+      });
 
       try {
         await PerpsMarketDetailsView.closePositionWithRetry();
@@ -114,8 +135,10 @@ test.describe(`${Performance} ${PerformancePreps}`, () => {
         console.error('❌ Error closing position:', error);
       }
 
+      if (perpsGtmOnboardingModalEnabled) {
+        performanceTracker.addTimer(selectPerpsMainScreenTimer);
+      }
       performanceTracker.addTimers(
-        selectPerpsMainScreenTimer,
         selectMarketTimer,
         openOrderScreenTimer,
         openPositionTimer,
diff --git a/tests/performance/onboarding/seedless-apple-onboarding.spec.ts b/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
index b9dee63c4f05..40aa7cd85766 100644
--- a/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-apple-onboarding.spec.ts
@@ -1,8 +1,15 @@
 import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper';
-import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
+import {
+  asPlaywrightElement,
+  PlaywrightAssertions,
+  PlaywrightGestures,
+} from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
-import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow';
+import {
+  dismissOnboardingInterestQuestionnaire,
+  dismisspredictionsModalPlaywright,
+} from '../../flows/wallet.flow';
 import {
   Performance,
   System,
@@ -16,7 +23,6 @@ import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSucce
 import PredictModalView from '../../page-objects/Predict/PredictModalView';
 import WalletView from '../../page-objects/wallet/WalletView';
 import LoginView from '../../page-objects/wallet/LoginView';
-import PlaywrightGestures from '../../framework/PlaywrightGestures';
 const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   await new Promise<T>((resolve, reject) => {
     let rejectedCount = 0;
@@ -46,12 +52,12 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
       );
       const timer2 = new TimerHelper(
         'Apple: Tap Apple login → post-OAuth screen visible',
-        { ios: 15000, android: 15000 },
+        { ios: 15000, android: 6000 },
         currentDeviceDetails.platform,
       );
       const timer3 = new TimerHelper(
         'Apple: Post-OAuth action → Password fields visible',
-        { ios: 4000, android: 2000 },
+        { ios: 5000, android: 2000 },
         currentDeviceDetails.platform,
       );
       const timer4 = new TimerHelper(
@@ -61,12 +67,12 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
       );
       const timer5 = new TimerHelper(
         'Apple: Tap "Done" → feature sheet visible',
-        { ios: 2500, android: 3100 },
+        { ios: 2500, android: 5000 },
         currentDeviceDetails.platform,
       );
       const timer6 = new TimerHelper(
         'Apple: Dismiss feature sheet → wallet main screen visible',
-        { ios: 30000, android: 30000 },
+        { ios: 30000, android: 5000 },
         currentDeviceDetails.platform,
       );
 
@@ -121,6 +127,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
         await PlaywrightGestures.hideKeyboard();
 
         await CreatePasswordView.tapIUnderstandCheckBox();
+        await PlaywrightGestures.hideKeyboard();
         await CreatePasswordView.tapCreatePasswordButton();
 
         await timer4.measure(async () => {
@@ -131,7 +138,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
             },
           );
         });
-
+        await dismissOnboardingInterestQuestionnaire();
         await OnboardingSuccessView.tapDone();
         await timer5.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
@@ -146,7 +153,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
         await dismisspredictionsModalPlaywright();
         await timer6.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(WalletView.container),
+            asPlaywrightElement(WalletView.accountIcon), // Workaround until iOS nested component gets fixed
             {
               description: 'Wallet main screen should be visible',
             },
diff --git a/tests/performance/onboarding/seedless-google-onboarding.spec.ts b/tests/performance/onboarding/seedless-google-onboarding.spec.ts
index c1b0259f9b62..2f8d36dc6745 100644
--- a/tests/performance/onboarding/seedless-google-onboarding.spec.ts
+++ b/tests/performance/onboarding/seedless-google-onboarding.spec.ts
@@ -1,8 +1,15 @@
 import { test } from '../../framework/fixture';
 import TimerHelper from '../../framework/TimerHelper';
-import { asPlaywrightElement, PlaywrightAssertions } from '../../framework';
+import {
+  asPlaywrightElement,
+  PlaywrightAssertions,
+  PlaywrightGestures,
+} from '../../framework';
 import { getPasswordForScenario } from '../../framework/utils/TestConstants.js';
-import { dismisspredictionsModalPlaywright } from '../../flows/wallet.flow';
+import {
+  dismissOnboardingInterestQuestionnaire,
+  dismisspredictionsModalPlaywright,
+} from '../../flows/wallet.flow';
 import {
   Performance,
   System,
@@ -16,7 +23,6 @@ import OnboardingSuccessView from '../../page-objects/Onboarding/OnboardingSucce
 import PredictModalView from '../../page-objects/Predict/PredictModalView';
 import WalletView from '../../page-objects/wallet/WalletView';
 import LoginView from '../../page-objects/wallet/LoginView';
-import PlaywrightGestures from '../../framework/PlaywrightGestures';
 
 const waitForFirstSuccessful = async <T>(promises: Promise<T>[]): Promise<T> =>
   await new Promise<T>((resolve, reject) => {
@@ -47,12 +53,12 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
       );
       const timer2 = new TimerHelper(
         'Google: Tap Google login → post-OAuth screen visible',
-        { ios: 15000, android: 15000 },
+        { ios: 15000, android: 5000 },
         currentDeviceDetails.platform,
       );
       const timer3 = new TimerHelper(
         'Google: Post-OAuth action → Password fields visible',
-        { ios: 4000, android: 2000 },
+        { ios: 4000, android: 4000 },
         currentDeviceDetails.platform,
       );
       const timer4 = new TimerHelper(
@@ -62,12 +68,12 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
       );
       const timer5 = new TimerHelper(
         'Google: Tap "Done" → feature sheet visible',
-        { ios: 2500, android: 3100 },
+        { ios: 2500, android: 5000 },
         currentDeviceDetails.platform,
       );
       const timer6 = new TimerHelper(
         'Google: Dismiss feature sheet → wallet main screen visible',
-        { ios: 30000, android: 30000 },
+        { ios: 30000, android: 5000 },
         currentDeviceDetails.platform,
       );
 
@@ -84,6 +90,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
       });
 
       await OnboardingSheet.tapGoogleLoginButton();
+      await SocialLoginView.dismissUpdateModalIfPresent();
 
       let isNewUser = true;
 
@@ -120,7 +127,6 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
         await CreatePasswordView.enterPassword(password);
         await CreatePasswordView.reEnterPassword(password);
         await PlaywrightGestures.hideKeyboard();
-
         await CreatePasswordView.tapIUnderstandCheckBox();
         await CreatePasswordView.tapCreatePasswordButton();
 
@@ -133,6 +139,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
           );
         });
 
+        await dismissOnboardingInterestQuestionnaire();
         await OnboardingSuccessView.tapDone();
         await timer5.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
@@ -147,7 +154,7 @@ test.describe(`${Performance} ${System} ${PerformanceOnboarding}`, () => {
         await dismisspredictionsModalPlaywright();
         await timer6.measure(async () => {
           await PlaywrightAssertions.expectElementToBeVisible(
-            asPlaywrightElement(WalletView.container),
+            asPlaywrightElement(WalletView.accountIcon), // Workaround until iOS nested component gets fixed
             {
               description: 'Wallet main screen should be visible',
             },
diff --git a/tests/playwright.config.ts b/tests/playwright.config.ts
index 13921c79ba96..cbb9465f3b7b 100644
--- a/tests/playwright.config.ts
+++ b/tests/playwright.config.ts
@@ -4,6 +4,9 @@ import { defineConfig } from './framework/config';
 export default defineConfig({
   testDir: './',
   fullyParallel: false,
+  workers: process.env.PLAYWRIGHT_WORKERS
+    ? parseInt(process.env.PLAYWRIGHT_WORKERS, 10)
+    : 3,
   timeout: 7 * 60 * 1000, //7 minutes until we introduce fixtures
   grep: /@Performance/,
   reporter: [
diff --git a/tests/reporters/PerformanceReporter.ts b/tests/reporters/PerformanceReporter.ts
index d3ed6cb69fbf..948905422867 100644
--- a/tests/reporters/PerformanceReporter.ts
+++ b/tests/reporters/PerformanceReporter.ts
@@ -311,11 +311,48 @@ class PerformanceReporter {
             logger.info(
               this.qualityGatesReportFormatter.formatConsoleReport(
                 qualityGatesResult,
+                metricsEntry.sessionCreationDurationMs,
               ),
             );
           }
 
-          // Update failed test entry with quality gates info
+          // Quality gates exceeded → always mark the test as failed in the
+          // report, regardless of what Playwright reports as result.status
+          // (fixture teardown errors can surface as 'interrupted' in some
+          // Playwright versions instead of 'failed').
+          if (qualityGatesResult.hasThresholds && !qualityGatesResult.passed) {
+            metricsEntry.testFailed = true;
+            metricsEntry.failureReason = 'quality_gates_exceeded';
+
+            // Ensure the test is tracked in failedTestsByTeam even when
+            // trackFailedTest() was skipped because result.status was not
+            // 'failed' or 'timedOut'.
+            const teamId = teamInfo.teamId;
+            if (!this.failedTestsByTeam[teamId]) {
+              this.failedTestsByTeam[teamId] = { team: teamInfo, tests: [] };
+            }
+            const alreadyTracked = this.failedTestsByTeam[teamId].tests.find(
+              (t) => t.testName === test.title && t.projectName === projectName,
+            );
+            if (!alreadyTracked) {
+              const sessionIdFromAnnotation =
+                result.annotations?.find((a) => a.type === 'sessionId')
+                  ?.description ?? null;
+              this.failedTestsByTeam[teamId].tests.push({
+                testName: test.title,
+                testFilePath,
+                tags: testTags,
+                status: 'failed',
+                duration: result.duration,
+                projectName,
+                sessionId: sessionIdFromAnnotation,
+                qualityGates: qualityGatesResult,
+                failureReason: 'quality_gates_exceeded',
+              });
+            }
+          }
+
+          // Update existing failed test entry with quality gates details
           if (metricsEntry.testFailed) {
             const updates: Record<string, unknown> = {
               qualityGates: qualityGatesResult,
diff --git a/tests/reporters/PerformanceTracker.ts b/tests/reporters/PerformanceTracker.ts
index b2a12305ee58..e0c013784ff4 100644
--- a/tests/reporters/PerformanceTracker.ts
+++ b/tests/reporters/PerformanceTracker.ts
@@ -26,6 +26,7 @@ export interface MetricsOutput {
     percentOver: string | null;
   } | null;
   device: DeviceInfo;
+  sessionCreationDurationMs?: number;
 }
 
 /**
@@ -35,6 +36,7 @@ export interface MetricsOutput {
 export class PerformanceTracker {
   timers: Timer[];
   teamInfo: TeamInfo | null;
+  private _sessionCreationDurationMs?: number;
 
   constructor() {
     this.timers = [];
@@ -45,6 +47,10 @@ export class PerformanceTracker {
     this.teamInfo = teamInfo;
   }
 
+  setSessionCreationDuration(ms: number): void {
+    this._sessionCreationDurationMs = ms;
+  }
+
   addTimers(...timers: Timer[]): void {
     timers.forEach((timer) => {
       this.addTimer(timer);
@@ -71,6 +77,9 @@ export class PerformanceTracker {
       hasThresholds: false,
       totalValidation: null,
       device: { name: 'Unknown', osVersion: 'Unknown', provider: 'unknown' },
+      ...(this._sessionCreationDurationMs !== undefined && {
+        sessionCreationDurationMs: this._sessionCreationDurationMs,
+      }),
     };
 
     let totalSeconds = 0;
diff --git a/tests/reporters/generators/CsvReportGenerator.ts b/tests/reporters/generators/CsvReportGenerator.ts
index 7589a479ecc7..c7e22dad846b 100644
--- a/tests/reporters/generators/CsvReportGenerator.ts
+++ b/tests/reporters/generators/CsvReportGenerator.ts
@@ -43,6 +43,11 @@ export class CsvReportGenerator {
           }
         });
       }
+      if (test.sessionCreationDurationMs !== undefined) {
+        csvRows.push(
+          `BrowserStack Session Creation (ms),${test.sessionCreationDurationMs},,,,`,
+        );
+      }
       csvRows.push(''); // Blank line for readability
 
       // Add column headers
diff --git a/tests/reporters/generators/HtmlReportGenerator.ts b/tests/reporters/generators/HtmlReportGenerator.ts
index f61843d6de9d..b81561ec1774 100644
--- a/tests/reporters/generators/HtmlReportGenerator.ts
+++ b/tests/reporters/generators/HtmlReportGenerator.ts
@@ -69,6 +69,7 @@ export class HtmlReportGenerator {
       .map(
         (test) => `
       <h2>${test.testName}</h2>
+      ${this.generateSessionCreationRow(test)}
       <table>
         <tr>
           <th>Steps</th>
@@ -90,6 +91,15 @@ export class HtmlReportGenerator {
       .join('');
   }
 
+  private generateSessionCreationRow(test: MetricsEntry): string {
+    if (test.sessionCreationDurationMs === undefined) return '';
+    const seconds = (test.sessionCreationDurationMs / 1000).toFixed(2);
+    return `<div style="background-color: #fff8e1; border-left: 4px solid #ffa000; padding: 10px 15px; margin-bottom: 12px; border-radius: 4px; font-size: 14px;">
+      <strong>BrowserStack Session Creation:</strong> ${test.sessionCreationDurationMs} ms (${seconds} s)
+      <span style="color: #888; margin-left: 8px;">— infrastructure overhead, not included in total</span>
+    </div>`;
+  }
+
   private generateStepRows(test: MetricsEntry): string {
     if (test.steps && Array.isArray(test.steps)) {
       return test.steps
diff --git a/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts b/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts
index af67098a0cc9..0bdd441ae055 100644
--- a/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts
+++ b/tests/reporters/providers/sentry/PerformanceSentryPublisher.ts
@@ -21,6 +21,7 @@ const MAX_MEASUREMENT_KEY_LENGTH = 64;
 const RESERVED_MEASUREMENT_KEYS = [
   'scenario_total_time_ms',
   'scenario_total_threshold_ms',
+  'bs_session_creation_ms',
 ] as const;
 
 interface PublishPerformanceScenarioOptions {
@@ -289,6 +290,13 @@ export async function publishPerformanceScenarioToSentry(
     };
   }
 
+  if (options.metrics.sessionCreationDurationMs !== undefined) {
+    measurements.bs_session_creation_ms = {
+      value: options.metrics.sessionCreationDurationMs,
+      unit: 'millisecond',
+    };
+  }
+
   const provider = options.metrics.device.provider || 'unknown';
   const teamId = options.metrics.team?.teamId || 'unknown';
   const teamName = options.metrics.team?.teamName || 'unknown';
@@ -398,6 +406,7 @@ export async function publishPerformanceScenarioToSentry(
       total_threshold_ms: options.metrics.totalThreshold,
       total_validation: options.metrics.totalValidation,
       timer_steps: timerMeasurements,
+      bs_session_creation_ms: options.metrics.sessionCreationDurationMs ?? null,
       sentry_project_id: parsedDsn.projectId,
     },
   };
diff --git a/tests/reporters/types.ts b/tests/reporters/types.ts
index 4efeaa6e3e30..68a89c378fe6 100644
--- a/tests/reporters/types.ts
+++ b/tests/reporters/types.ts
@@ -59,6 +59,7 @@ export interface MetricsEntry {
   qualityGates?: QualityGatesResult | null;
   videoURL?: string | null;
   sessionId?: string | null;
+  sessionCreationDurationMs?: number;
   profilingData?: ProfilingData | null;
   profilingSummary?: ProfilingSummary | null;
   apiCalls?: NetworkLogEntry[] | null;
diff --git a/tests/scripts/aggregate-performance-reports.mjs b/tests/scripts/aggregate-performance-reports.mjs
index f034ca875305..fb08f102f9d4 100755
--- a/tests/scripts/aggregate-performance-reports.mjs
+++ b/tests/scripts/aggregate-performance-reports.mjs
@@ -401,8 +401,8 @@ function createSummary(groupedResults) {
     });
   });
   
-    // Unique test count: each test counts once per device regardless of retries
-    const uniqueTestCount = Object.keys(testExecutions).length;
+  // Unique test count: each test counts once per device regardless of retries
+  const uniqueTestCount = Object.keys(testExecutions).length;
 
   // Second pass: determine final test status
   // A test is only considered failed if ALL executions failed (no successful retry)
@@ -411,7 +411,7 @@ function createSummary(groupedResults) {
   const failedTestsByPlatform = { android: 0, ios: 0 };
 
   const uniqueFailedTestNames = new Set();
-  
+
   Object.values(testExecutions).forEach(execution => {
     // If test passed at least once, it's considered passed (successful retry)
     if (execution.hasPassed) {
diff --git a/tests/selectors/Bridge/QuoteView.selectors.ts b/tests/selectors/Bridge/QuoteView.selectors.ts
index 4852120a9aea..bef457fd4105 100644
--- a/tests/selectors/Bridge/QuoteView.selectors.ts
+++ b/tests/selectors/Bridge/QuoteView.selectors.ts
@@ -52,4 +52,5 @@ export const QuoteViewSelectorIDs = {
   FEE_DISCLAIMER: 'bridge-fee-disclaimer',
   KEYPAD_DELETE_BUTTON: 'keypad-delete-button',
   BACK_BUTTON: 'button-icon',
+  PRICE_IMPACT_INFO_BUTTON: 'price-impact-info-button',
 };
diff --git a/yarn.lock b/yarn.lock
index 7d1c3a53775e..e7cfaf683529 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7762,17 +7762,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/account-tree-controller@npm:^7.2.0, @metamask/account-tree-controller@npm:^7.4.0":
-  version: 7.4.0
-  resolution: "@metamask/account-tree-controller@npm:7.4.0"
+"@metamask/account-tree-controller@npm:^7.2.0, @metamask/account-tree-controller@npm:^7.4.0, @metamask/account-tree-controller@npm:^7.5.0":
+  version: 7.5.0
+  resolution: "@metamask/account-tree-controller@npm:7.5.0"
   dependencies:
-    "@metamask/accounts-controller": "npm:^38.1.1"
+    "@metamask/accounts-controller": "npm:^38.1.2"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/keyring-api": "npm:^23.1.0"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/messenger": "npm:^1.2.0"
-    "@metamask/multichain-account-service": "npm:^10.0.0"
-    "@metamask/profile-sync-controller": "npm:^28.1.0"
+    "@metamask/multichain-account-service": "npm:^10.0.1"
+    "@metamask/profile-sync-controller": "npm:^28.1.1"
     "@metamask/snaps-controllers": "npm:^19.0.0"
     "@metamask/snaps-sdk": "npm:^11.0.0"
     "@metamask/snaps-utils": "npm:^12.1.2"
@@ -7783,7 +7783,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/8c9967775e4ef3bcb718efb18feb2f94f077c540510c94eb9cc9e814dc91f19b1d4e374e694cbfb6697e162d9c88922acafa1723e727b8912bf4ef3620a8e784
+  checksum: 10/b7d6f1505d3ae07304649c3d922e5275270a83bbb97391dd47d776656ad3b22b6926d75f3925e22b28dde7c6e713f23fd6a4de7f20c2d02a9eece27cd1b10f9f
   languageName: node
   linkType: hard
 
@@ -7826,15 +7826,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/ai-controllers@npm:0.6.3":
-  version: 0.6.3
-  resolution: "@metamask/ai-controllers@npm:0.6.3"
+"@metamask/ai-controllers@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "@metamask/ai-controllers@npm:0.7.0"
   dependencies:
-    "@metamask/base-controller": "npm:^9.0.1"
-    "@metamask/messenger": "npm:^1.0.0"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/messenger": "npm:^1.2.0"
     "@metamask/superstruct": "npm:^3.1.0"
     "@metamask/utils": "npm:^11.9.0"
-  checksum: 10/678f024889a2fe691633df7b3cce529c8a87c0533096df9b238308736ce232f4a71f1a2f9a74cff16ef6cd635b551141517e8c53dedfc0a38a45d2771850b6b6
+  checksum: 10/129d02a26595f16362c6bb1905ef3885b369529eb0a174da46ed7add5fd1d6ffa4d00ba29e09f7583ef70a299dc99f33c82efc45eeea08ab7e5e712c4a3dc11d
   languageName: node
   linkType: hard
 
@@ -7916,22 +7916,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controller@npm:^8.0.0, @metamask/assets-controller@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "@metamask/assets-controller@npm:8.0.1"
+"@metamask/assets-controller@npm:^8.0.0, @metamask/assets-controller@npm:^8.0.1, @metamask/assets-controller@npm:^8.2.0":
+  version: 8.2.0
+  resolution: "@metamask/assets-controller@npm:8.2.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.4.0"
-    "@metamask/accounts-controller": "npm:^38.1.1"
-    "@metamask/assets-controllers": "npm:^108.1.0"
+    "@metamask/account-tree-controller": "npm:^7.5.0"
+    "@metamask/accounts-controller": "npm:^38.1.2"
+    "@metamask/assets-controllers": "npm:^108.3.0"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/client-controller": "npm:^1.0.1"
     "@metamask/controller-utils": "npm:^12.1.0"
-    "@metamask/core-backend": "npm:^6.3.0"
+    "@metamask/core-backend": "npm:^6.3.1"
     "@metamask/keyring-api": "npm:^23.1.0"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/keyring-internal-api": "npm:^11.0.1"
     "@metamask/keyring-snap-client": "npm:^9.0.2"
     "@metamask/messenger": "npm:^1.2.0"
@@ -7949,13 +7949,13 @@ __metadata:
     bignumber.js: "npm:^9.1.2"
     lodash: "npm:^4.17.21"
     p-limit: "npm:^3.1.0"
-  checksum: 10/056627318de4985ea2780f3009f8f803cba7eb4ba45f605b29dc4783146db9a8743e83e9d91ea949ad401c2018105531eef66793f09bf7822d955807446016f1
+  checksum: 10/f10efa10eb986321fc291f679a6fd2458054c317be9c3a23574121c0a84ca36fd9945417b545743a1f9cb693893f713c429f322c226883c3d156b42a7e4a1004
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:^108.0.0, @metamask/assets-controllers@npm:^108.1.0":
-  version: 108.1.0
-  resolution: "@metamask/assets-controllers@npm:108.1.0"
+"@metamask/assets-controllers@npm:^108.0.0, @metamask/assets-controllers@npm:^108.1.0, @metamask/assets-controllers@npm:^108.3.0":
+  version: 108.3.0
+  resolution: "@metamask/assets-controllers@npm:108.3.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
@@ -7964,32 +7964,32 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/abi-utils": "npm:^2.0.3"
-    "@metamask/account-tree-controller": "npm:^7.4.0"
-    "@metamask/accounts-controller": "npm:^38.1.1"
+    "@metamask/account-tree-controller": "npm:^7.5.0"
+    "@metamask/accounts-controller": "npm:^38.1.2"
     "@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:^12.1.0"
-    "@metamask/core-backend": "npm:^6.2.2"
+    "@metamask/core-backend": "npm:^6.3.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/keyring-api": "npm:^23.1.0"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/messenger": "npm:^1.2.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/multichain-account-service": "npm:^10.0.0"
+    "@metamask/multichain-account-service": "npm:^10.0.1"
     "@metamask/network-controller": "npm:^32.0.0"
-    "@metamask/network-enablement-controller": "npm:^5.1.1"
+    "@metamask/network-enablement-controller": "npm:^5.2.0"
     "@metamask/permission-controller": "npm:^13.1.1"
-    "@metamask/phishing-controller": "npm:^17.1.2"
-    "@metamask/polling-controller": "npm:^16.0.5"
+    "@metamask/phishing-controller": "npm:^17.2.0"
+    "@metamask/polling-controller": "npm:^16.0.6"
     "@metamask/preferences-controller": "npm:^23.1.0"
-    "@metamask/profile-sync-controller": "npm:^28.1.0"
+    "@metamask/profile-sync-controller": "npm:^28.1.1"
     "@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:^65.3.0"
+    "@metamask/transaction-controller": "npm:^66.0.0"
     "@metamask/utils": "npm:^11.9.0"
     "@tanstack/query-core": "npm:^5.62.16"
     "@types/bn.js": "npm:^5.1.5"
@@ -8006,7 +8006,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/b30574058978f594505b6585dff7501b05a1b36591dfe97ea58c915b85f4e534374d8d3fc72420d58f0a44df9d29aa62c526ec5e903482a64ed9384ff4f09f44
+  checksum: 10/13bbd5c023577b4f5c4f587fcafc8a2d42f49c204a10bd85444ae5de2d1015d409042195f4d576c6c37d443b67c7268ec553337cda5c475571e0def4b81486d1
   languageName: node
   linkType: hard
 
@@ -8364,20 +8364,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/core-backend@npm:^6.2.2, @metamask/core-backend@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@metamask/core-backend@npm:6.3.0"
+"@metamask/core-backend@npm:^6.2.2, @metamask/core-backend@npm:^6.3.0, @metamask/core-backend@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "@metamask/core-backend@npm:6.3.1"
   dependencies:
-    "@metamask/accounts-controller": "npm:^38.1.1"
+    "@metamask/accounts-controller": "npm:^38.1.2"
     "@metamask/controller-utils": "npm:^12.1.0"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/messenger": "npm:^1.2.0"
-    "@metamask/profile-sync-controller": "npm:^28.1.0"
+    "@metamask/profile-sync-controller": "npm:^28.1.1"
     "@metamask/utils": "npm:^11.9.0"
     "@tanstack/query-core": "npm:^5.62.16"
     async-mutex: "npm:^0.5.0"
     uuid: "npm:^8.3.2"
-  checksum: 10/4823dc2d9ac77e405190eb7aca87c14ddc1cc2d30092872c48a2dbf45672f64859a36bc298fa2673cfcd14165525216dad4f3d9242c7f2ec743a71c175045928
+  checksum: 10/f267e17202738f6190da8edc7eeeb49941b76ba893d33c8e07fb2010bf0f9c44f360556199b2e5bc08db4e66296efec377b8d06cb7fabba2be99bf7c2a6d21c9
   languageName: node
   linkType: hard
 
@@ -9064,6 +9064,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/keyring-controller@npm:^26.0.0":
+  version: 26.0.0
+  resolution: "@metamask/keyring-controller@npm:26.0.0"
+  dependencies:
+    "@ethereumjs/util": "npm:^9.1.0"
+    "@metamask/base-controller": "npm:^9.1.0"
+    "@metamask/browser-passworder": "npm:^6.0.0"
+    "@metamask/eth-hd-keyring": "npm:^14.1.1"
+    "@metamask/eth-sig-util": "npm:^8.2.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/3ca8a86b97fb9568debdc7b574d42cf98a6c3ff76695e72679980169738ff9e4b9626c9ee59a91f3aa57e3e89003ecccfd5f2e9fa7c2775ff1b545e12a47933f
+  languageName: node
+  linkType: hard
+
 "@metamask/keyring-internal-api@npm:^11.0.1":
   version: 11.0.1
   resolution: "@metamask/keyring-internal-api@npm:11.0.1"
@@ -9332,22 +9355,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/multichain-account-service@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@metamask/multichain-account-service@npm:10.0.0"
+"@metamask/multichain-account-service@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@metamask/multichain-account-service@npm:10.0.1"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
-    "@metamask/accounts-controller": "npm:^38.1.1"
+    "@metamask/accounts-controller": "npm:^38.1.2"
     "@metamask/base-controller": "npm:^9.1.0"
     "@metamask/eth-snap-keyring": "npm:^22.0.1"
     "@metamask/key-tree": "npm:^10.1.1"
     "@metamask/keyring-api": "npm:^23.1.0"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/keyring-internal-api": "npm:^11.0.1"
     "@metamask/keyring-snap-client": "npm:^9.0.2"
     "@metamask/keyring-utils": "npm:^3.2.1"
     "@metamask/messenger": "npm:^1.2.0"
-    "@metamask/snap-account-service": "npm:^0.1.0"
+    "@metamask/snap-account-service": "npm:^0.2.1"
     "@metamask/snaps-controllers": "npm:^19.0.0"
     "@metamask/snaps-sdk": "npm:^11.0.0"
     "@metamask/snaps-utils": "npm:^12.1.2"
@@ -9359,7 +9382,7 @@ __metadata:
     "@metamask/account-api": ^1.0.4
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/07b7e0dc1d4b50bfbd4846fa82598d9a1244a37645a122d00502d710bacb05abcc863a2f569d1c6a33ea656c7f25361b8e1b4de7895be028718195aa2673384b
+  checksum: 10/e522b621aa939f2cd3e8733574c137951275d2b209369e6765e005d26cc9a3b63842ce66bab8c705c78ee19f74cfcc14f59d1b3970e5bda1278efdbf2fc12f18
   languageName: node
   linkType: hard
 
@@ -9704,13 +9727,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-sync-controller@npm:^28.0.0, @metamask/profile-sync-controller@npm:^28.0.2, @metamask/profile-sync-controller@npm:^28.1.0":
-  version: 28.1.0
-  resolution: "@metamask/profile-sync-controller@npm:28.1.0"
+"@metamask/profile-sync-controller@npm:^28.0.0, @metamask/profile-sync-controller@npm:^28.0.2, @metamask/profile-sync-controller@npm:^28.1.0, @metamask/profile-sync-controller@npm:^28.1.1":
+  version: 28.1.1
+  resolution: "@metamask/profile-sync-controller@npm:28.1.1"
   dependencies:
     "@metamask/address-book-controller": "npm:^7.1.2"
     "@metamask/base-controller": "npm:^9.1.0"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/messenger": "npm:^1.2.0"
     "@metamask/snaps-controllers": "npm:^19.0.0"
     "@metamask/snaps-sdk": "npm:^11.0.0"
@@ -9724,7 +9747,7 @@ __metadata:
   peerDependencies:
     "@metamask/providers": ^22.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/33c318fe005e55b38b4d0d603806c9303b8deaddf8f98fc04f89ecb49cf26da2189ceea20ac6a4b1be5da49060a928d6788cb465b4451aa199c8e51172366213
+  checksum: 10/0fd175ee7f3327eaaf9d019ca1044aa10d98df1025c8f2d1fbd9c24f8ee0d5183a695aed32a9a6ff18fe94247edd18967ad7d9c2872bc9999d70c39a5794b523
   languageName: node
   linkType: hard
 
@@ -10106,20 +10129,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snap-account-service@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@metamask/snap-account-service@npm:0.1.0"
+"@metamask/snap-account-service@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "@metamask/snap-account-service@npm:0.2.1"
   dependencies:
     "@metamask/account-api": "npm:^1.0.4"
-    "@metamask/account-tree-controller": "npm:^7.4.0"
+    "@metamask/account-tree-controller": "npm:^7.5.0"
     "@metamask/eth-snap-keyring": "npm:^22.0.1"
-    "@metamask/keyring-controller": "npm:^25.5.0"
+    "@metamask/keyring-controller": "npm:^26.0.0"
     "@metamask/messenger": "npm:^1.2.0"
     "@metamask/snaps-controllers": "npm:^19.0.0"
     "@metamask/snaps-sdk": "npm:^11.0.0"
     "@metamask/utils": "npm:^11.9.0"
     lodash: "npm:^4.17.21"
-  checksum: 10/75f07b042cc6223943f663a6ef5cf76553fe7bf5a1132e4b95d2621e749e8c7ec88c47e881f7e914e7017ae810d2380f95825a0aff7583f9ad3c9868116ef08c
+  checksum: 10/ab6b412b1bda09d2299ff97e24dacbf58ae6faafdc13ead7f4fe0b875472f9495811d59a48195259515d8057911900da184d37e5f285ad1732b189a359bb32d7
   languageName: node
   linkType: hard
 
@@ -35415,12 +35438,12 @@ __metadata:
     "@metamask/account-tree-controller": "npm:^7.2.0"
     "@metamask/accounts-controller": "npm:^38.0.0"
     "@metamask/address-book-controller": "npm:^7.1.2"
-    "@metamask/ai-controllers": "npm:0.6.3"
+    "@metamask/ai-controllers": "npm:^0.7.0"
     "@metamask/analytics-controller": "npm:^1.0.0"
     "@metamask/app-metadata-controller": "npm:^2.0.0"
     "@metamask/approval-controller": "npm:^9.0.0"
-    "@metamask/assets-controller": "npm:^8.0.1"
-    "@metamask/assets-controllers": "npm:^108.1.0"
+    "@metamask/assets-controller": "npm:^8.2.0"
+    "@metamask/assets-controllers": "npm:^108.3.0"
     "@metamask/authenticated-user-storage": "npm:^2.0.0"
     "@metamask/auto-changelog": "npm:^5.3.0"
     "@metamask/base-controller": "npm:^9.0.1"