diff options
author | Brandon Millman <brandon@0xproject.com> | 2018-07-03 09:25:58 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-03 09:25:58 +0800 |
commit | 81062d20ebd88cea7980fa06606f07c56e453f2f (patch) | |
tree | f5abd09b8e941e285604ef43e51b01029a99d406 /packages/website/ts/components/wallet | |
parent | 835d06dcdcdfd70414754608466cad3c41feaa9e (diff) | |
parent | bc7e8ff471d7abe8e65b30d1945f6a989d521f10 (diff) | |
download | dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.tar dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.tar.gz dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.tar.bz2 dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.tar.lz dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.tar.xz dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.tar.zst dexon-0x-contracts-81062d20ebd88cea7980fa06606f07c56e453f2f.zip |
Merge pull request #808 from 0xProject/feature/website/better-balance-formatting
Add better balance formatting rules for balances and usd values
Diffstat (limited to 'packages/website/ts/components/wallet')
-rw-r--r-- | packages/website/ts/components/wallet/wallet.tsx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index a75404637..6c8b398c4 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -1,6 +1,5 @@ import { constants as sharedConstants, EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared'; import { BigNumber, errorUtils } from '@0xproject/utils'; -import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import ActionAccountBalanceWallet from 'material-ui/svg-icons/action/account-balance-wallet'; @@ -83,7 +82,6 @@ const ICON_DIMENSION = 28; const BODY_ITEM_KEY = 'BODY'; const HEADER_ITEM_KEY = 'HEADER'; const ETHER_ITEM_KEY = 'ETHER'; -const USD_DECIMAL_PLACES = 2; const NO_ALLOWANCE_TOGGLE_SPACE_WIDTH = 56; const ACCOUNT_PATH = `${WebsitePaths.Portal}/account`; const PLACEHOLDER_COLOR = colors.grey300; @@ -412,19 +410,11 @@ export class Wallet extends React.Component<WalletProps, WalletState> { price?: BigNumber, isLoading: boolean = false, ): React.ReactNode { - let result; - if (!isLoading) { - if (_.isUndefined(price)) { - result = '--'; - } else { - const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals); - const value = unitAmount.mul(price); - const formattedAmount = value.toFixed(USD_DECIMAL_PLACES); - result = `$${formattedAmount}`; - } - } else { - result = '$0.00'; - } + const result = !isLoading + ? _.isUndefined(price) + ? '--' + : utils.getUsdValueFormattedAmount(amount, decimals, price) + : '$0.00'; return ( <PlaceHolder hideChildren={isLoading} fillColor={PLACEHOLDER_COLOR}> <Text fontSize="14px" fontColor={colors.darkGrey} lineHeight="1em"> |