Merge origin/main into stable-main-13.36.0

Author: metamaskbot

.eslintrc.js

@@ -609,7 +609,6 @@ module.exports = {
         'app/scripts/lockdown-run.js',
         'app/scripts/lockdown-more.js',
         'test/helpers/protect-intrinsics-helpers.js',
-        'test/unit-global/protect-intrinsics.test.js',
       ],
       globals: {
         harden: 'readonly',
@@ -830,7 +829,6 @@ module.exports = {
         'test/e2e/page-objects/pages/debug-page.ts',
         'test/e2e/page-objects/pages/deep-link-page.ts',
         'test/e2e/page-objects/pages/defi-details-page.ts',
-        'test/e2e/page-objects/pages/defi-tab.ts',
         'test/e2e/page-objects/pages/dialog/account-details-modal.ts',
         'test/e2e/page-objects/pages/dialog/add-edit-network.ts',
         'test/e2e/page-objects/pages/dialog/add-network-rpc-url.ts',
@@ -854,10 +852,12 @@ module.exports = {
         'test/e2e/page-objects/pages/hardware-wallet/connect-hardware-wallet-page.ts',
         'test/e2e/page-objects/pages/hardware-wallet/select-hardware-wallet-account-page.ts',
         'test/e2e/page-objects/pages/header-navbar.ts',
-        'test/e2e/page-objects/pages/home/activity-list.ts',
-        'test/e2e/page-objects/pages/home/asset-list.ts',
+        'test/e2e/page-objects/pages/home/activity-tab.ts',
+        'test/e2e/page-objects/pages/home/defi-tab.ts',
         'test/e2e/page-objects/pages/home/homepage.ts',
-        'test/e2e/page-objects/pages/home/nft-list.ts',
+        'test/e2e/page-objects/pages/home/nfts-tab.ts',
+        'test/e2e/page-objects/pages/home/perps-tab.ts',
+        'test/e2e/page-objects/pages/home/tokens-tab.ts',
         'test/e2e/page-objects/pages/home/transaction-details.ts',
         'test/e2e/page-objects/pages/login-page.ts',
         'test/e2e/page-objects/pages/multichain/account-address-modal.ts',
@@ -880,7 +880,6 @@ module.exports = {
         'test/e2e/page-objects/pages/permission/permission-list-page.ts',
         'test/e2e/page-objects/pages/permission/site-permission-page.ts',
         'test/e2e/page-objects/pages/perps/perps-activity-page.ts',
-        'test/e2e/page-objects/pages/perps/perps-home-page.ts',
         'test/e2e/page-objects/pages/perps/perps-market-detail-page.ts',
         'test/e2e/page-objects/pages/perps/perps-market-list-page.ts',
         'test/e2e/page-objects/pages/perps/perps-order-entry-page.ts',

.github/CODEOWNERS

@@ -99,19 +99,24 @@ test/e2e/tests/perps/ @MetaMask/perps
 docs/perps/ @MetaMask/perps
 **/perps/** @MetaMask/perps
 
-# Snaps
-**/snaps/**                          @MetaMask/core-platform
-shared/constants/permissions.ts      @MetaMask/core-platform
-ui/helpers/utils/permission.js       @MetaMask/core-platform
-app/scripts/constants/snaps.ts       @MetaMask/core-platform
+# Core Platform
+**/snaps/**                                                @MetaMask/core-platform
+shared/constants/permissions.ts                            @MetaMask/core-platform
+ui/helpers/utils/permission.js                             @MetaMask/core-platform
+app/scripts/constants/snaps.ts                             @MetaMask/core-platform
+app/scripts/services/legacy-background-api-service.ts      @MetaMask/core-platform
+app/scripts/services/legacy-background-api-service.test.ts @MetaMask/core-platform
+
 
 # Co-owned by Confirmations and Snaps
 ui/components/app/metamask-template-renderer @MetaMask/confirmations @MetaMask/core-platform
 
 # Core Extension UX
 ui/components/app/whats-new-popup               @MetaMask/core-extension-ux
 ui/css                                          @MetaMask/core-extension-ux
+shared/lib/activity                             @MetaMask/core-extension-ux
 ui/pages/home                                   @MetaMask/core-extension-ux
+ui/pages/activity                               @MetaMask/core-extension-ux
 ui/pages/core                                   @MetaMask/core-extension-ux
 ui/pages/permissions-connect/                   @MetaMask/core-extension-ux
 ui/pages/settings                               @MetaMask/core-extension-ux
@@ -196,21 +201,21 @@ test/e2e/benchmarks/utils/gated-metrics.ts                            @MetaMask/
 test/e2e/benchmarks/utils/thresholds.ts                               @MetaMask/qa @MetaMask/extension-platform
 
 # Wallet Integrations
-app/scripts/lib/rpc-method-middleware                                 @MetaMask/wallet-integrations
-shared/lib/caip25-caveat-merger.ts                                    @MetaMask/wallet-integrations
-test/e2e/page-objects/benchmark                                       @MetaMask/wallet-integrations
-test/e2e/playwright/benchmark                                         @MetaMask/wallet-integrations
-test/e2e/flask/multichain-api                                         @MetaMask/wallet-integrations
+test/e2e/page-objects/benchmark                                       @MetaMask/core-platform
+test/e2e/playwright/benchmark                                         @MetaMask/core-platform
+app/scripts/lib/createDefiReferralMiddleware.ts                       @MetaMask/core-platform
+app/scripts/lib/rpc-method-middleware                                 @MetaMask/core-platform
+shared/lib/caip25-caveat-merger.ts                                    @MetaMask/core-platform
+test/e2e/flask/multichain-api                                         @MetaMask/core-platform
 # TODO CONSOLIDATE THE MIDDLEWARE BELOW INTO THE RPC-METHOD-MIDDLEWARE FOLDER
-app/scripts/lib/createRPCMethodTrackingMiddleware.js                  @MetaMask/wallet-integrations
-app/scripts/lib/createMetamaskMiddleware.ts                           @MetaMask/wallet-integrations
-app/scripts/lib/createOnboardingMiddleware.js                         @MetaMask/wallet-integrations
-app/scripts/lib/createEvmMethodsToNonEvmAccountReqFilterMiddleware.ts @MetaMask/wallet-integrations
-app/scripts/lib/createDefiReferralMiddleware.ts                @MetaMask/wallet-integrations
-app/scripts/lib/middleware/                                           @MetaMask/wallet-integrations
-app/scripts/lib/createOriginThrottlingMiddleware.ts                   @MetaMask/wallet-integrations
-app/scripts/lib/createMainFrameOriginMiddleware.ts                    @MetaMask/wallet-integrations
-app/scripts/lib/createTracingMiddleware.ts                            @MetaMask/wallet-integrations
+app/scripts/lib/createRPCMethodTrackingMiddleware.js                  @MetaMask/core-platform
+app/scripts/lib/createMetamaskMiddleware.ts                           @MetaMask/core-platform
+app/scripts/lib/createOnboardingMiddleware.js                         @MetaMask/core-platform
+app/scripts/lib/createEvmMethodsToNonEvmAccountReqFilterMiddleware.ts @MetaMask/core-platform
+app/scripts/lib/middleware/                                           @MetaMask/core-platform
+app/scripts/lib/createOriginThrottlingMiddleware.ts                   @MetaMask/core-platform
+app/scripts/lib/createMainFrameOriginMiddleware.ts                    @MetaMask/core-platform
+app/scripts/lib/createTracingMiddleware.ts                            @MetaMask/core-platform
 
 # mUSD
 **/musd/** @MetaMask/earn
@@ -270,3 +275,8 @@ app/scripts/lib/metaRPCClientFactory.ts              @MetaMask/extension-platfor
 ui/hooks/gator-permissions                           @MetaMask/delegation
 app/scripts/messenger-client-init/gator-permissions  @MetaMask/delegation
 shared/lib/gator-permissions                         @MetaMask/delegation
+
+# Snapshots – no code owners assigned
+# This allows anyone with write access to approve changes to any *.snap files.
+# ⚠️ Note: Leaving this rule unassigned disables Code Owner review enforcement for snapshot files.
+**/*.snap

.github/scripts/bundle-stats-commit.sh

@@ -27,7 +27,7 @@ git config --global user.name "MetaMask Bot"
 
 git clone --depth 1 https://github.com/MetaMask/extension_bundlesize_stats.git temp
 
-BUNDLE_SIZE_FILE="test-artifacts/chrome/bundle_size_stats.json"
+BUNDLE_SIZE_FILE="test-artifacts/chrome/chrome.json"
 STATS_FILE="temp/stats/bundle_size_data.json"
 TEMP_FILE="temp/stats/bundle_size_data.temp.json"
 

.github/workflows/e2e-chrome.yml

@@ -15,8 +15,6 @@ on:
         type: string
         description: The matrix for the E2E jobs
     secrets:
-      PR_COMMENT_TOKEN:
-        required: false
       INFURA_PROJECT_ID:
         required: false
 

.github/workflows/main.yml

@@ -446,7 +446,7 @@ jobs:
   bundle-size:
     needs:
       - get-requirements
-      - build-dist-browserify
+      - build-dist-webpack
     if: ${{ needs.get-requirements.outputs.skip-everything != 'true' && needs.get-requirements.outputs.builds-from-run == github.run_id }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -461,15 +461,15 @@ jobs:
           is-high-risk-environment: false
           skip-allow-scripts: true
 
-      - name: Download artifact 'build-dist-browserify'
+      - name: Download artifact 'build-dist-webpack'
         uses: actions/download-artifact@v7
         with:
-          name: build-dist-browserify
+          name: build-dist-webpack
           github-token: ${{ secrets.GITHUB_TOKEN }} # This is required when downloading artifacts from a different repository or from a different workflow run.
           run-id: ${{ needs.get-requirements.outputs.builds-from-run }} # Download from the run that produced the builds.
 
-      - name: Measure bundle size
-        run: yarn tsx test/e2e/mv3-perf-stats/bundle-size.ts --out test-artifacts/chrome
+      - name: Copy bundle size summary
+        run: mkdir -p test-artifacts && mv dist/bundle-size test-artifacts/chrome
 
       - name: Record bundle size at commit
         # Skip on fork repos — only record stats on the canonical repository.
@@ -617,7 +617,6 @@ jobs:
       builds-from-run: ${{ needs.get-requirements.outputs.builds-from-run }}
       builds-from-sha: ${{ needs.get-requirements.outputs.builds-from-sha }}
     secrets:
-      PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
       E2E_OPENAI_API_KEY: ${{ secrets.E2E_OPENAI_API_KEY }}
       E2E_CLAUDE_API_KEY: ${{ secrets.E2E_CLAUDE_API_KEY }}
       E2E_GEMINI_API_KEY: ${{ secrets.E2E_GEMINI_API_KEY }}

.github/workflows/publish-prerelease.yml

@@ -3,8 +3,6 @@ name: Publish prerelease
 on:
   workflow_call:
     secrets:
-      PR_COMMENT_TOKEN:
-        required: true
       E2E_OPENAI_API_KEY:
         required: false
       E2E_CLAUDE_API_KEY:
@@ -109,8 +107,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     environment: pr-comment
+    permissions:
+      contents: read
+      id-token: write
     env:
-      PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
       OWNER: ${{ github.repository_owner }}
       REPOSITORY: ${{ github.event.repository.name }}
       RUN_ID: ${{ github.run_id }}
@@ -188,6 +188,17 @@ jobs:
             echo "EOF"
           } >> "${GITHUB_ENV}"
 
+      - name: Get token
+        id: token
+        if: ${{ env.PR_NUMBER && vars.AWS_CLOUDFRONT_URL }}
+        uses: MetaMask/github-tools/.github/actions/get-token@v1
+        with:
+          token-exchange-url: ${{ vars.TOKEN_EXCHANGE_URL }}
+          permissions: |
+            pull_requests: write
+
       - name: Publish prerelease
-        if: ${{ env.PR_NUMBER && env.PR_COMMENT_TOKEN && vars.AWS_CLOUDFRONT_URL }}
+        if: ${{ env.PR_NUMBER && steps.token.outputs.token && vars.AWS_CLOUDFRONT_URL }}
+        env:
+          PR_COMMENT_TOKEN: ${{ steps.token.outputs.token }}
         run: yarn tsx ./development/metamaskbot-build-announce/index.ts

.storybook/i18n.js

@@ -1,4 +1,4 @@
-import React, { Component, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { getMessage } from '../ui/helpers/utils/i18n-helper';
 import { I18nContext } from '../ui/contexts/i18n';
@@ -29,29 +29,3 @@ I18nProvider.propTypes = {
 I18nProvider.defaultProps = {
   children: undefined,
 };
-
-export class LegacyI18nProvider extends Component {
-  static propTypes = {
-    children: PropTypes.node,
-  };
-
-  static defaultProps = {
-    children: undefined,
-  };
-
-  static contextType = I18nContext;
-
-  static childContextTypes = {
-    t: PropTypes.func,
-  };
-
-  getChildContext() {
-    return {
-      t: this.context,
-    };
-  }
-
-  render() {
-    return this.props.children;
-  }
-}

.storybook/metametrics.js

@@ -1,16 +1,8 @@
 import React from 'react';
-import {
-  MetaMetricsProvider,
-  LegacyMetaMetricsProvider
-} from '../ui/contexts/metametrics';
+import { MetaMetricsProvider } from '../ui/contexts/metametrics';
 
-const MetaMetricsProviderStorybook = (props) => 
-    (
-        <MetaMetricsProvider>
-          <LegacyMetaMetricsProvider>
-            {props.children}
-          </LegacyMetaMetricsProvider>
-        </MetaMetricsProvider>
-  );
+const MetaMetricsProviderStorybook = (props) => (
+  <MetaMetricsProvider>{props.children}</MetaMetricsProvider>
+);
 
-export default MetaMetricsProviderStorybook
+export default MetaMetricsProviderStorybook;

.storybook/preview.js

@@ -9,7 +9,7 @@ import configureStore from '../ui/store/store';
 import '../ui/css/index.scss';
 import localeList from '../app/_locales/index.json';
 import * as allLocales from './locales';
-import { I18nProvider, LegacyI18nProvider } from './i18n';
+import { I18nProvider } from './i18n';
 import testData from './test-data.js';
 import { MemoryRouter, Routes, Route } from 'react-router-dom';
 import { setBackgroundConnection } from '../ui/store/background-connection';
@@ -142,11 +142,9 @@ const metamaskDecorator = (story, context) => {
               current={current}
               en={allLocales.en}
             >
-              <LegacyI18nProvider>
-                <Routes>
-                  <Route path={path} element={<StoryComponent />} />
-                </Routes>
-              </LegacyI18nProvider>
+              <Routes>
+                <Route path={path} element={<StoryComponent />} />
+              </Routes>
             </I18nProvider>
           </AlertMetricsProvider>
         </MemoryRouter>

.yarnrc.yml

@@ -45,11 +45,6 @@ npmAuditIgnoreAdvisories:
   # three years.
   - 'popper.js (deprecation)'
 
-  # Material UI dependencies are planned for removal
-  - '@material-ui/core (deprecation)'
-  - '@material-ui/styles (deprecation)'
-  - '@material-ui/pickers (deprecation)'
-
   # Dependencies brought in by @truffle/decoder that are deprecated:
   - 'cids (deprecation)' # via @ensdomains/content-hash
   - 'multibase (deprecation)' # via cids