fix(test): harden MMConnect Android deeplink chooser handling

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: chrisleewilcox

tests/framework/ChromeCdpHelpers.ts

@@ -185,7 +185,14 @@ export default class ChromeCdpHelpers {
           const el = document.querySelector('[data-testid=${JSON.stringify(testId)}]');
           if (!el) return false;
           el.scrollIntoView({ block: 'center', inline: 'center' });
-          el.click();
+          // Prefer a trusted-style activation path for deeplink buttons.
+          if (typeof el.focus === 'function') el.focus();
+          el.dispatchEvent(new MouseEvent('click', {
+            bubbles: true,
+            cancelable: true,
+            view: window,
+          }));
+          if (typeof el.click === 'function') el.click();
           return true;
         })()`,
       );

tests/page-objects/MMConnect/AndroidScreenHelpers.ts

@@ -1,28 +1,134 @@
-import { encapsulatedAction } from '../../framework';
+import { encapsulatedAction, sleep, createLogger } from '../../framework';
 import {
   encapsulated,
   EncapsulatedElementType,
 } from '../../framework/EncapsulatedElement';
+import { APP_PACKAGE_IDS } from '../../framework/Constants';
 import PlaywrightMatchers from '../../framework/PlaywrightMatchers';
-import UnifiedGestures from '../../framework/UnifiedGestures';
+import PlaywrightGestures from '../../framework/PlaywrightGestures';
+import PlaywrightUtilities, {
+  getDriver,
+} from '../../framework/PlaywrightUtilities';
+import { ConnectAccountBottomSheetSelectorsIDs } from '../../../app/components/Views/MultichainAccounts/shared/ConnectAccountBottomSheet.testIds';
+
+const logger = createLogger({
+  name: 'AndroidScreenHelpers',
+});
+
+/** Exact MetaMask label outside Chrome WebView (Android app chooser). */
+const CHOOSER_METAMASK_XPATHS = [
+  '//android.widget.TextView[@text="MetaMask" and not(ancestor::android.webkit.WebView)]',
+  '//*[@resource-id="android:id/text1" and @text="MetaMask"]',
+  '//android.widget.Button[@text="MetaMask"]',
+  '//*[@content-desc="MetaMask"]',
+];
+
+const JUST_ONCE_XPATHS = [
+  '//android.widget.Button[@resource-id="android:id/button_once"]',
+  '//android.widget.Button[@text="Just once"]',
+  '//*[@text="Just once"]',
+];
+
+const CHOOSER_TIMEOUT_MS = 20_000;
+const POLL_MS = 500;
 
 class AndroidScreenHelpers {
   get openDeeplinkWithMetaMask(): EncapsulatedElementType {
     return encapsulated({
       appium: () =>
-        PlaywrightMatchers.getElementByXPath(
-          '//android.widget.TextView[@text="MetaMask"]',
-        ),
+        PlaywrightMatchers.getElementByXPath(CHOOSER_METAMASK_XPATHS[0]),
     });
   }
 
+  /**
+   * After a dapp deeplink, select MetaMask from the Android app chooser.
+   * On CI emulators MetaMask is often the only handler, so Android skips the
+   * chooser and opens the app directly — treat that as success. Also collapse
+   * the status bar so Play services heads-up toasts do not block taps.
+   */
   async tapOpenDeeplinkWithMetaMask(): Promise<void> {
     await encapsulatedAction({
       appium: async () => {
-        await UnifiedGestures.waitAndTap(this.openDeeplinkWithMetaMask);
+        PlaywrightUtilities.collapseStatusBar();
+
+        const deadline = Date.now() + CHOOSER_TIMEOUT_MS;
+        while (Date.now() < deadline) {
+          PlaywrightUtilities.collapseStatusBar();
+
+          if (await this.isMetaMaskForeground()) {
+            logger.debug(
+              'MetaMask already foreground after deeplink; skipping chooser',
+            );
+            return;
+          }
+
+          for (const xpath of CHOOSER_METAMASK_XPATHS) {
+            try {
+              const option = await PlaywrightMatchers.getElementByXPath(xpath);
+              if (await option.isVisible()) {
+                await PlaywrightGestures.waitAndTap(option, {
+                  timeout: 3_000,
+                  delay: 200,
+                });
+                await this.tapJustOnceIfPresent();
+                return;
+              }
+            } catch {
+              // Try next selector
+            }
+          }
+
+          await sleep(POLL_MS);
+        }
+
+        throw new Error(
+          `Android MetaMask deeplink chooser not shown (and MetaMask not foreground) after ${CHOOSER_TIMEOUT_MS}ms`,
+        );
       },
     });
   }
+
+  private async isMetaMaskForeground(): Promise<boolean> {
+    try {
+      const currentPackage = (await getDriver().execute(
+        'mobile: getCurrentPackage',
+      )) as string;
+      if (
+        currentPackage === APP_PACKAGE_IDS.ANDROID ||
+        currentPackage?.startsWith(`${APP_PACKAGE_IDS.ANDROID}.`)
+      ) {
+        return true;
+      }
+    } catch {
+      // Ignore package probe failures
+    }
+
+    try {
+      const connectButton = await PlaywrightMatchers.getElementById(
+        ConnectAccountBottomSheetSelectorsIDs.CONNECT_BUTTON,
+      );
+      return await connectButton.isVisible();
+    } catch {
+      return false;
+    }
+  }
+
+  private async tapJustOnceIfPresent(): Promise<void> {
+    for (const xpath of JUST_ONCE_XPATHS) {
+      try {
+        const button = await PlaywrightMatchers.getElementByXPath(xpath);
+        if (await button.isVisible()) {
+          await PlaywrightGestures.waitAndTap(button, {
+            timeout: 2_000,
+            delay: 100,
+          });
+          return;
+        }
+      } catch {
+        // Not present
+      }
+    }
+  }
 }
 
 export default new AndroidScreenHelpers();

tests/smoke-appium/mm-connect/connection-multichain.spec.ts

@@ -6,6 +6,7 @@ import AndroidScreenHelpers from '../../page-objects/MMConnect/AndroidScreenHelp
 import DappConnectionModal from '../../page-objects/MMConnect/DappConnectionModal.js';
 import PlaywrightContextHelpers from '../../framework/PlaywrightContextHelpers.js';
 import ChromeCdpHelpers from '../../framework/ChromeCdpHelpers.js';
+import PlaywrightUtilities from '../../framework/PlaywrightUtilities.js';
 import { DappServer, DappVariants, TestDapps } from '../../framework/index.js';
 import {
   getDappUrlForBrowser,
@@ -66,6 +67,7 @@ appiumTest.describe(SmokeMMConnect('Multichain browser connect'), () => {
 
           // Emulator Chrome 113: Appium WEBVIEW_chrome switch hangs in Chromedriver
           // session creation. Drive the dapp via CDP instead.
+          PlaywrightUtilities.collapseStatusBar();
           await ChromeCdpHelpers.waitAndClickTestId(
             DAPP_URL,
             MMConnectDappTestIds.CONNECT_BUTTON,