PR

# Conflicts:
#	package.json
#	pnpm-lock.yaml

package.json

@@ -40,9 +40,9 @@
     "@cosmjs/proto-signing": "^0.32.1",
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.4.12",
+    "@dydxprotocol/v4-abacus": "^1.4.6",
     "@dydxprotocol/v4-client-js": "^1.0.20",
-    "@dydxprotocol/v4-localization": "^1.1.35",
+    "@dydxprotocol/v4-localization": "^1.1.34",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-accordion": "^1.1.2",

pnpm-lock.yaml

@@ -30,14 +30,14 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.12
-    version: 1.4.12
+    specifier: ^1.4.6
+    version: 1.4.6
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.20
     version: 1.0.20
   '@dydxprotocol/v4-localization':
-    specifier: ^1.1.35
-    version: 1.1.35
+    specifier: ^1.1.34
+    version: 1.1.34
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -1290,8 +1290,8 @@ packages:
     resolution: {integrity: sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q==}
     dev: false
 
-  /@dydxprotocol/v4-abacus@1.4.12:
-    resolution: {integrity: sha512-dNQFaNrLTujyViMH2JEtf9Vn2ew2le+qTWexktK5h7AeADBbS9uxQknMIFhfwzGkbS1QqqszBT1plrDmQ+E6nQ==}
+  /@dydxprotocol/v4-abacus@1.4.6:
+    resolution: {integrity: sha512-qYq+4TizcMMxYVXckn0LCucWBe5N9ZNtD1XnowCAuBUUifHSgMGvao5OeZIKMgNM/udSKOXLss4zLy6dH/G2SA==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.20:
@@ -1323,8 +1323,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@1.1.35:
-    resolution: {integrity: sha512-q5JFYoL/QanHXOtFqRa2owBZJibi1sMpSm3dAcxs9x0/xe8mo6fWcnbQfhl8k7g0/tv7PsBc+e3rbWD0EfvGiA==}
+  /@dydxprotocol/v4-localization@1.1.34:
+    resolution: {integrity: sha512-I7zivjv8gS+6b9n7/wh7PY9QEUDIIyLx9ugZ5K6ybar0xT/06yupOVdVE6iLivQ/IAsVi/RFHkD8bQd0DWCetg==}
     dev: false
 
   /@dydxprotocol/v4-proto@4.0.0-dev.0:

public/configs/env.json

@@ -725,7 +725,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-dydx": {
@@ -812,7 +812,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-nodefleet": {
@@ -899,7 +899,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-kingnodes": {
@@ -986,7 +986,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-liquify": {
@@ -1073,7 +1073,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-polkachu": {
@@ -1151,7 +1151,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-bware": {
@@ -1238,7 +1238,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-mainnet": {

public/configs/v1/env.json

@@ -71,8 +71,7 @@
          "keplrDashboard": "https://testnet.keplr.app/",
          "strideZoneApp": "https://testnet.stride.zone",
          "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-         "launchIncentive": "https://cloud.chaoslabs.co/"
+         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
       },
       "dydx-testnet-4": {
          "tos": "https://dydx.exchange/v4-terms",
@@ -93,8 +92,7 @@
          "keplrDashboard": "https://testnet.keplr.app/",
          "strideZoneApp": "https://testnet.stride.zone",
          "accountExportLearnMore": "https://help.dydx.exchange/en/articles/8565867-secret-phrase-on-dydx-chain",
-         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet",
-         "launchIncentive": "https://cloud.chaoslabs.co/"
+         "walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
       },
       "[mainnet chain id]": {
          "tos": "[HTTP link to TOS]",
@@ -115,8 +113,7 @@
          "keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
          "strideZoneApp": "[HTTP link to stride zone app, can be null]",
          "accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
-         "walletLearnMore": "[HTTP link to wallet learn more, can be null]",
-         "launchIncentive": "[HTTP link to launch incentive host, can be null]"
+         "walletLearnMore": "[HTTP link to wallet learn more, can be null]"
       }
    },
    "wallets": {
@@ -261,8 +258,7 @@
             "faucet": "https://faucet.v4dev.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-dev-2": {
@@ -287,8 +283,7 @@
             "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-dev-4": {
@@ -314,8 +309,7 @@
             "faucet": "https://faucet.v4dev4.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-dev-5": {
@@ -340,8 +334,7 @@
             "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-staging": {
@@ -367,8 +360,7 @@
             "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-staging-forced-update": {
@@ -401,8 +393,7 @@
             }
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-staging-west": {
@@ -428,8 +419,7 @@
             "nobleValidator": "https://noble-testnet-rpc.polkachu.com/"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": false
+            "reduceOnlySupported": true
          }
       },
       "dydxprotocol-testnet": {
@@ -459,8 +449,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-dydx": {
@@ -486,8 +475,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-nodefleet": {
@@ -513,8 +501,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-kingnodes": {
@@ -540,8 +527,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-liquify": {
@@ -567,8 +553,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-polkachu": {
@@ -594,8 +579,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-testnet-bware": {
@@ -621,8 +605,7 @@
             "faucet": "https://faucet.v4testnet.dydx.exchange"
          },
          "featureFlags": {
-            "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       },
       "dydxprotocol-mainnet": {
@@ -648,8 +631,7 @@
             "nobleValidator": "[noble validator endpoint for mainnet]"
          },
          "featureFlags": {
-            "reduceOnlySupported": false,
-            "usePessimisticCollateralCheck": true
+            "reduceOnlySupported": false
          }
       }
    }

src/constants/analytics.ts

@@ -81,9 +81,6 @@ export enum AnalyticsEvent {
   TradePlaceOrderConfirmed = 'TradePlaceOrderConfirmed',
   TradeCancelOrder = 'TradeCancelOrder',
   TradeCancelOrderConfirmed = 'TradeCancelOrderConfirmed',
-
-  // Notification
-  NotificationAction = 'NotificationAction',
 }
 
 export type AnalyticsEventData<T extends AnalyticsEvent> =
@@ -183,12 +180,6 @@ export type AnalyticsEventData<T extends AnalyticsEvent> =
         /** URL/IP of node the order was sent to */
         validatorUrl: string;
       }
-    : // Notifcation
-    T extends AnalyticsEvent.NotificationAction
-    ? {
-        type: string;
-        id: string;
-      }
     : never;
 
 export const DEFAULT_TRANSACTION_MEMO = 'dYdX Frontend (web)';

src/constants/notifications.ts

@@ -143,11 +143,6 @@ export type TransferNotifcation = {
   isExchange?: boolean;
 };
 
-export enum ReleaseUpdateNotificationIds {
-  RewardsAndFullTradingLive = 'rewards-and-full-trading-live',
-  IncentivesS3 = 'incentives-s3',
-}
-
 /**
  * @description Struct to store whether a NotificationType should be triggered
  */

src/hooks/tradingView/useChartLines.ts

@@ -57,15 +57,13 @@ export const useChartLines = ({
   useEffect(() => {
     if (tvWidget && isChartReady) {
       tvWidget.onChartReady(() => {
-        tvWidget.headerReady().then(() => {
-          tvWidget.chart().dataReady(() => {
-            if (showOrderLines) {
-              drawOrderLines();
-              drawPositionLine();
-            } else {
-              deleteChartLines();
-            }
-          });
+        tvWidget.chart().dataReady(() => {
+          if (showOrderLines) {
+            drawOrderLines();
+            drawPositionLine();
+          } else {
+            deleteChartLines();
+          }
         });
       });
     }

src/hooks/useNotificationTypes.tsx

@@ -5,7 +5,7 @@ import { isEqual, groupBy } from 'lodash';
 import { useNavigate } from 'react-router-dom';
 
 import { DialogTypes } from '@/constants/dialogs';
-import { AppRoute, TokenRoute } from '@/constants/routes';
+import { AppRoute } from '@/constants/routes';
 import { DydxChainAsset } from '@/constants/wallets';
 
 import {
@@ -20,10 +20,9 @@ import {
   NotificationType,
   DEFAULT_TOAST_AUTO_CLOSE_MS,
   TransferNotificationTypes,
-  ReleaseUpdateNotificationIds,
 } from '@/constants/notifications';
 
-import { useStringGetter, useTokenConfigs } from '@/hooks';
+import { useStringGetter } from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
 import { AssetIcon } from '@/components/AssetIcon';
@@ -239,16 +238,13 @@ export const notificationTypes: NotificationTypeConfig[] = [
   {
     type: NotificationType.ReleaseUpdates,
     useTrigger: ({ trigger }) => {
-      const { chainTokenLabel } = useTokenConfigs();
       const stringGetter = useStringGetter();
-      const expirationDate = new Date('2024-03-08T23:59:59');
-      const currentDate = new Date();
 
       useEffect(() => {
         trigger(
-          ReleaseUpdateNotificationIds.RewardsAndFullTradingLive,
+          'rewards-and-full-trading-live',
           {
-            icon: <AssetIcon symbol={chainTokenLabel} />,
+            icon: <AssetIcon symbol="DYDX" />,
             title: stringGetter({ key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.TITLE' }),
             body: stringGetter({
               key: 'NOTIFICATIONS.RELEASE_REWARDS_AND_FULL_TRADING.BODY',
@@ -274,41 +270,14 @@ export const notificationTypes: NotificationTypeConfig[] = [
               },
             }),
             toastSensitivity: 'foreground',
-            groupKey: ReleaseUpdateNotificationIds.RewardsAndFullTradingLive,
+            groupKey: NotificationType.ReleaseUpdates,
           },
           []
         );
-        if (currentDate <= expirationDate) {
-          trigger(
-            ReleaseUpdateNotificationIds.IncentivesS3,
-            {
-              icon: <AssetIcon symbol={chainTokenLabel} />,
-              title: stringGetter({ key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.TITLE' }),
-              body: stringGetter({
-                key: 'NOTIFICATIONS.INCENTIVES_SEASON_BEGUN.BODY',
-                params: {
-                  SEASON_NUMBER: '3',
-                  PREV_SEASON_NUMBER: '1',
-                  DYDX_AMOUNT: '34',
-                  USDC_AMOUNT: '100',
-                },
-              }),
-              toastSensitivity: 'foreground',
-              groupKey: ReleaseUpdateNotificationIds.IncentivesS3,
-            },
-            []
-          );
-        }
       }, [stringGetter]);
     },
     useNotificationAction: () => {
-      const { chainTokenLabel } = useTokenConfigs();
-      const navigate = useNavigate();
-      return (notificationId: string) => {
-        if (notificationId === ReleaseUpdateNotificationIds.IncentivesS3) {
-          navigate(`${chainTokenLabel}/${TokenRoute.TradingRewards}`);
-        }
-      };
+      return () => {};
     },
   },
 ];

src/hooks/useNotifications.tsx

@@ -1,6 +1,5 @@
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
-import { AnalyticsEvent } from '@/constants/analytics';
 import { LOCAL_STORAGE_VERSIONS, LocalStorageKey } from '@/constants/localStorage';
 import {
   type Notification,
@@ -14,8 +13,7 @@ import {
 import { useLocalStorage } from './useLocalStorage';
 import { notificationTypes } from './useNotificationTypes';
 
-import { track } from '@/lib/analytics';
-import { renderSvgToDataUrl } from '@/lib/renderSvgToDataUrl';
+import { renderSvgToDataUrl } from '../lib/renderSvgToDataUrl';
 
 type NotificationsContextType = ReturnType<typeof useNotificationsContext>;
 
@@ -50,7 +48,6 @@ const useNotificationsContext = () => {
       defaultValue: {
         [NotificationType.AbacusGenerated]: true,
         [NotificationType.SquidTransfer]: true,
-        [NotificationType.ReleaseUpdates]: true,
         version: LOCAL_STORAGE_VERSIONS[LocalStorageKey.NotificationPreferences],
       },
     });
@@ -179,10 +176,8 @@ const useNotificationsContext = () => {
     )
   );
 
-  const onNotificationAction = async (notification: Notification) => {
-    track(AnalyticsEvent.NotificationAction, { type: notification.type, id: notification.id });
-    return await actions[notification.type]?.(notification.id);
-  };
+  const onNotificationAction = async (notification: Notification) =>
+    await actions[notification.type]?.(notification.id);
 
   // Push notifications
   const [hasEnabledPush, setHasEnabledPush] = useLocalStorage({

src/lib/testFlags.ts

@@ -26,6 +26,10 @@ class TestFlags {
   get showTradingRewards() {
     return !!this.queryParams.tradingrewards;
   }
+
+  get showCexWithdrawal() {
+    return !!this.queryParams.cexwithdrawal;
+  }
 }
 
 export const testFlags = new TestFlags();

src/views/forms/AccountManagementForms/SourceSelectMenu.tsx

@@ -63,11 +63,12 @@ export const SourceSelectMenu = ({
   return (
     <SearchSelectMenu
       items={[
-        exchangeItems.length > 0 && {
-          group: 'exchanges',
-          groupLabel: stringGetter({ key: STRING_KEYS.EXCHANGES }),
-          items: exchangeItems,
-        },
+        exchangeItems.length > 0 &&
+          (testFlags.showCexWithdrawal || type === TransferType.deposit) && {
+            group: 'exchanges',
+            groupLabel: stringGetter({ key: STRING_KEYS.EXCHANGES }),
+            items: exchangeItems,
+          },
         chainItems.length > 0 && {
           group: 'chains',
           groupLabel: stringGetter({ key: STRING_KEYS.CHAINS }),