TRCL-3128 TradePlaceOrder and TradeCancelOrder are now tracked by Abacus

.env.example

@@ -4,11 +4,7 @@ VITE_ALCHEMY_API_KEY=
 
 VITE_PK_ENCRYPTION_KEY=
 
-VITE_V3_TOKEN_ADDRESS=
-VITE_TOKEN_MIGRATION_URI=
+VITE_WALLETCONNECT2_PROJECT_ID=
 
-AMPLITUDE_API_KEY=
-BUGSNAG_API_KEY=
-IOS_APP_ID=
-INTERCOM_APP_ID=
-STATUS_PAGE_SCRIPT_URI=
+VITE_V3_TOKEN_ADDRESS=0x6d5bb505a4f85c10b122ccc36e30f57e2b86a291
+VITE_TOKEN_MIGRATION_URI=https://bridge.dydx.trade/

LICENSE

@@ -1,9 +1,6 @@
 Copyright (C) 2023 dYdX Trading Inc.
 
-Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate.
-
-
-The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license.
+Subject to your compliance with applicable law, you are granted the right to use the Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Licensed Work will automatically and immediately terminate.
 
 
 The GNU Affero General Public License

README.md

@@ -69,21 +69,6 @@ You'll need to provide a Wallet Connect project id to enable onboarding and wall
 - Create a project on https://cloud.walletconnect.com/app
 - Copy over the project ID into this [field](https://github.com/dydxprotocol/v4-web/blob/67ecbd75b43e0c264b7b4d2d9b3d969830b0621c/public/configs/env.json#L822C33-L822C46)
 
-## Part 4: Set Enviornment variables
-Set environment variables via `.env`.
-
-- `VITE_BASE_URL` (required): The base URL of the deployment (e.g., `https://www.example.com`).
-- `VITE_ALCHEMY_API_KEY` (optional): Add an Alchemy API key for EVM interactions; the app will fall back to public RPCs if not provided.
-- `VITE_PK_ENCRYPTION_KEY` (optional): AES encryption key used for signature obfuscation; necessary for enabling the "Remember Me" feature.
-- `VITE_V3_TOKEN_ADDRESS` (optional): Address of the V3 $DYDX token.
-- `VITE_TOKEN_MIGRATION_URI` (optional): The URL of the token migration website.
-- `AMPLITUDE_API_KEY` (optional): Amplitude API key for enabling Amplitude; used with `pnpm run build:inject-amplitude`.
-- `BUGSNAG_API_KEY` (optional): API key for enabling Bugsnag; used with `pnpm run build:inject-bugsnag`.
-- `IOS_APP_ID` (optional): iOS app ID used for enabling deep linking to the iOS app; used with `pnpm run build:inject-app-deeplinks`.
-- `INTERCOM_APP_ID` (optional): Used for enabling Intercom; utilized with `pnpm run build:inject-intercom`.
-- `STATUS_PAGE_SCRIPT_URI` (optional): Used for enabling the status page; used with `pnpm run build:inject-statuspage`.
-
-
 # Deployments
 
 ## Deploying with Vercel

package.json

@@ -39,7 +39,7 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@cosmjs/tendermint-rpc": "^0.31.0",
-    "@dydxprotocol/v4-abacus": "^1.0.10",
+    "@dydxprotocol/v4-abacus": "^1.0.3",
     "@dydxprotocol/v4-client-js": "^1.0.0",
     "@dydxprotocol/v4-localization": "^1.0.0",
     "@ethersproject/providers": "^5.7.2",

pnpm-lock.yaml

@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 dependencies:
   '@0xsquid/sdk':
     specifier: ^1.10.0
@@ -27,8 +23,8 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.0.10
-    version: 1.0.10
+    specifier: ^1.0.3
+    version: 1.0.3
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.0
     version: 1.0.0
@@ -979,8 +975,8 @@ packages:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/v4-abacus@1.0.10:
-    resolution: {integrity: sha512-SdxI/JcyxM1ydtR9ImWujeurea3gbxj37qYnw1wz829BQiZ05uNEtll3xJCI0MjpG+01ARsxVys7SHbpjSxwOg==}
+  /@dydxprotocol/v4-abacus@1.0.3:
+    resolution: {integrity: sha512-GuX37/DMMNSke8ZFcw52II7IVJfUgVGHqoi1Uw2cUb+hgIjjSG3OtbyRWedm5r6nqWq8BNLOexI0VVFB6OMVYg==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.0:
@@ -7656,7 +7652,7 @@ packages:
     resolution: {integrity: sha512-WIdaQ8uW1vIbYvNnAVunkC6yxTrneJC7VQ5UUQ0kuw8b0C0A39KTIpoQHCfc8tV7o9vF4niwRhdXEdfAgQEsQQ==}
     dependencies:
       cosmos-directory-types: 0.0.6
-      node-fetch-native: 1.4.1
+      node-fetch-native: 1.4.0
     dev: false
 
   /cosmos-directory-types@0.0.6:
@@ -11287,8 +11283,8 @@ packages:
     engines: {node: '>=10.5.0'}
     dev: true
 
-  /node-fetch-native@1.4.1:
-    resolution: {integrity: sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==}
+  /node-fetch-native@1.4.0:
+    resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==}
     dev: false
 
   /node-fetch@2.6.12:
@@ -14100,3 +14096,7 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

public/configs/env.json

@@ -1,9 +1,4 @@
 {
-   "apps": {
-      "iOS": {
-         "scheme": "dydxv4"
-      }
-   },
    "deployments": {
       "MAINNET": {
          "environments": [
@@ -43,7 +38,6 @@
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -116,7 +110,6 @@
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -188,7 +181,6 @@
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -208,8 +200,8 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://indexer.v4dev4.dydx.exchange",
-                  "socket": "wss://indexer.v4dev4.dydx.exchange"
+                  "api": "http://indexer.v4dev4.dydx.exchange",
+                  "socket": "ws://indexer.v4dev4.dydx.exchange"
                }
             ],
             "validators": [
@@ -260,7 +252,6 @@
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -332,7 +323,6 @@
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -406,7 +396,6 @@
          "dydxChainId": "dydxprotocol-testnet",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -480,7 +469,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -558,7 +546,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -633,7 +620,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -708,7 +694,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -783,7 +768,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -858,7 +842,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -923,7 +906,6 @@
          "dydxChainId": "dydx-testnet-4",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "dYdX-api",
          "isMainNet": false,
          "tokens": {
             "chain": {
@@ -998,7 +980,6 @@
          "dydxChainId": "[mainnet chain id]",
          "chainName": "dYdX Chain",
          "chainLogo": "dydx-chain.png",
-         "squidIntegratorId": "[mainnet squid integrator id]",
          "isMainNet": true,
          "tokens": {
             "comment": "Change according to mainnet release",

src/hooks/useSquid.tsx

@@ -22,11 +22,7 @@ const useSquidContext = () => {
   };
 
   const squid = useMemo(
-    () =>
-      new Squid({
-        baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'],
-        integratorId: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.squidIntegratorId,
-      }),
+    () => new Squid({ baseUrl: ENVIRONMENT_CONFIG_MAP[selectedNetwork]?.endpoints['0xsquid'] }),
     [selectedNetwork]
   );
 

src/hooks/useSubaccount.tsx

@@ -48,7 +48,7 @@ export const useSubaccount = () => useContext(SubaccountContext);
 
 export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: LocalWallet }) => {
   const dispatch = useDispatch();
-  const { usdcDenom, usdcDecimals } = useTokenConfigs();
+  const { usdcDenom } = useTokenConfigs();
   const { compositeClient, faucetClient } = useDydxClient();
 
   const { getFaucetFunds } = useMemo(
@@ -79,34 +79,16 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         subaccountClient: SubaccountClient;
         assetId?: number;
         amount: number;
-      }) => {
-        try {
-          return await compositeClient?.depositToSubaccount(
-            subaccountClient,
-            amount.toFixed(usdcDecimals)
-          );
-        } catch (error) {
-          log('useSubaccount/depositToSubaccount', error);
-          throw error;
-        }
-      },
+      }) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),
+
       withdrawFromSubaccount: async ({
         subaccountClient,
         amount,
       }: {
         subaccountClient: SubaccountClient;
         amount: number;
-      }) => {
-        try {
-          return await compositeClient?.withdrawFromSubaccount(
-            subaccountClient,
-            amount.toFixed(usdcDecimals)
-          );
-        } catch (error) {
-          log('useSubaccount/withdrawFromSubaccount', error);
-          throw error;
-        }
-      },
+      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount.toString()),
+
       transferFromSubaccountToAddress: async ({
         subaccountClient,
         assetId = 0,
@@ -117,33 +99,27 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         assetId?: number;
         amount: number;
         recipient: string;
-      }) => {
-        try {
-          return await compositeClient?.validatorClient.post.send(
-            subaccountClient?.wallet,
-            () =>
-              new Promise((resolve) => {
-                const msg =
-                  compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
-                    subaccountClient.address,
-                    subaccountClient.subaccountNumber,
-                    assetId,
-                    Long.fromNumber(amount * QUANTUM_MULTIPLIER),
-                    recipient
-                  );
+      }) =>
+        await compositeClient?.validatorClient.post.send(
+          subaccountClient?.wallet,
+          () =>
+            new Promise((resolve) => {
+              const msg =
+                compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
+                  subaccountClient.address,
+                  subaccountClient.subaccountNumber,
+                  assetId,
+                  Long.fromNumber(amount * QUANTUM_MULTIPLIER),
+                  recipient
+                );
 
-                resolve([msg]);
-              }),
-            false,
-            undefined,
-            undefined,
-            Method.BroadcastTxCommit
-          );
-        } catch (error) {
-          log('useSubaccount/transferFromSubaccountToAddress', error);
-          throw error;
-        }
-      },
+              resolve([msg]);
+            }),
+          false,
+          undefined,
+          undefined,
+          Method.BroadcastTxCommit
+        ),
 
       transferNativeToken: async ({
         subaccountClient,
@@ -153,30 +129,24 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         subaccountClient: SubaccountClient;
         amount: number;
         recipient: string;
-      }) => {
-        try {
-          return await compositeClient?.validatorClient.post.send(
-            subaccountClient.wallet,
-            () =>
-              new Promise((resolve) => {
-                const msg = compositeClient?.sendTokenMessage(
-                  subaccountClient.wallet,
-                  amount.toString(),
-                  recipient
-                );
+      }) =>
+        await compositeClient?.validatorClient.post.send(
+          subaccountClient.wallet,
+          () =>
+            new Promise((resolve) => {
+              const msg = compositeClient?.sendTokenMessage(
+                subaccountClient.wallet,
+                amount.toString(),
+                recipient,
+              );
 
-                resolve([msg]);
-              }),
-            false,
-            compositeClient?.validatorClient?.post.defaultDydxGasPrice,
-            undefined,
-            Method.BroadcastTxCommit
-          );
-        } catch (error) {
-          log('useSubaccount/transferNativeToken', error);
-          throw error;
-        }
-      },
+              resolve([msg]);
+            }),
+          false,
+          compositeClient?.validatorClient?.post.defaultDydxGasPrice,
+          undefined,
+          Method.BroadcastTxCommit
+        ),
 
       sendSquidWithdrawFromSubaccount: async ({
         subaccountClient,
@@ -188,27 +158,20 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         payload: string;
       }) => {
         if (!compositeClient) throw new Error('client not initialized');
-        try {
-          const transaction = JSON.parse(payload);
 
-          const msg = compositeClient.withdrawFromSubaccountMessage(
-            subaccountClient,
-            amount.toFixed(usdcDecimals)
-          );
-          const ibcMsg: EncodeObject = {
-            typeUrl: transaction.msgTypeUrl,
-            value: transaction.msg,
-          };
+        const transaction = JSON.parse(payload);
 
-          return await compositeClient.send(
-            subaccountClient.wallet,
-            () => Promise.resolve([msg, ibcMsg]),
-            false
-          );
-        } catch (error) {
-          log('useSubaccount/sendSquidWithdrawFromSubaccount', error);
-          throw error;
-        }
+        const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount.toString());
+        const ibcMsg: EncodeObject = {
+          typeUrl: transaction.msgTypeUrl,
+          value: transaction.msg,
+        };
+
+        return await compositeClient.send(
+          subaccountClient.wallet,
+          () => Promise.resolve([msg, ibcMsg]),
+          false
+        );
       },
     }),
     [compositeClient]
