aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-07-08 02:38:11 +0800
committerDan Finlay <dan@danfinlay.com>2016-07-08 02:38:11 +0800
commita02f43fb7f480e786bce7a430e8bcb24ef0fb35b (patch)
tree6fe6aa5ff3752b03fb1f0f23b7717f026b38911e /ui
parentec7dfe9f11d06295f7b4f58b6d1aec4c81c0ac37 (diff)
parentbbc7d222d88dd1c0cfe2b534e84592f114670866 (diff)
downloadtangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.gz
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.bz2
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.lz
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.xz
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.tar.zst
tangerine-wallet-browser-a02f43fb7f480e786bce7a430e8bcb24ef0fb35b.zip
Merge branch 'master' into ConfirmationStyle
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/eth-balance.js35
-rw-r--r--ui/app/util.js33
2 files changed, 28 insertions, 40 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 288a0fcaf..113e698ad 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -2,7 +2,6 @@ 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
@@ -32,32 +31,28 @@ EthBalanceComponent.prototype.render = function () {
)
}
EthBalanceComponent.prototype.renderBalance = function (value) {
+
if (value === 'None') return value
- var balance = value.formatted.split(' ')[0]
- var label = value.formatted.split(' ')[1]
+ var balance = value.split(' ')[0]
+ var label = value.split(' ')[1]
return (
- h(Tooltip, {
- title: value.balance,
- position: 'bottom',
+ h('.flex-column', {
+ style: {
+ alignItems: 'flex-end',
+ lineHeight: '13px',
+ fontFamily: 'Montserrat Thin',
+ textRendering: 'geometricPrecision',
+ },
}, [
- h('.flex-column', {
+ h('div', balance),
+ h('div', {
style: {
- alignItems: 'flex-end',
- lineHeight: '13px',
- fontFamily: 'Montserrat Light',
- textRendering: 'geometricPrecision',
+ color: ' #AEAEAE',
+ fontSize: '12px',
},
- }, [
- h('div', balance),
- h('div', {
- style: {
- color: ' #AEAEAE',
- fontSize: '12px',
- },
- }, label),
- ]),
+ }, label),
])
)
}
diff --git a/ui/app/util.js b/ui/app/util.js
index 0a243387a..89853d746 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -110,29 +110,22 @@ function formatBalance (balance, decimalsToKeep) {
var parsed = parseBalance(balance)
var beforeDecimal = parsed[0]
var afterDecimal = parsed[1]
- var formatted, formattedBalance
-
- if (beforeDecimal === '0') {
- if (afterDecimal !== '0') {
- var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits
- if (sigFigs) { afterDecimal = sigFigs[0] }
- formattedBalance = afterDecimal.substr(0, 5) === '00000' ? '<0.00001' : `0.${afterDecimal.slice(0, 6)}`
+ var formatted = 'None'
+ if (decimalsToKeep === undefined) {
+ if (beforeDecimal === '0') {
+ if (afterDecimal !== '0') {
+ var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits
+ if (sigFigs) { afterDecimal = sigFigs[0] }
+ formatted = '0.' + afterDecimal + ' ETH'
+ }
+ } else {
+ formatted = beforeDecimal + '.' + afterDecimal.slice(0, 3) + ' ETH'
}
} else {
- formattedBalance = `${beforeDecimal}.${afterDecimal.slice(0, 2)}`
- }
- if (decimalsToKeep) {
- formattedBalance = `${beforeDecimal}.${afterDecimal.slice(0, decimalsToKeep)}`
- }
-
- formatted = `${formattedBalance} ETH`
-
- if (formattedBalance === '0.0' || formattedBalance === undefined) {
- formatted = 'None'
- formattedBalance = 'None'
+ afterDecimal += Array(decimalsToKeep).join('0')
+ formatted = beforeDecimal + '.' + afterDecimal.slice(0, decimalsToKeep) + ' ETH'
}
-
- return {formattedBalance, balance: parsed.join('.'), formatted}
+ return formatted
}
function dataSize (data) {