chore: synced with main

Author: lwin-kyaw

.yarn/patches/@metamask-assets-controllers-npm-89.0.1-02fa7acd54.patch

@@ -0,0 +1,48 @@
+diff --git a/dist/TokenBalancesController.cjs b/dist/TokenBalancesController.cjs
+index 4918812dde60b8d0e24a7bded27d88f233968858..4e8018bce92b9e5d47fc40784409e16db22be615 100644
+--- a/dist/TokenBalancesController.cjs
++++ b/dist/TokenBalancesController.cjs
+@@ -535,14 +535,16 @@ class TokenBalancesController extends (0, polling_controller_1.StaticIntervalPol
+             }
+             // Update with actual fetched balances only if the value has changed
+             aggregated.forEach(({ success, value, account, token, chainId }) => {
+-                var _a, _b, _c;
++                var _a, _b;
+                 if (success && value !== undefined) {
++                    // Ensure all accounts we add/update are in lower-case
++                    const lowerCaseAccount = account.toLowerCase();
+                     const newBalance = (0, controller_utils_1.toHex)(value);
+                     const tokenAddress = checksum(token);
+-                    const currentBalance = d.tokenBalances[account]?.[chainId]?.[tokenAddress];
++                    const currentBalance = d.tokenBalances[lowerCaseAccount]?.[chainId]?.[tokenAddress];
+                     // Only update if the balance has actually changed
+                     if (currentBalance !== newBalance) {
+-                        ((_c = ((_a = d.tokenBalances)[_b = account] ?? (_a[_b] = {})))[chainId] ?? (_c[chainId] = {}))[tokenAddress] = newBalance;
++                        ((_b = ((_a = d.tokenBalances)[lowerCaseAccount] ?? (_a[lowerCaseAccount] = {})))[chainId] ?? (_b[chainId] = {}))[tokenAddress] = newBalance;
+                     }
+                 }
+             });
+diff --git a/dist/TokenBalancesController.mjs b/dist/TokenBalancesController.mjs
+index f64d13f8de56631345a44e6ebb025e62e03f51bc..99aa7f27c574c94b26daa56091ac50d15281dd30 100644
+--- a/dist/TokenBalancesController.mjs
++++ b/dist/TokenBalancesController.mjs
+@@ -531,14 +531,16 @@ export class TokenBalancesController extends StaticIntervalPollingController() {
+             }
+             // Update with actual fetched balances only if the value has changed
+             aggregated.forEach(({ success, value, account, token, chainId }) => {
+-                var _a, _b, _c;
++                var _a, _b;
+                 if (success && value !== undefined) {
++                    // Ensure all accounts we add/update are in lower-case
++                    const lowerCaseAccount = account.toLowerCase();
+                     const newBalance = toHex(value);
+                     const tokenAddress = checksum(token);
+-                    const currentBalance = d.tokenBalances[account]?.[chainId]?.[tokenAddress];
++                    const currentBalance = d.tokenBalances[lowerCaseAccount]?.[chainId]?.[tokenAddress];
+                     // Only update if the balance has actually changed
+                     if (currentBalance !== newBalance) {
+-                        ((_c = ((_a = d.tokenBalances)[_b = account] ?? (_a[_b] = {})))[chainId] ?? (_c[chainId] = {}))[tokenAddress] = newBalance;
++                        ((_b = ((_a = d.tokenBalances)[lowerCaseAccount] ?? (_a[lowerCaseAccount] = {})))[chainId] ?? (_b[chainId] = {}))[tokenAddress] = newBalance;
+                     }
+                 }
+             });

app/images/riv_animations/shield_banner.riv

@@ -84,7 +84,6 @@
     "notifications",
     "scripting",
     "storage",
-    "tabs",
     "unlimitedStorage",
     "webRequest",
     "offscreen",

app/images/riv_animations/shield_illustration.riv

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { describe, it, after, mock } from 'node:test';
+import { describe, it, afterEach, mock } from 'node:test';
 import assert from 'node:assert';
 import { resolve } from 'node:path';
 import { version } from '../../../package.json';
