Merge branch 'develop' into feat/portfolio-view-feature-flag-removal

MetaMask · Nov 27, 2024 · b40ca8e · b40ca8e
2 parents a01df8c + f711459
commit b40ca8e
Show file tree

Hide file tree

Showing 29 changed files with 847 additions and 799 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,13 +3,13 @@ version: 2.1
 executors:
   node-browsers-small:
     docker:
-      - image: cimg/node:20.17-browsers
+      - image: cimg/node:20.18-browsers
     resource_class: small
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
   node-browsers-medium:
     docker:
-      - image: cimg/node:20.17-browsers
+      - image: cimg/node:20.18-browsers
     resource_class: medium
     environment:
       NODE_OPTIONS: --max_old_space_size=3072
@@ -21,7 +21,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=6144
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:20.17-browsers
+      - image: cimg/node:20.18-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=4096

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v20.17
+v20.18
diff --git a/app/scripts/controllers/metametrics-controller.test.ts b/app/scripts/controllers/metametrics-controller.test.ts
@@ -1453,7 +1453,7 @@ describe('MetaMetricsController', function () {
           participateInMetaMetrics: true,
           currentCurrency: 'usd',
           dataCollectionForMarketing: false,
-          preferences: { privacyMode: true },
+          preferences: { privacyMode: true, tokenNetworkFilter: [] },
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           custodyAccountDetails: {},
           ///: END:ONLY_INCLUDE_IF
@@ -1494,6 +1494,7 @@ describe('MetaMetricsController', function () {
           ///: END:ONLY_INCLUDE_IF
           [MetaMetricsUserTrait.TokenSortPreference]: 'token-sort-key',
           [MetaMetricsUserTrait.PrivacyModeEnabled]: true,
+          [MetaMetricsUserTrait.NetworkFilterPreference]: [],
         });
       });
     });
