bump abacus

.env.example

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

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.
+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 “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.
 
 
 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
@@ -98,11 +83,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,9 +39,9 @@
     "@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.10",
     "@dydxprotocol/v4-client-js": "^1.0.0",
-    "@dydxprotocol/v4-localization": "^1.0.5",
+    "@dydxprotocol/v4-localization": "^1.0.0",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-collapsible": "^1.0.3",
@@ -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,14 +27,14 @@ dependencies:
     specifier: ^0.31.0
     version: 0.31.0
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.0.24
+    specifier: ^1.0.10
-    version: 1.0.24
+    version: 1.0.10
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.0
     version: 1.0.0
   '@dydxprotocol/v4-localization':
-    specifier: ^1.0.5
+    specifier: ^1.0.0
-    version: 1.0.5
+    version: 1.0.0
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -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.10:
-    resolution: {integrity: sha512-wDGSjkrc3Se6Ev7UTjPgJV7PiyzZSz2mJwOTZikLwH7W3k1iPYGQmaCd7TudFk8h2aSdlEwNsQBCf0sLoyvHaQ==}
+    resolution: {integrity: sha512-SdxI/JcyxM1ydtR9ImWujeurea3gbxj37qYnw1wz829BQiZ05uNEtll3xJCI0MjpG+01ARsxVys7SHbpjSxwOg==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.0:
@@ -1014,8 +1011,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@1.0.5:
+  /@dydxprotocol/v4-localization@1.0.0:
-    resolution: {integrity: sha512-zZm3GFp/ORz9YjigQFVBlcWmaxYY+XEdIw8AWN5nEbsuiA2Jay+/OA7lO9+nV1J1p1T+TgLo9iczIHJsAo3IsA==}
+    resolution: {integrity: sha512-U7QjOlzpfSAVEchkNDB3xYRx7okzdeYi83XsnHwI+EHa2quFm/2Y2dhrBkT5fqpZmhcwxb/vG8AZmFSToOf9hA==}
     dev: false
 
   /@dydxprotocol/v4-proto@0.4.1:
@@ -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==}

public/configs/env.json

