diff options
author | Dan Finlay <somniac@me.com> | 2016-07-08 02:35:53 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-08 02:35:53 +0800 |
commit | bbc7d222d88dd1c0cfe2b534e84592f114670866 (patch) | |
tree | 9b1ff36352eefdc644b1f683d09810ed6f1e3fc5 /ui/app/util.js | |
parent | 768b049696b762ac161090286c22609c7c4d5725 (diff) | |
parent | 2cc44df584daae2b03ef44f5a025f9192f4f00c6 (diff) | |
download | tangerine-wallet-browser-bbc7d222d88dd1c0cfe2b534e84592f114670866.tar.gz tangerine-wallet-browser-bbc7d222d88dd1c0cfe2b534e84592f114670866.tar.zst tangerine-wallet-browser-bbc7d222d88dd1c0cfe2b534e84592f114670866.zip |
Merge pull request #410 from MetaMask/cleanupEthbug
Revert back to original formatBalance
Diffstat (limited to 'ui/app/util.js')
-rw-r--r-- | ui/app/util.js | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/ui/app/util.js b/ui/app/util.js index a09c180a1..db12a1282 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -99,29 +99,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) { |