address comments

package.json

@@ -40,7 +40,7 @@
     "@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.9",
     "@dydxprotocol/v4-client-js": "^1.0.20",
     "@dydxprotocol/v4-localization": "^1.1.35",
     "@ethersproject/providers": "^5.7.2",

pnpm-lock.yaml

@@ -30,8 +30,8 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.12
-    version: 1.4.12
+    specifier: ^1.4.9
+    version: 1.4.9
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.20
     version: 1.0.20
@@ -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.9:
+    resolution: {integrity: sha512-OnrD5Db7AGSxyQE+gWRmkBuXbkZMfSEDB+v2s+ft0zgd4D5j/WTZkk1RG0fn8ISV4AffoN5T24jBWxLfqVlmZw==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.20:

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

@@ -11,7 +11,6 @@ export enum DialogTypes {
   ExternalNavKeplr = 'ExternalNavKeplr',
   MnemonicExport = 'MnemonicExport',
   MobileSignIn = 'MobileSignIn',
-  MobileDownload = 'MobileDownload',
   Onboarding = 'Onboarding',
   OrderDetails = 'OrderDetails',
   Preferences = 'Preferences',

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/layout/DialogManager.tsx

@@ -31,7 +31,6 @@ import { FillDetailsDialog } from '@/views/dialogs/DetailsDialog/FillDetailsDial
 import { NewMarketMessageDetailsDialog } from '@/views/dialogs/NewMarketMessageDetailsDialog';
 import { NewMarketAgreementDialog } from '@/views/dialogs/NewMarketAgreementDialog';
 import { ExternalNavStrideDialog } from '@/views/dialogs/ExternalNavStrideDialog';
-import { MobileDownloadDialog } from '@/views/dialogs/MobileDownloadDialog';
 
 export const DialogManager = () => {
   const dispatch = useDispatch();
@@ -64,7 +63,6 @@ export const DialogManager = () => {
     [DialogTypes.ExternalNavStride]: <ExternalNavStrideDialog {...modalProps} />,
     [DialogTypes.MnemonicExport]: <MnemonicExportDialog {...modalProps} />,
     [DialogTypes.MobileSignIn]: <MobileSignInDialog {...modalProps} />,
-    [DialogTypes.MobileDownload]: <MobileDownloadDialog {...modalProps} />,
     [DialogTypes.Onboarding]: <OnboardingDialog {...modalProps} />,
     [DialogTypes.OrderDetails]: <OrderDetailsDialog {...modalProps} />,
     [DialogTypes.Preferences]: <PreferencesDialog {...modalProps} />,

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/dialogs/MobileDownloadDialog.tsx

@@ -1,140 +0,0 @@
-import styled, { AnyStyledComponent, css } from 'styled-components';
-
-import { layoutMixins } from '@/styles/layoutMixins';
-
-import { Dialog } from '@/components/Dialog';
-import { QrCode } from '@/components/QrCode';
-import { useStringGetter } from '@/hooks';
-import { STRING_KEYS } from '@/constants/localization';
-
-type ElementProps = {
-  setIsOpen: (open: boolean) => void;
-};
-
-/*
-  When/if deployer deploys the web app with smartbanner, "smartbanner:button-url-apple" and/or 
-  "smartbanner:button-url-google" <meta> are set.
-  This implementation assumes "smartbanner:button-url-apple" and "smartbanner:button-url-google" 
-  are set to the same value with onelink or other redirect URL.
-  Since there is no way for the desktop web app to know what mobile device the user is using, 
-  we should give a onelink URL which redirects to either iOS or Android app store depending on 
-  the mobile device used to scan the link.
-*/
-
-// for testing only
-// export const mobileAppUrl = "http://example.com";
-
-let mobileAppUrl: string | undefined | null = undefined;
-
-export const getMobileAppUrl = () => {
-  if (!mobileAppUrl) {
-    mobileAppUrl =
-    // for testing to verify <meta> is retrieved by name, QR code should show "@dYdX" as value
-    // document.querySelector('meta[name="twitter:creator"]')?.getAttribute('content') ??
-    document.querySelector('meta[name="smartbanner:button-url-apple"]')?.getAttribute('content') ?? 
-    document.querySelector('meta[name="smartbanner:button-url-google"]')?.getAttribute('content');
-  }
-  return mobileAppUrl;
-}
-  
-const MobileQrCode = ({
-  url,
-}: {
-  url: string;
-}) => {
-  return (
-    <Styled.QrCodeContainer isShowing={true}>
-      <QrCode hasLogo size={432} value={url} />
-    </Styled.QrCodeContainer>
-  );
-};
-
-/*
-MobileDownloadDialog should only been shown on desktop when mobileAppUrl has value. That's controlled by AccountMenu.tsx.
-*/
-
-export const MobileDownloadDialog = ({ setIsOpen }: ElementProps) => {
-  const stringGetter = useStringGetter();
-  const content = (
-    <MobileQrCode url={mobileAppUrl!} />
-  );
-
-  return (
-    <Dialog isOpen setIsOpen={setIsOpen} title={
-        stringGetter({ key: STRING_KEYS.DOWNLOAD_MOBILE_APP })
-      }>
-      <Styled.Content>{content}</Styled.Content>
-    </Dialog>
-  );
-};
-
-const Styled: Record<string, AnyStyledComponent> = {};
-
-Styled.Content = styled.div`
-  ${layoutMixins.column}
-  gap: 1rem;
-
-  strong {
-    font-weight: 900;
-    color: var(--color-text-2);
-  }
-
-  footer {
-    ${layoutMixins.row}
-    justify-content: space-between;
-
-    svg {
-      width: auto;
-    }
-  }
-`;
-
-Styled.WaitingSpan = styled.span`
-  strong {
-    color: var(--color-warning);
-  }
-`;
-
-Styled.QrCodeContainer = styled.figure<{ isShowing: boolean }>`
-  ${layoutMixins.stack}
-
-  overflow: hidden;
-  border-radius: 0.75em;
-
-  cursor: pointer;
-
-  transition: 0.2s;
-
-  &:hover {
-    filter: brightness(var(--hover-filter-base));
-  }
-
-  > * {
-    position: relative;
-    transition: 0.16s;
-  }
-
-  > :first-child {
-    pointer-events: none;
-
-    ${({ isShowing }) =>
-      !isShowing &&
-      css`
-        filter: blur(1rem) brightness(1.4);
-        will-change: filter;
-      `}
-  }
-
-  > span {
-    place-self: center;
-
-    font-size: 1.4em;
-    color: var(--color-text-2);
-
-    ${({ isShowing }) =>
-      isShowing &&
-      css`
-        opacity: 0;
-      `}
-  }
-`;

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

src/views/menus/AccountMenu.tsx

@@ -40,7 +40,6 @@ import { getAppTheme } from '@/state/configsSelectors';
 import { isTruthy } from '@/lib/isTruthy';
 import { truncateAddress } from '@/lib/wallet';
 import { MustBigNumber } from '@/lib/numbers';
-import { getMobileAppUrl } from '../dialogs/MobileDownloadDialog';
 
 export const AccountMenu = () => {
   const stringGetter = useStringGetter();
@@ -190,18 +189,6 @@ export const AccountMenu = () => {
           label: stringGetter({ key: STRING_KEYS.DISPLAY_SETTINGS }),
           onSelect: () => dispatch(openDialog({ type: DialogTypes.DisplaySettings })),
         },
-        ...(getMobileAppUrl()
-          ? [
-              {
-                value: 'MobileDownload',
-                icon: <Icon iconName={IconName.Qr} />,
-                label: stringGetter({ key: STRING_KEYS.DOWNLOAD_MOBILE_APP }),
-                onSelect: () => {
-                  dispatch(openDialog({ type: DialogTypes.MobileDownload }));
-                },
-              },
-            ]
-          : []),
         ...(onboardingState === OnboardingState.AccountConnected && hdKey
           ? [
               {