Merge branch 'main' into chore/navigation-typing-phase-3-shells-wallet-settings

Author: weitingsun

.eslintrc.js

@@ -93,15 +93,12 @@ const utilNumberImportBurndownFiles = [
   'app/components/UI/Stake/hooks/useBalance.ts',
   'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.test.ts',
   'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts',
-  'app/components/UI/TransactionElement/utils-gas.js',
-  'app/components/UI/TransactionElement/utils.js',
   'app/components/UI/UrlAutocomplete/Result.tsx',
   'app/components/Views/GasEducationCarousel/index.js',
   'app/components/Views/NetworksManagement/NetworkDetailsView/hooks/useNetworkValidation.ts',
   'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyBottomSheet.ts',
   'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyQuotes.ts',
   'app/components/Views/SocialLeaderboard/utils/formatters.ts',
-  'app/components/Views/UnifiedTransactionsView/useUnifiedTxActions.test.ts',
   'app/components/Views/confirmations/components/gas/max-base-fee-input/max-base-fee-input.tsx',
   'app/components/Views/confirmations/components/gas/priority-fee-input/priority-fee-input.tsx',
   'app/components/Views/confirmations/components/info/typed-sign-v3v4/simulation/components/native-value-display/native-value-display.tsx',
@@ -133,10 +130,9 @@ const utilNumberImportBurndownFiles = [
   // `../number/bigint` (or `./number/bigint` from `app/util/`).
   'app/util/confirm-tx.js',
   'app/util/conversions.js',
-  'app/util/confirmation/gas.ts',
+
   'app/util/confirmation/transactions.ts',
   'app/util/custom-gas/index.js',
-  'app/util/networks/index.js',
   'app/util/transactions/index.js',
   'app/util/transactions/index.test.ts',
 ];

.github/guidelines/E2E_DECISION_TREE.md

@@ -32,7 +32,7 @@ When a PR only changes E2E/performance test files (and other ignorable files), C
 
 The native build fingerprint for test-only PRs is computed from **`main` HEAD** (not the PR merge tree) so the lookup key matches completed `ci.yml` runs on `main`. Reuse tries GitHub Actions artifacts first, then the Cirrus `main` APK cache on Android.
 
-If `main` has new native-changing commits but its CI build has not finished yet, reuse lookup may miss — CI logs a warning and **falls back to a fresh native build** instead of failing the workflow. Performance E2E on test-only PRs resolves BrowserStack apps by `custom_id` prefix `MetaMask-Android-*-main-*` so only uploads from `main` are reused (not other branches or PRs).
+If `main` has new native-changing commits but its CI build has not finished yet, reuse lookup may miss — CI logs a warning and **falls back to a fresh native build** instead of failing the workflow. Performance E2E on test-only PRs resolves BrowserStack apps via stable main `custom_id`s (`MetaMask-Android-*-main`) first, then legacy `…-main-<run_id>` IDs; if none are found it **falls back to a fresh dual Android upload** instead of failing.
 
 This applies when all changed files match `e2e_test_files` or `e2e_ignorable` filters in `.github/rules/filter-rules.yml`, with at least one E2E test file changed, and no E2E-relevant workflow files were modified.
 

.github/scripts/browserstack-app-validation.cjs

@@ -6,14 +6,24 @@
 /** BrowserStack app URLs use the bs:// scheme with an opaque app hash. */
 const BROWSERSTACK_APP_URL_PATTERN = /^bs:\/\/[A-Za-z0-9]+$/;
 
+/**
+ * custom_id format after MMQA-1667:
+ * - Stable per branch: MetaMask-Android-With-SRP-<branchSlug>
+ * - Legacy with run id: MetaMask-Android-With-SRP-<branchSlug>-<runId>
+ * Slug must include at least one letter so pure-numeric pre-MMQA IDs are rejected.
+ */
 const WITH_SRP_CUSTOM_ID_PATTERN =
-  /^MetaMask-Android-With-SRP-[A-Za-z0-9._-]+-\d+$/;
+  /^MetaMask-Android-With-SRP-(?=.*[A-Za-z])[A-Za-z0-9._-]+$/;
 const WITHOUT_SRP_CUSTOM_ID_PATTERN =
-  /^MetaMask-Android-Without-SRP-[A-Za-z0-9._-]+-\d+$/;
+  /^MetaMask-Android-Without-SRP-(?=.*[A-Za-z])[A-Za-z0-9._-]+$/;
 
 const MAIN_BRANCH_BROWSERSTACK_SLUG = 'main';
-const MAIN_WITH_SRP_CUSTOM_ID_PREFIX = `MetaMask-Android-With-SRP-${MAIN_BRANCH_BROWSERSTACK_SLUG}-`;
-const MAIN_WITHOUT_SRP_CUSTOM_ID_PREFIX = `MetaMask-Android-Without-SRP-${MAIN_BRANCH_BROWSERSTACK_SLUG}-`;
+/** Stable custom_id used for main uploads (overwritten on each main upload). */
+const MAIN_WITH_SRP_CUSTOM_ID = `MetaMask-Android-With-SRP-${MAIN_BRANCH_BROWSERSTACK_SLUG}`;
+const MAIN_WITHOUT_SRP_CUSTOM_ID = `MetaMask-Android-Without-SRP-${MAIN_BRANCH_BROWSERSTACK_SLUG}`;
+/** Prefix for older main uploads that still embed github.run_id. */
+const MAIN_WITH_SRP_CUSTOM_ID_PREFIX = `${MAIN_WITH_SRP_CUSTOM_ID}-`;
+const MAIN_WITHOUT_SRP_CUSTOM_ID_PREFIX = `${MAIN_WITHOUT_SRP_CUSTOM_ID}-`;
 
 /**
  * @param {unknown} value
@@ -50,6 +60,30 @@ function assertBrowserStackCustomId(value, kind) {
   return assertMatchesPattern(value, pattern, `${kind} custom_id`);
 }
 
+/**
+ * @param {unknown} customId
+ * @param {'with-srp' | 'without-srp'} kind
+ * @returns {boolean}
+ */
+function isMainBranchBrowserStackCustomId(customId, kind) {
+  if (typeof customId !== 'string') {
+    return false;
+  }
+  const stable =
+    kind === 'with-srp' ? MAIN_WITH_SRP_CUSTOM_ID : MAIN_WITHOUT_SRP_CUSTOM_ID;
+  const legacyPrefix =
+    kind === 'with-srp'
+      ? MAIN_WITH_SRP_CUSTOM_ID_PREFIX
+      : MAIN_WITHOUT_SRP_CUSTOM_ID_PREFIX;
+  if (customId === stable) {
+    return true;
+  }
+  return (
+    customId.startsWith(legacyPrefix) &&
+    /^\d+$/.test(customId.slice(legacyPrefix.length))
+  );
+}
+
 /**
  * @param {string} path
  * @param {Record<string, string>} outputs
@@ -70,9 +104,12 @@ module.exports = {
   WITH_SRP_CUSTOM_ID_PATTERN,
   WITHOUT_SRP_CUSTOM_ID_PATTERN,
   MAIN_BRANCH_BROWSERSTACK_SLUG,
+  MAIN_WITH_SRP_CUSTOM_ID,
+  MAIN_WITHOUT_SRP_CUSTOM_ID,
   MAIN_WITH_SRP_CUSTOM_ID_PREFIX,
   MAIN_WITHOUT_SRP_CUSTOM_ID_PREFIX,
   assertBrowserStackAppUrl,
   assertBrowserStackCustomId,
+  isMainBranchBrowserStackCustomId,
   writeGithubOutputs,
 };

.github/scripts/browserstack-app-validation.test.ts

@@ -5,6 +5,7 @@ import path from 'node:path';
 const {
   assertBrowserStackAppUrl,
   assertBrowserStackCustomId,
+  isMainBranchBrowserStackCustomId,
   writeGithubOutputs,
 } = require('./browserstack-app-validation.cjs');
 
@@ -24,7 +25,10 @@ describe('browserstack-app-validation', () => {
     ).toThrow('Invalid test');
   });
 
-  it('accepts expected custom_id formats with branch slug', () => {
+  it('accepts stable and run-scoped custom_id formats with branch slug', () => {
+    expect(
+      assertBrowserStackCustomId('MetaMask-Android-With-SRP-main', 'with-srp'),
+    ).toBe('MetaMask-Android-With-SRP-main');
     expect(
       assertBrowserStackCustomId(
         'MetaMask-Android-With-SRP-main-123',
@@ -45,14 +49,42 @@ describe('browserstack-app-validation', () => {
     ).toBe('MetaMask-Android-With-SRP-feature_x-789');
   });
 
-  it('rejects legacy custom_id formats without branch slug', () => {
+  it('rejects legacy custom_id formats without a letterful branch slug', () => {
     expect(() =>
       assertBrowserStackCustomId('MetaMask-Android-With-SRP-123', 'with-srp'),
     ).toThrow('Invalid with-srp custom_id');
   });
 
+  it('detects main-branch custom_ids only', () => {
+    expect(
+      isMainBranchBrowserStackCustomId(
+        'MetaMask-Android-With-SRP-main',
+        'with-srp',
+      ),
+    ).toBe(true);
+    expect(
+      isMainBranchBrowserStackCustomId(
+        'MetaMask-Android-With-SRP-main-999',
+        'with-srp',
+      ),
+    ).toBe(true);
+    expect(
+      isMainBranchBrowserStackCustomId(
+        'MetaMask-Android-With-SRP-feature_x',
+        'with-srp',
+      ),
+    ).toBe(false);
+    expect(
+      isMainBranchBrowserStackCustomId(
+        'MetaMask-Android-With-SRP-maintenance-1',
+        'with-srp',
+      ),
+    ).toBe(false);
+  });
+
   it('writes only validated single-line GitHub outputs', () => {
-    const outputPath = path.join(os.tmpdir(), `gh-output-${Date.now()}.txt`);
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gh-output-'));
+    const outputPath = path.join(tempDir, 'gh-output-test.txt');
     writeGithubOutputs(outputPath, {
       found: 'true',
       'with-srp-browserstack-url': 'bs://abc123',
@@ -61,6 +93,6 @@ describe('browserstack-app-validation', () => {
     expect(fs.readFileSync(outputPath, 'utf8')).toBe(
       'found=true\nwith-srp-browserstack-url=bs://abc123\n',
     );
-    fs.unlinkSync(outputPath);
+    fs.rmSync(tempDir, { recursive: true, force: true });
   });
 });