@@ -1,9 +1,4 @@
 {
-   "apps": {
-      "ios": {
-         "scheme": "dydxv4"
-      }
-   },
    "deployments": {
       "MAINNET": {
          "environments": [
@@ -208,8 +203,8 @@
          "endpoints": {
             "indexers": [
                {
-                  "api": "https://indexer.v4dev4.dydx.exchange",
+                  "api": "http://indexer.v4dev4.dydx.exchange",
-                  "socket": "wss://indexer.v4dev4.dydx.exchange"
+                  "socket": "ws://indexer.v4dev4.dydx.exchange"
                }
             ],
             "validators": [
@@ -400,76 +395,6 @@
             "signTypedDataDomainName": "dYdX Chain"
          }
       },
-      "dydxprotocol-staging-forced-update": {
-         "name": "v4 Staging Forced Update",
-         "ethereumChainId": "5",
-         "dydxChainId": "dydxprotocol-testnet",
-         "chainName": "dYdX Chain",
-         "chainLogo": "dydx-chain.png",
-         "isMainNet": false,
-         "tokens": {
-            "chain": {
-               "name": "Dv4TNT",
-               "denom": "adv4tnt",
-               "decimals": 18,
-               "image": "/currencies/dydx.png"
-            },
-            "usdc": {
-               "name": "USDC",
-               "denom": "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
-               "gasDenom": "uusdc",
-               "decimals": 6,
-               "image": "/currencies/usdc.png"
-            }
-         },
-         "endpoints": {
-            "indexers": [
-               {
-                  "api": "https://indexer.v4staging.dydx.exchange",
-                  "socket": "wss://indexer.v4staging.dydx.exchange"
-               }
-            ],
-            "faucet": "https://faucet.v4staging.dydx.exchange",
-            "validators": [
-               "https://validator.v4staging.dydx.exchange"
-            ],
-            "0xsquid": "https://testnet.api.squidrouter.com"
-         },
-         "links": {
-            "tos": "https://dydx.exchange/v4-terms",
-            "privacy": "https://dydx.exchange/privacy",
-            "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "documentation": "https://v4-teacher.vercel.app/",
-            "community": "https://discord.com/invite/dydx",
-            "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
-            "blogs": "https://www.dydx.foundation/blog"
-         },
-         "wallets": {
-            "walletconnect": {
-               "client": {
-                  "name": "dYdX v4",
-                  "description": "dYdX v4 App",
-                  "iconUrl": "/logos/dydx-x.png"
-               },
-               "v2": {
-                  "projectId": "47559b2ec96c09aed9ff2cb54a31ab0e"
-               }
-            },
-            "walletSegue": {
-               "callbackUrl": "/walletsegue"
-            },
-            "images": "/wallets/",
-            "signTypedDataAction": "dYdX Chain Onboarding",
-            "signTypedDataDomainName": "dYdX Chain"
-         },
-         "apps": {
-            "ios": {
-               "minimalVersion": "1.0",
-               "build":40000,
-               "url": "https://apps.apple.com/app/dydx/id1564787350"
-            }
-         }
-      },
       "dydxprotocol-staging-west": {
          "name": "v4 Staging West",
          "ethereumChainId": "5",
@@ -963,7 +888,6 @@
             "privacy": "https://dydx.exchange/privacy",
             "statusPage": "https://status.v4testnet.dydx.exchange/",
             "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
-            "mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
             "documentation": "https://docs.dydx.exchange/",
             "community": "https://discord.com/invite/dydx",
             "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
@@ -1104,7 +1028,7 @@
             "tos": "[HTTP link to TOS]",
             "privacy": "[HTTP link to Privacy Policy]",
             "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
-            "mintscanBase": "[HTTP link to TOS mintscan base url]",
+            "mintscanBase": "[HTTP link to TOS mintsacn base url]",
             "feedback": "[HTTP link to feedback form, can be null]",
             "blogs": "[HTTP link to blogs, can be null]",
             "foundation": "[HTTP link to foundation, can be null]",

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

@@ -1,18 +1,12 @@
 import environments from '../../public/configs/env.json';
 
-const CURRENT_MODE = ({
+// TODO: Update for Mainnet deployment
-  production: 'MAINNET',
+export const AVAILABLE_ENVIRONMENTS =
-  testnet: 'TESTNET',
+  import.meta.env.MODE === 'production'
-  staging: 'DEV',
+    ? environments.deployments.TESTNET
-  development: 'DEV',
+    : environments.deployments.DEV;
-}[import.meta.env.MODE] ?? 'MAINNET') as 'MAINNET' | 'TESTNET' | 'DEV';
 
-export const isMainnet = CURRENT_MODE === 'MAINNET';
+export const CURRENT_ABACUS_DEPLOYMENT = import.meta.env.MODE === 'production' ? 'TESTNET' : 'DEV';
-export const isTestnet = CURRENT_MODE === 'TESTNET';
-export const isDev = CURRENT_MODE === 'DEV';
-
-export const AVAILABLE_ENVIRONMENTS = environments.deployments[CURRENT_MODE];
-export const CURRENT_ABACUS_DEPLOYMENT = CURRENT_MODE;
 export const ENVIRONMENT_CONFIG_MAP = environments.environments;
 export type DydxNetwork = keyof typeof ENVIRONMENT_CONFIG_MAP;
 export const DEFAULT_APP_ENVIRONMENT = AVAILABLE_ENVIRONMENTS.default as DydxNetwork;

src/hooks/useAccounts.tsx

@@ -42,7 +42,6 @@ const useAccountsContext = () => {
     selectedWalletError,
     evmAddress,
     signerWagmi,
-    publicClientWagmi,
     dydxAddress: connectedDydxAddress,
     signerGraz,
   } = useWalletConnection();
@@ -297,7 +296,6 @@ const useAccountsContext = () => {
     // Wallet connection (EVM)
     evmAddress,
     signerWagmi,
-    publicClientWagmi,
 
     // Wallet connection (Cosmos)
     signerGraz,

src/hooks/useDisplayedWallets.ts

@@ -1,4 +1,3 @@
-import { isDev } from '@/constants/networks';
 import { WalletType } from '@/constants/wallets';
 
 import { isTruthy } from '@/lib/isTruthy';
@@ -7,7 +6,7 @@ export const useDisplayedWallets = () => {
   return [
     WalletType.MetaMask,
 
-    isDev && WalletType.Keplr,
+    import.meta.env.MODE !== 'production' && WalletType.Keplr,
 
     WalletType.WalletConnect2,
     

src/hooks/useNotificationTypes.tsx

@@ -7,11 +7,9 @@ import { AlertType } from '@/constants/alerts';
 import { AbacusOrderStatus, ORDER_SIDES } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS, StringKey } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 import { type NotificationTypeConfig, NotificationType } from '@/constants/notifications';
 import { ORDER_SIDE_STRINGS } from '@/constants/trade';
 
-import { useSelectedNetwork }  from '@/hooks';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 
 import { Icon, IconName } from '@/components/Icon';
@@ -25,6 +23,7 @@ import { OrderStatusIcon } from '@/views/OrderStatusIcon';
 
 import { useStringGetter } from './useStringGetter';
 import { TransferStatusSteps } from '@/views/TransferStatusSteps';
+import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
 
 export const notificationTypes = [
   {
@@ -125,7 +124,6 @@ export const notificationTypes = [
     useTrigger: ({ trigger }) => {
       const stringGetter = useStringGetter();
       const { transferNotifications } = useLocalNotifications();
-      const { selectedNetwork } = useSelectedNetwork();
 
       const getTitleStringKey = useCallback((type: 'deposit' | 'withdrawal', finished: boolean) => {
         if (type === 'deposit' && !finished) return STRING_KEYS.DEPOSIT_IN_PROGRESS;
@@ -138,7 +136,7 @@ export const notificationTypes = [
         for (const transfer of transferNotifications) {
           const { fromChainId, status, txHash, toAmount } = transfer;
           const finished = Boolean(status) && status?.squidTransactionStatus !== 'ongoing';
-          const type = fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId ? 'withdrawal' : 'deposit';
+          const type = fromChainId === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
           // @ts-ignore status.errors is not in the type definition but can be returned
           const error = status?.errors?.length ? status?.errors[0] : status?.error;
 

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;
-      }) => {
+      }) => await compositeClient?.depositToSubaccount(subaccountClient, amount.toString()),
-        try {
+
-          return await compositeClient?.depositToSubaccount(
-            subaccountClient,
-            amount.toFixed(usdcDecimals)
-          );
-        } catch (error) {
-          log('useSubaccount/depositToSubaccount', error);
-          throw error;
-        }
-      },
       withdrawFromSubaccount: async ({
         subaccountClient,
         amount,
       }: {
         subaccountClient: SubaccountClient;
         amount: number;
-      }) => {
+      }) => await compositeClient?.withdrawFromSubaccount(subaccountClient, amount.toString()),
-        try {
+
-          return await compositeClient?.withdrawFromSubaccount(
-            subaccountClient,
-            amount.toFixed(usdcDecimals)
-          );
-        } catch (error) {
-          log('useSubaccount/withdrawFromSubaccount', error);
-          throw error;
-        }
-      },
       transferFromSubaccountToAddress: async ({
         subaccountClient,
         assetId = 0,
@@ -117,33 +99,27 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         assetId?: number;
         amount: number;
         recipient: string;
-      }) => {
+      }) =>
-        try {
+        await compositeClient?.validatorClient.post.send(
-          return await compositeClient?.validatorClient.post.send(
+          subaccountClient?.wallet,
-            subaccountClient?.wallet,
+          () =>
-            () =>
+            new Promise((resolve) => {
-              new Promise((resolve) => {
+              const msg =
-                const msg =
+                compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
-                  compositeClient?.validatorClient.post.composer.composeMsgWithdrawFromSubaccount(
+                  subaccountClient.address,
-                    subaccountClient.address,
+                  subaccountClient.subaccountNumber,
-                    subaccountClient.subaccountNumber,
+                  assetId,
-                    assetId,
+                  Long.fromNumber(amount * QUANTUM_MULTIPLIER),
-                    Long.fromNumber(amount * QUANTUM_MULTIPLIER),
+                  recipient
-                    recipient
+                );
-                  );
 
-                resolve([msg]);
+              resolve([msg]);
-              }),
+            }),
-            false,
+          false,
-            undefined,
+          undefined,
-            undefined,
+          undefined,
-            Method.BroadcastTxCommit
+          Method.BroadcastTxCommit
-          );
+        ),
-        } catch (error) {
-          log('useSubaccount/transferFromSubaccountToAddress', error);
-          throw error;
-        }
-      },
 
       transferNativeToken: async ({
         subaccountClient,
@@ -153,30 +129,24 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         subaccountClient: SubaccountClient;
         amount: number;
         recipient: string;
-      }) => {
+      }) =>
-        try {
+        await compositeClient?.validatorClient.post.send(
-          return await compositeClient?.validatorClient.post.send(
+          subaccountClient.wallet,
-            subaccountClient.wallet,
+          () =>
-            () =>
+            new Promise((resolve) => {
-              new Promise((resolve) => {
+              const msg = compositeClient?.sendTokenMessage(
-                const msg = compositeClient?.sendTokenMessage(
+                subaccountClient.wallet,
-                  subaccountClient.wallet,
+                amount.toString(),
-                  amount.toString(),
+                recipient,
-                  recipient
+              );
-                );
 
-                resolve([msg]);
+              resolve([msg]);
-              }),
+            }),
-            false,
+          false,
-            compositeClient?.validatorClient?.post.defaultDydxGasPrice,
+          compositeClient?.validatorClient?.post.defaultDydxGasPrice,
-            undefined,
+          undefined,
-            Method.BroadcastTxCommit
+          Method.BroadcastTxCommit
-          );
+        ),
-        } catch (error) {
-          log('useSubaccount/transferNativeToken', error);
-          throw error;
-        }
-      },
 
       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(
+        const transaction = JSON.parse(payload);
-            subaccountClient,
-            amount.toFixed(usdcDecimals)
-          );
-          const ibcMsg: EncodeObject = {
-            typeUrl: transaction.msgTypeUrl,
-            value: transaction.msg,
-          };
 
-          return await compositeClient.send(
+        const msg = compositeClient.withdrawFromSubaccountMessage(subaccountClient, amount.toString());
-            subaccountClient.wallet,
+        const ibcMsg: EncodeObject = {
-            () => Promise.resolve([msg, ibcMsg]),
+          typeUrl: transaction.msgTypeUrl,
-            false
+          value: transaction.msg,
-          );
+        };
-        } catch (error) {
+
-          log('useSubaccount/sendSquidWithdrawFromSubaccount', error);
+        return await compositeClient.send(
-          throw error;
+          subaccountClient.wallet,
-        }
+          () => Promise.resolve([msg, ibcMsg]),
+          false
+        );
       },
     }),
     [compositeClient]
