rebase

README.md

@@ -98,11 +98,6 @@ For the "Build & Development Settings", we recommend the following:
 - Framework Preset: `Vite`
 - Build Command (override): `pnpm run build`
 
-By default, the dev server runs in development mode and the build command runs in production mode. To override the default mode, you can pass in the `--mode` option flag. For example, if you want to build your app for testnet:
-```
-pnpm run build --mode testnet
-```
-
 If you wish to incorporate analytics via Amplitude and Bugsnag, you can use our scripts:
 `pnpm run build:inject-amplitude` and `pnpm run build:inject-bugsnag`. You will need to provide your own API keys for these services. In the Environment Variables section, name the variables as `AMPLITUDE_API_KEY` and `BUGSNAG_API_KEY` and provide the respective keys as their values.
 

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.24",
+    "@dydxprotocol/v4-abacus": "^1.0.19",
     "@dydxprotocol/v4-client-js": "^1.0.0",
     "@dydxprotocol/v4-localization": "^1.0.5",
     "@ethersproject/providers": "^5.7.2",
@@ -96,7 +96,6 @@
     "long": "^5.2.3",
     "luxon": "^3.3.0",
     "qr-code-styling": "1.6.0-rc.1",
-    "query-string": "^8.1.0",
     "react": "^18.2.0",
     "react-aria": "^3.25.0",
     "react-dom": "^18.2.0",

pnpm-lock.yaml

@@ -27,8 +27,8 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.0.24
+    specifier: ^1.0.19
-    version: 1.0.24
+    version: 1.0.19
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.0
     version: 1.0.0
@@ -197,9 +197,6 @@ dependencies:
   qr-code-styling:
     specifier: 1.6.0-rc.1
     version: 1.6.0-rc.1
-  query-string:
-    specifier: ^8.1.0
-    version: 8.1.0
   react:
     specifier: ^18.2.0
     version: 18.2.0
@@ -982,8 +979,8 @@ packages:
     resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
     dev: true
 
-  /@dydxprotocol/v4-abacus@1.0.24:
+  /@dydxprotocol/v4-abacus@1.0.19:
-    resolution: {integrity: sha512-wDGSjkrc3Se6Ev7UTjPgJV7PiyzZSz2mJwOTZikLwH7W3k1iPYGQmaCd7TudFk8h2aSdlEwNsQBCf0sLoyvHaQ==}
+    resolution: {integrity: sha512-XhvSHGr503gNwHWEiOYP7M2uYeLu+Qm4szpE5w5H6hWFCanSGz6zAsTbPuyPLtt7IE1gj5z8mlL9J3tw2AZROg==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.0:
@@ -7878,6 +7875,7 @@ packages:
   /decode-uri-component@0.4.1:
     resolution: {integrity: sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==}
     engines: {node: '>=14.16'}
+    dev: true
 
   /deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
@@ -8947,6 +8945,7 @@ packages:
   /filter-obj@5.1.0:
     resolution: {integrity: sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==}
     engines: {node: '>=14.16'}
+    dev: true
 
   /find-cache-dir@3.3.2:
     resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
@@ -11877,6 +11876,7 @@ packages:
       decode-uri-component: 0.4.1
       filter-obj: 5.1.0
       split-on-first: 3.0.0
+    dev: true
 
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -12701,6 +12701,7 @@ packages:
   /split-on-first@3.0.0:
     resolution: {integrity: sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==}
     engines: {node: '>=12'}
+    dev: true
 
   /split2@4.2.0:
     resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}

src/App.tsx

@@ -23,7 +23,6 @@ import { LocalNotificationsProvider } from '@/hooks/useLocalNotifications';
 import { RestrictionProvider } from '@/hooks/useRestrictions';
 import { SubaccountProvider } from '@/hooks/useSubaccount';
 import { SquidProvider } from '@/hooks/useSquid';
-import { TestFlagsProvider } from '@/hooks/useTestFlags';
 
 import { GuardedMobileRoute } from '@/components/GuardedMobileRoute';
 
