Merge branch 'main' into TSA-pass-chain-value-to-top-trader-events

Author: zone-live

.depcheckrc.yml

@@ -46,6 +46,11 @@ ignores:
   - 'xml2js'
   # jest-junit is used as a Jest reporter in tests/jest.e2e.detox.config.js
   - 'jest-junit'
+  # Required directly only by scripts/babel/named-capturing-groups-regex.test.ts
+  # (a regression guard for the @react-native/babel-preset patch). It's provided
+  # transitively via @expo/metro-config + Metro, so we don't declare it as a
+  # direct dependency.
+  - 'babel-preset-expo'
 
   # tsconfig path alias pointing to app/controllers/perps (not an npm package)
   - '@metamask/perps-controller'
@@ -76,7 +81,6 @@ ignores:
   - 'chromedriver'
   - 'execa'
   - 'jetifier'
-  - 'metro-react-native-babel-preset'
   - 'react-native-svg-asset-plugin'
   - 'regenerator-runtime'
   - 'prettier-2'

.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/workflows/ci.yml

@@ -307,22 +307,6 @@ jobs:
           command: yarn install --immutable
       - name: Clean state and following up dependencies installation
         run: yarn setup:github-ci --node
-      - name: Restore ESLint cache
-        if: ${{ matrix.scripts == 'lint' }}
-        uses: actions/cache@v4
-        with:
-          path: .eslintcache
-          key: eslintcache-${{ runner.os }}-${{ github.run_id }}
-          restore-keys: |
-            eslintcache-${{ runner.os }}-
-      - name: Restore TypeScript incremental build cache
-        if: ${{ matrix.scripts == 'lint:tsc' }}
-        uses: actions/cache@v4
-        with:
-          path: tsconfig.tsbuildinfo
-          key: tsbuildinfo-${{ runner.os }}-${{ github.run_id }}
-          restore-keys: |
-            tsbuildinfo-${{ runner.os }}-
       - run: yarn ${{ matrix['scripts'] }}
       - name: Require clean working directory
         shell: bash
@@ -1354,13 +1338,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    needs:
-      [
-        get_requirements,
-        build-android-apks,
-        smart-e2e-selection,
-        prepare-e2e-timings,
-      ]
+    needs: [get_requirements, build-android-apks, smart-e2e-selection, prepare-e2e-timings]
     uses: ./.github/workflows/run-e2e-smoke-tests-android.yml
     with:
       changed_files: ${{ needs.get_requirements.outputs.changed_files }}
@@ -1414,13 +1392,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    needs:
-      [
-        get_requirements,
-        ios-tests-ready,
-        smart-e2e-selection,
-        prepare-e2e-timings,
-      ]
+    needs: [get_requirements, ios-tests-ready, smart-e2e-selection, prepare-e2e-timings]
     uses: ./.github/workflows/run-e2e-smoke-tests-ios.yml
     with:
       changed_files: ${{ needs.get_requirements.outputs.changed_files }}

.github/workflows/create-release-pr.yml

@@ -109,6 +109,8 @@ jobs:
       # - contents: write       → push the release / version-bump / changelog branches
       # - pull_requests: write  → open the release PRs
       # - members: read         → auto-changelog --autoCategorize resolves PR author teams (read:org)
+      # - workflows: write      → the release branch cut here comes from main and can genuinely
+      #                           differ in .github/workflows/* from the previous release branch
       # OIDC works on every trigger, so no workflow_dispatch vs workflow_call token split is needed.
       - name: Get token
         id: get-token
@@ -119,6 +121,7 @@ jobs:
             contents: write
             pull_requests: write
             members: read
+            workflows: write
 
       - name: Create Release PR (semver / native version bump)
         if: needs.resolve-bases.outputs.is_ota != 'true'

.github/workflows/run-appium-smoke-tests-android.yml

@@ -219,3 +219,27 @@ jobs:
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
+
+  appium-money-android-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags), 'ALL') ||
+         contains(fromJson(inputs.selected_tags), 'SmokeMoney'))
+      }}
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-money-android-smoke-${{ matrix.split }}
+      platform: android
+      test_suite_tag: SmokeMoney
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      test-timeout-minutes: 60
+      build_type: ${{ inputs.build_type }}
+      metamask_environment: ${{ inputs.metamask_environment }}
+      runner_provider: ${{ inputs.runner_provider }}
+    secrets: inherit

.github/workflows/run-appium-smoke-tests-ios.yml

@@ -198,3 +198,27 @@ jobs:
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
     secrets: inherit
