fix: unnest bridge feature flags

MetaMask · Aug 13, 2024 · f560842 · f560842
1 parent 663fe2f
commit f560842
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 96 deletions.
diff --git a/app/scripts/controllers/bridge/bridge-controller.test.ts b/app/scripts/controllers/bridge/bridge-controller.test.ts
@@ -47,7 +47,7 @@ describe('BridgeController', function () {
     expect(bridgeController.state).toStrictEqual(EMPTY_INIT_STATE);
 
     await bridgeController.setBridgeFeatureFlags();
-    expect(bridgeController.state.bridgeState.bridgeFeatureFlags).toStrictEqual(
+    expect(bridgeController.state.bridgeState).toStrictEqual(
       expectedFeatureFlagsResponse,
     );
   });

diff --git a/app/scripts/controllers/bridge/bridge-controller.ts b/app/scripts/controllers/bridge/bridge-controller.ts
@@ -44,7 +44,7 @@ export default class BridgeController extends BaseController<
     const { bridgeState } = this.state;
     const bridgeFeatureFlags = await fetchBridgeFeatureFlags();
     this.update((_state) => {
-      _state.bridgeState = { ...bridgeState, bridgeFeatureFlags };
+      _state.bridgeState = { ...bridgeState, ...bridgeFeatureFlags };
     });
   };
 }
