Merge branch 'develop' into jl/reset-streams-on-bfcache-pageshow

MetaMask · Jun 3, 2024 · dec9f77 · dec9f77
2 parents 851c995 + 895d1f1
commit dec9f77
Show file tree

Hide file tree

Showing 86 changed files with 1,242 additions and 734 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1189,7 +1189,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              timeout 20m yarn test:e2e:chrome --retries 1
+              timeout 20m yarn test:e2e:chrome:confirmation-redesign --retries 1
             fi
           no_output_timeout: 5m
           environment:

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
@@ -17,13 +17,17 @@ 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.
 
-      - run: corepack enable
-
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:

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,13 +9,17 @@ 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:
           fetch-depth: 0
 
-      - run: corepack enable
-
       - name: Use Node.js
         uses: actions/setup-node@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/.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/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
@@ -10,7 +10,7 @@ import { SignatureController } from '@metamask/signature-controller';
 
 import { NetworkController } from '@metamask/network-controller';
 import { AccountsController } from '@metamask/accounts-controller';
-import { EthAccountType, EthMethod } from '@metamask/keyring-api';
+import { EthAccountType } from '@metamask/keyring-api';
 
 import { CustodyController } from '@metamask-institutional/custody-controller';
 import {
@@ -30,6 +30,7 @@ jest.mock('@metamask-institutional/portfolio-dashboard', () => ({
 }));
 
 import * as PortfolioDashboard from '@metamask-institutional/portfolio-dashboard';
+import { ETH_EOA_METHODS } from '../../../shared/constants/eth-methods';
 
 jest.mock('./permissions', () => ({
   getPermissionBackgroundApiMethods: jest.fn().mockImplementation(() => {
@@ -49,7 +50,7 @@ const mockAccount = {
     },
   },
   options: {},
-  methods: [...Object.values(EthMethod)],
+  methods: ETH_EOA_METHODS,
   type: EthAccountType.Eoa,
 };
 const mockAccount2 = {
@@ -62,7 +63,7 @@ const mockAccount2 = {
     },
   },
   options: {},
-  methods: [...Object.values(EthMethod)],
+  methods: ETH_EOA_METHODS,
   type: EthAccountType.Eoa,
 };
 
@@ -349,7 +350,7 @@ describe('MMIController', function () {
   });
 
   describe('getAllCustodianAccountsWithToken', () => {
-    it('should return custodian accounts with tokens', async () => { });
+    it('should return custodian accounts with tokens', async () => {});
   });
 
   describe('handleMmiDashboardData', () => {
@@ -438,7 +439,11 @@ describe('MMIController', function () {
           getCustodianAccounts: mockCustodialKeyring,
         });
 
-      await mmiController.getCustodianAccounts('token', 'neptune-custody', 'ECA3');
+      await mmiController.getCustodianAccounts(
+        'token',
+        'neptune-custody',
+        'ECA3',
+      );
 
       expect(selectedAccountSpy).toHaveBeenCalledTimes(0);
 

diff --git a/app/scripts/controllers/permissions/specifications.test.js b/app/scripts/controllers/permissions/specifications.test.js
@@ -1,9 +1,10 @@
-import { EthMethod, EthAccountType } from '@metamask/keyring-api';
+import { EthAccountType } from '@metamask/keyring-api';
 import { SnapCaveatType } from '@metamask/snaps-rpc-methods';
 import {
   CaveatTypes,
   RestrictedMethods,
 } from '../../../../shared/constants/permissions';
+import { ETH_EOA_METHODS } from '../../../../shared/constants/eth-methods';
 import {
   getCaveatSpecifications,
   getPermissionSpecifications,
@@ -149,7 +150,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
               {
@@ -163,7 +164,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
             ];
@@ -290,7 +291,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
               {
@@ -303,7 +304,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
               {
@@ -317,7 +318,7 @@ describe('PermissionController specifications', () => {
                   lastSelected: 3,
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
               {
@@ -331,7 +332,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
             ];
@@ -367,7 +368,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
               {
@@ -381,7 +382,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
             ];
@@ -415,7 +416,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
               {
@@ -429,7 +430,7 @@ describe('PermissionController specifications', () => {
                   },
                 },
                 options: {},
-                methods: [...Object.values(EthMethod)],
+                methods: ETH_EOA_METHODS,
                 type: EthAccountType.Eoa,
               },
             ];