@@ -1543,7 +1544,7 @@ describe('MetaMetricsController', function () {
           allNfts: {},
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
-          preferences: { privacyMode: true },
+          preferences: { privacyMode: true, tokenNetworkFilter: [] },
           securityAlertsEnabled: true,
           names: {
             ethereumAddress: {},
@@ -1607,7 +1608,7 @@ describe('MetaMetricsController', function () {
           allNfts: {},
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
-          preferences: { privacyMode: true },
+          preferences: { privacyMode: true, tokenNetworkFilter: [] },
           securityAlertsEnabled: true,
           ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
           custodyAccountDetails: {},
@@ -1672,7 +1673,7 @@ describe('MetaMetricsController', function () {
           },
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
-          preferences: { privacyMode: true },
+          preferences: { privacyMode: true, tokenNetworkFilter: [] },
           securityAlertsEnabled: true,
           security_providers: ['blockaid'],
           currentCurrency: 'usd',
@@ -1718,7 +1719,7 @@ describe('MetaMetricsController', function () {
           allNfts: {},
           participateInMetaMetrics: true,
           dataCollectionForMarketing: false,
-          preferences: { privacyMode: true },
+          preferences: { privacyMode: true, tokenNetworkFilter: [] },
           names: {
             ethereumAddress: {},
           },

diff --git a/app/scripts/controllers/metametrics-controller.ts b/app/scripts/controllers/metametrics-controller.ts
@@ -166,6 +166,7 @@ export type MetaMaskState = {
   currentCurrency: string;
   preferences: {
     privacyMode: PreferencesControllerState['preferences']['privacyMode'];
+    tokenNetworkFilter: string[];
   };
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   custodyAccountDetails: {
@@ -1233,6 +1234,9 @@ export default class MetaMetricsController extends BaseController<
         metamaskState.tokenSortConfig?.key || '',
       [MetaMetricsUserTrait.PrivacyModeEnabled]:
         metamaskState.preferences.privacyMode,
+      [MetaMetricsUserTrait.NetworkFilterPreference]: Object.keys(
+        metamaskState.preferences.tokenNetworkFilter || {},
+      ),
     };
 
     if (!previousUserTraits) {

diff --git a/app/scripts/controllers/permissions/caveat-mutators.js b/app/scripts/controllers/permissions/caveat-mutators.js
@@ -33,14 +33,14 @@ function removeAccount(targetAccount, existingAccounts) {
   );
 
   if (newAccounts.length === existingAccounts.length) {
-    return { operation: CaveatMutatorOperation.noop };
+    return { operation: CaveatMutatorOperation.Noop };
   } else if (newAccounts.length > 0) {
     return {
-      operation: CaveatMutatorOperation.updateValue,
+      operation: CaveatMutatorOperation.UpdateValue,
       value: newAccounts,
     };
   }
-  return { operation: CaveatMutatorOperation.revokePermission };
+  return { operation: CaveatMutatorOperation.RevokePermission };
 }
 
 /**
@@ -60,12 +60,12 @@ function removeChainId(targetChainId, existingChainIds) {
   );
 
   if (newChainIds.length === existingChainIds.length) {
-    return { operation: CaveatMutatorOperation.noop };
+    return { operation: CaveatMutatorOperation.Noop };
   } else if (newChainIds.length > 0) {
     return {
-      operation: CaveatMutatorOperation.updateValue,
+      operation: CaveatMutatorOperation.UpdateValue,
       value: newChainIds,
     };
   }
-  return { operation: CaveatMutatorOperation.revokePermission };
+  return { operation: CaveatMutatorOperation.RevokePermission };
 }
diff --git a/app/scripts/controllers/permissions/caveat-mutators.test.js b/app/scripts/controllers/permissions/caveat-mutators.test.js
@@ -14,20 +14,20 @@ describe('caveat mutators', () => {
     describe('removeAccount', () => {
       it('returns the no-op operation if the target account is not permitted', () => {
         expect(removeAccount(address2, [address1])).toStrictEqual({
-          operation: CaveatMutatorOperation.noop,
+          operation: CaveatMutatorOperation.Noop,
         });
       });
 
       it('returns the update operation and a new value if the target account is permitted', () => {
         expect(removeAccount(address2, [address1, address2])).toStrictEqual({
-          operation: CaveatMutatorOperation.updateValue,
+          operation: CaveatMutatorOperation.UpdateValue,
           value: [address1],
         });
       });
 
       it('returns the revoke permission operation the target account is the only permitted account', () => {
         expect(removeAccount(address1, [address1])).toStrictEqual({
-          operation: CaveatMutatorOperation.revokePermission,
+          operation: CaveatMutatorOperation.RevokePermission,
         });
       });
 
@@ -36,28 +36,28 @@ describe('caveat mutators', () => {
         const checksummedAddress3 =
           '0x95222290dd7278AA3DDd389cc1E1d165Cc4BaeE5';
         expect(removeAccount(checksummedAddress3, [address3])).toStrictEqual({
-          operation: CaveatMutatorOperation.revokePermission,
+          operation: CaveatMutatorOperation.RevokePermission,
         });
       });
 
       describe('Multichain behaviour', () => {
         it('returns the no-op operation if the target account is not permitted', () => {
           expect(removeAccount(address2, [nonEvmAddress])).toStrictEqual({
-            operation: CaveatMutatorOperation.noop,
+            operation: CaveatMutatorOperation.Noop,
           });
         });
 
         it('can revoke permission for non-EVM addresses', () => {
           expect(removeAccount(nonEvmAddress, [nonEvmAddress])).toStrictEqual({
-            operation: CaveatMutatorOperation.revokePermission,
+            operation: CaveatMutatorOperation.RevokePermission,
           });
         });
 
         it('returns the update operation and a new value if the target non-EVM account is permitted', () => {
           expect(
             removeAccount(nonEvmAddress, [address1, nonEvmAddress]),
           ).toStrictEqual({
-            operation: CaveatMutatorOperation.updateValue,
+            operation: CaveatMutatorOperation.UpdateValue,
             value: [address1],
           });
         });

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -4146,8 +4146,7 @@ export default class MetamaskController extends EventEmitter {
         ),
 
       // GasFeeController
-      gasFeeStartPollingByNetworkClientId:
-        gasFeeController.startPollingByNetworkClientId.bind(gasFeeController),
+      gasFeeStartPolling: gasFeeController.startPolling.bind(gasFeeController),
       gasFeeStopPollingByPollingToken:
         gasFeeController.stopPollingByPollingToken.bind(gasFeeController),