@@ -124,7 +123,6 @@ const providers = [
   wrapProvider(QueryClientProvider, { client: queryClient }),
   wrapProvider(GrazProvider),
   wrapProvider(WagmiConfig, { config }),
-  wrapProvider(TestFlagsProvider),
   wrapProvider(LocaleProvider),
   wrapProvider(RestrictionProvider),
   wrapProvider(DydxProvider),

src/hooks/useTestFlags.tsx

@@ -1,46 +0,0 @@
-import { createContext, useContext, useEffect, useState } from 'react';
-import { useLocation } from 'react-router-dom';
-import queryString from 'query-string';
-
-class TestFlags {
-  public queryParams: queryString.ParsedQuery<string>;
-
-  constructor() {
-    this.queryParams = {};
-  }
-
-  setQueryParams(flags: queryString.ParsedQuery<string>) {
-    this.queryParams = flags;
-  }
-
-  get displayInitializingMarkets() {
-    return !!this.queryParams.displayInitializingMarkets;
-  }
-}
-
-export const testFlags = new TestFlags();
-
-const useTestFlagsContext = () => {
-  const [queryParams, setQueryParams] = useState<queryString.ParsedQuery<string>>({});
-  const location = useLocation();
-
-  useEffect(() => {
-    const parsedQueryParams = queryString.parse(location.search.substring(-1));
-    testFlags.setQueryParams(parsedQueryParams);
-    setQueryParams(parsedQueryParams);
-  }, []);
-
-  return {
-    ...queryParams,
-  };
-};
-
-type TestFlagsContextType = ReturnType<typeof useTestFlagsContext>;
-const TestFlagsContext = createContext<TestFlagsContextType>({} as TestFlagsContextType);
-TestFlagsContext.displayName = 'TestFlags';
-
-export const TestFlagsProvider = ({ ...props }) => (
-  <TestFlagsContext.Provider value={useTestFlagsContext()} {...props} />
-);
-
-export const useTestFlags = () => useContext(TestFlagsContext);

src/lib/abacus/rest.ts

@@ -56,7 +56,12 @@ class AbacusRest implements AbacusRestProtocol {
       .then(async (response) => {
         const data = await response.text();
 
-        callback(data, response.status);
+        if (response.ok) {
+          callback(data, response.status);
+        } else {
+          // response not OK, call callback with null data and the status, this includes 400/500 status codes
+          callback(null, response.status);
+        }
 
         try {
           lastSuccessfulRestRequestByOrigin[new URL(url).origin] = Date.now();

src/lib/abacus/websocket.ts

@@ -9,12 +9,11 @@ import {
   PONG_MESSAGE_TYPE,
 } from '@/constants/websocket';
 
-import { lastSuccessfulWebsocketRequestByOrigin } from '@/hooks/useAnalytics';
-import { testFlags } from '@/hooks/useTestFlags';
-
 import { subscriptionsByChannelId } from '@/lib/tradingView/dydxfeed/cache';
 import { mapCandle } from '@/lib/tradingView/utils';
 
+import { lastSuccessfulWebsocketRequestByOrigin } from '@/hooks/useAnalytics';
+
 import { log } from '../telemetry';
 
 const RECONNECT_INTERVAL_MS = 10_000;
@@ -145,23 +144,6 @@ class AbacusWebsocket implements Omit<AbacusWebsocketProtocol, '__doNotUseOrImpl
 
               break;
             }
-            case 'v4_markets': {
-              if (testFlags.displayInitializingMarkets) {
-                shouldProcess = false;
-                const { contents } = parsedMessage;
-
-                Object.keys(contents.markets ?? {}).forEach((market: any) => {
-                  const status = contents.markets[market].status;
-                  if (status === 'INITIALIZING') {
-                    contents.markets[market].status = 'ONLINE';
-                  }
-                });
-
-                this.receivedCallback?.(JSON.stringify(parsedMessage));
-              }
-
-              break;
-            }
             default: {
               break;
             }

src/views/dialogs/DepositDialog.tsx

@@ -17,7 +17,7 @@ type ElementProps = {
 };
 
 export const DepositDialog = ({ setIsOpen }: ElementProps) => {
-  const [showFaucet, setShowFaucet] = useState(!isMainnet);
+  const [showTestDeposit, setShowTestDeposit] = useState(true);
   const stringGetter = useStringGetter();
   const { isMobile } = useBreakpoints();
 
@@ -28,18 +28,20 @@ export const DepositDialog = ({ setIsOpen }: ElementProps) => {
       isOpen
       setIsOpen={setIsOpen}
       title={stringGetter({ key: STRING_KEYS.DEPOSIT })}
-      description={showFaucet && 'Test funds will be sent directly to your dYdX account.'}
+      description={
+        !isMainnet && showTestDeposit && 'Test funds will be sent directly to your dYdX account.'
+      }
       placement={isMobile ? DialogPlacement.FullScreen : DialogPlacement.Default}
     >
       <Styled.Content>
-        {isMainnet || !showFaucet ? (
+        {!isMainnet && showTestDeposit ? (
-          <DepositForm />
-        ) : (
           <TestnetDepositForm onDeposit={closeDialog} />
+        ) : (
+          <DepositForm />
         )}
         {!isMainnet && (
-          <Styled.TextToggle onClick={() => setShowFaucet(!showFaucet)}>
+          <Styled.TextToggle onClick={() => setShowTestDeposit(!showTestDeposit)}>
-            {showFaucet ? 'Show deposit form' : 'Show test faucet'}
+            {showTestDeposit ? 'Show deposit form (Under Construction)' : 'Show test faucet'}
           </Styled.TextToggle>
         )}
       </Styled.Content>

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -2,7 +2,7 @@ import { type FormEvent, useCallback, useEffect, useMemo, useState } from 'react
 import styled, { type AnyStyledComponent } from 'styled-components';
 import { type NumberFormatValues } from 'react-number-format';
 import { shallowEqual, useSelector } from 'react-redux';
-import { parseUnits } from 'viem';
+import { parseUnits } from 'viem'
 
 import erc20 from '@/abi/erc20.json';
 import { TransferInputField, TransferInputTokenResource, TransferType } from '@/constants/abacus';
@@ -65,8 +65,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
     chain: chainIdStr,
     resources,
     summary,
-    errors: routeErrors,
-    errorMessage: routeErrorMessage,
   } = useSelector(getTransferInputs, shallowEqual) || {};
   const chainId = chainIdStr ? parseInt(chainIdStr) : undefined;
 
@@ -99,7 +97,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
 
   useEffect(() => {
     const hasInvalidInput =
-      debouncedAmountBN.isNaN() || debouncedAmountBN.lte(0) || debouncedAmountBN.gt(balanceBN);
+      debouncedAmountBN.isNaN() || debouncedAmountBN.lte(0) || debouncedAmountBN.gte(balanceBN);
 
     abacusStateManager.setTransferValue({
       value: hasInvalidInput ? 0 : debouncedAmount,
@@ -173,8 +171,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
 
   const validateTokenApproval = useCallback(async () => {
     if (!signerWagmi || !publicClientWagmi) throw new Error('Missing signer');
-    if (!sourceToken?.address || !sourceToken.decimals)
+    if (!sourceToken?.address || !sourceToken.decimals) throw new Error('Missing source token address');
-      throw new Error('Missing source token address');
     if (!sourceChain?.rpc) throw new Error('Missing source chain rpc');
     if (!requestPayload?.targetAddress) throw new Error('Missing target address');
     if (!requestPayload?.value) throw new Error('Missing transaction value');
@@ -184,7 +181,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
       address: sourceToken.address as EvmAddress,
       abi: erc20,
       functionName: 'allowance',
-      args: [evmAddress as EvmAddress, requestPayload.targetAddress as EvmAddress],
+      args: [evmAddress as EvmAddress, requestPayload.targetAddress as EvmAddress]
     });
 
     const sourceAmountBN = parseUnits(debouncedAmount, sourceToken.decimals);
@@ -196,12 +193,12 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
         abi: erc20,
         functionName: 'approve',
         args: [requestPayload.targetAddress as EvmAddress, sourceAmountBN],
-      });
+      })
 
       const approveTx = await signerWagmi.writeContract(request);
       await publicClientWagmi.waitForTransactionReceipt({
         hash: approveTx,
-      });
+      })
     }
   }, [signerWagmi, sourceToken, sourceChain, requestPayload, publicClientWagmi]);
 
@@ -231,7 +228,8 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
           to: requestPayload.targetAddress as EvmAddress,
           data: requestPayload.data as EvmAddress,
           gasLimit: BigInt(requestPayload.gasLimit),
-          value: requestPayload.routeType !== 'SEND' ? BigInt(requestPayload.value) : undefined,
+          value:
+            requestPayload.routeType !== 'SEND' ? BigInt(requestPayload.value) : undefined,
         };
         const txHash = await signerWagmi.sendTransaction(tx);
 
@@ -289,15 +287,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
       return parseWalletError({ error, stringGetter }).message;
     }
 
