Merge branch 'master' of https://github.com/AustP/metamask-plugin into AustP-master

2016-07-18 11:32:29 -07:00 · 2016-07-18 11:32:29 -07:00 · 41aad32b19
parent 046ca5787b c1859a24ee
commit 41aad32b19
1 changed files with 6 additions and 1 deletions
--- a/ui/app/util.js
+++ b/ui/app/util.js
@ -123,7 +123,12 @@ function generateBalanceObject (formattedBalance, decimalsToKeep = 1) {
  var shortBalance = shortenBalance(balance, decimalsToKeep)

  if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') {
-    balance = '<1.0e-5'
+    // eslint-disable-next-line eqeqeq
+    if (afterDecimal == 0) {
+      balance = '0'
+    } else {
+      balance = '<1.0e-5'
+    }
  } else if (beforeDecimal !== '0') {
    balance = `${beforeDecimal}.${afterDecimal.slice(0, decimalsToKeep)}`
  }