Merge pull request #28507 from MetaMask/Version-v12.6.2

Version v12.6.2 RC

.circleci/config.yml

@@ -87,15 +87,15 @@ aliases:
         cat ${HOME}/project/.circleci/scripts/enable-vnc.sh >> ~/.bashrc
       fi
 
-  # Check if MMI tests should run
-  - &check-mmi-trigger
-    name: Check if MMI tests should run
+  # Check if MMI Optional tests should run
+  - &check-mmi-optional
+    name: Check if MMI Optional tests should run
     command: |
-      source mmi_trigger.env
-      if [ "${run_mmi_tests}" == "true" ]; then
-        echo "Running MMI tests"
+      RUN_MMI_OPTIONAL=$(cat ./RUN_MMI_OPTIONAL)
+      if [[ "${RUN_MMI_OPTIONAL}" == "true" ]]; then
+        echo "Running MMI Optional tests"
       else
-        echo "Skipping MMI tests"
+        echo "Skipping MMI Optional tests"
         circleci step halt
       fi
 
@@ -114,7 +114,7 @@ workflows:
       - trigger-beta-build:
           requires:
             - prep-deps
-      - check-mmi-trigger
+      - check-pr-tag
       - prep-deps
       - get-changed-files-with-git-diff:
           filters:
@@ -179,7 +179,7 @@ workflows:
       - prep-build-test-mmi-playwright:
           requires:
             - prep-deps
-            - check-mmi-trigger
+            - check-pr-tag
       - prep-build-storybook:
           requires:
             - prep-deps
@@ -231,7 +231,7 @@ workflows:
           requires:
             - prep-build-test-mmi
             - get-changed-files-with-git-diff
-      - test-e2e-mmi-playwright:
+      - test-e2e-mmi-playwright - OPTIONAL:
           requires:
             - prep-build-test-mmi-playwright
       - test-e2e-chrome-rpc-mmi:
@@ -421,6 +421,39 @@ jobs:
           name: Create GitHub Pull Request for version
           command: .circleci/scripts/release-create-release-pr.sh
 
+  check-pr-tag:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - run:
+          name: Check for MMI Team Tag
+          command: |
+            #!/bin/bash
+
+            GH_LABEL=team-mmi
+            if [ -z "$CIRCLE_PULL_REQUESTS" ]; then
+              echo "Skipping tag check; this is not a PR."
+              echo "false" > ./RUN_MMI_OPTIONAL
+              exit 0
+            fi
+
+            echo $CIRCLE_PULL_REQUESTS | sed 's/,/\n/g'
+
+            # See if any associated PRs have matching label
+            HAS_MATCHING_PR=$(echo $CIRCLE_PULL_REQUESTS \
+              | sed -e 's#,#\n#g' -e 's#/github.com/#/api.github.com/repos/#g' -e 's#/pull/#/pulls/#g' \
+              | xargs -n1 curl -s \
+              | jq -s "map((.labels|map(select(.name==\"${GH_LABEL}\"))))|flatten|length > 0")
+
+            echo "${GH_LABEL} tag presence: ${HAS_MATCHING_PR}"
+
+            # assign the RUN_MMI_OPTIONAL variable
+            echo "${HAS_MATCHING_PR}" > ./RUN_MMI_OPTIONAL
+      - persist_to_workspace:
+          root: .
+          paths:
+            - RUN_MMI_OPTIONAL
+
   prep-deps:
     executor: node-browsers-medium
     steps:
@@ -806,7 +839,7 @@ jobs:
       - run: corepack enable
       - attach_workspace:
           at: .
-      - run: *check-mmi-trigger
+      - run: *check-mmi-optional
       - run:
           name: Build MMI extension for Playwright e2e
           command: |
@@ -821,6 +854,7 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
+            - RUN_MMI_OPTIONAL
             - dist-test-mmi-playwright
             - builds-test-mmi-playwright
       - store_artifacts:
@@ -1272,15 +1306,15 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e
 
-  test-e2e-mmi-playwright:
+  test-e2e-mmi-playwright - OPTIONAL:
     executor: playwright
     parallelism: 2
     steps:
       - run: *shallow-git-clone-and-enable-vnc
       - run: corepack enable
       - attach_workspace:
           at: .
-      - run: *check-mmi-trigger
+      - run: *check-mmi-optional
       - run:
           name: Move test build to dist
           command: mv ./dist-test-mmi-playwright ./dist
@@ -1709,18 +1743,3 @@ jobs:
       - run:
           name: All Tests Passed
           command: echo 'whew - everything passed!'
-
-  check-mmi-trigger:
-    executor: node-browsers-medium
-    steps:
-      - checkout
-      - run:
-          name: Check for MMI Team Label or Reviewer
-          command: ./.circleci/scripts/check_mmi_trigger.sh
-      - store_artifacts:
-          path: mmi_trigger.env
-          destination: mmi_trigger.env
-      - persist_to_workspace:
-          root: .
-          paths:
-            - mmi_trigger.env

.depcheckrc.yml

