do not use TESTNET_CHAIN_ID

src/hooks/useNotificationTypes.tsx

@@ -7,9 +7,11 @@ 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';
@@ -23,7 +25,6 @@ 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 = [
   {
@@ -124,6 +125,7 @@ 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;
@@ -136,7 +138,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 === TESTNET_CHAIN_ID ? 'withdrawal' : 'deposit';
+          const type = fromChainId === ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId ? '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]

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/views/forms/AccountManagementForms/DepositForm.tsx

@@ -2,7 +2,6 @@ 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 { TESTNET_CHAIN_ID } from '@dydxprotocol/v4-client-js';
 import { parseUnits } from 'viem'
 
 import erc20 from '@/abi/erc20.json';
@@ -10,10 +9,11 @@ import { TransferInputField, TransferInputTokenResource, TransferType } from '@/
 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 } from '@/hooks';
+import { useAccounts, useDebounce, useStringGetter, useSelectedNetwork } from '@/hooks';
 import { useAccountBalance, CHAIN_DEFAULT_TOKEN_ADDRESS } from '@/hooks/useAccountBalance';
 import { useLocalNotifications } from '@/hooks/useLocalNotifications';
 import { NATIVE_TOKEN_ADDRESS, useSquid } from '@/hooks/useSquid';
@@ -54,6 +54,7 @@ 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 } = useAccounts();
   const { publicClientWagmi } = useWalletConnection();
@@ -239,7 +240,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
         if (txHash) {
           addTransferNotification({
             txHash: txHash,
-            toChainId: TESTNET_CHAIN_ID,
+            toChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
             fromChainId: chainIdStr || undefined,
             toAmount: summary?.usdcSize || undefined,
             triggeredAt: Date.now(),

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,6 +17,7 @@ import {
   useDebounce,
   useDydxClient,
   useRestrictions,
+  useSelectedNetwork,
   useStringGetter,
   useSubaccount,
 } from '@/hooks';
@@ -52,6 +53,7 @@ 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) || {};
@@ -164,7 +166,7 @@ export const WithdrawForm = () => {
             const hash = `0x${Buffer.from(txHash.hash).toString('hex')}`;
             addTransferNotification({
               txHash: hash,
-              fromChainId: TESTNET_CHAIN_ID,
+              fromChainId: ENVIRONMENT_CONFIG_MAP[selectedNetwork].dydxChainId,
               toChainId: chainIdStr || undefined,
               toAmount: debouncedAmountBN.toNumber(),
               triggeredAt: Date.now(),