crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #669 from 0xProject/bug/website/fix-balance-rendering

Browse Source 
Update balance amount rendering logic
This commit is contained in:
Brandon Millman
2018-06-06 11:44:06 -07:00
committed by GitHub
parent b1e8545981 d75fec0cee
commit da3f783a9f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/website/ts/components/wallet/wallet.tsx
View File

@@ -135,7 +135,7 @@ const styles: Styles = {
const ETHER_ICON_PATH = '/images/ether.png'; const ETHER_ICON_PATH = '/images/ether.png';
const ICON_DIMENSION = 28; const ICON_DIMENSION = 28;
const TOKEN_AMOUNT_DISPLAY_PRECISION = 3; const TOKEN_AMOUNT_DISPLAY_PRECISION = 5;
const BODY_ITEM_KEY = 'BODY'; const BODY_ITEM_KEY = 'BODY';
const HEADER_ITEM_KEY = 'HEADER'; const HEADER_ITEM_KEY = 'HEADER';
const FOOTER_ITEM_KEY = 'FOOTER'; const FOOTER_ITEM_KEY = 'FOOTER';
@@ -448,14 +448,19 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
symbol: string, symbol: string,
isLoading: boolean = false, isLoading: boolean = false,
): React.ReactNode { ): React.ReactNode {
const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals); if (isLoading) {
const formattedAmount = unitAmount.toPrecision(TOKEN_AMOUNT_DISPLAY_PRECISION); return (
const result = `${formattedAmount} ${symbol}`; <PlaceHolder hideChildren={isLoading}>
return ( <div style={styles.amountLabel}>0.00 XXX</div>
<PlaceHolder hideChildren={isLoading}> </PlaceHolder>
<div style={styles.amountLabel}>{result}</div> );
</PlaceHolder> } else {
); const unitAmount = Web3Wrapper.toUnitAmount(amount, decimals);
const precision = Math.min(TOKEN_AMOUNT_DISPLAY_PRECISION, unitAmount.decimalPlaces());
const formattedAmount = unitAmount.toFixed(precision);
const result = `${formattedAmount} ${symbol}`;
return <div style={styles.amountLabel}>{result}</div>;
}
} }
private _renderValue( private _renderValue(
amount: BigNumber, amount: BigNumber,