diff --git a/app/scripts/controllers/bridge/constants.ts b/app/scripts/controllers/bridge/constants.ts
@@ -3,9 +3,7 @@ import { BridgeControllerState, BridgeFeatureFlagsKey } from './types';
 export const BRIDGE_CONTROLLER_NAME = 'BridgeController';
 
 export const DEFAULT_BRIDGE_CONTROLLER_STATE: BridgeControllerState = {
-  bridgeFeatureFlags: {
-    [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: false,
-    [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: [],
-    [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: [],
-  },
+  [BridgeFeatureFlagsKey.EXTENSION_SUPPORT]: false,
+  [BridgeFeatureFlagsKey.NETWORK_SRC_ALLOWLIST]: [],
+  [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: [],
 };
diff --git a/app/scripts/controllers/bridge/types.ts b/app/scripts/controllers/bridge/types.ts
@@ -18,9 +18,7 @@ export type BridgeFeatureFlags = {
   [BridgeFeatureFlagsKey.NETWORK_DEST_ALLOWLIST]: Hex[];
 };
 
-export type BridgeControllerState = {
-  bridgeFeatureFlags: BridgeFeatureFlags;
-};
+export type BridgeControllerState = BridgeFeatureFlags;
 
 export enum BridgeBackgroundAction {
   SET_FEATURE_FLAGS = 'setBridgeFeatureFlags',

diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
@@ -129,11 +129,9 @@ export const SENTRY_BACKGROUND_STATE = {
   },
   BridgeController: {
     bridgeState: {
-      bridgeFeatureFlags: {
-        extensionSupport: false,
-        destNetworkAllowlist: [],
-        srcNetworkAllowlist: [],
-      },
+      extensionSupport: false,
+      destNetworkAllowlist: [],
+      srcNetworkAllowlist: [],
     },
   },
   CronjobController: {

diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
@@ -118,11 +118,9 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
       },
       BridgeController: {
         bridgeState: {
-          bridgeFeatureFlags: {
-            extensionSupport: false,
-            srcNetworkAllowlist: ['0x1', '0xa', '0xe708'],
-            destNetworkAllowlist: ['0x1', '0xa', '0xe708'],
-          },
+          extensionSupport: false,
+          srcNetworkAllowlist: ['0x1', '0xa', '0xe708'],
+          destNetworkAllowlist: ['0x1', '0xa', '0xe708'],
         },
       },
       CurrencyController: {

diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
@@ -370,11 +370,9 @@ class FixtureBuilder {
   withBridgeControllerDefaultState() {
     this.fixture.data.BridgeController = {
       bridgeState: {
-        bridgeFeatureFlags: {
-          destNetworkAllowlist: [],
-          extensionSupport: false,
-          srcNetworkAllowlist: [],
-        },
+        destNetworkAllowlist: [],
+        extensionSupport: false,
+        srcNetworkAllowlist: [],
       },
     };
     return this;

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -61,18 +61,16 @@
   "AuthenticationController": { "isSignedIn": "boolean" },
   "BridgeController": {
     "bridgeState": {
-      "bridgeFeatureFlags": {
-        "extensionSupport": "boolean",
-        "srcNetworkAllowlist": {
-          "0": "string",
-          "1": "string",
-          "2": "string"
-        },
-        "destNetworkAllowlist": {
-          "0": "string",
-          "1": "string",
-          "2": "string"
-        }
+      "extensionSupport": "boolean",
+      "srcNetworkAllowlist": {
+        "0": "string",
+        "1": "string",
+        "2": "string"
+      },
+      "destNetworkAllowlist": {
+        "0": "string",
+        "1": "string",
+        "2": "string"
       }
     }
   },

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -252,18 +252,16 @@
       "swapsFeatureFlags": {}
     },
     "bridgeState": {
-      "bridgeFeatureFlags": {
-        "extensionSupport": "boolean",
-        "srcNetworkAllowlist": {
-          "0": "string",
-          "1": "string",
-          "2": "string"
-        },
-        "destNetworkAllowlist": {
-          "0": "string",
-          "1": "string",
-          "2": "string"
-        }
+      "extensionSupport": "boolean",
+      "srcNetworkAllowlist": {
+        "0": "string",
+        "1": "string",
+        "2": "string"
+      },
+      "destNetworkAllowlist": {
+        "0": "string",
+        "1": "string",
+        "2": "string"
       }
     },
     "ensEntries": "object",

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -144,18 +144,16 @@
     },
     "BridgeController": {
       "bridgeState": {
-        "bridgeFeatureFlags": {
-          "extensionSupport": "boolean",
-          "srcNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          },
-          "destNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          }
+        "extensionSupport": "boolean",
+        "srcNetworkAllowlist": {
+          "0": "string",
+          "1": "string",
+          "2": "string"
+        },
+        "destNetworkAllowlist": {
+          "0": "string",
+          "1": "string",
+          "2": "string"
         }
       }
     },

diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -153,18 +153,16 @@
     },
     "BridgeController": {
       "bridgeState": {
-        "bridgeFeatureFlags": {
-          "extensionSupport": "boolean",
-          "srcNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          },
-          "destNetworkAllowlist": {
-            "0": "string",
-            "1": "string",
-            "2": "string"
-          }
+        "extensionSupport": "boolean",
+        "srcNetworkAllowlist": {
+          "0": "string",
+          "1": "string",
+          "2": "string"
+        },
+        "destNetworkAllowlist": {
+          "0": "string",
+          "1": "string",
+          "2": "string"
         }
       }
     },

diff --git a/test/integration/data/onboarding-completion-route.json b/test/integration/data/onboarding-completion-route.json
@@ -58,9 +58,7 @@
   },
   "approvalFlows": [],
   "bridgeState": {
-    "bridgeFeatureFlags": {
-      "extensionSupport": false
-    }
+    "extensionSupport": false
   },
   "browserEnvironment": { "os": "mac", "browser": "firefox" },
   "completedOnboarding": false,

diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
@@ -683,12 +683,10 @@ export const createBridgeMockStore = (
       ...swapsStore.metamask,
       bridgeState: {
         ...(swapsStore.metamask.bridgeState ?? {}),
-        bridgeFeatureFlags: {
-          extensionSupport: false,
-          srcNetworkAllowlist: [],
-          destNetworkAllowlist: [],
-          ...featureFlagOverrides,
-        },
+        extensionSupport: false,
+        srcNetworkAllowlist: [],
+        destNetworkAllowlist: [],
+        ...featureFlagOverrides,
       },
     },
   };

diff --git a/ui/ducks/bridge/selectors.test.ts b/ui/ducks/bridge/selectors.test.ts
@@ -199,7 +199,7 @@ describe('Bridge selectors', () => {
         metamask: {
           providerConfig: { chainId: '0x1' },
           useExternalServices: true,
-          bridgeState: { bridgeFeatureFlags: { extensionSupport: false } },
+          bridgeState: { extensionSupport: false },
         },
         bridge: { toChain: { chainId: '0x38' } as unknown as ProviderConfig },
       };
@@ -214,7 +214,7 @@ describe('Bridge selectors', () => {
         metamask: {
           providerConfig: { chainId: '0x1' },
           useExternalServices: true,
-          bridgeState: { bridgeFeatureFlags: { extensionSupport: true } },
+          bridgeState: { extensionSupport: true },
         },
         bridge: { toChain: null },
       };
@@ -229,7 +229,7 @@ describe('Bridge selectors', () => {
         metamask: {
           providerConfig: { chainId: '0x1', id: 'test-id', type: 'rpc' },
           useExternalServices: true,
-          bridgeState: { bridgeFeatureFlags: { extensionSupport: true } },
+          bridgeState: { extensionSupport: true },
           networkConfigurations: [{ chainId: '0x1', id: 'test-id' }],
         },
         bridge: { toChain: { chainId: '0x1' } },
@@ -245,7 +245,7 @@ describe('Bridge selectors', () => {
         metamask: {
           providerConfig: { chainId: '0x1' },
           useExternalServices: false,
-          bridgeState: { bridgeFeatureFlags: { extensionSupport: true } },
+          bridgeState: { extensionSupport: true },
         },
         bridge: { toChain: { chainId: '0x38' } },
       };
@@ -260,7 +260,7 @@ describe('Bridge selectors', () => {
         metamask: {
           providerConfig: { chainId: '0x1', id: 'test-id', type: 'rpc' },
           useExternalServices: true,
-          bridgeState: { bridgeFeatureFlags: { extensionSupport: true } },
+          bridgeState: { extensionSupport: true },
           networkConfigurations: [{ chainId: '0x1', id: 'test-id' }],
         },
         bridge: { toChain: { chainId: '0x38' } },

diff --git a/ui/ducks/bridge/selectors.ts b/ui/ducks/bridge/selectors.ts
@@ -41,7 +41,7 @@ export const getAllBridgeableNetworks = createDeepEqualSelector(
 );
 export const getFromChains = createDeepEqualSelector(
   getAllBridgeableNetworks,
-  (state: BridgeAppState) => state.metamask.bridgeState?.bridgeFeatureFlags,
+  (state: BridgeAppState) => state.metamask.bridgeState,
   (
     allBridgeableNetworks,
     bridgeFeatureFlags,
@@ -54,7 +54,7 @@ export const getFromChains = createDeepEqualSelector(
 );
 export const getToChains = createDeepEqualSelector(
   getAllBridgeableNetworks,
-  (state: BridgeAppState) => state.metamask.bridgeState?.bridgeFeatureFlags,
+  (state: BridgeAppState) => state.metamask.bridgeState,
   (
     allBridgeableNetworks,
     bridgeFeatureFlags,

diff --git a/ui/hooks/bridge/useBridging.test.ts b/ui/hooks/bridge/useBridging.test.ts
@@ -83,9 +83,7 @@ describe('useBridging', () => {
             },
             metaMetricsId: MOCK_METAMETRICS_ID,
             bridgeState: {
-              bridgeFeatureFlags: {
-                extensionSupport: false,
-              },
+              extensionSupport: false,
             },
             internalAccounts: {
               selectedAccount: '0xabc',
@@ -154,9 +152,7 @@ describe('useBridging', () => {
             },
             metaMetricsId: MOCK_METAMETRICS_ID,
             bridgeState: {
-              bridgeFeatureFlags: {
-                extensionSupport: true,
-              },
+              extensionSupport: true,
             },
             internalAccounts: {
               selectedAccount: '0xabc',

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
@@ -1348,7 +1348,7 @@ export function getIsBridgeChain(state) {
 }
 
 function getBridgeFeatureFlags(state) {
-  return state.metamask.bridgeState?.bridgeFeatureFlags;
+  return state.metamask.bridgeState;
 }
 
 export const getIsBridgeEnabled = createSelector(