@@ -350,6 +313,11 @@ export const useSubaccountContext = ({ localDydxWallet }: { localDydxWallet?: Lo
         placeOrderParams = abacusStateManager.placeOrder(callback);
       }
 
+      track(AnalyticsEvent.TradePlaceOrder, {
+        ...placeOrderParams,
+        isClosePosition,
+      } as HumanReadablePlaceOrderPayload & { isClosePosition: boolean });
+
       return placeOrderParams;
     },
     [subaccountClient]
@@ -378,6 +346,7 @@ 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/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/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/hooks/useWalletConnection.ts

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState, useMemo } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import { LocalStorageKey } from '@/constants/localStorage';
@@ -90,21 +90,19 @@ export const useWalletConnection = () => {
 
   const selectedNetwork = useSelector(getSelectedNetwork);
   const walletConnectConfig = ENVIRONMENT_CONFIG_MAP[selectedNetwork].wallets.walletconnect;
-  const wagmiConnector = useMemo(
+
-    () =>
+  const { connectAsync: connectWagmi } =
-      walletType && walletConnectionType
+    walletType && walletConnectionType
-        ? resolveWagmiConnector({
+      ? useConnectWagmi({
+          connector: resolveWagmiConnector({
             walletType,
             walletConnection: {
               type: walletConnectionType,
             },
             walletConnectConfig,
-          })
+          }),
-        : undefined,
+        })
-    [walletConnectConfig, walletType, walletConnectionType]
+      : useConnectWagmi();
-  );
-
-  const { connectAsync: connectWagmi } = useConnectWagmi({ connector: wagmiConnector })
   const { suggestAndConnect: connectGraz } = useConnectGraz();
 
   const connectWallet = useCallback(

src/layout/Footer/FooterDesktop.tsx

@@ -3,7 +3,7 @@ import styled, { type AnyStyledComponent, css } from 'styled-components';
 import { AbacusApiStatus } from '@/constants/abacus';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP, isDev } from '@/constants/networks';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 
 import { useApiState, useSelectedNetwork, useStringGetter } from '@/hooks';
 import { ChatIcon, LinkOutIcon } from '@/icons';
@@ -75,7 +75,7 @@ export const FooterDesktop = () => {
         )}
       </Styled.Row>
 
