diff options
author | Francesco Agosti <francesco.agosti93@gmail.com> | 2018-07-07 06:38:51 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-07 06:38:51 +0800 |
commit | 269b56b907f8af49e5d92bdcf3aedbc9af03e368 (patch) | |
tree | 8edcdaab384b8808f8f8520347e5cf6929f0c57e /packages/website/ts/components/wallet | |
parent | e929fb4337b227bae55b1b8456b5035f7df5eb4f (diff) | |
parent | 60ebfcf36df3d2e4f15142823fb5821d8d65937e (diff) | |
download | dexon-0x-contracts-269b56b907f8af49e5d92bdcf3aedbc9af03e368.tar.gz dexon-0x-contracts-269b56b907f8af49e5d92bdcf3aedbc9af03e368.tar.zst dexon-0x-contracts-269b56b907f8af49e5d92bdcf3aedbc9af03e368.zip |
Merge pull request #838 from 0xProject/feature/website/portal-final-touches
Some final polish touches for portal!
Diffstat (limited to 'packages/website/ts/components/wallet')
-rw-r--r-- | packages/website/ts/components/wallet/wallet.tsx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index 1c7dafca0..6c1c495d7 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -8,6 +8,7 @@ import firstBy = require('thenby'); import { Blockchain } from 'ts/blockchain'; import { AccountConnection } from 'ts/components/ui/account_connection'; +import { Balance } from 'ts/components/ui/balance'; import { Container } from 'ts/components/ui/container'; import { DropDown, DropdownMouseEvent } from 'ts/components/ui/drop_down'; import { IconButton } from 'ts/components/ui/icon_button'; @@ -269,7 +270,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> { position: 'relative', overflowY: this.state.isHoveringSidebar ? 'scroll' : 'hidden', marginRight: this.state.isHoveringSidebar ? 0 : 4, - // TODO: make this completely responsive + minHeight: '250px', maxHeight: !utils.isMobileWidth(this.props.screenWidth) ? 'calc(90vh - 300px)' : undefined, }; } @@ -436,12 +437,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> { </PlaceHolder> ); } else { - const result = utils.getFormattedAmount(amount, decimals, symbol); - return ( - <Text fontSize="16px" fontWeight="bold" lineHeight="1em"> - {result} - </Text> - ); + return <Balance amount={amount} decimals={decimals} symbol={symbol} />; } } private _renderValue( |