@@ -350,11 +313,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         placeOrderParams = abacusStateManager.placeOrder(callback);
       }
 
-      track(AnalyticsEvent.TradePlaceOrder, {
-        ...placeOrderParams,
-        isClosePosition,
-      } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
-
       return placeOrderParams;
     },
     [subaccountClient]
@@ -383,7 +341,6 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
     }) => {
       const callback = (success: boolean, parsingError?: Nullable<ParsingError>) => {
         if (success) {
-          track(AnalyticsEvent.TradeCancelOrder);
           onSuccess?.();
         } else {
           onError?.({ errorStringKey: parsingError?.stringKey });

src/hooks/useTokenConfigs.ts

@@ -19,10 +19,8 @@ export const useTokenConfigs = (): {
     },
   };
   usdcDenom: string;
-  usdcDecimals: number;
   usdcLabel: string;
   chainTokenDenom: string;
-  chainTokenDecimals: number;
   chainTokenLabel: string;
 } => {
   const { selectedNetwork } = useSelectedNetwork();
@@ -31,10 +29,8 @@ export const useTokenConfigs = (): {
   return { 
     tokensConfigs,
     usdcDenom: tokensConfigs[DydxChainAsset.USDC].denom, 
-    usdcDecimals: tokensConfigs[DydxChainAsset.USDC].decimals, 
     usdcLabel: tokensConfigs[DydxChainAsset.USDC].name,
     chainTokenDenom: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom,
-    chainTokenDecimals: tokensConfigs[DydxChainAsset.CHAINTOKEN].decimals, 
     chainTokenLabel: tokensConfigs[DydxChainAsset.CHAINTOKEN].name,
   };
 };

src/pages/portfolio/AccountDetailsAndHistory.tsx

@@ -131,7 +131,7 @@ export const AccountDetailsAndHistory = () => {
       key: 'BuyingPower',
       labelKey: STRING_KEYS.BUYING_POWER,
       type: OutputType.Fiat,
-      value: MustBigNumber(buyingPower?.current).lt(0) ? undefined : buyingPower?.current, // show '-' when buying power is negative
+      value: buyingPower?.current,
     },
   ].filter(isTruthy);
 

src/views/AccountInfo/AccountInfoConnectedState.tsx

@@ -151,10 +151,7 @@ export const AccountInfoConnectedState = () => {
               ),
               label: stringGetter({ key: STRING_KEYS.BUYING_POWER }),
               type: OutputType.Fiat,
-              value:
-                MustBigNumber(buyingPower?.current).lt(0) && buyingPower?.postOrder === null
-                  ? undefined
-                  : buyingPower,
+              value: buyingPower,
             },
           ].map(
             ({

src/views/forms/AccountManagementForms/DepositForm/DepositButtonAndReceipt.tsx

@@ -1,5 +1,5 @@
 import { type Dispatch, type SetStateAction, useState, type ReactNode } from 'react';
-import styled, { type AnyStyledComponent } from 'styled-components';
+import styled, { type AnyStyledComponent,  } from 'styled-components';
 import { shallowEqual, useSelector } from 'react-redux';
 import type { RouteData } from '@0xsquid/sdk';
 
@@ -32,8 +32,6 @@ import { WithReceipt } from '@/components/WithReceipt';
 import { getSubaccountBuyingPower, getSubaccountEquity } from '@/state/accountSelectors';
 import { getTransferInputs } from '@/state/inputsSelectors';
 
-import { MustBigNumber } from '@/lib/numbers';
-
 import { SlippageEditor } from '../SlippageEditor';
 
 type ElementProps = {
@@ -133,7 +131,7 @@ export const DepositButtonAndReceipt = ({
       value: (
         <DiffOutput
           type={OutputType.Fiat}
-          value={MustBigNumber(buyingPower).lt(0) ? undefined : buyingPower}
+          value={buyingPower}
           newValue={newBuyingPower}
           sign={NumberSign.Positive}
           withDiff={Boolean(newBuyingPower) && buyingPower !== newBuyingPower}

src/views/menus/AccountMenu.tsx

@@ -36,7 +36,6 @@ import { truncateAddress } from '@/lib/wallet';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 import { headerMixins } from '@/styles/headerMixins';
-import { MustBigNumber } from '@/lib/numbers';
 
 export const AccountMenu = () => {
   const stringGetter = useStringGetter();
@@ -50,8 +49,6 @@ export const AccountMenu = () => {
 
   const { evmAddress, walletType, dydxAddress, hdKey } = useAccounts();
 
-  const usdcBalance = freeCollateral?.current || 0;
-
   const onRecoverKeys = () => {
     dispatch(openDialog({ type: DialogTypes.Onboarding }));
   };
@@ -125,11 +122,7 @@ export const AccountMenu = () => {
                   </Styled.label>
                   <Styled.BalanceOutput type={OutputType.Asset} value={nativeTokenBalance} />
                 </div>
-                <AssetActions
-                  asset={DydxChainAsset.CHAINTOKEN}
-                  dispatch={dispatch}
-                  hasBalance={nativeTokenBalance.gt(0)}
-                />
+                <AssetActions asset={DydxChainAsset.CHAINTOKEN} dispatch={dispatch} />
               </div>
               <div>
                 <div>
@@ -142,16 +135,11 @@ export const AccountMenu = () => {
                   </Styled.label>
                   <Styled.BalanceOutput
                     type={OutputType.Asset}
-                    value={usdcBalance}
+                    value={freeCollateral?.current || 0}
                     fractionDigits={2}
                   />
                 </div>
-                <AssetActions
-                  asset={DydxChainAsset.USDC}
-                  dispatch={dispatch}
-                  hasBalance={MustBigNumber(usdcBalance).gt(0)}
-                  withOnboarding
-                />
+                <AssetActions asset={DydxChainAsset.USDC} dispatch={dispatch} withOnboarding />
               </div>
             </Styled.Balances>
           </Styled.AccountInfo>
@@ -229,25 +217,22 @@ const AssetActions = memo(
     asset,
     dispatch,
     withOnboarding,
-    hasBalance,
   }: {
     asset: DydxChainAsset;
     dispatch: Dispatch;
     withOnboarding?: boolean;
-    hasBalance?: boolean;
   }) => (
     <Styled.InlineRow>
       {[
-        withOnboarding &&
-          hasBalance && {
-            dialogType: DialogTypes.Withdraw,
-            iconName: IconName.Withdraw,
-          },
+        withOnboarding && {
+          dialogType: DialogTypes.Withdraw,
+          iconName: IconName.Withdraw,
+        },
         withOnboarding && {
           dialogType: DialogTypes.Deposit,
           iconName: IconName.Deposit,
         },
-        hasBalance && {
+        {
           dialogType: DialogTypes.Transfer,
           dialogProps: { selectedAsset: asset },
           iconName: IconName.Send,