-    if (routeErrors) {
-      return routeErrorMessage
-        ? stringGetter({
-            key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-            params: { ERROR_MESSAGE: routeErrorMessage },
-          })
-        : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
-    }
-
     if (fromAmount) {
       if (!chainId) {
         return stringGetter({ key: STRING_KEYS.MUST_SPECIFY_CHAIN });
@@ -311,16 +300,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
     }
 
     return undefined;
-  }, [
+  }, [error, balance, chainId, fromAmount, sourceToken]);
-    error,
-    routeErrors,
-    routeErrorMessage,
-    balance,
-    chainId,
-    fromAmount,
-    sourceToken,
-    stringGetter,
-  ]);
 
   const isDisabled =
     Boolean(errorMessage) ||

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

@@ -164,7 +164,6 @@ export const DepositButtonAndReceipt = ({
       label: <span>{stringGetter({ key: STRING_KEYS.SLIPPAGE })}</span>,
       value: (
         <SlippageEditor
-          disabled
           slippage={slippage}
           setIsEditing={setIsEditingSlipapge}
           setSlippage={setSlippage}

src/views/forms/AccountManagementForms/SlippageEditor.tsx

@@ -24,17 +24,11 @@ type ElementProps = {
   slippage: number;
   setIsEditing?: Dispatch<SetStateAction<boolean>>;
   setSlippage: (slippage: number) => void;
-  disabled?: boolean;
 };
 
 export type SlippageEditorProps = ElementProps;
 
-export const SlippageEditor = ({
+export const SlippageEditor = ({ slippage, setIsEditing, setSlippage }: SlippageEditorProps) => {
-  disabled,
-  slippage,
-  setIsEditing,
-  setSlippage,
-}: SlippageEditorProps) => {
   const percentSlippage = slippage * 100;
   const [slippageInputValue, setSlippageInputValue] = useState(percentSlippage.toString());
   const [editorState, setEditorState] = useState(EditorState.Viewing);
@@ -86,10 +80,6 @@ export const SlippageEditor = ({
     }
   };
 
-  if (disabled) {
-    return <Output type={OutputType.Percent} value={slippage} />;
-  }
-
   return (
     <Styled.WithConfirmationPopover
       open={editorState !== EditorState.Viewing}

src/views/forms/AccountManagementForms/WithdrawForm.tsx

@@ -44,10 +44,10 @@ import { getTransferInputs } from '@/state/inputsSelectors';
 
 import abacusStateManager from '@/lib/abacus';
 import { MustBigNumber } from '@/lib/numbers';
-import { log } from '@/lib/telemetry';
 
 import { TokenSelectMenu } from './TokenSelectMenu';
 import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';
+import { join } from 'path';
 
 export const WithdrawForm = () => {
   const stringGetter = useStringGetter();
@@ -69,8 +69,6 @@ export const WithdrawForm = () => {
     chain: chainIdStr,
     address: toAddress,
     resources,
-    errors: routeErrors,
-    errorMessage: routeErrorMessage,
   } = useSelector(getTransferInputs, shallowEqual) || {};
 
   const isValidAddress = toAddress && isAddress(toAddress);
@@ -283,15 +281,6 @@ export const WithdrawForm = () => {
       });
     }
 
-    if (routeErrors) {
-      return routeErrorMessage
-        ? stringGetter({
-            key: STRING_KEYS.SOMETHING_WENT_WRONG_WITH_MESSAGE,
-            params: { ERROR_MESSAGE: routeErrorMessage },
-          })
-        : stringGetter({ key: STRING_KEYS.SOMETHING_WENT_WRONG });
-    }
-
     if (!toAddress) return stringGetter({ key: STRING_KEYS.WITHDRAW_MUST_SPECIFY_ADDRESS });
 
     if (sanctionedAddresses.has(toAddress))
@@ -314,15 +303,12 @@ export const WithdrawForm = () => {
     return undefined;
   }, [
     error,
-    routeErrors,
-    routeErrorMessage,
     freeCollateralBN,
     chainIdStr,
     debouncedAmountBN,
     toToken,
     toAddress,
     sanctionedAddresses,
-    stringGetter,
   ]);
 
   const isDisabled =

src/views/forms/AccountManagementForms/WithdrawForm/WithdrawButtonAndReceipt.tsx

@@ -147,7 +147,6 @@ export const WithdrawButtonAndReceipt = ({
       label: <span>{stringGetter({ key: STRING_KEYS.SLIPPAGE })}</span>,
       value: (
         <SlippageEditor
-          disabled
           slippage={slippage}
           setIsEditing={setIsEditingSlipapge}
           setSlippage={setSlippage}

src/views/forms/TransferForm.tsx

@@ -61,53 +61,38 @@ export const TransferForm = ({
   const stringGetter = useStringGetter();
   const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
   const { dydxAddress } = useAccounts();
+  const {
+    address: recipientAddress,
+    size,
+    fee,
+  } = useSelector(getTransferInputs, shallowEqual) || {};
   const { transfer } = useSubaccount();
   const { nativeTokenBalance, usdcBalance } = useAccountBalance();
   const { selectedNetwork } = useSelectedNetwork();
   const { tokensConfigs, usdcLabel, chainTokenLabel } = useTokenConfigs();
 
-  const {
+  // User Input
-    address: recipientAddress,
+  const [asset, setAsset] = useState<DydxChainAsset>(selectedAsset);
-    size,
-    fee,
-    token,
-  } = useSelector(getTransferInputs, shallowEqual) || {};
 
   // Form states
   const [error, setError] = useState<string>();
   const [isLoading, setIsLoading] = useState(false);
 
-  // temp fix: TODO: reset fees when changing token in Abacus
+  const balance = asset === DydxChainAsset.USDC ? freeCollateral?.current : nativeTokenBalance;
-  const [currentFee, setCurrentFee] = useState(fee);
+  const newBalance =
-  useEffect(() => {
+    asset === DydxChainAsset.USDC
-    setCurrentFee(fee);
+      ? freeCollateral?.postOrder
-  }, [fee]);
+      : MustBigNumber(nativeTokenBalance)
+          .minus(size?.size ?? 0)
+          .toNumber();
+  const amount = asset === DydxChainAsset.USDC ? size?.usdcSize : size?.size;
 
-  const asset = (token ?? selectedAsset) as DydxChainAsset;
+  const showNotEnoughGasWarning = fee && asset === DydxChainAsset.USDC && usdcBalance < fee;
-  const isUSDCSelected = asset === DydxChainAsset.USDC;
-  const amount = isUSDCSelected ? size?.usdcSize : size?.size;
-  const showNotEnoughGasWarning = fee && isUSDCSelected && usdcBalance < fee;
-  const balance = isUSDCSelected ? freeCollateral?.current : nativeTokenBalance;
 
   // BN
-  const newBalanceBN = isUSDCSelected
-    ? MustBigNumber(freeCollateral?.postOrder)
-    : nativeTokenBalance.minus(size?.size ?? 0);
-
   const amountBN = MustBigNumber(amount);
   const balanceBN = MustBigNumber(balance);
-
+  const newBalanceBN = MustBigNumber(newBalance);
-  const onChangeAsset = (asset: DydxChainAsset) => {
-    setError(undefined);
-    setCurrentFee(undefined);
-
-    if (asset) {
-      abacusStateManager.setTransferValue({
-        value: asset,
-        field: TransferInputField.token,
-      });
-    }
-  };
 
   useEffect(() => {
     abacusStateManager.setTransferValue({
@@ -115,13 +100,19 @@ export const TransferForm = ({
       field: TransferInputField.type,
     });
 
-    onChangeAsset(selectedAsset);
-
     return () => {
       abacusStateManager.clearTransferInputValues();
     };
   }, []);
 
+  useEffect(() => {
+    setError(undefined);
+    abacusStateManager.setTransferValue({
+      value: asset,
+      field: TransferInputField.token,
+    });
+  }, [asset]);
+
   const { sanctionedAddresses } = useRestrictions();
 
   const isAddressValid = useMemo(
@@ -143,6 +134,11 @@ export const TransferForm = ({
     setError(undefined);
 
     try {
+      // Subtract fees from amount if sending native tokens
+      const amountToTransfer = (
+        asset === DydxChainAsset.CHAINTOKEN ? amountBN.minus(fee) : amountBN
+      ).toNumber();
+
       const screenResults = await screenAddresses({
         addresses: [recipientAddress!, dydxAddress!],
       });
@@ -161,9 +157,9 @@ export const TransferForm = ({
         );
       } else {
         const txResponse = await transfer(
-          amountBN.toNumber(),
+          amountToTransfer,
           recipientAddress as string,
-          tokensConfigs[asset]?.denom
+          tokensConfigs[asset].denom,
         );
 
         if (txResponse?.code === 0) {
@@ -204,7 +200,7 @@ export const TransferForm = ({
   const onChangeAmount = (value?: number) => {
     abacusStateManager.setTransferValue({
       value,
-      field: isUSDCSelected ? TransferInputField.usdcSize : TransferInputField.size,
+      field: asset === DydxChainAsset.USDC ? TransferInputField.usdcSize : TransferInputField.size,
     });
   };
 
@@ -230,7 +226,7 @@ export const TransferForm = ({
       value: DydxChainAsset.CHAINTOKEN,
       label: (
         <Styled.InlineRow>
-          <AssetIcon symbol={chainTokenLabel} />
+          {/* <AssetIcon symbol="DYDX" />  */}
           {chainTokenLabel}
         </Styled.InlineRow>
       ),
@@ -253,15 +249,15 @@ export const TransferForm = ({
       key: 'amount',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.AVAILABLE })} <Tag>{tokensConfigs[asset]?.name}</Tag>
+          {stringGetter({ key: STRING_KEYS.AVAILABLE })} <Tag>{tokensConfigs[asset].name}</Tag>
         </span>
       ),
       value: (
         <DiffOutput
           type={OutputType.Asset}
-          value={balanceBN}
+          value={balanceBN.toString()}
+          newValue={newBalanceBN.toString()}
           sign={NumberSign.Negative}
-          newValue={newBalanceBN}
           hasInvalidNewValue={newBalanceBN.isNegative()}
           withDiff={Boolean(amount && balance) && !amountBN.isNaN()}
         />
@@ -344,8 +340,8 @@ export const TransferForm = ({
 
       <Styled.SelectMenu
         label={stringGetter({ key: STRING_KEYS.ASSET })}
-        value={token}
+        value={asset}
-        onValueChange={onChangeAsset}
+        onValueChange={setAsset}
         disabled={isLoading}
       >
         {assetOptions.map(({ value, label }) => (
@@ -359,16 +355,12 @@ export const TransferForm = ({
           type={InputType.Number}
           onChange={({ floatValue }: NumberFormatValues) => onChangeAmount(floatValue)}
           value={amount ?? undefined}
-          slotRight={
+          slotRight={renderFormInputButton({
-            isUSDCSelected &&
+            label: stringGetter({ key: STRING_KEYS.MAX }),
-            balanceBN.gt(0) &&
+            isInputEmpty: size?.usdcSize == null,
-            renderFormInputButton({
+            onClear: () => onChangeAmount(undefined),
-              label: stringGetter({ key: STRING_KEYS.MAX }),
+            onClick: () => onChangeAmount(balanceBN.toNumber()),
-              isInputEmpty: size?.usdcSize == null,
+          })}
-              onClear: () => onChangeAmount(undefined),
-              onClick: () => onChangeAmount(balanceBN.toNumber()),
-            })
-          }
           disabled={isLoading}
         />
       </WithDetailsReceipt>
@@ -377,7 +369,7 @@ export const TransferForm = ({
         <AlertMessage type={AlertType.Warning}>
           {stringGetter({
             key: STRING_KEYS.TRANSFER_INSUFFICIENT_GAS,
-            params: { USDC_BALANCE: `(${usdcBalance} USDC)` },
+            params: { USDC_BALANCE: `(${usdcBalance})` },
           })}
         </AlertMessage>
       )}
@@ -387,9 +379,9 @@ export const TransferForm = ({
       <Styled.Footer>
         <TransferButtonAndReceipt
           selectedAsset={asset}
-          fee={currentFee || undefined}
+          fees={fee || undefined}
-          isDisabled={!isAmountValid || !isAddressValid || !currentFee || isLoading}
+          isDisabled={!isAmountValid || !isAddressValid || !fee || isLoading}
-          isLoading={isLoading || Boolean(isAmountValid && isAddressValid && !currentFee)}
+          isLoading={isLoading || Boolean(isAmountValid && isAddressValid && !fee)}
         />
       </Styled.Footer>
     </Styled.Form>

src/views/forms/TransferForm/TransferButtonAndReceipt.tsx

@@ -23,14 +23,14 @@ import { MustBigNumber } from '@/lib/numbers';
 
 type ElementProps = {
   selectedAsset: DydxChainAsset;
-  fee?: number;
+  fees?: number;
   isDisabled?: boolean;
   isLoading?: boolean;
 };
 
 export const TransferButtonAndReceipt = ({
   selectedAsset,
-  fee,
+  fees,
   isDisabled,
   isLoading,
 }: ElementProps) => {
@@ -47,46 +47,43 @@ export const TransferButtonAndReceipt = ({
   const { current: equity, postOrder: newEquity } = equityInfo || {};
   const { current: leverage, postOrder: newLeverage } = leverageInfo || {};
 
-  const isUSDCSelected = selectedAsset === DydxChainAsset.USDC;
+  // TODO(@aforaleka): add wallet balance for DYDX
-
+  const balance = selectedAsset === DydxChainAsset.USDC ? equity : nativeTokenBalance;
-  const balance = isUSDCSelected ? equity : nativeTokenBalance;
+  const newBalance =
-  const newNativeTokenBalance = nativeTokenBalance
+    selectedAsset === DydxChainAsset.USDC
-    .minus(size?.size ?? 0)
+      ? newEquity
-    .minus(fee ?? 0) // show balance after fees for button receipt
+      : MustBigNumber(nativeTokenBalance)
-    .toNumber();
+          .minus(size?.size ?? 0)
-
+          .toNumber();
-  const newBalance = isUSDCSelected ? newEquity : newNativeTokenBalance;
 
   const transferDetailItems = [
     {
       key: 'fees',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.FEES })} <Tag>{tokensConfigs[selectedAsset]?.name}</Tag>
+          {stringGetter({ key: STRING_KEYS.FEES })} <Tag>{tokensConfigs[selectedAsset].name}</Tag>
         </span>
       ),
-      value: <Output type={OutputType.Asset} value={fee} />,
+      value: <Output type={OutputType.Asset} value={fees} />,
     },
     {
       key: 'balance',
       label: (
         <span>
-          {stringGetter({ key: STRING_KEYS.BALANCE })}{' '}
+          {stringGetter({ key: STRING_KEYS.BALANCE })} <Tag>{tokensConfigs[selectedAsset].name}</Tag>
-          <Tag>{tokensConfigs[selectedAsset]?.name}</Tag>
         </span>
       ),
       value: (
         <DiffOutput
           type={OutputType.Asset}
           value={balance}
-          sign={NumberSign.Negative}
           newValue={newBalance}
-          hasInvalidNewValue={MustBigNumber(newBalance).isNegative()}
+          sign={NumberSign.Negative}
-          withDiff={newBalance !== null && !MustBigNumber(balance).eq(newBalance ?? 0)}
+          withDiff={Boolean(newBalance) && balance !== newBalance}
         />
       ),
     },
-    isUSDCSelected && {
+    selectedAsset === DydxChainAsset.USDC && {
       key: 'leverage',
       label: <span>{stringGetter({ key: STRING_KEYS.LEVERAGE })}</span>,
       value: (