Merge branch 'main' into chore/remove-supported-chainIds-static-array

Author: sahar-fehri

.github/workflows/run-e2e.yml

@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: ghcr.io/metamask/metamask-extension-e2e-image:v1.0.0
+      image: ghcr.io/metamask/metamask-extension-e2e-image:v24.11.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

.nvmrc

@@ -1 +1 @@
-v22.15
+v24.11

.yarn/yarn-corepack.tgz

@@ -47,7 +47,7 @@ If you are not a MetaMask Internal Developer, or are otherwise developing on a f
 
 ## Building on your local machine
 
-- Install [Node.js](https://nodejs.org) version 22
+- Install [Node.js](https://nodejs.org) version 24
   - If you are using [nvm](https://github.com/nvm-sh/nvm#installing-and-updating) (recommended) running `nvm use` will automatically choose the right node version for you.
 - Enable Corepack by executing the command `corepack enable` within the metamask-extension project. Corepack is a utility included with Node.js by default. It manages Yarn on a per-project basis, using the version specified by the `packageManager` property in the project's package.json file. Please note that modern releases of [Yarn](https://yarnpkg.com/getting-started/install) are not intended to be installed globally or via npm.
 - Duplicate `.metamaskrc.dist` within the root and rename it to `.metamaskrc` by running `cp .metamaskrc{.dist,}`.

README.md

@@ -339,11 +339,12 @@ function maybeDetectPhishing(theController) {
       }
 
       const { hostname, href, searchParams } = new URL(details.url);
-      if (inTest) {
-        if (searchParams.has('IN_TEST_BYPASS_EARLY_PHISHING_DETECTION')) {
-          // this is a test page that needs to bypass early phishing detection
-          return {};
-        }
+      if (
+        inTest &&
+        searchParams.has('IN_TEST_BYPASS_EARLY_PHISHING_DETECTION')
+      ) {
+        // this is a test page that needs to bypass early phishing detection
+        return {};
       }
 
       theController.phishingController.maybeUpdateState();

app/_locales/en/messages.json

@@ -396,14 +396,11 @@ export const SENTRY_BACKGROUND_STATE = {
   },
 };
 
-const flattenedBackgroundStateMask = Object.values(
-  SENTRY_BACKGROUND_STATE,
-).reduce((partialBackgroundState, controllerState: object) => {
-  return {
-    ...partialBackgroundState,
-    ...controllerState,
-  };
-}, {});
+const flattenedBackgroundStateMask: Record<string, unknown> = {};
+
+for (const controllerState of Object.values(SENTRY_BACKGROUND_STATE)) {
+  Object.assign(flattenedBackgroundStateMask, controllerState);
+}
 
 // This describes the subset of Redux state attached to errors sent to Sentry
 // These properties have some potential to be useful for debugging, and they do

app/_locales/en_GB/messages.json

@@ -187,11 +187,11 @@ export const NetworkEnablementControllerInit: ControllerInitFunction<
       );
       ///: END:ONLY_INCLUDE_IF
 
-      const allEnabledNetworks = Object.values(
-        controller.state.enabledNetworkMap,
-      ).reduce((acc, curr) => {
-        return { ...acc, ...curr };
-      }, {});
+      const allEnabledNetworks = {};
+
+      for (const network of Object.values(controller.state.enabledNetworkMap)) {
+        Object.assign(allEnabledNetworks, network);
+      }
 
       if (Object.keys(allEnabledNetworks).length === 1) {
         const chainId = Object.keys(allEnabledNetworks)[0];