aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-04-15 12:27:46 +0800
committerkumavis <kumavis@users.noreply.github.com>2016-04-15 12:27:46 +0800
commit61590807318a66a5853e50d52f316881d04b1c65 (patch)
treefcefefc50d3bb7452e91e507b437805a48c9e929 /ui
parent2f8a5d1c3a1f472aecfaac959f07c7f013512d39 (diff)
parent907e39e5abc301fa54e144c5c151b79c3affb788 (diff)
downloadtangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.tar
tangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.tar.gz
tangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.tar.bz2
tangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.tar.lz
tangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.tar.xz
tangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.tar.zst
tangerine-wallet-browser-61590807318a66a5853e50d52f316881d04b1c65.zip
Merge pull request #111 from MetaMask/i53
inpage sync RPC
Diffstat (limited to 'ui')
-rw-r--r--ui/app/util.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/util.js b/ui/app/util.js
index 74e2c19aa..67b7c8f67 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -66,11 +66,11 @@ function weiToEth(bn) {
var decimalsToKeep = 4
function formatBalance(balance) {
- if (!balance) return 'None'
+ if (!balance || balance === '0x0') return 'None'
var wei = numericBalance(balance)
var padded = wei.toString(10)
var len = padded.length
- var nonZeroIndex = padded.match(/[^0]/).index
+ var nonZeroIndex = padded.match(/[^0]/) && padded.match(/[^0]/).index
var beforeDecimal = padded.substr(nonZeroIndex ? nonZeroIndex : 0, len - 18)
var afterDecimal = padded.substr(len - 18, decimalsToKeep)
return `${beforeDecimal}.${afterDecimal} ETH`