@@ -13,21 +13,29 @@ describe('./utils/config.ts', () => {
   // behaving
   describe('variables', () => {
     const originalReadFileSync = fs.readFileSync;
-    function mockRc(env: Record<string, string> = {}) {
+    function mockRc(
+      env: Record<string, string> = {},
+      prodEnv: Record<string, string> = {},
+    ) {
       mock.method(fs, 'readFileSync', (path: string, options: object) => {
+        // mock the rc files as users might have customized it which may break our tests
         if (path === resolve(__dirname, '../../../.metamaskrc')) {
-          // mock `.metamaskrc`, as users might have customized it which may
-          // break our tests
           return `
-${Object.entries(env)
-  .map(([key, value]) => `${key}=${value}`)
-  .join('\n')}
-`;
+            ${Object.entries(env)
+              .map(([key, value]) => `${key}=${value}`)
+              .join('\n')}
+            `;
+        } else if (path === resolve(__dirname, '../../../.metamaskprodrc')) {
+          return `
+            ${Object.entries(prodEnv)
+              .map(([key, value]) => `${key}=${value}`)
+              .join('\n')}
+            `;
         }
         return originalReadFileSync(path, options);
       });
     }
-    after(() => mock.restoreAll());
+    afterEach(() => mock.restoreAll());
 
     it('should return valid build variables for the default build', () => {
       const buildTypes = loadBuildTypesConfig();
@@ -49,17 +57,31 @@ ${Object.entries(env)
       );
     });
 
-    it('should prefer .metamaskrc variables over others', () => {
+    it('should prefer .metamaskprodrc over .metamaskrc', () => {
       const buildTypes = loadBuildTypesConfig();
       const { args } = parseArgv([], buildTypes);
       const defaultVars = config.getVariables(args, buildTypes);
 
       // verify the default value of the main build is false
       assert.strictEqual(defaultVars.variables.get('ALLOW_LOCAL_SNAPS'), false);
 
-      mockRc({
-        ALLOW_LOCAL_SNAPS: 'true',
-      });
+      mockRc({ ALLOW_LOCAL_SNAPS: 'false' }, { ALLOW_LOCAL_SNAPS: 'true' });
+
+      const overrides = config.getVariables(args, buildTypes);
+
+      // verify the value of the main build is set to the value in .metamaskprodrc
+      assert.strictEqual(overrides.variables.get('ALLOW_LOCAL_SNAPS'), true);
+    });
+
+    it('should prefer .metamaskrc variables over builds.yml', () => {
+      const buildTypes = loadBuildTypesConfig();
+      const { args } = parseArgv([], buildTypes);
+      const defaultVars = config.getVariables(args, buildTypes);
+
+      // verify the default value of the main build is false
+      assert.strictEqual(defaultVars.variables.get('ALLOW_LOCAL_SNAPS'), false);
+
+      mockRc({ ALLOW_LOCAL_SNAPS: 'true' });
 
       const overrides = config.getVariables(args, buildTypes);
 
@@ -68,10 +90,8 @@ ${Object.entries(env)
     });
 
     it('should return valid build variables for a non-default build', () => {
-      mockRc({
-        // required by the `beta` build type
-        SEGMENT_BETA_WRITE_KEY: '.',
-      });
+      // required by the `beta` build type
+      mockRc({ SEGMENT_BETA_WRITE_KEY: '.' });
       const buildTypes = loadBuildTypesConfig();
       const { args } = parseArgv(
         ['--type', 'beta', '--test', '--env', 'production'],

app/images/shield-entry-modal-bg.png

@@ -155,15 +155,16 @@ export function getVariables(
 }
 
 /**
- * Loads configuration variables from process.env, .metamaskrc, and build.yml.
+ * Loads configuration variables from process.env, .metamaskprodrc, .metamaskrc, and build.yml.
  *
  * The order of precedence is:
  * 1. process.env
- * 2. .metamaskrc
- * 3. build.yml
+ * 2. .metamaskprodrc
+ * 3. .metamaskrc
+ * 4. builds.yml
  *
  * i.e., if a variable is defined in `process.env`, it will take precedence over
- * the same variable defined in `.metamaskrc` or `build.yml`.
+ * the same variable defined in `.metamaskprodrc`, `.metamaskrc` or `build.yml`.
  *
  * @param activeBuild
  * @param build
@@ -175,6 +176,7 @@ function loadConfigVars(
   { env }: BuildTypesConfig,
 ) {
   const definitions = loadEnv();
+  addRc(definitions, join(__dirname, '../../../.metamaskprodrc'));
   addRc(definitions, join(__dirname, '../../../.metamaskrc'));
   addVars(activeBuild.env);
   addVars(env);