aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2016-07-14 06:46:36 +0800
committerDan Finlay <somniac@me.com>2016-07-14 06:46:36 +0800
commitdbc9008295f96b8917c5b66d8df2c2e2360c2814 (patch)
treee3d5ef6010156bbee1e9d93ce1fe8206e527916f /ui
parent7b9b22e8a082bf78061030d176327914a4ad54de (diff)
downloadtangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.tar
tangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.tar.gz
tangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.tar.bz2
tangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.tar.lz
tangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.tar.xz
tangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.tar.zst
tangerine-wallet-browser-dbc9008295f96b8917c5b66d8df2c2e2360c2814.zip
Fix eth balance tooltip to show 6 decimals (#440)
* Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/eth-balance.js4
-rw-r--r--ui/app/components/transaction-list-item.js1
-rw-r--r--ui/app/util.js8
3 files changed, 9 insertions, 4 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 5f99a3e48..612ef7779 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -15,7 +15,7 @@ EthBalanceComponent.prototype.render = function () {
var state = this.props
var style = state.style
- const value = formatBalance(state.value)
+ const value = formatBalance(state.value, 6)
var width = state.width
return (
@@ -35,7 +35,7 @@ EthBalanceComponent.prototype.render = function () {
}
EthBalanceComponent.prototype.renderBalance = function (value, state) {
if (value === 'None') return value
- var balanceObj = generateBalanceObject(value, 1)
+ var balanceObj = generateBalanceObject(value, state.shorten ? 1 : 3)
var balance
if (state.shorten) {
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 2314c7107..78867fca4 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -75,6 +75,7 @@ TransactionListItem.prototype.render = function () {
value: txParams.value,
width: '55px',
shorten: true,
+ style: {fontSize: '15px'},
}) : h('.flex-column'),
])
)
diff --git a/ui/app/util.js b/ui/app/util.js
index c04612455..a08006077 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -122,7 +122,11 @@ function generateBalanceObject (formattedBalance, decimalsToKeep = 1) {
var afterDecimal = balance.split('.')[1]
var shortBalance = shortenBalance(balance, decimalsToKeep)
- if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') { balance = '<1.0e-5' }
+ if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') {
+ balance = '<1.0e-5'
+ } else if (beforeDecimal !== '0') {
+ balance = `${beforeDecimal}.${afterDecimal.slice(0, decimalsToKeep)}`
+ }
return { balance, label, shortBalance }
}
@@ -141,7 +145,7 @@ function shortenBalance (balance, decimalsToKeep = 1) {
truncatedValue = (convertedBalance * Math.pow(10, exponent)).toFixed(decimalsToKeep)
return `<${truncatedValue}e-${exponent}`
} else {
- return balance
+ return convertedBalance.toFixed(decimalsToKeep)
}
}