Commit 241043b6 authored by lynn's avatar lynn Committed by GitHub

fix: remove number from name in balances (#4711)

remove number
parent e97e1172
...@@ -47,17 +47,17 @@ const TotalBalanceItem = styled.div` ...@@ -47,17 +47,17 @@ const TotalBalanceItem = styled.div`
export default function BalanceSummary({ export default function BalanceSummary({
address, address,
balanceNumber, balance,
balanceUsdNumber, balanceUsd,
}: { }: {
address: string address: string
balanceNumber?: number balance?: number
balanceUsdNumber?: number balanceUsd?: number
}) { }) {
const token = useToken(address) const token = useToken(address)
const { loading, error } = useNetworkTokenBalances({ address }) const { loading, error } = useNetworkTokenBalances({ address })
if (loading || (!error && !balanceNumber && !balanceUsdNumber)) return null if (loading || (!error && !balance && !balanceUsd)) return null
return ( return (
<BalancesCard> <BalancesCard>
{error ? ( {error ? (
...@@ -72,8 +72,8 @@ export default function BalanceSummary({ ...@@ -72,8 +72,8 @@ export default function BalanceSummary({
<TotalBalanceSection> <TotalBalanceSection>
Your balance Your balance
<TotalBalance> <TotalBalance>
<TotalBalanceItem>{`${balanceNumber} ${token?.symbol}`}</TotalBalanceItem> <TotalBalanceItem>{`${balance} ${token?.symbol}`}</TotalBalanceItem>
<TotalBalanceItem>{`$${balanceUsdNumber}`}</TotalBalanceItem> <TotalBalanceItem>{`$${balanceUsd}`}</TotalBalanceItem>
</TotalBalance> </TotalBalance>
</TotalBalanceSection> </TotalBalanceSection>
</> </>
......
...@@ -132,13 +132,13 @@ const ErrorText = styled.span` ...@@ -132,13 +132,13 @@ const ErrorText = styled.span`
export default function FooterBalanceSummary({ export default function FooterBalanceSummary({
address, address,
networkBalances, networkBalances,
balanceNumber, balance,
balanceUsdNumber, balanceUsd,
}: { }: {
address: string address: string
networkBalances: (JSX.Element | null)[] | null networkBalances: (JSX.Element | null)[] | null
balanceNumber?: number balance?: number
balanceUsdNumber?: number balanceUsd?: number
}) { }) {
const tokenSymbol = useToken(address)?.symbol const tokenSymbol = useToken(address)?.symbol
const [showMultipleBalances, setShowMultipleBalances] = useState(false) const [showMultipleBalances, setShowMultipleBalances] = useState(false)
...@@ -161,15 +161,15 @@ export default function FooterBalanceSummary({ ...@@ -161,15 +161,15 @@ export default function FooterBalanceSummary({
</ErrorText> </ErrorText>
</ErrorState> </ErrorState>
) : ( ) : (
!!balanceNumber && !!balance &&
!!balanceUsdNumber && ( !!balanceUsd && (
<BalanceInfo> <BalanceInfo>
{multipleBalances ? 'Balance on all networks' : `Your balance on ${networkNameIfOneBalance}`} {multipleBalances ? 'Balance on all networks' : `Your balance on ${networkNameIfOneBalance}`}
<BalanceTotal> <BalanceTotal>
<BalanceValue> <BalanceValue>
{balanceNumber} {tokenSymbol} {balance} {tokenSymbol}
</BalanceValue> </BalanceValue>
<FiatValue>{`$${balanceUsdNumber}`}</FiatValue> <FiatValue>{`$${balanceUsd}`}</FiatValue>
</BalanceTotal> </BalanceTotal>
{multipleBalances && ( {multipleBalances && (
<ViewAll onClick={() => setShowMultipleBalances(!showMultipleBalances)}> <ViewAll onClick={() => setShowMultipleBalances(!showMultipleBalances)}>
......
...@@ -117,10 +117,10 @@ export default function TokenDetails() { ...@@ -117,10 +117,10 @@ export default function TokenDetails() {
const { data: networkData } = NetworkBalances(token?.address) const { data: networkData } = NetworkBalances(token?.address)
const { chainId: connectedChainId, account } = useWeb3React() const { chainId: connectedChainId, account } = useWeb3React()
const balance = useTokenBalance(account, token ?? undefined) const balanceValue = useTokenBalance(account, token ?? undefined)
const balanceNumber = balance ? formatToDecimal(balance, Math.min(balance.currency.decimals, 6)) : undefined const balance = balanceValue ? formatToDecimal(balanceValue, Math.min(balanceValue.currency.decimals, 6)) : undefined
const balanceUsd = useStablecoinValue(balance)?.toFixed(2) const balanceUsdValue = useStablecoinValue(balanceValue)?.toFixed(2)
const balanceUsdNumber = balanceUsd ? parseFloat(balanceUsd) : undefined const balanceUsd = balanceUsdValue ? parseFloat(balanceUsdValue) : undefined
const chainsToList = useMemo(() => { const chainsToList = useMemo(() => {
let chainIds = [...L1_CHAIN_IDS, ...L2_CHAIN_IDS] let chainIds = [...L1_CHAIN_IDS, ...L2_CHAIN_IDS]
...@@ -192,14 +192,14 @@ export default function TokenDetails() { ...@@ -192,14 +192,14 @@ export default function TokenDetails() {
<RightPanel> <RightPanel>
<Widget defaultToken={token ?? undefined} onReviewSwapClick={onReviewSwap} /> <Widget defaultToken={token ?? undefined} onReviewSwapClick={onReviewSwap} />
{tokenWarning && <TokenSafetyMessage tokenAddress={token.address} warning={tokenWarning} />} {tokenWarning && <TokenSafetyMessage tokenAddress={token.address} warning={tokenWarning} />}
<BalanceSummary address={token.address} balanceNumber={balanceNumber} balanceUsdNumber={balanceUsdNumber} /> <BalanceSummary address={token.address} balance={balance} balanceUsd={balanceUsd} />
</RightPanel> </RightPanel>
<Footer> <Footer>
<FooterBalanceSummary <FooterBalanceSummary
address={token.address} address={token.address}
networkBalances={balancesByNetwork} networkBalances={balancesByNetwork}
balanceNumber={balanceNumber} balance={balance}
balanceUsdNumber={balanceUsdNumber} balanceUsd={balanceUsd}
/> />
</Footer> </Footer>
<TokenSafetyModal <TokenSafetyModal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment