Merge branch 'develop' into MMI-5059-ofa-feature

MetaMask · Jun 4, 2024 · c2fb078 · c2fb078
2 parents 0dd3ba7 + a85b6cf
commit c2fb078
Show file tree

Hide file tree

Showing 269 changed files with 11,749 additions and 8,143 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/scripts/bundle-stats-commit.sh b/.circleci/scripts/bundle-stats-commit.sh
@@ -42,7 +42,7 @@ git clone [email protected]:MetaMask/extension_bundlesize_stats.git temp
 
 {
     echo " '${CIRCLE_SHA1}': ";
-    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    cat test-artifacts/chrome/bundle_size_stats.json;
     echo ", ";
 } >> temp/stats/bundle_size_data.temp.js
 
@@ -57,14 +57,14 @@ if [ -f temp/stats/bundle_size_data.json ]; then
   {
     echo "},";
     echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    cat test-artifacts/chrome/bundle_size_stats.json;
     echo "}";
   } >> bundle_size_stats.temp.json
 else
   {
     echo "{";
     echo "\"$CIRCLE_SHA1\":";
-    cat test-artifacts/chrome/mv3/bundle_size_stats.json;
+    cat test-artifacts/chrome/bundle_size_stats.json;
     echo "}";
   } > bundle_size_stats.temp.json
 fi

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -64,3 +64,18 @@ ui/selectors/institutional           @MetaMask/mmi
 # Design System to own code for the component-library folder
 # Slack handle: @metamask-design-system-team | Slack channel: #metamask-design-system
 ui/components/component-library      @MetaMask/design-system-engineers
+
+# The Notifications team is responsible for code related to notifications,
+# authentication, and profile syncing inside the Extension.
+
+# Controllers
+**/controllers/authentication/**                    @MetaMask/notifications
+**/controllers/metamask-notifications/**            @MetaMask/notifications
+**/controllers/push-platform-notifications/**       @MetaMask/notifications
+**/controllers/user-storage/**                      @MetaMask/notifications
+
+# UI
+**/metamask-notifications/**                        @MetaMask/notifications
+**/multichain/notification*/**                      @MetaMask/notifications
+**/pages/notification*/**                           @MetaMask/notifications
+**/utils/notification.util.ts                       @MetaMask/notifications
diff --git a/.github/workflows/add-release-label.yml b/.github/workflows/add-release-label.yml
@@ -12,6 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+
+      - run: corepack enable
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/check-pr-labels.yml b/.github/workflows/check-pr-labels.yml
@@ -1,4 +1,4 @@
-name: "Check PR has required labels"
+name: 'Check PR has required labels'
 on:
   pull_request:
     branches:
@@ -17,10 +17,16 @@ jobs:
       pull-requests: read
 
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-            fetch-depth: 1 # This retrieves only the latest commit.
+          fetch-depth: 1 # This retrieves only the latest commit.
 
       - name: Set up Node.js
         uses: actions/setup-node@v4

diff --git a/.github/workflows/check-template-and-add-labels.yml b/.github/workflows/check-template-and-add-labels.yml
@@ -10,6 +10,12 @@ jobs:
   check-template-and-add-labels:
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/close-bug-report.yml b/.github/workflows/close-bug-report.yml
@@ -12,6 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'Version-v')
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/codespaces.yml b/.github/workflows/codespaces.yml
@@ -13,6 +13,12 @@ jobs:
     name: Generate cache image
     runs-on: ubuntu-latest
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/fitness-functions.yml b/.github/workflows/fitness-functions.yml
@@ -9,6 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/update-lavamoat-policies.yml b/.github/workflows/update-lavamoat-policies.yml
@@ -51,6 +51,11 @@ jobs:
     outputs:
       COMMIT_SHA: ${{ steps.commit-sha.outputs.COMMIT_SHA }}
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Checkout pull request
@@ -75,6 +80,11 @@ jobs:
     needs:
       - prepare
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Checkout pull request
@@ -109,6 +119,11 @@ jobs:
       - prepare
       - update-lavamoat-build-policy
     steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+      - run: corepack enable
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Checkout pull request

diff --git a/.gitignore b/.gitignore
@@ -59,7 +59,6 @@ test-results/
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
-!.yarn/releases
 !.yarn/sdks
 !.yarn/versions
 

diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -2,11 +2,12 @@ import { draftTransactionInitialState } from '../ui/ducks/send';
 import { KeyringType } from '../shared/constants/keyring';
 import { NetworkType } from '@metamask/controller-utils';
 import { NetworkStatus } from '@metamask/network-controller';
-import { EthAccountType, EthMethod } from '@metamask/keyring-api';
+import { EthAccountType } from '@metamask/keyring-api';
 import { CHAIN_IDS } from '../shared/constants/network';
 import { copyable, divider, heading, panel, text } from '@metamask/snaps-sdk';
 import { getJsxElementFromComponent } from '@metamask/snaps-utils';
 import { FirstTimeFlowType } from '../shared/constants/onboarding';
+import { ETH_EOA_METHODS } from '../shared/constants/eth-methods';
 
 const state = {
   invalidCustomNetwork: {
@@ -282,13 +283,15 @@ const state = {
     },
     interfaces: {
       'test-interface': {
-        content: getJsxElementFromComponent(panel([
-          heading('Foo bar'),
-          text('Description'),
-          divider(),
-          text('More text'),
-          copyable('Text you can copy'),
-        ])),
+        content: getJsxElementFromComponent(
+          panel([
+            heading('Foo bar'),
+            text('Description'),
+            divider(),
+            text('More text'),
+            copyable('Text you can copy'),
+          ]),
+        ),
         state: {},
         snapId: 'local:http://localhost:8080/',
       },
@@ -324,7 +327,7 @@ const state = {
             },
           },
           options: {},
-          methods: [...Object.values(EthMethod)],
+          methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
         },
         '07c2cfec-36c9-46c4-8115-3836d3ac9047': {
@@ -337,7 +340,7 @@ const state = {
             },
           },
           options: {},
-          methods: [...Object.values(EthMethod)],
+          methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
         },
         '15e69915-2a1a-4019-93b3-916e11fd432f': {
@@ -350,7 +353,7 @@ const state = {
             },
           },
           options: {},
-          methods: [...Object.values(EthMethod)],
+          methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
         },
         '784225f4-d30b-4e77-a900-c8bbce735b88': {
@@ -363,7 +366,7 @@ const state = {
             },
           },
           options: {},
-          methods: [...Object.values(EthMethod)],
+          methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
         },
         'b990b846-b384-4508-93d9-587461f1123e': {
@@ -376,7 +379,7 @@ const state = {
             },
           },
           options: {},
-          methods: [...Object.values(EthMethod)],
+          methods: ETH_EOA_METHODS,
           type: EthAccountType.Eoa,
         },
       },

diff --git a/...rk-controller-npm-18.1.0-680908c29a.patch → ...rk-controller-npm-18.1.2-1bcb8d8610.patch b/...rk-controller-npm-18.1.0-680908c29a.patch → ...rk-controller-npm-18.1.2-1bcb8d8610.patch
@@ -1,23 +1,23 @@
-diff --git a/dist/chunk-AJED3H6M.mjs b/dist/chunk-AJED3H6M.mjs
-index c7f9903611ccf8f0bb01bea786177efc1a915f7f..26d559fe80f193288badd737cfb8f9d91eb3fa67 100644
---- a/dist/chunk-AJED3H6M.mjs
-+++ b/dist/chunk-AJED3H6M.mjs
-@@ -341,7 +341,6 @@ var NetworkController = class extends BaseController {
+diff --git a/dist/chunk-4ZD3DTQ7.js b/dist/chunk-4ZD3DTQ7.js
+index e172d15715b3cb4f26c42e51f8c7ff7394075bfe..148c802bac1d79f784618d18fa61d9de3330cae7 100644
+--- a/dist/chunk-4ZD3DTQ7.js
++++ b/dist/chunk-4ZD3DTQ7.js
+@@ -341,7 +341,6 @@ var NetworkController = class extends _basecontroller.BaseController {
    async initializeProvider() {
-     __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-     __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
 -    await this.lookupNetwork();
    }
    /**
     * Refreshes the network meta with EIP-1559 support and the network status
-diff --git a/dist/chunk-UEWIYOS6.js b/dist/chunk-UEWIYOS6.js
-index 05e09914e085ed2fb67106bc750b8bb46882c80e..16eb520b7658625e411c9c6e35f86bd49fcce52f 100644
---- a/dist/chunk-UEWIYOS6.js
-+++ b/dist/chunk-UEWIYOS6.js
-@@ -341,7 +341,6 @@ var NetworkController = class extends _basecontroller.BaseController {
+diff --git a/dist/chunk-UG2NYGJD.mjs b/dist/chunk-UG2NYGJD.mjs
+index c39eb49a4a1d2b4ddb78aadb4fb03446b1705528..cd7ce41f31434e66b56f584c177d4952e334e212 100644
+--- a/dist/chunk-UG2NYGJD.mjs
++++ b/dist/chunk-UG2NYGJD.mjs
+@@ -341,7 +341,6 @@ var NetworkController = class extends BaseController {
    async initializeProvider() {
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+     __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+     __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
 -    await this.lookupNetwork();
    }
    /**

diff --git a/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch b/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch