diff --git a/src/App.tsx b/src/App.tsx index 7f11814..0de3dda 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -63,7 +63,7 @@ const Content = () => { const { isTablet, isNotTablet } = useBreakpoints(); const isShowingHeader = isNotTablet; const isShowingFooter = useShouldShowFooter(); - const { chainLabel } = useTokenConfigs(); + const { chainTokenLabel } = useTokenConfigs(); return ( @@ -78,7 +78,7 @@ const Content = () => { } /> - } /> + } /> {isTablet && ( <> } /> diff --git a/src/constants/wallets.ts b/src/constants/wallets.ts index ab94cda..5a0c3c5 100644 --- a/src/constants/wallets.ts +++ b/src/constants/wallets.ts @@ -352,5 +352,5 @@ export const DYDX_CHAIN_INFO: Parameters[0] = { // TODO: export this type from abacus instead export enum DydxChainAsset { USDC = 'usdc', - CHAIN = 'chain', + CHAINTOKEN = 'chain', } diff --git a/src/hooks/useAccountBalance.ts b/src/hooks/useAccountBalance.ts index 0de0737..7aa5e89 100644 --- a/src/hooks/useAccountBalance.ts +++ b/src/hooks/useAccountBalance.ts @@ -51,7 +51,7 @@ export const useAccountBalance = ({ const selectedNetwork = useSelector(getSelectedNetwork); const balances = useSelector(getBalances, shallowEqual); - const { chainDenom, usdcDenom } = useTokenConfigs(); + const { chainTokenDenom, usdcDenom } = useTokenConfigs(); const evmChainId = Number(ENVIRONMENT_CONFIG_MAP[selectedNetwork].ethereumChainId); const stakingBalances = useSelector(getStakingBalances, shallowEqual); @@ -93,7 +93,7 @@ export const useAccountBalance = ({ const { formatted: evmBalance } = evmQuery.data || {}; const balance = !assetSymbol ? '0' : isCosmosChain ? cosmosQuery.data : evmBalance; - const nativeTokenCoinBalance = balances?.[chainDenom]; + const nativeTokenCoinBalance = balances?.[chainTokenDenom]; const nativeTokenBalance = MustBigNumber(nativeTokenCoinBalance?.amount) .div(QUANTUM_MULTIPLIER) .toNumber(); @@ -101,7 +101,7 @@ export const useAccountBalance = ({ const usdcCoinBalance = balances?.[usdcDenom]; const usdcBalance = MustBigNumber(usdcCoinBalance?.amount).div(QUANTUM_MULTIPLIER).toNumber(); - const nativeStakingCoinBalanace = stakingBalances?.[chainDenom]; + const nativeStakingCoinBalanace = stakingBalances?.[chainTokenDenom]; const nativeStakingBalance = MustBigNumber(nativeStakingCoinBalanace?.amount) .div(QUANTUM_MULTIPLIER) .toNumber(); diff --git a/src/hooks/useTokenConfigs.ts b/src/hooks/useTokenConfigs.ts index 4ecbd09..d99b3e5 100644 --- a/src/hooks/useTokenConfigs.ts +++ b/src/hooks/useTokenConfigs.ts @@ -5,12 +5,12 @@ import { useSelectedNetwork } from '@/hooks'; export const useTokenConfigs = (): { tokensConfigs: { - ['usdc']: { + [DydxChainAsset.USDC]: { denom: string; name: string; decimals: number; }, - ['chain']: { + [DydxChainAsset.CHAINTOKEN]: { denom: string; name: string; decimals: number; @@ -18,8 +18,8 @@ export const useTokenConfigs = (): { }; usdcDenom: string; usdcLabel: string; - chainDenom: string; - chainLabel: string; + chainTokenDenom: string; + chainTokenLabel: string; } => { const { selectedNetwork } = useSelectedNetwork(); const tokensConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].tokens; @@ -28,7 +28,7 @@ export const useTokenConfigs = (): { tokensConfigs, usdcDenom: tokensConfigs[DydxChainAsset.USDC].denom, usdcLabel: tokensConfigs[DydxChainAsset.USDC].name, - chainDenom: tokensConfigs[DydxChainAsset.CHAIN].denom, - chainLabel: tokensConfigs[DydxChainAsset.CHAIN].name, + chainTokenDenom: tokensConfigs[DydxChainAsset.CHAINTOKEN].denom, + chainTokenLabel: tokensConfigs[DydxChainAsset.CHAINTOKEN].name, }; }; diff --git a/src/layout/Header/HeaderDesktop.tsx b/src/layout/Header/HeaderDesktop.tsx index 0fba874..de92dfd 100644 --- a/src/layout/Header/HeaderDesktop.tsx +++ b/src/layout/Header/HeaderDesktop.tsx @@ -28,7 +28,7 @@ import { layoutMixins } from '@/styles/layoutMixins'; export const HeaderDesktop = () => { const stringGetter = useStringGetter(); const dispatch = useDispatch(); - const { chainLabel } = useTokenConfigs(); + const { chainTokenLabel } = useTokenConfigs(); const navItems = [ { @@ -45,9 +45,9 @@ export const HeaderDesktop = () => { href: AppRoute.Trade, }, { - value: chainLabel, - label: chainLabel, - href: `/${chainLabel}`, + value: chainTokenLabel, + label: chainTokenLabel, + href: `/${chainTokenLabel}`, }, { value: 'PORTFOLIO', diff --git a/src/pages/rewards/DYDXBalancePanel.tsx b/src/pages/rewards/DYDXBalancePanel.tsx index ca2ee7c..f2c055e 100644 --- a/src/pages/rewards/DYDXBalancePanel.tsx +++ b/src/pages/rewards/DYDXBalancePanel.tsx @@ -30,7 +30,7 @@ export const DYDXBalancePanel = () => { const { walletType } = useAccounts(); const canAccountTrade = useSelector(calculateCanAccountTrade, shallowEqual); const { nativeTokenBalance, nativeStakingBalance } = useAccountBalance(); - const { chainLabel } = useTokenConfigs(); + const { chainTokenLabel } = useTokenConfigs(); return ( { {/* */} - {chainLabel} + {chainTokenLabel} {!canAccountTrade ? ( @@ -111,7 +111,7 @@ export const DYDXBalancePanel = () => { ), }, diff --git a/src/views/dialogs/ReceiveDialog.tsx b/src/views/dialogs/ReceiveDialog.tsx index 68ae2a4..09c2a09 100644 --- a/src/views/dialogs/ReceiveDialog.tsx +++ b/src/views/dialogs/ReceiveDialog.tsx @@ -24,10 +24,10 @@ type ElementProps = { setIsOpen: (open: boolean) => void; }; -export const ReceiveDialog = ({ selectedAsset = DydxChainAsset.CHAIN, setIsOpen }: ElementProps) => { +export const ReceiveDialog = ({ selectedAsset = DydxChainAsset.CHAINTOKEN, setIsOpen }: ElementProps) => { const stringGetter = useStringGetter(); const { dydxAddress } = useAccounts(); - const { chainLabel, usdcLabel } = useTokenConfigs(); + const { chainTokenLabel, usdcLabel } = useTokenConfigs(); const [asset, setAsset] = useState(selectedAsset); @@ -41,11 +41,11 @@ export const ReceiveDialog = ({ selectedAsset = DydxChainAsset.CHAIN, setIsOpen ), }, { - value: DydxChainAsset.CHAIN, + value: DydxChainAsset.CHAINTOKEN, label: ( {/* */} - {chainLabel} + {chainTokenLabel} ), }, diff --git a/src/views/forms/TransferForm.tsx b/src/views/forms/TransferForm.tsx index 12318ad..71b3d40 100644 --- a/src/views/forms/TransferForm.tsx +++ b/src/views/forms/TransferForm.tsx @@ -54,7 +54,7 @@ type TransferFormProps = { }; export const TransferForm = ({ - selectedAsset = DydxChainAsset.CHAIN, + selectedAsset = DydxChainAsset.CHAINTOKEN, onDone, className, }: TransferFormProps) => { @@ -69,7 +69,7 @@ export const TransferForm = ({ const { transfer } = useSubaccount(); const { nativeTokenBalance, usdcBalance } = useAccountBalance(); const { selectedNetwork } = useSelectedNetwork(); - const { tokensConfigs, usdcLabel, chainLabel } = useTokenConfigs(); + const { tokensConfigs, usdcLabel, chainTokenLabel } = useTokenConfigs(); // User Input const [asset, setAsset] = useState(selectedAsset); @@ -136,7 +136,7 @@ export const TransferForm = ({ try { // Subtract fees from amount if sending native tokens const amountToTransfer = ( - asset === DydxChainAsset.CHAIN ? amountBN.minus(fee) : amountBN + asset === DydxChainAsset.CHAINTOKEN ? amountBN.minus(fee) : amountBN ).toNumber(); const screenResults = await screenAddresses({ @@ -223,11 +223,11 @@ export const TransferForm = ({ ), }, { - value: DydxChainAsset.CHAIN, + value: DydxChainAsset.CHAINTOKEN, label: ( {/* */} - {chainLabel} + {chainTokenLabel} ), }, diff --git a/src/views/menus/AccountMenu.tsx b/src/views/menus/AccountMenu.tsx index 3818655..a91b013 100644 --- a/src/views/menus/AccountMenu.tsx +++ b/src/views/menus/AccountMenu.tsx @@ -24,7 +24,6 @@ import { DropdownMenu } from '@/components/DropdownMenu'; import { Output, OutputType } from '@/components/Output'; import { Icon, IconName } from '@/components/Icon'; import { IconButton } from '@/components/IconButton'; -import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks'; import { WithTooltip } from '@/components/WithTooltip'; import { openDialog } from '@/state/dialogs'; @@ -46,7 +45,7 @@ export const AccountMenu = () => { const onboardingState = useSelector(getOnboardingState); const { freeCollateral } = useSelector(getSubaccount, shallowEqual) || {}; const { nativeTokenBalance } = useAccountBalance(); - const { usdcLabel, chainLabel } = useTokenConfigs(); + const { usdcLabel, chainTokenLabel } = useTokenConfigs(); const { evmAddress, walletType, dydxAddress, hdKey } = useAccounts(); @@ -117,13 +116,13 @@ export const AccountMenu = () => { {stringGetter({ key: STRING_KEYS.ASSET_BALANCE, - params: { ASSET: chainLabel }, + params: { ASSET: chainTokenLabel }, })} {/* */} - +