-      {isDev && (
+      {import.meta.env.MODE !== 'production' && (
         <Styled.Details
           withSeparators
           items={[

src/layout/Header/HeaderDesktop.tsx

@@ -236,5 +236,4 @@ Styled.IconButton = styled(IconButton)<{ size?: string }>`
   ${headerMixins.button}
   --button-border: none;
   --button-icon-size: 1rem;
-  --button-padding: 0 0.5em;
 `;

src/lib/abacus/dydxChainTransactions.ts

@@ -30,7 +30,7 @@ import {
 
 import { DialogTypes } from '@/constants/dialogs';
 import { UNCOMMITTED_ORDER_TIMEOUT_MS } from '@/constants/trade';
-import { ENVIRONMENT_CONFIG_MAP, DydxNetwork, isTestnet } from '@/constants/networks';
+import { QUANTUM_MULTIPLIER } from '@/constants/numbers';
 
 import { RootStore } from '@/state/_store';
 import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
@@ -198,13 +198,8 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
       const parsedTx = this.parseToPrimitives(tx);
       const hash = parsedTx?.hash;
 
-      if (isTestnet) {
+      if (import.meta.env.MODE === 'production') {
-        console.log(
+        console.log(`https://testnet.mintscan.io/dydx-testnet/txs/${hash}`);
-          `${
-            ENVIRONMENT_CONFIG_MAP[this.compositeClient.network.getString() as DydxNetwork]?.links
-              ?.mintscanBase
-          }/txs/${hash}`
-        );
       } else console.log(`txHash: ${hash}`);
 
       return JSON.stringify(parsedTx);
@@ -234,7 +229,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
         orderFlags,
         clobPairId,
         goodTilBlock || undefined,
-        goodTilBlockTime || undefined
+        goodTilBlockTime || undefined,
       );
 
       const parsedTx = this.parseToPrimitives(tx);
@@ -300,11 +295,15 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
             if (!this.localWallet) {
               throw new Error('Missing compositeClient or localWallet');
             }
-            const msg = compositeClient?.sendTokenMessage(this.localWallet, amount, recipient);
+            const msg = compositeClient?.sendTokenMessage(
+              this.localWallet,
+              amount,
+              recipient,
+            );
 
             resolve([msg]);
           }),
-        this.compositeClient?.validatorClient?.post.defaultDydxGasPrice
+        this.compositeClient?.validatorClient?.post.defaultDydxGasPrice,
       );
 
       const parsedTx = this.parseToPrimitives(tx);

src/lib/abacus/filesystem.ts

@@ -1,5 +1,10 @@
 import type { AbacusFileSystemProtocol, FileLocation, Nullable } from '@/constants/abacus';
 
+export const ENDPOINTS_PATH =
+  import.meta.env.MODE === 'production'
+    ? 'config/prod/endpoints.json'
+    : 'config/staging/dev_endpoints.json';
+
 class AbacusFileSystem implements AbacusFileSystemProtocol {
   readTextFile(location: FileLocation, path: string): Nullable<string> {
     return null;

src/lib/abacus/index.ts

@@ -41,7 +41,7 @@ import AbacusStateNotifier from './stateNotification';
 import AbacusLocalizer from './localizer';
 import AbacusFormatter from './formatter';
 import AbacusThreading from './threading';
-import AbacusFileSystem from './filesystem';
+import AbacusFileSystem, { ENDPOINTS_PATH } from './filesystem';
 import { LocaleSeparators } from '../numbers';
 class AbacusStateManager {
   private store: RootStore | undefined;

src/lib/abacus/rest.ts

@@ -56,8 +56,13 @@ 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();
         } catch {}

src/lib/abacus/websocket.ts

@@ -1,6 +1,5 @@
 import type { AbacusWebsocketProtocol } from '@/constants/abacus';
 import type { TradingViewBar } from '@/constants/candles';
-import { isDev } from '@/constants/networks';
 
 import {
   PING_INTERVAL_MS,
@@ -9,12 +8,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 +143,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;
             }
@@ -180,13 +161,13 @@ class AbacusWebsocket implements Omit<AbacusWebsocketProtocol, '__doNotUseOrImpl
 
     this.socket.onclose = (e) => {
       this.connectedCallback?.(false);
-      if (!isDev) return;
+      if (import.meta.env.MODE === 'production') return;
       console.warn('AbacusStateManager > WS > close > ', e);
     };
 
     this.socket.onerror = (e) => {
       this.connectedCallback?.(false);
-      if (!isDev) return;
+      if (import.meta.env.MODE === 'production') return;
       console.error('AbacusStateManager > WS > error > ', e);
     };
   };

src/lib/telemetry.ts

@@ -1,7 +1,5 @@
-import { isDev } from "@/constants/networks";
-
 export const log = (location: string, error: Error, metadata?: any) => {
-  if (isDev) {
+  if (import.meta.env.MODE !== 'production') {
     console.warn('telemetry/log:', { location, error, metadata });
   }
 

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/state/appMiddleware.ts

@@ -2,7 +2,6 @@ import type { PayloadAction } from '@reduxjs/toolkit';
 
 import { AbacusApiStatus } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
-import { isDev } from '@/constants/networks';
 
 import { setApiState, setSelectedNetwork } from '@/state/app';
 import { resetPerpetualsState } from '@/state/perpetuals';
@@ -31,7 +30,7 @@ export default (store: any) => (next: any) => async (action: PayloadAction<any>)
         store.dispatch(
           openDialog({
             type: DialogTypes.ExchangeOffline,
-            dialogProps: { preventClose: !isDev },
+            dialogProps: { preventClose: import.meta.env.MODE === 'production' },
           })
         );
       }

src/state/inputsSelectors.ts

@@ -48,15 +48,6 @@ export const getTradeInputErrors = (state: RootState) => {
   return currentInput === 'trade' ? getInputErrors(state) : [];
 };
 
-/**
- * @param state
- * @returns input errors for Close position
- */
-export const getClosePositionInputErrors = (state: RootState) => {
-  const currentInput = state.inputs.current;
-  return currentInput === 'closePosition' ? getInputErrors(state) : [];
-};
-
 /**
  * @param state
  * @returns input errors for Transfer

src/views/AccountInfo/AccountInfoConnectedState.tsx

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

src/views/TransferStatus.tsx

@@ -34,7 +34,7 @@ export const TransferStatusToast = ({
 }: ElementProps) => {
   const stringGetter = useStringGetter();
   const [open, setOpen] = useState<boolean>(false);
-  const [secondsLeft, setSecondsLeft] = useState<number>(0);
+  const [secondsLeft, setSecondsLeft] = useState<number | undefined>();
 
   // @ts-ignore status.errors is not in the type definition but can be returned
   const error = status?.errors?.length ? status?.errors[0] : status?.error;
@@ -49,23 +49,14 @@ export const TransferStatusToast = ({
 
   if (!status) return <LoadingDots size={3} />;
 
-  const inProgressStatusString =
-    type === 'deposit'
-      ? secondsLeft > 0
-        ? STRING_KEYS.DEPOSIT_STATUS
-        : STRING_KEYS.DEPOSIT_STATUS_SHORTLY
-      : secondsLeft > 0
-      ? STRING_KEYS.WITHDRAW_STATUS
-      : STRING_KEYS.WITHDRAW_STATUS_SHORTLY;
-
   const statusString =
     type === 'deposit'
       ? status?.squidTransactionStatus === 'success'
         ? STRING_KEYS.DEPOSIT_COMPLETE
-        : inProgressStatusString
+        : STRING_KEYS.DEPOSIT_STATUS
       : status?.squidTransactionStatus === 'success'
       ? STRING_KEYS.WITHDRAW_COMPLETE
-      : inProgressStatusString;
+      : STRING_KEYS.WITHDRAW_STATUS;
 
   return (
     <Styled.Root open={open} onOpenChange={setOpen}>

src/views/TransferStatusSteps.tsx

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import styled, { css, keyframes, type AnyStyledComponent } from 'styled-components';
 import { StatusResponse } from '@0xsquid/sdk';
 
-import { useStringGetter, useSelectedNetwork, useURLConfigs } from '@/hooks';
+import { useStringGetter } from '@/hooks';
 
 import { Link } from '@/components/Link';
 import { Icon, IconName } from '@/components/Icon';
@@ -11,7 +11,6 @@ import { LoadingSpinner } from '@/components/Loading/LoadingSpinner';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 
 type ElementProps = {
   status?: StatusResponse;
@@ -27,17 +26,12 @@ enum TransferStatusStep {
 
 export const TransferStatusSteps = ({ status, type }: ElementProps) => {
   const stringGetter = useStringGetter();
-  const { selectedNetwork } = useSelectedNetwork();
-  const { mintscan: mintscanTxUrl } = useURLConfigs();
-  const dydxChainId = ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId;
 
   const { currentStep, steps } = useMemo(() => {
     const routeStatus = status?.routeStatus;
     const fromChain = status?.fromChain?.chainData?.chainId;
     const toChain = status?.toChain?.chainData?.chainId;
 
-    const currentStatus = routeStatus?.[routeStatus?.length - 1];
-
     const steps = [
       {
         label: stringGetter({
@@ -60,15 +54,12 @@ export const TransferStatusSteps = ({ status, type }: ElementProps) => {
           },
         }),
         step: TransferStatusStep.ToChain,
-        link:
+        link: status?.toChain?.transactionUrl,
-          type === 'withdrawal'
-            ? status?.toChain?.transactionUrl
-            : currentStatus?.chainId === dydxChainId && currentStatus?.txHash
-            ? `${mintscanTxUrl?.replace('{tx_hash}', currentStatus.txHash)}`
-            : undefined,
       },
     ];
 
+    const currentStatus = routeStatus?.[routeStatus?.length - 1];
+
     let currentStep = TransferStatusStep.Bridge;
 
     if (!routeStatus?.length) {

src/views/dialogs/DepositDialog.tsx

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';
 
-import { isMainnet } from '@/constants/networks';
 import { STRING_KEYS } from '@/constants/localization';
 import { useBreakpoints, useStringGetter } from '@/hooks';
 
@@ -17,7 +16,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,20 +27,14 @@ 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={showTestDeposit && 'Test funds will be sent directly to your dYdX account.'}
       placement={isMobile ? DialogPlacement.FullScreen : DialogPlacement.Default}
     >
       <Styled.Content>
-        {isMainnet || !showFaucet ? (
+        {showTestDeposit ? <TestnetDepositForm onDeposit={closeDialog} /> : <DepositForm />}
-          <DepositForm />
+        <Styled.TextToggle onClick={() => setShowTestDeposit(!showTestDeposit)}>
-        ) : (
+          {showTestDeposit ? 'Show deposit form (Under Construction)' : 'Show test faucet'}
-          <TestnetDepositForm onDeposit={closeDialog} />
+        </Styled.TextToggle>
-        )}
-        {!isMainnet && (
-          <Styled.TextToggle onClick={() => setShowFaucet(!showFaucet)}>
-            {showFaucet ? 'Show deposit form' : 'Show test faucet'}
-          </Styled.TextToggle>
-        )}
       </Styled.Content>
     </Dialog>
   );

src/views/dialogs/ExchangeOfflineDialog.tsx

@@ -5,7 +5,6 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { AbacusApiStatus } from '@/constants/abacus';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS } from '@/constants/localization';
-import { isDev } from '@/constants/networks';
 
 import { useApiState, useStringGetter } from '@/hooks';
 import { layoutMixins } from '@/styles/layoutMixins';
@@ -46,7 +45,7 @@ export const ExchangeOfflineDialog = ({ preventClose, setIsOpen }: ElementProps)
     >
       <Styled.Content>
         <p>{statusErrorMessage}</p>
-        {isDev && <NetworkSelectMenu />}
+        {import.meta.env.MODE !== 'production' && <NetworkSelectMenu />}
       </Styled.Content>
     </Dialog>
   );

src/views/forms/AccountManagementForms/DepositForm.tsx

@@ -2,21 +2,22 @@ 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 { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
+import { parseUnits } from 'viem'
 
 import erc20 from '@/abi/erc20.json';
 import { TransferInputField, TransferInputTokenResource, TransferType } from '@/constants/abacus';
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 import { NumberSign } from '@/constants/numbers';
 import type { EvmAddress } from '@/constants/wallets';
 
-import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
+import { useAccounts, useDebounce, useStringGetter } from '@/hooks';
 import { useAccountBalance, CHAIN_DEFAULT_TOKEN_ADDRESS } from '@/hooks/useAccountBalance';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 import { NATIVE_TOKEN_ADDRESS, useSquid } from '@/hooks/useSquid';
+import { useWalletConnection } from '@/hooks/useWalletConnection';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 import { formMixins } from '@/styles/formMixins';
@@ -53,9 +54,9 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
   const stringGetter = useStringGetter();
   const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState(false);
-  const { selectedNetwork } = useSelectedNetwork();
 
-  const { evmAddress, signerWagmi, publicClientWagmi } = useAccounts();
+  const { evmAddress, signerWagmi } = useAccounts();
+  const { publicClientWagmi } = useWalletConnection();
 
   const { addTransferNotification } = useLocalNotifications();
 
@@ -65,8 +66,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 +98,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 +172,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,11 +182,11 @@ 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);
-
+    
     if (sourceAmountBN > (allowance as bigint)) {
       const { request } = await publicClientWagmi.simulateContract({
         account: evmAddress,
@@ -196,12 +194,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 +229,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);
 
@@ -240,7 +239,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
         if (txHash) {
           addTransferNotification({
             txHash: txHash,
-            toChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
+            toChainId: TESTNET_CHAIN_ID,
             fromChainId: chainIdStr || undefined,
             toAmount: summary?.usdcSize || undefined,
             triggeredAt: Date.now(),
@@ -289,15 +288,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 +301,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

@@ -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}
@@ -164,7 +162,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

@@ -3,13 +3,13 @@ import type { ChangeEvent, FormEvent } from 'react';
 import styled, { type AnyStyledComponent } from 'styled-components';
 import type { NumberFormatValues } from 'react-number-format';
 import { shallowEqual, useSelector } from 'react-redux';
+import { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
 import { isAddress } from 'viem';
 
 import { TransferInputField, TransferInputTokenResource, TransferType } from '@/constants/abacus';
 import { AlertType } from '@/constants/alerts';
 import { ButtonSize } from '@/constants/buttons';
 import { STRING_KEYS } from '@/constants/localization';
-import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 import { NumberSign } from '@/constants/numbers';
 
 import {
@@ -17,7 +17,6 @@ import {
   useDebounce,
   useDydxClient,
   useRestrictions,
-  useSelectedNetwork,
   useStringGetter,
   useSubaccount,
 } from '@/hooks';
@@ -44,16 +43,15 @@ 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();
   const [error, setError] = useState<string>();
   const [isLoading, setIsLoading] = useState(false);
-  const { selectedNetwork } = useSelectedNetwork();
 
   const { sendSquidWithdraw } = useSubaccount();
   const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {};
@@ -69,8 +67,6 @@ export const WithdrawForm = () => {
     chain: chainIdStr,
     address: toAddress,
     resources,
-    errors: routeErrors,
-    errorMessage: routeErrorMessage,
   } = useSelector(getTransferInputs, shallowEqual) || {};
 
   const isValidAddress = toAddress && isAddress(toAddress);
@@ -168,7 +164,7 @@ export const WithdrawForm = () => {
             const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
             addTransferNotification({
               txHash: hash,
-              fromChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
+              fromChainId: TESTNET_CHAIN_ID,
               toChainId: chainIdStr || undefined,
               toAmount: debouncedAmountBN.toNumber(),
               triggeredAt: Date.now(),
@@ -283,15 +279,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 +301,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/ClosePositionForm.tsx

@@ -4,10 +4,8 @@ import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 
 import {
   ClosePositionInputField,
-  ValidationError,
   type HumanReadablePlaceOrderPayload,
   type Nullable,
-  ErrorType,
 } from '@/constants/abacus';
 import { AlertType } from '@/constants/alerts';
 import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons';
@@ -37,14 +35,13 @@ import { PositionPreview } from '@/views/forms/TradeForm/PositionPreview';
 import { getCurrentMarketPositionData } from '@/state/accountSelectors';
 
 import { getCurrentMarketAssetData } from '@/state/assetsSelectors';
-import { getClosePositionInputErrors, getInputClosePositionData } from '@/state/inputsSelectors';
+import { getInputClosePositionData } from '@/state/inputsSelectors';
 import { getCurrentMarketConfig, getCurrentMarketId } from '@/state/perpetualsSelectors';
 import { closeDialog } from '@/state/dialogs';
 import { getCurrentInput } from '@/state/inputsSelectors';
 
 import abacusStateManager from '@/lib/abacus';
 import { MustBigNumber } from '@/lib/numbers';
-import { getTradeInputAlert } from '@/lib/tradeData';
 
 const MAX_KEY = 'MAX';
 
@@ -84,38 +81,15 @@ export const ClosePositionForm = ({
 
   const market = useSelector(getCurrentMarketId);
   const { id } = useSelector(getCurrentMarketAssetData, shallowEqual) || {};
-  const { stepSizeDecimals, tickSizeDecimals } =
+  const { stepSizeDecimals } = useSelector(getCurrentMarketConfig, shallowEqual) || {};
-    useSelector(getCurrentMarketConfig, shallowEqual) || {};
   const { size: sizeData, summary } = useSelector(getInputClosePositionData, shallowEqual) || {};
   const { size, percent } = sizeData || {};
   const currentInput = useSelector(getCurrentInput);
-  const closePositionInputErrors = useSelector(getClosePositionInputErrors, shallowEqual);
   const currentPositionData = useSelector(getCurrentMarketPositionData, shallowEqual);
   const { size: currentPositionSize } = currentPositionData || {};
   const { current: currentSize } = currentPositionSize || {};
   const currentSizeBN = MustBigNumber(currentSize).abs();
 
-  const hasInputErrors = closePositionInputErrors?.some(
-    (error: ValidationError) => error.type !== ErrorType.warning
-  );
-
-  const inputAlert = getTradeInputAlert({
-    abacusInputErrors: closePositionInputErrors ?? [],
-    stringGetter,
-    stepSizeDecimals,
-    tickSizeDecimals,
-  });
-
-  let alertContent;
-  let alertType = AlertType.Error;
-
-  if (closePositionError) {
-    alertContent = closePositionError;
-  } else if (inputAlert) {
-    alertContent = inputAlert?.alertString;
-    alertType = inputAlert?.type;
-  }
-
   useEffect(() => {
     if (currentStep && currentStep !== MobilePlaceOrderSteps.EditOrder) return;
 
@@ -208,7 +182,9 @@ export const ClosePositionForm = ({
     });
   };
 
-  const alertMessage = alertContent && <AlertMessage type={alertType}>{alertContent}</AlertMessage>;
+  const alertMessage = closePositionError && (
+    <AlertMessage type={AlertType.Error}>{closePositionError}</AlertMessage>
+  );
 
   const inputs = (
     <Styled.InputsColumn>
@@ -289,8 +265,8 @@ export const ClosePositionForm = ({
 
         <PlaceOrderButtonAndReceipt
           isLoading={isClosingPosition}
-          hasValidationErrors={hasInputErrors}
+          hasValidationErrors={!size}
-          actionStringKey={inputAlert?.actionStringKey}
+          actionStringKey={!size ? STRING_KEYS.ENTER_AMOUNT : undefined}
           summary={summary ?? undefined}
           currentStep={currentStep}
           isClosePosition

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: (

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
+                <AssetActions asset={DydxChainAsset.CHAINTOKEN} dispatch={dispatch} />
-                  asset={DydxChainAsset.CHAINTOKEN}
-                  dispatch={dispatch}
-                  hasBalance={nativeTokenBalance.gt(0)}
-                />
               </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
+                <AssetActions asset={DydxChainAsset.USDC} dispatch={dispatch} withOnboarding />
-                  asset={DydxChainAsset.USDC}
-                  dispatch={dispatch}
-                  hasBalance={MustBigNumber(usdcBalance).gt(0)}
-                  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 &&
+        withOnboarding && {
-          hasBalance && {
+          dialogType: DialogTypes.Withdraw,
-            dialogType: DialogTypes.Withdraw,
+          iconName: IconName.Withdraw,
-            iconName: IconName.Withdraw,
+        },
-          },
         withOnboarding && {
           dialogType: DialogTypes.Deposit,
           iconName: IconName.Deposit,
         },
-        hasBalance && {
+        {
           dialogType: DialogTypes.Transfer,
           dialogProps: { selectedAsset: asset },
           iconName: IconName.Send,

src/views/tables/TransferHistoryTable.tsx

@@ -7,7 +7,7 @@ import { ButtonAction } from '@/constants/buttons';
 import { DialogTypes } from '@/constants/dialogs';
 import { STRING_KEYS, StringGetterFunction } from '@/constants/localization';
 
-import { useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
+import { useBreakpoints, useStringGetter } from '@/hooks';
 
 import { layoutMixins } from '@/styles/layoutMixins';
 import { tradeViewMixins } from '@/styles/tradeViewMixins';
@@ -40,13 +40,11 @@ const getTransferHistoryTableColumnDef = ({
   key,
   stringGetter,
   width,
-  mintscanTxUrl,
 }: {
   key: TransferHistoryTableColumnKey;
   isTablet?: boolean;
   stringGetter: StringGetterFunction;
   width?: ColumnSize;
-  mintscanTxUrl?: string;
 }): ColumnDef<SubaccountTransfer> => ({
   width,
   ...(
@@ -100,12 +98,9 @@ const getTransferHistoryTableColumnDef = ({
         columnKey: TransferHistoryTableColumnKey.TxHash,
         getCellValue: (row) => row.transactionHash,
         label: stringGetter({ key: STRING_KEYS.TRANSACTION }),
-        renderCell: ({ transactionHash }) =>
+        renderCell: ({ transactionHash, resources }) =>
           transactionHash ? (
-            <Styled.TxHash
+            <Styled.TxHash withIcon href={resources.blockExplorerUrl}>
-              withIcon
-              href={`${mintscanTxUrl?.replace('{tx_hash}', transactionHash)}`}
-            >
               {truncateAddress(transactionHash, '')}
             </Styled.TxHash>
           ) : (
@@ -135,7 +130,6 @@ export const TransferHistoryTable = ({
   const stringGetter = useStringGetter();
   const dispatch = useDispatch();
   const { isMobile, isTablet } = useBreakpoints();
-  const { mintscan: mintscanTxUrl } = useURLConfigs();
 
   const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual);
 
@@ -152,7 +146,6 @@ export const TransferHistoryTable = ({
           isTablet,
           stringGetter,
           width: columnWidths?.[key],
-          mintscanTxUrl,
         })
       )}
       slotEmpty={