From d6945bf6fa9c8b028cbae8cb0bc045a8a32f7259 Mon Sep 17 00:00:00 2001 From: Kevin Peters Date: Wed, 22 Dec 2021 12:08:00 +0000 Subject: [PATCH] bridge_ui: Don't display amount on Redeem step (formatUnits throws on fractional amounts) --- bridge_ui/src/components/Transfer/Redeem.tsx | 21 +------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/bridge_ui/src/components/Transfer/Redeem.tsx b/bridge_ui/src/components/Transfer/Redeem.tsx index 89e79b9d..7c830265 100644 --- a/bridge_ui/src/components/Transfer/Redeem.tsx +++ b/bridge_ui/src/components/Transfer/Redeem.tsx @@ -7,10 +7,8 @@ import { CHAIN_ID_POLYGON, CHAIN_ID_SOLANA, isEVMChain, - MAX_VAA_DECIMALS, WSOL_ADDRESS, } from "@certusone/wormhole-sdk"; -import { formatUnits } from "@ethersproject/units"; import { Checkbox, FormControlLabel, @@ -18,14 +16,12 @@ import { makeStyles, } from "@material-ui/core"; import { Alert } from "@material-ui/lab"; -import { useCallback, useMemo, useState } from "react"; +import { useCallback, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import useGetIsTransferCompleted from "../../hooks/useGetIsTransferCompleted"; import { useHandleRedeem } from "../../hooks/useHandleRedeem"; import useIsWalletReady from "../../hooks/useIsWalletReady"; -import useMetadata from "../../hooks/useMetadata"; import { - selectTransferAmount, selectTransferIsRecovery, selectTransferTargetAsset, selectTransferTargetChain, @@ -61,17 +57,11 @@ function Redeem() { const targetChain = useSelector(selectTransferTargetChain); const targetAsset = useSelector(selectTransferTargetAsset); const isRecovery = useSelector(selectTransferIsRecovery); - const transferAmount = useSelector(selectTransferAmount); const { isTransferCompletedLoading, isTransferCompleted } = useGetIsTransferCompleted(true); const classes = useStyles(); const dispatch = useDispatch(); const { isReady, statusMessage } = useIsWalletReady(targetChain); - const targetAssetArrayed = useMemo( - () => (targetAsset ? [targetAsset] : []), - [targetAsset] - ); - const metadata = useMetadata(targetChain, targetAssetArrayed); //TODO better check, probably involving a hook & the VAA const isEthNative = targetChain === CHAIN_ID_ETH && @@ -118,14 +108,6 @@ function Redeem() { }, [dispatch]); const howToAddTokensUrl = getHowToAddTokensToWalletUrl(targetChain); - const formattedTransferAmount = useMemo(() => { - const decimals = - (targetAsset && metadata.data?.get(targetAsset)?.decimals) || undefined; - return decimals - ? formatUnits(transferAmount, Math.min(decimals, MAX_VAA_DECIMALS)) - : undefined; - }, [targetAsset, metadata, transferAmount]); - return ( <> Receive the tokens on the target chain @@ -184,7 +166,6 @@ function Redeem() { chainId={targetChain} address={targetAsset || undefined} /> - {formattedTransferAmount ? {`Amount: ${formattedTransferAmount}`} : null} ) : null} {isEVMChain(targetChain) ? : null}