Merge branch 'main' into kureev/MUSD-431-752-money-balance-card

Author: Kureev

.eslintrc.js

@@ -385,6 +385,33 @@ module.exports = {
         ],
       },
     },
+    {
+      files: ['**/*.test.{js,ts,tsx,jsx}', '**/*.spec.{js,ts,tsx,jsx}'],
+      plugins: ['jest'],
+      rules: {
+        // Prevent new file-based snapshots. Inline snapshots (toMatchInlineSnapshot)
+        // are still allowed as they keep assertions co-located with the test.
+        'jest/no-restricted-matchers': [
+          'error',
+          {
+            toMatchSnapshot:
+              'Use toMatchInlineSnapshot() or an explicit assertion instead. File-based snapshots are being phased out.',
+          },
+        ],
+      },
+    },
+    {
+      // Matches CODEOWNERS `**/snaps/**` and `**/Snaps/**` (@MetaMask/core-platform).
+      // ESLint cannot read CODEOWNERS.
+      files: [
+        '**/snaps/**/*.{test,spec}.{js,ts,tsx,jsx}',
+        '**/Snaps/**/*.{test,spec}.{js,ts,tsx,jsx}',
+      ],
+      plugins: ['jest'],
+      rules: {
+        'jest/no-restricted-matchers': 'off',
+      },
+    },
     // ── Perps controller Core-alignment override ──
     // Enforces the same ESLint rules that Core's @metamask/eslint-config
     // applies to packages/perps-controller so that code written in mobile

.github/guidelines/E2E_DECISION_TREE.md

@@ -33,7 +33,7 @@ To save infra resources while waiting for static analysis findings and potential
 - E2E tests are skipped and merge is blocked while the label is present, **unless** all changes are ignorable-only.
 - If E2E tests are needed, they should pass to be able to merge.
 
-## AI test selection
+## Smart AI E2E test selection
 
 Runs only when all of the following are true:
 
@@ -53,3 +53,10 @@ Flakiness detection is applied to modified E2E test files in PRs:
 - Modified E2E test files run twice
 - It applies to existing test files as well as new test files added in the PR
 - It can be disabled by adding the label `skip-e2e-flakiness-detection`. Useful when making large refactors or when changes don't pose flakiness risk.
+
+## Release branches
+
+PRs to release branches (cherry-picked from main) are exempt from the following:
+
+- Label `pr-not-ready-for-e2e` is not applied
+- Smart AI E2E selection is skipped - all E2E suites are run (if changes are not ignorable-only, e.g. only docs)

.github/workflows/update-e2e-fixtures.yml

@@ -255,7 +255,7 @@ jobs:
         run: |
           IS_TEST='true' NODE_OPTIONS='--experimental-vm-modules' \
             yarn detox test -c ios.sim.main.ci --headless \
-            tests/regression/fixtures/fixture-validation.spec.ts
+            tests/smoke/fixtures/fixture-validation.spec.ts
         env:
           PREBUILT_IOS_APP_PATH: artifacts/main-qa-MetaMask.app
 

.yarn/patches/@metamask-bridge-status-controller-npm-71.1.0-6140a0bdf3.patch

@@ -0,0 +1,68 @@
+diff --git a/dist/bridge-status-controller.cjs b/dist/bridge-status-controller.cjs
+index c8dcd1f18fd4395b13ac7945e533ae1a92553950..ced9b35dc96c65ffe7ac59d198f4ab2737ae24ac 100644
+--- a/dist/bridge-status-controller.cjs
++++ b/dist/bridge-status-controller.cjs
+@@ -863,16 +863,27 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
+                 };
+                 // Record in bridge history with actual transaction metadata
+                 try {
+-                    // Create a bridge transaction metadata that includes the original txId
++                    /**
++                      * Patch to fix ondo swap activity tab status issue logged at
++                      * https://consensyssoftware.atlassian.net/browse/BETR-413
++                      *
++                      */
++                    // Create a bridge transaction metadata keyed by orderUid for intent polling
+                     const bridgeTxMetaForHistory = {
+                         ...syntheticMeta,
+                         id: orderUid,
+-                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                     };
+                     // Use orderId as the history key for intent transactions
++                    // IMPORTANT: pass originalTransactionId as a top-level argument so
++                    // `getInitialHistoryItem` reads it. Setting it on `bridgeTxMeta` is a no-op
++                    // because `getInitialHistoryItem` destructures `originalTransactionId` from
++                    // the top-level args, not from `bridgeTxMeta`. Without this, the field
++                    // falls back to `bridgeTxMeta.id` (the orderUid), severing the link between
++                    // the bridge history record and the synthetic TransactionController entry.
+                     const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                         accountAddress,
+                         bridgeTxMeta: bridgeTxMetaForHistory,
++                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                         quoteResponse,
+                         slippagePercentage: 0,
+                         isStxEnabled: false,
+diff --git a/dist/bridge-status-controller.mjs b/dist/bridge-status-controller.mjs
+index 3c285a68a35e69b6898f5c811a000324044213c8..9e0b4ef973b167c39e142b60ca28cf32ea89f41a 100644
+--- a/dist/bridge-status-controller.mjs
++++ b/dist/bridge-status-controller.mjs
+@@ -860,16 +860,27 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
+                 };
+                 // Record in bridge history with actual transaction metadata
+                 try {
+-                    // Create a bridge transaction metadata that includes the original txId
++                    /**
++                      * Patch to fix ondo swap activity tab status issue logged at
++                      * https://consensyssoftware.atlassian.net/browse/BETR-413
++                      *
++                      */
++                    // Create a bridge transaction metadata keyed by orderUid for intent polling
+                     const bridgeTxMetaForHistory = {
+                         ...syntheticMeta,
+                         id: orderUid,
+-                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                     };
+                     // Use orderId as the history key for intent transactions
++                    // IMPORTANT: pass originalTransactionId as a top-level argument so
++                    // `getInitialHistoryItem` reads it. Setting it on `bridgeTxMeta` is a no-op
++                    // because `getInitialHistoryItem` destructures `originalTransactionId` from
++                    // the top-level args, not from `bridgeTxMeta`. Without this, the field
++                    // falls back to `bridgeTxMeta.id` (the orderUid), severing the link between
++                    // the bridge history record and the synthetic TransactionController entry.
+                     const historyKey = __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                         accountAddress,
+                         bridgeTxMeta: bridgeTxMetaForHistory,
++                        originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
+                         quoteResponse,
+                         slippagePercentage: 0,
+                         isStxEnabled: false,