@deeeed/metamask-harness 0.38.1 → 0.39.0

package/library/actions/mobile/swap_bridge/submit_transaction.mjs

@@ -0,0 +1,141 @@
+import { runAdapter } from '../platform/bridge.mjs';
+import {
+  closeNativeSession,
+  createNativeSession,
+  nativeLabel,
+  nativeNode,
+} from '../platform/native-session.mjs';
+
+function visibleLabels(snapshot) {
+  return snapshot.nodes
+    .filter((node) => node.visibleToUser !== false)
+    .map(nativeLabel)
+    .filter(Boolean);
+}
+
+function quote(snapshot) {
+  const source = nativeNode(snapshot, 'source-token-area');
+  const destination = nativeNode(snapshot, 'dest-token-area');
+  const sourceAmount = nativeLabel(nativeNode(snapshot, 'source-token-area-input'));
+  const destinationAmount = nativeLabel(nativeNode(snapshot, 'dest-token-area-input'));
+  const button = nativeNode(snapshot, 'bridge-confirm-button');
+  const labels = visibleLabels(snapshot);
+  return {
+    source: nativeLabel(source),
+    destination: nativeLabel(destination),
+    sourceAmount,
+    destinationAmount,
+    buttonEnabled: button?.enabled === true,
+    warning: labels.find((label) => /insufficient|no quotes|unavailable|may fail|might fail/iu.test(label)) ?? null,
+  };
+}
+
+async function waitForQuote(session, expected, timeoutMs) {
+  const deadline = Date.now() + Math.min(timeoutMs, 60_000);
+  let stable = null;
+  let stableSince = 0;
+  while (Date.now() <= deadline) {
+    const snapshot = await session.snapshot();
+    const current = quote(snapshot);
+    const matches = current.source.toUpperCase().includes(expected.sourceSymbol) &&
+      current.destination.toUpperCase().includes(expected.destinationSymbol) &&
+      Number(current.sourceAmount) === expected.amount &&
+      Number(current.destinationAmount) > 0 &&
+      current.buttonEnabled &&
+      !current.warning;
+    const identity = JSON.stringify(current);
+    if (!matches) {
+      stable = null;
+      stableSince = 0;
+    } else if (stable !== identity) {
+      stable = identity;
+      stableSince = Date.now();
+    } else if (Date.now() - stableSince >= 1500) {
+      return current;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 250));
+  }
+  throw new Error('The Mobile Swap quote did not remain submittable for the requested pair and amount.');
+}
+
+async function pressIfVisible(session, testId, timeoutMs) {
+  if (!nativeNode(await session.snapshot(), testId)) return false;
+  await session.execute('ui.press', { test_id: testId, timeout_ms: timeoutMs, settle: false });
+  return true;
+}
+
+async function waitForTerminalStatus(session, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() <= deadline) {
+    const snapshot = await session.snapshot();
+    const labels = visibleLabels(snapshot);
+    const failed = labels.find((label) => /^(?:Swap|Bridge) failed$/iu.test(label));
+    if (failed) throw new Error(`Mobile ${failed}.`);
+    const success = labels.find((label) => /^(?:Swap|Bridge) complete$/iu.test(label));
+    if (success) return { snapshot, status: success };
+    if (nativeNode(snapshot, 'price-impact-footer-confirm')) {
+      await session.execute('ui.press', {
+        test_id: 'price-impact-footer-confirm',
+        timeout_ms: Math.max(1, deadline - Date.now()),
+        settle: false,
+      });
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  throw new Error('Mobile Swap did not reach a terminal post-trade status.');
+}
+
+runAdapter(async (input) => {
+  const sourceSymbol = String(input.node?.source_symbol ?? '').trim().toUpperCase();
+  const destinationSymbol = String(input.node?.destination_symbol ?? '').trim().toUpperCase();
+  const amount = Number(input.node?.amount);
+  const timeoutMs = Number(input.node?.timeout_ms ?? 300_000);
+  if (!sourceSymbol || !destinationSymbol || !(amount > 0)) {
+    throw new Error('metamask.swap_bridge.submit_transaction requires source_symbol, destination_symbol, and positive amount.');
+  }
+  if (input.node?.confirm_live !== true) {
+    throw new Error('metamask.swap_bridge.submit_transaction requires confirm_live=true.');
+  }
+
+  const session = createNativeSession(input, 'Swap', `submit-${process.pid}`);
+  try {
+    await session.open();
+    const before = await waitForQuote(session, { sourceSymbol, destinationSymbol, amount }, timeoutMs);
+    await session.execute('ui.press', {
+      test_id: 'bridge-confirm-button',
+      timeout_ms: Math.min(timeoutMs, 60_000),
+      settle: false,
+    });
+    const terminal = await waitForTerminalStatus(session, timeoutMs);
+    await pressIfVisible(session, 'post-trade-bottom-sheet-view-activity-button', timeoutMs);
+    let activity = null;
+    const activityDeadline = Date.now() + Math.min(timeoutMs, 60_000);
+    while (Date.now() <= activityDeadline) {
+      const snapshot = await session.snapshot();
+      if (nativeNode(snapshot, 'activity-screen-safe-area-view')) {
+        const labels = visibleLabels(snapshot);
+        activity = labels.find((label) => {
+          const upper = label.toUpperCase();
+          return upper.includes(sourceSymbol) && upper.includes(destinationSymbol);
+        }) ?? labels.find((label) => /swap|bridge/iu.test(label)) ?? null;
+        if (activity) break;
+      }
+      await new Promise((resolve) => setTimeout(resolve, 300));
+    }
+    if (!activity) throw new Error('Confirmed Mobile Swap did not appear in visible Activity.');
+    return {
+      action: input.action,
+      sourceSymbol,
+      destinationSymbol,
+      amount,
+      destinationAmount: before.destinationAmount,
+      submitted: true,
+      confirmed: true,
+      status: terminal.status,
+      activity,
+      proofPath: 'native-accessibility-swap-post-trade-activity',
+    };
+  } finally {
+    await closeNativeSession(session);
+  }
+});

package/library/actions/mobile/ui/native-navigation.mjs

@@ -1,6 +1,9 @@
 import { createAgentDeviceUiTransport } from '@farmslot/expo-recipe';
 import { createAgentDeviceClient } from 'agent-device';
-import { nativeSessionName } from '../platform/native-session-name.mjs';
+import {
+  nativeAgentDeviceStateDir,
+  nativeSessionName,
+} from '../platform/native-session-name.mjs';
 
 const IDS = {
   wallet: ['wallet-safe-area', 'homepage-container'],
@@ -9,12 +12,16 @@ const IDS = {
   perpsEntry: 'homepage-balance-breakdown-row-perps',
   perpsTradeEntry: 'wallet-perps-action',
   swapTradeEntry: 'wallet-actions-bottom-sheet-swap-button',
+  swapBack: 'button-icon',
   swapSourceInput: 'source-token-area-input',
   swapSourceToken: 'source-token-area',
   swapDestinationToken: 'dest-token-area',
   perpsHome: 'perps-home',
   perpsHomeBack: 'perps-home-back-button',
+  perpsSearch: 'perps-home-search-toggle',
   tutorialSkip: 'perps-tutorial-skip-button',
+  modeLite: 'perps-mode-selection-lite-option',
+  modePro: 'perps-mode-selection-pro-option',
   market: 'perps-market-details-view',
   marketBack: 'perps-market-header-back-button',
   marketSubtitle: 'perps-market-header-subtitle',
@@ -23,6 +30,11 @@ const IDS = {
   proMarketList: 'perps-pro-market-header-market-list-button',
   proMarketSubtitle: 'perps-pro-market-header-subtitle',
   marketList: 'perps-market-list',
+  marketListClose: 'perps-market-list-close-button-back-button',
+  tokenList: 'token-list',
+  tokenListBack: 'back-button',
+  tokenDetails: 'token-asset-overview',
+  tokenDetailsBack: 'back-arrow-button',
 };
 
 export async function navigateOpaqueMobile(input, destination) {
@@ -33,8 +45,10 @@ export async function navigateOpaqueMobile(input, destination) {
   }
   const app = String(env.ANDROID_PACKAGE_ID ?? 'io.metamask');
   const session = nativeSessionName(env, device, app);
+  const stateDir = nativeAgentDeviceStateDir(env, input.context.projectRoot, device);
   const client = createAgentDeviceClient({
     session,
+    stateDir,
     lockPolicy: 'reject',
     lockPlatform: 'android',
   });
@@ -44,6 +58,7 @@ export async function navigateOpaqueMobile(input, destination) {
     device,
     app,
     session,
+    stateDir,
     client,
   });
   const context = {
@@ -52,9 +67,11 @@ export async function navigateOpaqueMobile(input, destination) {
     artifactsDir: input.context.artifactsDir,
     env,
   };
+  const perpsMode = destination.params?.mode === 'pro' ? 'pro' : 'lite';
   const press = (testId) => transport.execute('ui.press', {
     test_id: testId,
     timeout_ms: Number(input.node?.timeout_ms ?? 30_000),
+    settle: false,
   }, context);
   const wait = (testId) => transport.execute('ui.wait_for', {
     test_id: testId,
@@ -80,7 +97,9 @@ export async function navigateOpaqueMobile(input, destination) {
     forceFull: true,
   });
   const identifiers = async () => new Set(
-    (await snapshot()).nodes.map((node) => String(node.identifier ?? '')),
+    (await snapshot()).nodes
+      .filter((node) => node.visibleToUser !== false)
+      .map((node) => String(node.identifier ?? '')),
   );
 
   try {
@@ -91,25 +110,25 @@ export async function navigateOpaqueMobile(input, destination) {
     } else if (destination.page === 'swap') {
       observedScreen = await navigateSwap({ identifiers, press, wait, back });
     } else if (destination.page === 'perps-market-list') {
-      observedScreen = await navigatePerpsMarketList({ identifiers, press, wait, back, timeoutMs: Number(input.node?.timeout_ms ?? 30_000) });
+      observedScreen = await navigatePerpsMarketList({ identifiers, press, wait, back, timeoutMs: Number(input.node?.timeout_ms ?? 30_000), perpsMode });
     } else {
       const timeoutMs = Number(input.node?.timeout_ms ?? 30_000);
       const initialIds = await identifiers();
       observedScreen = destination.page === 'perps-market' && initialIds.has(IDS.marketList)
-        ? await selectMarket({ destination, identifiers, press, snapshot, timeoutMs })
-        : await navigatePerps({ identifiers, press, wait, back, timeoutMs });
+        ? await selectMarket({ destination, identifiers, press, snapshot, timeoutMs, perpsMode })
+        : await navigatePerps({ identifiers, press, wait, back, timeoutMs, perpsMode });
       if (destination.page === 'perps-market') {
         const market = String(destination.params.market.symbol).toUpperCase();
         const ids = await identifiers();
         if (ids.has(IDS.proMarket) && !await marketMatches(snapshot, market)) {
           await press(IDS.proMarketList);
-          observedScreen = await selectMarket({ destination, identifiers, press, snapshot, timeoutMs });
+          observedScreen = await selectMarket({ destination, identifiers, press, snapshot, timeoutMs, perpsMode });
         } else if (!ids.has(IDS.proMarket) && (!ids.has(IDS.market) || !await marketMatches(snapshot, market))) {
           if (ids.has(IDS.market)) await press(IDS.marketBack);
           await press(`perps-market-row-item-${market}`);
           observedScreen = IDS.market;
         }
-        await waitForPerpsDestination(identifiers, timeoutMs);
+        await waitForPerpsDestination(identifiers, timeoutMs, press, perpsMode);
         if (!await marketMatches(snapshot, market)) {
           throw new Error(`Opaque Mobile navigation opened a different Perps market than ${market}.`);
         }
@@ -147,10 +166,10 @@ async function navigateSwap({ identifiers, press, wait, back }) {
   return IDS.swapSourceInput;
 }
 
-async function selectMarket({ destination, identifiers, press, snapshot, timeoutMs }) {
+async function selectMarket({ destination, identifiers, press, snapshot, timeoutMs, perpsMode }) {
   const market = String(destination.params.market.symbol).toUpperCase();
   await press(`perps-market-row-item-${market}`);
-  const observed = await waitForPerpsDestination(identifiers, timeoutMs);
+  const observed = await waitForPerpsDestination(identifiers, timeoutMs, press, perpsMode);
   if (!await marketMatches(snapshot, market)) {
     throw new Error(`Opaque Mobile navigation opened a different Perps market than ${market}.`);
   }
@@ -162,32 +181,56 @@ async function navigateHome({ identifiers, press, wait, back }) {
     const ids = await identifiers();
     if (IDS.wallet.some((id) => ids.has(id))) return;
     if (ids.has(IDS.walletTab)) {
-      await press(IDS.walletTab);
-      await wait(IDS.wallet[0]);
-      return;
+      if (await pressCurrent(press, IDS.walletTab)) {
+        await wait(IDS.wallet[0]);
+        return;
+      }
+      continue;
     }
     if (ids.has(IDS.marketBack)) {
-      await press(IDS.marketBack);
+      await pressCurrent(press, IDS.marketBack);
       continue;
     }
     if (ids.has(IDS.proMarketBack)) {
-      await press(IDS.proMarketBack);
+      await pressCurrent(press, IDS.proMarketBack);
       continue;
     }
     if (ids.has(IDS.perpsHomeBack)) {
-      await press(IDS.perpsHomeBack);
+      await pressCurrent(press, IDS.perpsHomeBack);
       continue;
     }
-    if (ids.has(IDS.perpsTradeEntry)) {
-      await back();
+    if (ids.has(IDS.marketListClose)) {
+      await pressCurrent(press, IDS.marketListClose);
+      continue;
+    }
+    if (ids.has(IDS.tokenList) && ids.has(IDS.tokenListBack)) {
+      await pressCurrent(press, IDS.tokenListBack);
+      continue;
+    }
+    if (ids.has(IDS.tokenDetails) && ids.has(IDS.tokenDetailsBack)) {
+      await pressCurrent(press, IDS.tokenDetailsBack);
+      continue;
+    }
+    if (ids.has(IDS.swapSourceInput) && ids.has(IDS.swapBack)) {
+      await pressCurrent(press, IDS.swapBack);
       continue;
     }
-    throw new Error('Opaque Mobile navigation could not find a visible route back to wallet home.');
+    await back();
   }
   throw new Error('Opaque Mobile navigation did not reach wallet home.');
 }
 
-async function navigatePerps({ identifiers, press, wait, back, timeoutMs }) {
+async function pressCurrent(press, testId) {
+  try {
+    await press(testId);
+    return true;
+  } catch (error) {
+    if (!/Selector did not match/iu.test(String(error?.message ?? error))) throw error;
+    return false;
+  }
+}
+
+async function navigatePerps({ identifiers, press, wait, back, timeoutMs, perpsMode }) {
   let ids = await identifiers();
   if (ids.has(IDS.proMarket)) return IDS.proMarket;
   if (ids.has(IDS.market)) {
@@ -219,15 +262,20 @@ async function navigatePerps({ identifiers, press, wait, back, timeoutMs }) {
     ids = await identifiers();
   }
   if (ids.has(IDS.tutorialSkip)) await press(IDS.tutorialSkip);
-  return waitForPerpsDestination(identifiers, timeoutMs);
+  return waitForPerpsDestination(identifiers, timeoutMs, press, perpsMode);
 }
 
-async function navigatePerpsMarketList({ identifiers, press, wait, back, timeoutMs }) {
+async function navigatePerpsMarketList({ identifiers, press, wait, back, timeoutMs, perpsMode }) {
   let ids = await identifiers();
   if (ids.has(IDS.marketList)) return IDS.marketList;
-  const observed = await navigatePerps({ identifiers, press, wait, back, timeoutMs });
+  const observed = await navigatePerps({ identifiers, press, wait, back, timeoutMs, perpsMode });
   ids = await identifiers();
   if (ids.has(IDS.marketList)) return IDS.marketList;
+  if (ids.has(IDS.perpsSearch)) {
+    await press(IDS.perpsSearch);
+    await wait(IDS.marketList);
+    return IDS.marketList;
+  }
   if (ids.has(IDS.proMarketList)) {
     await press(IDS.proMarketList);
     await wait(IDS.marketList);
@@ -236,10 +284,14 @@ async function navigatePerpsMarketList({ identifiers, press, wait, back, timeout
   throw new Error(`Opaque Mobile navigation reached ${observed}, but no visible market-list control was available.`);
 }
 
-async function waitForPerpsDestination(identifiers, timeoutMs) {
+async function waitForPerpsDestination(identifiers, timeoutMs, press, perpsMode = 'lite') {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() <= deadline) {
     const ids = await identifiers();
+    if (ids.has(IDS.modeLite) || ids.has(IDS.modePro)) {
+      await press(perpsMode === 'pro' ? IDS.modePro : IDS.modeLite);
+      continue;
+    }
     for (const id of [IDS.perpsHome, IDS.market, IDS.proMarket]) {
       if (ids.has(id)) return id;
     }

package/library/actions/mobile/ui/navigate.mjs

@@ -15,11 +15,22 @@ function text(value) {
 function pageRoute(node) {
   const page = text(node?.page);
   if (!page) return undefined;
-  if (PAGE_ROUTES[page]) return { page, ...PAGE_ROUTES[page] };
+  const mode = text(node?.mode)?.toLowerCase() ?? 'lite';
+  if (!['lite', 'pro'].includes(mode)) {
+    throw new Error('mobile ui.navigate mode must be lite or pro.');
+  }
+  if (PAGE_ROUTES[page]) {
+    const route = PAGE_ROUTES[page];
+    return {
+      page,
+      ...route,
+      params: page.startsWith('perps') ? { ...route.params, mode } : route.params,
+    };
+  }
   if (page === 'perps-market') {
     const market = text(node.market) ?? text(node.symbol) ?? text(node.params?.market?.symbol);
     if (!market) throw new Error('mobile ui.navigate page=perps-market requires market or symbol.');
-    return { page, route: 'PerpsMarketDetails', params: { market: { symbol: market } } };
+    return { page, route: 'PerpsMarketDetails', params: { market: { symbol: market }, mode } };
   }
   throw new Error('mobile ui.navigate supported page intents: home, perps, perps-market-list, perps-market, swap.');
 }

package/library/actions/mobile/wallet/lock.mjs

@@ -0,0 +1,14 @@
+import { runAdapter } from '../platform/bridge.mjs';
+import { isOpaqueMobileRuntime, lockWalletThroughNativeUi } from './native-ui.mjs';
+
+runAdapter(async (input) => {
+  if (!isOpaqueMobileRuntime(input)) {
+    throw new Error('metamask.wallet.lock requires an opaque Mobile runtime.');
+  }
+  return {
+    action: input.action,
+    ...await lockWalletThroughNativeUi(input),
+    locked: true,
+    proofPath: 'mobile-visible-wallet-lock-native',
+  };
+});

package/library/actions/mobile/wallet/native-ui.mjs

@@ -1,6 +1,9 @@
 import { createAgentDeviceUiTransport } from '@farmslot/expo-recipe';
 import { createAgentDeviceClient } from 'agent-device';
-import { nativeSessionName } from '../platform/native-session-name.mjs';
+import {
+  nativeAgentDeviceStateDir,
+  nativeSessionName,
+} from '../platform/native-session-name.mjs';
 
 const TEST_IDS = {
   existingWallet: 'wallet-setup-screen-have-an-existing-wallet-button-id',
@@ -85,6 +88,10 @@ function isWalletScreen(nodes) {
   return nodes.some((node) => WALLET_SCREEN_IDS.includes(String(node.identifier ?? '')));
 }
 
+function visibleSnapshotNodes(nodes) {
+  return nodes.filter((node) => node.visibleToUser !== false);
+}
+
 function hasBlockingSystemUi(nodes) {
   return nodes.some((node) =>
     (node.bundleId === 'com.android.systemui' || PERMISSION_CONTROLLER_PACKAGES.has(node.bundleId)) &&
@@ -101,7 +108,7 @@ export async function importWalletThroughNativeUi(input, credentials, options) {
   const native = nativeSession(input);
   try {
     const initial = await native.normalizeWalletSurface(options.timeoutMs);
-    if (initial.wallet) {
+    if (initial.wallet && !initial.visible.has(TEST_IDS.walletTourSkip)) {
       if (options.requireFresh) {
         throw new Error('metamask.wallet.import method=ui requires a fresh Mobile onboarding state.');
       }
@@ -183,6 +190,27 @@ export async function unlockWalletThroughNativeUi(input, password, timeoutMs) {
   }
 }
 
+export async function lockWalletThroughNativeUi(input) {
+  const native = nativeSession(input);
+  const timeoutMs = Number(input.node?.timeout_ms ?? 30_000);
+  try {
+    const state = await native.normalizeWalletSurface(timeoutMs);
+    if (state.visible.has(TEST_IDS.login)) {
+      return { alreadyLocked: true, provider: 'android-native-accessibility' };
+    }
+    if (!state.wallet) throw new Error('Opaque Mobile wallet lock could not reach wallet home.');
+    await native.press(TEST_IDS.hamburger, timeoutMs);
+    await native.press(TEST_IDS.lock, timeoutMs);
+    if (await native.exists(TEST_IDS.confirmLock, 3000)) {
+      await native.press(TEST_IDS.confirmLock, timeoutMs);
+    }
+    await native.wait(TEST_IDS.login, timeoutMs);
+    return { alreadyLocked: false, provider: 'android-native-accessibility' };
+  } finally {
+    await native.close();
+  }
+}
+
 export async function resetWalletThroughNativeUi(input) {
   const native = nativeSession(input);
   const timeoutMs = Number(input.node?.timeout_ms ?? 60_000);
@@ -219,8 +247,10 @@ function nativeSession(input) {
   if (!device) throw new Error('Opaque Mobile UI execution requires one explicit Android device serial.');
   const app = String(env.ANDROID_PACKAGE_ID ?? 'io.metamask');
   const session = nativeSessionName(env, device, app);
+  const stateDir = nativeAgentDeviceStateDir(env, input.context.projectRoot, device);
   const client = createAgentDeviceClient({
     session,
+    stateDir,
     lockPolicy: 'reject',
     lockPlatform: 'android',
   });
@@ -230,6 +260,7 @@ function nativeSession(input) {
     device,
     app,
     session,
+    stateDir,
     client,
   });
   const context = {
@@ -240,7 +271,11 @@ function nativeSession(input) {
   };
   const execute = (action, node) => transport.execute(action, node, context);
   return {
-    press: (testId, timeoutMs) => execute('ui.press', { test_id: testId, timeout_ms: timeoutMs }),
+    press: (testId, timeoutMs) => execute('ui.press', {
+      test_id: testId,
+      timeout_ms: timeoutMs,
+      settle: false,
+    }),
     fill: (testId, value, timeoutMs) => execute('ui.set_input', {
       test_id: testId,
       value,
@@ -259,7 +294,7 @@ function nativeSession(input) {
         interactiveOnly: false,
         forceFull: true,
       });
-      const actual = new Map(snapshot.nodes
+      const actual = new Map(visibleSnapshotNodes(snapshot.nodes)
         .filter((node) => /^phrase-input-id_\d+$/u.test(String(node.identifier ?? '')))
         .map((node) => [
           Number(String(node.identifier).split('_').at(-1)),
@@ -288,11 +323,12 @@ function nativeSession(input) {
         interactiveOnly: false,
         forceFull: true,
       });
+      const nodes = visibleSnapshotNodes(snapshot.nodes);
       return {
-        nodes: snapshot.nodes,
-        visible: new Set(snapshot.nodes.map((node) => String(node.identifier ?? ''))),
-        wallet: isWalletScreen(snapshot.nodes),
-        postPassword: isPostPasswordScreen(snapshot.nodes) || isMetaMaskBiometricPrompt(snapshot.nodes),
+        nodes,
+        visible: new Set(nodes.map((node) => String(node.identifier ?? ''))),
+        wallet: isWalletScreen(nodes),
+        postPassword: isPostPasswordScreen(nodes) || isMetaMaskBiometricPrompt(nodes),
       };
     },
     async normalizeWalletSurface(timeoutMs) {
@@ -333,13 +369,15 @@ function nativeSession(input) {
       let walletTourSkipped = false;
       let interestsHandled = false;
       let awaitingNotificationPermission = false;
+      let stableWalletCaptures = 0;
       while (Date.now() <= deadline) {
         const snapshot = await client.capture.snapshot({
           ...selection,
           interactiveOnly: false,
           forceFull: true,
         });
-        if (isMetaMaskBiometricPrompt(snapshot.nodes)) {
+        const nodes = visibleSnapshotNodes(snapshot.nodes);
+        if (isMetaMaskBiometricPrompt(nodes)) {
           if (options.biometricsEnabled) {
             throw new Error('Mobile biometrics=true requires manual device authentication and is not supported by an unattended recipe.');
           }
@@ -351,7 +389,7 @@ function nativeSession(input) {
           biometricPromptDismissed = true;
           continue;
         }
-        if (isMetaMaskNotificationPermissionPrompt(snapshot.nodes) && awaitingNotificationPermission) {
+        if (isMetaMaskNotificationPermissionPrompt(nodes) && awaitingNotificationPermission) {
           await client.command.alert({
             ...selection,
             action: 'accept',
@@ -362,10 +400,12 @@ function nativeSession(input) {
           notificationsEnabled = true;
           continue;
         }
-        if (hasBlockingSystemUi(snapshot.nodes)) {
+        if (hasBlockingSystemUi(nodes)) {
           throw new Error('Unexpected Android system UI blocked Mobile wallet creation; refusing to dismiss it as biometric authentication.');
         }
-        const visible = new Set(snapshot.nodes.map((node) => String(node.identifier ?? '')));
+        const visible = new Set(nodes.map((node) => String(node.identifier ?? '')));
+        const walletVisible = WALLET_SCREEN_IDS.some((testId) => visible.has(testId));
+        if (!walletVisible) stableWalletCaptures = 0;
         if (visible.has(TEST_IDS.metricsContinue)) {
           if (!options.metametricsEnabled) {
             await this.press(TEST_IDS.metricsCheckbox, options.timeoutMs);
@@ -402,6 +442,7 @@ function nativeSession(input) {
           continue;
         }
         if (visible.has(TEST_IDS.walletTourSkip)) {
+          stableWalletCaptures = 0;
           if (options.skipWalletTour) {
             await this.press(TEST_IDS.walletTourSkip, options.timeoutMs);
             walletTourSkipped = true;
@@ -409,10 +450,15 @@ function nativeSession(input) {
           }
           throw new Error('Mobile wallet-home tour remains visible because skip_wallet_tour=false; wallet readiness cannot be proven.');
         }
-        if (WALLET_SCREEN_IDS.some((testId) => visible.has(testId))) {
+        if (walletVisible) {
           if (options.interests.length > 0 && !interestsHandled) {
             throw new Error('Mobile onboarding interests were requested, but the questionnaire is not enabled for this build.');
           }
+          stableWalletCaptures += 1;
+          if (stableWalletCaptures < 2) {
+            await new Promise((resolve) => setTimeout(resolve, 500));
+            continue;
+          }
           return {
             biometricsEnabled: options.biometricsEnabled,
             biometricPromptDismissed,
@@ -433,8 +479,15 @@ function nativeSession(input) {
     }),
     async waitForWallet(timeoutMs) {
       const deadline = Date.now() + timeoutMs;
+      let stableCaptures = 0;
       while (Date.now() <= deadline) {
-        if ((await this.screenState()).wallet) return;
+        const state = await this.screenState();
+        if (state.wallet && state.visible.has(TEST_IDS.walletAddress)) {
+          stableCaptures += 1;
+          if (stableCaptures >= 2) return;
+        } else {
+          stableCaptures = 0;
+        }
         await new Promise((resolve) => setTimeout(resolve, 250));
       }
       throw new Error('Mobile wallet home did not become visible before the readiness timeout.');

package/library/actions/shared/perps/visible-state.mjs

@@ -132,6 +132,7 @@ function marketFromTestId(testId) {
   for (const prefix of ['perps-watchlist-', 'explore-markets-', 'perps-market-row-item-', 'market-row-']) {
     if (!testId.startsWith(prefix)) continue;
     const raw = testId.slice(prefix.length);
+    if (/(?:-token-logo|-asset-label)$/u.test(raw)) return undefined;
     if ((prefix === 'explore-markets-' || prefix === 'market-row-') && raw.startsWith('xyz-')) {
       return `XYZ:${raw.slice(4).toUpperCase()}`;
     }
@@ -173,18 +174,19 @@ function compactEntries(items, maximum) {
 function visibleFeatures(items) {
   const ids = new Set(items.map((item) => item.testId));
   const has = (pattern) => [...ids].some((testId) => pattern.test(testId));
-  const long = has(/(?:long-cta-button|direction-long)$/u);
-  const short = has(/(?:short-cta-button|direction-short)$/u);
+  const long = has(/(?:long-cta-button|direction-long|market-details-long-button)$/u);
+  const short = has(/(?:short-cta-button|direction-short|market-details-short-button)$/u);
   return {
     activity: has(/^(?:transaction-card-|perps-(?:recent-activity|activity))/u),
     balance: has(/^perps-balance-dropdown/u),
-    chart: has(/perps-(?:candlestick-chart|market-detail-chart|pro-market-chart)/u),
+    chart: has(/^(?:chart_surface|tv_chart_container)$/u) ||
+      has(/perps-(?:candlestick-chart|market-detail-chart|market-details-fullscreen-chart|pro-market-chart)/u),
     'long-short': long && short,
     'market-list': has(/^(?:market-list-view|perps-market-list|perps-watchlist-|explore-markets-|market-row-)/u),
     'order-entry': has(/perps-(?:order-entry|pro-order-form)/u),
-    price: has(/perps-(?:market-detail-price|pro-market-price)$/u),
-    'price-change': has(/perps-(?:market-detail-change|pro-market-price-change)$/u),
-    stats: has(/perps-(?:stats-section|market-detail-oracle-price|pro-market-stats)/u),
+    price: has(/perps-(?:market-detail-price|market-header-price|pro-market-price)$/u),
+    'price-change': has(/perps-(?:market-detail-change|market-header-price-change|pro-market-price-change)$/u),
+    stats: has(/perps-(?:stats-section|market-details-market-summary|market-detail-oracle-price|pro-market-stats)/u),
   };
 }