fix(onboarding): Disable non CCTP withdrawals with featureflag (#450)

* fix(onboarding): Disable non CCTP withdrawals with featureflag * fix condition
dydxprotocol · Apr 16, 2024 · 9477f99 · 9477f99
1 parent 7dd087c
commit 9477f99
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 51 deletions.
diff --git a/public/configs/env.json b/public/configs/env.json
@@ -128,7 +128,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-dev-2": {
@@ -214,7 +215,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-dev-4": {
@@ -301,7 +303,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-dev-5": {
@@ -387,7 +390,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-staging": {
@@ -475,7 +479,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-staging-forced-update": {
@@ -561,7 +566,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-staging-west": {
@@ -649,7 +655,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet": {
@@ -741,7 +748,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-dydx": {
@@ -830,7 +838,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-nodefleet": {
@@ -919,7 +928,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-kingnodes": {
@@ -1008,7 +1018,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-liquify": {
@@ -1097,7 +1108,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-polkachu": {
@@ -1177,7 +1189,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-bware": {
@@ -1266,7 +1279,8 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-mainnet": {

diff --git a/public/configs/v1/env.json b/public/configs/v1/env.json
@@ -270,7 +270,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-dev-2": {
@@ -298,7 +299,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-dev-4": {
@@ -327,7 +329,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-dev-5": {
@@ -355,7 +358,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-staging": {
@@ -384,7 +388,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-staging-forced-update": {
@@ -420,7 +425,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-staging-west": {
@@ -449,7 +455,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet": {
@@ -482,7 +489,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-dydx": {
@@ -510,7 +518,8 @@
          "featureFlags": {
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-nodefleet": {
@@ -539,7 +548,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-kingnodes": {
@@ -567,7 +577,8 @@
          "featureFlags": {
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-liquify": {
@@ -596,7 +607,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-polkachu": {
@@ -625,7 +637,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-testnet-bware": {
@@ -654,7 +667,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       },
       "dydxprotocol-mainnet": {
@@ -683,7 +697,8 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": true,
             "useOptimisticCollateralCheck": false,
-            "withdrawalSafetyEnabled": true
+            "withdrawalSafetyEnabled": true,
+            "CCTPWithdrawalOnly": true
          }
       }
    }

diff --git a/src/components/SearchSelectMenu.tsx b/src/components/SearchSelectMenu.tsx
@@ -17,6 +17,8 @@ import { Popover, TriggerType } from '@/components/Popover';
 import { WithDetailsReceipt } from '@/components/WithDetailsReceipt';
 import { WithLabel } from '@/components/WithLabel';
 
+import cctpTokens from '../../public/configs/cctp.json';
+
 type ElementProps = {
   asChild?: boolean;
   children: ReactNode;
@@ -34,6 +36,12 @@ type StyleProps = {
 
 export type SearchSelectMenuProps = ElementProps & StyleProps;
 
+type TokenInfo = {
+  chainId: string;
+  tokenAddress: string;
+  name: string;
+};
+
 export const SearchSelectMenu = ({
   asChild,
   children,
@@ -54,6 +62,15 @@ export const SearchSelectMenu = ({
     ref: searchSelectMenuRef,
   });
 
+  const cctpChainsById = cctpTokens.reduce((acc, token) => {
+    // Check if the key for this chainId already exists
+    if (!acc[token.chainId]) {
+      acc[token.chainId] = []; // Initialize it with an empty array if not existing
+    }
+    acc[token.chainId].push(token); // Push the current token into the corresponding array
+    return acc;
+  }, {} as Record<string, TokenInfo[]>);
+
   const Trigger = asChild ? (
     children
   ) : (

diff --git a/src/hooks/useEnvFeatures.ts b/src/hooks/useEnvFeatures.ts
@@ -7,6 +7,7 @@ import { getSelectedNetwork } from '@/state/appSelectors';
 export interface EnvironmentFeatures {
   reduceOnlySupported: boolean;
   withdrawalSafetyEnabled: boolean;
+  CCTPWithdrawalOnly: boolean;
 }
 
 export const useEnvFeatures = (): EnvironmentFeatures => {

diff --git a/src/hooks/useNotificationTypes.tsx b/src/hooks/useNotificationTypes.tsx
@@ -250,11 +250,13 @@ export const notificationTypes: NotificationTypeConfig[] = [
             ReleaseUpdateNotificationIds.IncentivesS4,
             {
               icon: <AssetIcon symbol={chainTokenLabel} />,
-              title: stringGetter({ key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.TITLE' }),
+              title: stringGetter({
+                key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.TITLE',
+                params: { SEASON_NUMBER: '4' },
+              }),
               body: stringGetter({
                 key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.BODY',
                 params: {
-                  SEASON_NUMBER: '4',
                   PREV_SEASON_NUMBER: '2',
                   DYDX_AMOUNT: '16',
                   USDC_AMOUNT: '50',