Merge branch 'main' into send-tokens-styling

Author: amandaye0h

.github/workflows/e2e-chrome.yml

@@ -4,15 +4,15 @@ on:
   workflow_call:
 
 jobs:
-  test-e2e-chrome:
+  test-e2e-chrome-browserify:
     uses: ./.github/workflows/run-e2e.yml
     strategy:
       fail-fast: false
       matrix:
         index:
           [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
     with:
-      test-suite-name: test-e2e-chrome
+      test-suite-name: test-e2e-chrome-browserify
       build-artifact: prep-build-test-browserify-chrome
       build-command: yarn build:test
       test-command: yarn test:e2e:chrome
@@ -72,7 +72,7 @@ jobs:
 
   test-e2e-chrome-report:
     needs:
-      - test-e2e-chrome
+      - test-e2e-chrome-browserify
       - test-e2e-chrome-webpack
       - test-e2e-chrome-multiple-providers
       - test-e2e-chrome-rpc

.github/workflows/e2e-firefox.yml

@@ -4,15 +4,15 @@ on:
   workflow_call:
 
 jobs:
-  test-e2e-firefox:
+  test-e2e-firefox-browserify:
     uses: ./.github/workflows/run-e2e.yml
     strategy:
       fail-fast: false
       matrix:
         index:
           [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
     with:
-      test-suite-name: test-e2e-firefox
+      test-suite-name: test-e2e-firefox-browserify
       build-command: yarn build:test:mv2
       test-command: yarn test:e2e:firefox
       matrix-index: ${{ matrix.index }}
@@ -33,7 +33,7 @@ jobs:
 
   test-e2e-firefox-report:
     needs:
-      - test-e2e-firefox
+      - test-e2e-firefox-browserify
       - test-e2e-firefox-flask
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }}

.yarnrc.yml

@@ -55,8 +55,14 @@ npmAuditIgnoreAdvisories:
   - 1102472
 
   # Issue: Issue: Babel has inefficient RexExp complexity in generated code with .replace when transpiling named capturing groups
-  # We are ignoring this on March 12, 2025 to unblock CI, we will follow with a proper fix or confirmation this does not affect our users
+  # We are ignoring this on March 12, 2025 and April 24, 2025 to unblock CI, we will follow with a proper fix or confirmation this does not affect our users
   - 1103026
+  - 1104001
+
+  # Issue: ses's global contour bindings leak into Compartment lexical scope
+  # URL: https://github.com/advisories/GHSA-h9w6-f932-gq62
+  # We are ignoring this on April 24, 2025 as it does not affect the codebase.
+  - 1103932
 
   # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix
   # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299

app/scripts/migrations/154.test.ts

@@ -0,0 +1,52 @@
+import { migrate, version } from './154';
+
+const oldVersion = 153;
+
+describe(`migration #${version}`, () => {
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  describe(`migration #${version}`, () => {
+    it('removes the QueuedRequestController from the state', async () => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: {
+          QueuedRequestController: {
+            queuedRequestCount: 0,
+          },
+        },
+      };
+      const expectedData = {};
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual(expectedData);
+    });
+
+    it('does nothing to other state params', async () => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: {
+          OtherController: {
+            someParam: 0,
+          },
+        },
+      };
+
+      const expectedData = {
+        OtherController: {
+          someParam: 0,
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual(expectedData);
+    });
+  });
+});

app/scripts/migrations/154.ts

@@ -0,0 +1,32 @@
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 154;
+
+/**
+ * This migration deletes the QueuedRequestController from the state.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly
+ * what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by
+ * controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(state: Record<string, unknown>) {
+  delete state?.QueuedRequestController;
+}

app/scripts/migrations/index.js

@@ -181,6 +181,7 @@ const migrations = [
   require('./152'),
   require('./152.1'),
   require('./153'),
+  require('./154'),
 ];
 
 export default migrations;

shared/constants/metametrics.ts

@@ -929,7 +929,6 @@ export enum MetaMetricsEventAccountType {
 
 export enum QueueType {
   NavigationHeader = 'navigation_header',
-  QueueController = 'queue_controller',
 }
 
 export enum MetaMetricsEventAccountImportType {