Merge branch 'main' into fix/remove-supported-chains-check-ppom

.circleci/config.yml

@@ -3,13 +3,13 @@ version: 2.1
 executors:
   node-browsers-small:
     docker:
-      - image: cimg/node:20.18-browsers
+      - image: cimg/node:22.13-browsers
     resource_class: small
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-medium:
     docker:
-      - image: cimg/node:20.18-browsers
+      - image: cimg/node:22.13-browsers
     resource_class: medium
     environment:
       NODE_OPTIONS: --max_old_space_size=3072
@@ -21,7 +21,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=6144
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:20.18-browsers
+      - image: cimg/node:22.13-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=4096
@@ -99,9 +99,6 @@ workflows:
           <<: *rc_branch_only
           requires:
             - prep-deps
-      - trigger-beta-build:
-          requires:
-            - prep-deps
       - prep-deps
       - get-changed-files-with-git-diff:
           filters:
@@ -198,9 +195,6 @@ workflows:
       - validate-source-maps-mv2:
           requires:
             - prep-build-mv2
-      - validate-source-maps-beta:
-          requires:
-            - trigger-beta-build
       - validate-source-maps-flask:
           requires:
             - prep-build-flask
@@ -218,7 +212,6 @@ workflows:
       - all-tests-pass:
           requires:
             - validate-source-maps
-            - validate-source-maps-beta
             - validate-source-maps-flask
             - test-mozilla-lint-mv2
             - test-mozilla-lint-flask-mv2
@@ -250,7 +243,6 @@ workflows:
             - prep-build-test-mv2
             - prep-build-test-flask
             - prep-build-test-flask-mv2
-            - trigger-beta-build
             - prep-build-storybook
             - prep-build-ts-migration-dashboard
             - benchmark
@@ -316,35 +308,6 @@ workflows:
             - validate-locales-only
 
 jobs:
-  trigger-beta-build:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - when:
-          condition:
-            not:
-              matches:
-                pattern: /^master$/
-                value: << pipeline.git.branch >>
-          steps:
-            - run:
-                name: Build beta prod
-                command: .circleci/scripts/trigger-beta-build.sh
-            - run:
-                name: Move beta build to 'dist-beta' to avoid conflict with production build
-                command: mv ./dist ./dist-beta
-            - run:
-                name: Move beta zips to 'builds-beta' to avoid conflict with production build
-                command: mv ./builds ./builds-beta
-            - persist_to_workspace:
-                root: .
-                paths:
-                  - dist-beta
-                  - builds-beta
-
   create_release_pull_request:
     executor: node-browsers-medium
     steps:
@@ -1089,25 +1052,18 @@ jobs:
       - store_artifacts:
           path: dist/sourcemaps
           destination: builds/sourcemaps
-      - store_artifacts:
-          path: dist-beta/sourcemaps
-          destination: builds-beta/sourcemaps
       - store_artifacts:
           path: dist-flask/sourcemaps
           destination: builds-flask/sourcemaps
       - store_artifacts:
           path: builds
           destination: builds
-      - store_artifacts:
-          path: builds-beta
-          destination: builds-beta
       - store_artifacts:
           path: builds-flask
           destination: builds-flask
       - store_artifacts:
           path: builds-flask-mv2
           destination: builds-flask-mv2
-
       - store_artifacts:
           path: builds-mv2
           destination: builds-mv2
@@ -1204,17 +1160,6 @@ jobs:
           name: Validate source maps
           command: yarn validate-source-maps
 
-  validate-source-maps-beta:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: Validate source maps
-          command: .circleci/scripts/validate-source-maps-beta.sh
-
   validate-source-maps-flask:
     executor: node-browsers-small
     steps:

.depcheckrc.yml

@@ -24,7 +24,7 @@ ignores:
   - '@metamask/phishing-warning' # statically hosted as part of some e2e tests
   - '@metamask/test-dapp'
   - '@metamask/design-tokens' # Only imported in index.css
-  - '@tsconfig/node20' # required dynamically by TS, used in tsconfig.json
+  - '@tsconfig/node22' # required dynamically by TS, used in tsconfig.json
   - '@sentry/cli' # invoked as `sentry-cli`
   - 'chromedriver'
   - 'depcheck' # ooo meta

.eslintrc.js

@@ -308,7 +308,6 @@ module.exports = {
       files: [
         '**/__snapshots__/*.snap',
         'app/scripts/controllers/app-state-controller.test.ts',
-        'app/scripts/controllers/mmi-controller.test.ts',
         'app/scripts/controllers/alert-controller.test.ts',
         'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',

.github/CODEOWNERS

@@ -56,18 +56,13 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 .devcontainer/                       @MetaMask/extension-security-team @HowardBraham
 
 # Confirmations team to own code for confirmations on UI.
-app/scripts/lib/ppom                    @MetaMask/confirmations
-app/scripts/lib/signature               @MetaMask/confirmations
-app/scripts/lib/transaction/decode      @MetaMask/confirmations
-app/scripts/lib/transaction/metrics.*   @MetaMask/confirmations
-app/scripts/lib/transaction/util.*      @MetaMask/confirmations
-ui/pages/confirmations                  @MetaMask/confirmations
-
-# MMI team is responsible for code related with Institutioanl version of MetaMask
-ui/pages/institutional               @MetaMask/mmi
-ui/components/institutional          @MetaMask/mmi
-ui/ducks/institutional               @MetaMask/mmi
-ui/selectors/institutional           @MetaMask/mmi
+app/scripts/controller-init/confirmations                         @MetaMask/confirmations
+app/scripts/lib/ppom                                              @MetaMask/confirmations
+app/scripts/lib/signature                                         @MetaMask/confirmations
+app/scripts/lib/transaction/decode                                @MetaMask/confirmations
+app/scripts/lib/transaction/metrics.*                             @MetaMask/confirmations
+app/scripts/lib/transaction/util.*                                @MetaMask/confirmations
+ui/pages/confirmations                                            @MetaMask/confirmations
 
 # Design System to own code for the component-library folder
 # Slack handle: @metamask-design-system-team | Slack channel: #metamask-design-system