diff options
author | Dan Finlay <somniac@me.com> | 2016-07-07 09:01:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-07 09:01:22 +0800 |
commit | 525abb85d4848e2593f7ffaf4e462e067a64632f (patch) | |
tree | c8169ebbe1e2dba3158df1b104f82688a9681d11 /ui/app/components | |
parent | 9d54f10dc5bd42f9103ff6c9f2094d5af81b2342 (diff) | |
parent | 53eefc1efc65c138c8692bb069ae64e5eae9942b (diff) | |
download | tangerine-wallet-browser-525abb85d4848e2593f7ffaf4e462e067a64632f.tar.gz tangerine-wallet-browser-525abb85d4848e2593f7ffaf4e462e067a64632f.tar.zst tangerine-wallet-browser-525abb85d4848e2593f7ffaf4e462e067a64632f.zip |
Merge pull request #399 from MetaMask/ethBalance
Eth balance
Diffstat (limited to 'ui/app/components')
-rw-r--r-- | ui/app/components/eth-balance.js | 35 | ||||
-rw-r--r-- | ui/app/components/tooltip.js | 2 |
2 files changed, 21 insertions, 16 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index c7240ea21..510b620f3 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const formatBalance = require('../util').formatBalance +const Tooltip = require('./tooltip') module.exports = EthBalanceComponent @@ -30,28 +31,32 @@ EthBalanceComponent.prototype.render = function () { ) } EthBalanceComponent.prototype.renderBalance = function (value) { - if (value === 'None') return value - var balance = value.split(' ')[0] - var label = value.split(' ')[1] + var balance = value.formatted.split(' ')[0] + var label = value.formatted.split(' ')[1] return ( - h('.flex-column', { - style: { - alignItems: 'flex-end', - lineHeight: '13px', - fontFamily: 'Montserrat Thin', - textRendering: 'geometricPrecision', - }, + h(Tooltip, { + title: value.balance, + position: 'bottom', }, [ - h('div', balance), - h('div', { + h('.flex-column', { style: { - color: ' #AEAEAE', - fontSize: '12px', + alignItems: 'flex-end', + lineHeight: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', }, - }, label), + }, [ + h('div', balance), + h('div', { + style: { + color: ' #AEAEAE', + fontSize: '12px', + }, + }, label), + ]), ]) ) } diff --git a/ui/app/components/tooltip.js b/ui/app/components/tooltip.js index 4eab8611e..fb67c717e 100644 --- a/ui/app/components/tooltip.js +++ b/ui/app/components/tooltip.js @@ -14,7 +14,7 @@ Tooltip.prototype.render = function () { const props = this.props return h(ReactTooltip, { - position: 'left', + position: props.position ? props.position : 'left', title: props.title, fixed: false, }, props.children) |