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/constants/wallets.ts

@@ -16,7 +16,6 @@ import {
   KeplrIcon,
   MathWalletIcon,
   MetaMaskIcon,
-  OkxWalletIcon,
   RainbowIcon,
   TokenPocketIcon,
   TrustWalletIcon,
@@ -90,7 +89,6 @@ export enum WalletType {
   // Ledger = 'LEDGER',
   MathWallet = 'MATH_WALLET',
   MetaMask = 'METAMASK',
-  OkxWallet = 'OKX_WALLET',
   Rainbow = 'RAINBOW_WALLET',
   TokenPocket = 'TOKEN_POCKET',
   TrustWallet = 'TRUST_WALLET',
@@ -104,7 +102,6 @@ const WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS = {
   imToken: 'ef333840daf915aafdc4a004525502d6d49d77bd9c65e0642dbaefb3c2893bef',
   TokenPocket: '20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66',
   Trust: '4622a2b2d6af1c9844944291e5e7351a6aa24cd7b23099efac1b2fd875da31a0',
-  OkxWallet: '971e689d0a5be527bac79629b4ee9b925e82208e5168b733496a09c0faed0709',
   Rainbow: '1ae92b26df02f0abca6304df07debccd18262fdf5fe82daa81593582dac9a369',
   Zerion: 'ecc4036f814562b41a5268adc86270fba1365471402006302e70169465b7ac18',
   Ledger: '19177a98252e07ddfc9af2083ba8e07ef627cb6103467ffebb3f8f4205fd7927',
@@ -215,14 +212,6 @@ export const wallets: Record<WalletType, WalletConfig> = {
     matchesInjectedEip1193: isMetaMask,
     walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
   },
-  [WalletType.OkxWallet]: {
-    type: WalletType.OkxWallet,
-    stringKey: STRING_KEYS.OKX_WALLET,
-    icon: OkxWalletIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
-    matchesInjectedEip1193: (provider) => provider.isOkxWallet,
-    walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.OkxWallet,
-  },
   [WalletType.Rainbow]: {
     type: WalletType.Rainbow,
     stringKey: STRING_KEYS.RAINBOW_WALLET,
@@ -289,10 +278,6 @@ export type WithInjectedWeb3Provider = {
   };
 };
 
-export type WithInjectedOkxWalletProvider = {
-  okxwallet: InjectedWeb3Provider;
-};
-
 // Wallet connections
 
 export type WalletConnection = {

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/useDisplayedWallets.ts

@@ -10,10 +10,9 @@ export const useDisplayedWallets = () => {
     isDev && WalletType.Keplr,
 
     WalletType.WalletConnect2,
-
+    
     WalletType.CoinbaseWallet,
-
-    WalletType.OkxWallet,
+    
     // Hide these wallet options until they can be properly tested on mainnet
     // WalletType.ImToken,
     // WalletType.Rainbow,

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/icons/index.ts

@@ -83,7 +83,6 @@ export { default as LedgerIcon } from './wallets/ledger.svg';
 export { default as MagicIcon } from './wallets/magic.svg';
 export { default as MathWalletIcon } from './wallets/mathwallet.svg';
 export { default as MetaMaskIcon } from './wallets/metamask.svg';
-export { default as OkxWalletIcon } from './wallets/okx-wallet.svg';
 export { default as RainbowIcon } from './wallets/rainbow-wallet.svg';
 export { default as TestWalletIcon } from './wallets/test-wallet.svg';
 export { default as TokenPocketIcon } from './wallets/tokenpocket.svg';

src/icons/wallets/okx-wallet.svg

@@ -1 +0,0 @@
-<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400" viewBox="0, 0, 400,400"><g id="svgg"><path id="path0" d="M85.200 76.394 C 80.665 76.883,78.308 78.483,76.929 82.006 C 76.085 84.161,75.592 142.346,76.360 149.217 C 76.910 154.145,78.020 156.078,81.141 157.541 L 83.400 158.600 117.600 158.600 C 154.653 158.600,154.238 158.623,156.431 156.431 C 158.623 154.238,158.600 154.653,158.600 117.600 L 158.600 83.400 157.541 81.141 C 156.025 77.909,154.089 76.841,148.902 76.377 C 144.325 75.968,89.012 75.983,85.200 76.394 M249.890 76.409 C 245.967 76.882,243.812 78.255,242.459 81.141 L 241.400 83.400 241.400 117.600 C 241.400 154.653,241.377 154.238,243.569 156.431 C 245.762 158.623,245.347 158.600,282.400 158.600 L 316.600 158.600 318.859 157.541 C 324.048 155.108,324.091 154.742,323.907 114.679 C 323.739 78.113,323.917 79.248,317.999 76.930 C 316.018 76.154,255.815 75.693,249.890 76.409 M163.813 159.382 C 158.668 160.777,158.800 159.708,158.800 200.000 C 158.800 240.779,158.632 239.561,164.419 240.762 C 168.838 241.680,235.468 241.166,237.395 240.200 C 241.459 238.161,241.400 238.753,241.400 200.000 C 241.400 161.247,241.459 161.839,237.395 159.800 C 235.329 158.764,167.515 158.378,163.813 159.382 M84.192 241.586 C 75.955 242.833,75.887 243.209,76.093 286.273 C 76.252 319.496,76.167 318.455,78.918 321.120 C 81.744 323.860,80.445 323.758,114.679 323.911 C 154.743 324.090,155.109 324.047,157.541 318.859 L 158.600 316.600 158.600 282.400 C 158.600 242.256,158.762 243.612,153.768 241.955 C 151.993 241.366,87.894 241.026,84.192 241.586 M248.251 241.633 C 241.106 242.699,241.228 241.990,241.215 282.600 C 241.202 321.601,241.152 321.289,247.760 323.301 C 250.708 324.198,315.213 324.005,317.830 323.091 C 323.901 320.971,323.748 321.925,323.911 285.321 C 324.090 245.267,324.075 245.137,319.000 242.600 L 316.600 241.400 283.600 241.341 C 265.450 241.309,249.543 241.440,248.251 241.633 " stroke="none" fill="#fafafa" fill-rule="evenodd"></path><path id="path1" d="M0.000 200.000 L 0.000 400.000 200.000 400.000 L 400.000 400.000 400.000 200.000 L 400.000 0.000 200.000 0.000 L 0.000 0.000 0.000 200.000 M148.902 76.377 C 154.089 76.841,156.025 77.909,157.541 81.141 L 158.600 83.400 158.600 117.600 C 158.600 154.653,158.623 154.238,156.431 156.431 C 154.238 158.623,154.653 158.600,117.600 158.600 L 83.400 158.600 81.141 157.541 C 75.953 155.109,75.910 154.743,76.089 114.679 C 76.250 78.643,76.131 79.509,81.200 77.288 C 83.883 76.112,137.816 75.387,148.902 76.377 M317.999 76.930 C 323.917 79.248,323.739 78.113,323.907 114.679 C 324.091 154.742,324.048 155.108,318.859 157.541 L 316.600 158.600 282.400 158.600 C 245.347 158.600,245.762 158.623,243.569 156.431 C 241.377 154.238,241.400 154.653,241.400 117.600 L 241.400 83.400 242.459 81.141 C 243.812 78.255,245.967 76.882,249.890 76.409 C 255.815 75.693,316.018 76.154,317.999 76.930 M237.395 159.800 C 241.459 161.839,241.400 161.247,241.400 200.000 C 241.400 238.753,241.459 238.161,237.395 240.200 C 235.468 241.166,168.838 241.680,164.419 240.762 C 158.632 239.561,158.800 240.779,158.800 200.000 C 158.800 159.708,158.668 160.777,163.813 159.382 C 167.515 158.378,235.329 158.764,237.395 159.800 M153.768 241.955 C 158.762 243.612,158.600 242.256,158.600 282.400 L 158.600 316.600 157.541 318.859 C 155.109 324.047,154.743 324.090,114.679 323.911 C 80.445 323.758,81.744 323.860,78.918 321.120 C 76.167 318.455,76.252 319.496,76.093 286.273 C 75.887 243.209,75.955 242.833,84.192 241.586 C 87.894 241.026,151.993 241.366,153.768 241.955 M319.000 242.600 C 324.075 245.137,324.090 245.267,323.911 285.321 C 323.748 321.925,323.901 320.971,317.830 323.091 C 315.213 324.005,250.708 324.198,247.760 323.301 C 244.032 322.166,242.292 320.037,241.590 315.751 C 241.084 312.662,241.101 252.756,241.608 248.844 C 242.629 240.980,241.034 241.265,283.600 241.341 L 316.600 241.400 319.000 242.600 " stroke="none" fill="#040404" fill-rule="evenodd"></path></g></svg>

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/lib/wallet/providers.ts

@@ -5,7 +5,6 @@ import {
   type InjectedCoinbaseWalletExtensionProvider,
   type WithInjectedEthereumProvider,
   type WithInjectedWeb3Provider,
-  type WithInjectedOkxWalletProvider,
 } from '@/constants/wallets';
 
 import { isTruthy } from '../isTruthy';
@@ -19,6 +18,15 @@ export const isMetaMask = (provider: ExternalProvider) => (
   && (
     !(provider as InjectedCoinbaseWalletExtensionProvider).overrideIsMetaMask
   )
+
+  /* not a MetaMask wannabe! */
+  && (
+    Reflect.ownKeys(provider).filter((key) =>
+      typeof key === 'string'
+      && key.match(/^is/)
+      && !['isConnected', 'isMetaMask'].includes(key)
+    ).length === 0
+  )
 )
 
 /*
@@ -46,10 +54,5 @@ export const detectInjectedEip1193Providers = (): ExternalProvider[] => {
     ? ethereumProvider.providers
     : [];
 
-  const okxWalletProvider = (globalThis as typeof globalThis & WithInjectedOkxWalletProvider)
-    ?.okxwallet;
-
-  return [...displacedProviders, ethereumProvider, web3Provider, okxWalletProvider].filter(
-    isTruthy
-  );
+  return [...displacedProviders, ethereumProvider, web3Provider].filter(isTruthy);
 };

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 }),