aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-07-08 03:42:31 +0800
committerGitHub <noreply@github.com>2016-07-08 03:42:31 +0800
commit5a99d2a77c9029ecbf78d6859db30bcfec0f2eca (patch)
treeeb06881f49eafa8fe04dc718bd9759f68532664d
parentbbc7d222d88dd1c0cfe2b534e84592f114670866 (diff)
parentcd8ae4b5ff5405e4129df897559cc35066492ea7 (diff)
downloadtangerine-wallet-browser-5a99d2a77c9029ecbf78d6859db30bcfec0f2eca.tar.gz
tangerine-wallet-browser-5a99d2a77c9029ecbf78d6859db30bcfec0f2eca.tar.zst
tangerine-wallet-browser-5a99d2a77c9029ecbf78d6859db30bcfec0f2eca.zip
Merge pull request #412 from MetaMask/ethBalance
Add method to deal with small decimals
-rw-r--r--ui/app/components/eth-balance.js39
-rw-r--r--ui/app/util.js12
2 files changed, 34 insertions, 17 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index c7240ea21..e31b3ed97 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -2,7 +2,8 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const formatBalance = require('../util').formatBalance
-
+const generateBalanceObject = require('../util').generateBalanceObject
+const Tooltip = require('./tooltip.js')
module.exports = EthBalanceComponent
inherits(EthBalanceComponent, Component)
@@ -14,7 +15,6 @@ EthBalanceComponent.prototype.render = function () {
var state = this.props
var style = state.style
var value = formatBalance(state.value)
-
return (
h('.ether-balance', {
@@ -30,28 +30,33 @@ EthBalanceComponent.prototype.render = function () {
)
}
EthBalanceComponent.prototype.renderBalance = function (value) {
-
if (value === 'None') return value
+ var balanceObj = generateBalanceObject(value)
- var balance = value.split(' ')[0]
- var label = value.split(' ')[1]
+ var balance = balanceObj.balance
+ var label = balanceObj.label
return (
- h('.flex-column', {
- style: {
- alignItems: 'flex-end',
- lineHeight: '13px',
- fontFamily: 'Montserrat Thin',
- textRendering: 'geometricPrecision',
- },
+ h(Tooltip, {
+ position: 'bottom',
+ title: value.split(' ')[0],
}, [
- 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/util.js b/ui/app/util.js
index db12a1282..befb2aad8 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -26,6 +26,7 @@ module.exports = {
numericBalance: numericBalance,
parseBalance: parseBalance,
formatBalance: formatBalance,
+ generateBalanceObject: generateBalanceObject,
dataSize: dataSize,
readableDate: readableDate,
ethToWei: ethToWei,
@@ -117,6 +118,17 @@ function formatBalance (balance, decimalsToKeep) {
return formatted
}
+function generateBalanceObject (formattedBalance) {
+ var balance = formattedBalance.split(' ')[0]
+ var label = formattedBalance.split(' ')[1]
+ var beforeDecimal = balance.split('.')[0]
+ var afterDecimal = balance.split('.')[1]
+
+ if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') { balance = '< 0.00001' }
+
+ return { balance, label }
+}
+
function dataSize (data) {
var size = data ? ethUtil.stripHexPrefix(data).length : 0
return size + ' bytes'