test(e2e): harden android proxy cleanup and allowlist probes

Co-authored-by: javiergarciavera <javiergarciavera@users.noreply.github.com>

Author: cursoragent

tests/api-mocking/MockServerE2E.ts

@@ -123,6 +123,43 @@ const translateFallbackPortToActual = (url: string): string => {
   }
 };
 
+/**
+ * Some app code probes the command queue debug endpoint even when the command queue
+ * server is not enabled for the current test. When device proxying is active, those
+ * probes are routed through MockServer and would fail with fetch errors.
+ *
+ * Treat this endpoint as optional and return an empty JSON response when no
+ * command queue server port is allocated for the test.
+ */
+const isOptionalCommandQueueDebugEndpoint = (url: string): boolean => {
+  try {
+    const parsedUrl = new URL(url);
+    const isLocalhost =
+      parsedUrl.hostname === 'localhost' ||
+      parsedUrl.hostname === '127.0.0.1' ||
+      parsedUrl.hostname === '10.0.2.2';
+
+    if (!isLocalhost) {
+      return false;
+    }
+
+    if (parsedUrl.port !== FALLBACK_COMMAND_QUEUE_SERVER_PORT.toString()) {
+      return false;
+    }
+
+    if (parsedUrl.pathname !== '/debug.json') {
+      return false;
+    }
+
+    const commandQueuePort = PortManager.getInstance().getPort(
+      ResourceType.COMMAND_QUEUE_SERVER,
+    );
+    return commandQueuePort === undefined;
+  } catch {
+    return false;
+  }
+};
+
 const isUrlAllowed = (url: string): boolean => {
   try {
     if (ALLOWLISTED_URLS.includes(url)) {
@@ -400,6 +437,9 @@ export default class MockServerE2E implements Resource {
           }
 
           try {
+            if (isOptionalCommandQueueDebugEndpoint(updatedUrl)) {
+              return { statusCode: 200, body: '{}' };
+            }
             return await handleDirectFetch(
               updatedUrl,
               method,
@@ -492,6 +532,9 @@ export default class MockServerE2E implements Resource {
         }
 
         try {
+          if (isOptionalCommandQueueDebugEndpoint(translatedUrl)) {
+            return { statusCode: 200, body: '{}' };
+          }
           // Read body safely before passing to handleDirectFetch to catch abort errors
           const bodyText = await safeGetBodyText(request);
           // If body read was aborted, return 499 (client closed request)

tests/api-mocking/mock-e2e-allowlist.ts

@@ -32,6 +32,9 @@ export const ALLOWLISTED_HOSTS = [
 export const ALLOWLISTED_URLS = [
   // Temporarily allow existing live requests during migration
   'https://clients3.google.com/generate_204',
+  'http://connectivitycheck.gstatic.com/generate_204',
+  'http://play.googleapis.com/generate_204',
+  'http://www.google.com/gen_204',
   'https://api.avax.network/ext/bc/C/rpc',
   // Token SVGs in notifications list
   'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/usdc.svg',

tests/framework/fixtures/FixtureHelper.ts

@@ -690,6 +690,17 @@ export async function withFixtures(
       }
     }
 
+    // Disable device proxy before RN reload to avoid interfering with Detox transport
+    // during teardown/reconnect.
+    if (shouldEnableDeviceNetworkProxy) {
+      try {
+        await disableDeviceTrafficProxy();
+      } catch (cleanupError) {
+        logger.error('Error disabling device network proxy:', cleanupError);
+        cleanupErrors.push(cleanupError as Error);
+      }
+    }
+
     // skipReactNativeReload needs to happen before killing the mock server to avoid race conditions
     if (!skipReactNativeReload) {
       try {
@@ -754,15 +765,6 @@ export async function withFixtures(
       }
     }
 
-    if (shouldEnableDeviceNetworkProxy) {
-      try {
-        await disableDeviceTrafficProxy();
-      } catch (cleanupError) {
-        logger.error('Error disabling device network proxy:', cleanupError);
-        cleanupErrors.push(cleanupError as Error);
-      }
-    }
-
     // Remove the abort filter AFTER all cleanup is complete so late async
     // "Aborted" rejections from destroyed sockets are still caught.
     if (mockServerInstance) {