@@ -81,8 +81,6 @@ ignores:
   # trezor
   - 'ts-mixer'
   - '@testing-library/dom'
-  - 'mini-css-extract-plugin'
-  - 'webpack-cli'
 
 # files depcheck should not parse
 ignorePatterns:

.github/CODEOWNERS

@@ -52,12 +52,7 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 .devcontainer/                       @MetaMask/library-admins @HowardBraham @plasmacorral
 
 # 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
+ui/pages/confirmations               @MetaMask/confirmations
 
 # MMI team is responsible for code related with Institutioanl version of MetaMask
 ui/pages/institutional               @MetaMask/mmi

.gitignore

@@ -80,6 +80,3 @@ html-report/
 
 /app/images/branding
 /changed-files
-
-# UI Integration tests
-test/integration/config/assets

.metamaskrc.dist

@@ -4,10 +4,6 @@
 ; This variable is required
 INFURA_PROJECT_ID=00000000000
 
-; This variable is not required but it's necessary for the storybook
-; to render stories that use onchain data.
-INFURA_STORYBOOK_PROJECT_ID=
-
 ;PASSWORD=METAMASK PASSWORD
 ;SEGMENT_WRITE_KEY=
 ;BRIDGE_USE_DEV_APIS=

.storybook/main.js

@@ -1,9 +1,6 @@
 const path = require('path');
 const { ProvidePlugin } = require('webpack');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const dotenv = require('dotenv');
-dotenv.config({ path: path.resolve(__dirname, '../.metamaskrc') });
-
 module.exports = {
   core: {
     disableTelemetry: true,
@@ -32,7 +29,6 @@ module.exports = {
   env: (config) => ({
     ...config,
     ENABLE_CONFIRMATION_REDESIGN: true,
-    INFURA_PROJECT_ID: process.env.INFURA_STORYBOOK_PROJECT_ID || '',
   }),
   // Uses babel.config.js settings and prevents "Missing class properties transform" error
   babel: async (options) => ({
@@ -52,16 +48,10 @@ module.exports = {
     config.resolve.alias['../../../../../../store/actions'] = require.resolve(
       '../ui/__mocks__/actions.js',
     );
-    config.resolve.alias['../../../store/actions'] = require.resolve(
-      '../ui/__mocks__/actions.js',
-    );
     // Import within controller-utils crashes storybook.
     config.resolve.alias['@ethereumjs/util'] = require.resolve(
       '../ui/__mocks__/ethereumjs-util.js',
     );
-    config.resolve.alias['./useNftCollectionsMetadata'] = require.resolve(
-      '../ui/__mocks__/useNftCollectionsMetadata.js',
-    );
     config.resolve.fallback = {
       child_process: false,
       constants: false,
@@ -96,7 +86,7 @@ module.exports = {
             sourceMap: true,
             implementation: require('sass-embedded'),
             sassOptions: {
-              includePaths: ['ui/css/', 'node_modules/'],
+              includePaths: ['ui/css/', 'node_modules/',],
             },
           },
         },
@@ -106,7 +96,12 @@ module.exports = {
       new CopyWebpackPlugin({
         patterns: [
           {
-            from: path.join('ui', 'css', 'utilities', 'fonts/'),
+            from: path.join(
+              'ui',
+              'css',
+              'utilities',
+              'fonts/',
+            ),
             to: 'fonts',
           },
           {

.storybook/test-data.js

@@ -1596,7 +1596,6 @@ const state = {
         },
       },
     },
-    openSeaEnabled: true,
   },
   appState: {
     shouldClose: false,

.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch

@@ -0,0 +1,12 @@
+diff --git a/lib/index.js b/lib/index.js
+index 64ff8344f6280d20988f8c3c81e1f248a1869e53..6739e7bd2271be6b861479ec384bbd007bdb5df8 100644
+--- a/lib/index.js
++++ b/lib/index.js
+@@ -222,7 +222,6 @@ var _transform = require("./transform.js");
+ var _transformFile = require("./transform-file.js");
+ var _transformAst = require("./transform-ast.js");
+ var _parse = require("./parse.js");
+-var thisFile = require("./index.js");
+ ;
+ const version = "7.23.2";
+ exports.version = version;

.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch → .yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch

@@ -1,10 +1,10 @@
 diff --git a/helpers/construct.js b/helpers/construct.js
-index aee8e70448824f509d6605e2dfa4455167442f21..00a69eba8d4c15a1f9aa318a50abb96c2ec447d9 100644
+index 771e1d7952e80f11619424fbabb3744b959ffa49..5fe152bc1129bd8c8b7bb217ca1972ac4e089051 100644
 --- a/helpers/construct.js
 +++ b/helpers/construct.js
-@@ -1,10 +1,22 @@
- var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
+@@ -1,10 +1,21 @@
 -var setPrototypeOf = require("./setPrototypeOf.js");
+-var isNativeReflectConstruct = require("./isNativeReflectConstruct.js");
 -function _construct(t, e, r) {
 -  if (isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
 -  var o = [null];