+
+  appium-money-ios-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags || '["ALL"]'), 'ALL') ||
+         contains(fromJson(inputs.selected_tags || '["ALL"]'), 'SmokeMoney'))
+      }}
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-money-ios-smoke-${{ matrix.split }}
+      platform: ios
+      test_suite_tag: SmokeMoney
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      test-timeout-minutes: 60
+      build_type: ${{ inputs.build_type || 'main' }}
+      metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
+      runner_provider: ${{ inputs.runner_provider || 'current' }}
+    secrets: inherit

.github/workflows/update-release-changelog.yml

@@ -54,6 +54,12 @@ jobs:
       pull-requests: write
       id-token: write
     steps:
+      # Mint a short-lived token via the token-exchange service (OIDC). It needs:
+      # - contents: write       → push the changelog branch
+      # - pull_requests: write  → open/update the changelog PR
+      # - workflows: write      → workaround for a GitHub push-protection timeout bug on new
+      #                           branch pushes (see actions/checkout#2287); this step never
+      #                           actually touches workflow files.
       - name: Get token
         id: get-token
         uses: MetaMask/github-tools/.github/actions/get-token@v1
@@ -62,6 +68,7 @@ jobs:
           permissions: |
             contents: write
             pull_requests: write
+            workflows: write
 
       - name: Checkout release branch
         uses: actions/checkout@v4

.yarn/patches/@react-native-babel-preset-npm-0.83.6-90eed53ffb.patch

@@ -0,0 +1,22 @@
+diff --git a/src/configs/main.js b/src/configs/main.js
+index a2f5e1e53a663c07ce8fa3def3a1d6d7828a4557..5179e8cf5bb6f085275daa183a05d21553cf695a 100644
+--- a/src/configs/main.js
++++ b/src/configs/main.js
+@@ -120,9 +120,14 @@ const getPreset = (src, options) => {
+     extraPlugins.push([require('@babel/plugin-transform-numeric-separator')]);
+     extraPlugins.push([require('@babel/plugin-transform-sticky-regex')]);
+   } else {
+-    extraPlugins.push([
+-      require('@babel/plugin-transform-named-capturing-groups-regex'),
+-    ]);
++    // NOTE (MetaMask): Do NOT down-level named-capture-group regexes on Hermes.
++    // Current Hermes supports them natively, and the `@babel/runtime/helpers/wrapRegExp`
++    // helper that this transform introduces breaks under SES lockdown (frozen
++    // intrinsics), causing `RegExp.exec` to return null for matching strings
++    // (e.g. NetworkController's INFURA_URL_REGEX -> "Could not derive Infura network").
++    // extraPlugins.push([
++    //   require('@babel/plugin-transform-named-capturing-groups-regex'),
++    // ]);
+     // Needed for regenerator
+     if (isHermes && enableRegenerator) {
+       extraPlugins.push([

.yarn/patches/@tommasini-react-native-scrollable-tab-view-npm-1.1.1-153a9df479.patch

@@ -54,7 +54,7 @@ index 81a8a70576a2336fbfce44f429b80acb6bacb2c1..f8916b181efe7ba4ab598d3e6fb11477
      borderTopWidth: 0,
      borderLeftWidth: 0,
 diff --git a/index.js b/index.js
-index dc9d4f4e0bb7b5a165e0bcc89133e4bf6cdfff91..496530970bce3754e76362737be4c3491d159f05 100644
+index dc9d4f4e0bb7b5a165e0bcc89133e4bf6cdfff91..94f7ac60e15478b197aa3f537224745d0d5fecb6 100644
 --- a/index.js
 +++ b/index.js
 @@ -13,17 +13,14 @@ const {
@@ -98,3 +98,12 @@ index dc9d4f4e0bb7b5a165e0bcc89133e4bf6cdfff91..496530970bce3754e76362737be4c349
          )}
          ref={(scrollView) => { this.scrollView = scrollView; }}
          {...this.props.contentProps}
+@@ -348,7 +342,7 @@ const ScrollableTabView = createReactClass({
+       // Need to call __makeNative manually to avoid a native animated bug. See
+       // https://github.com/facebook/react-native/pull/14435
+       containerWidthAnimatedValue.__makeNative();
+-      scrollValue = Animated.divide(this.state.scrollXIOS, containerWidthAnimatedValue);
++      const scrollValue = Animated.divide(this.state.scrollXIOS, containerWidthAnimatedValue);
+       this.setState({ containerWidth: width, scrollValue, });
+     } else {
+       this.setState({ containerWidth: width, });

app/actions/settings/index.js

@@ -107,3 +107,10 @@ export function setPerpsChartPreferredCandlePeriod(preferredCandlePeriod) {
     preferredCandlePeriod,
   };
 }
+
+export function setShowAccountOnLeaderboard(showAccountOnLeaderboard) {
+  return {
+    type: 'SET_SHOW_ACCOUNT_ON_LEADERBOARD',
+    showAccountOnLeaderboard,
+  };
+}