Merge branch 'AustP-master'

1 files changed, 7 insertions, 2 deletions

diff --git a/ui/app/util.js b/ui/app/util.js
index a08006077..84680fd06 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -96,7 +96,7 @@ function formatBalance (balance, decimalsToKeep) {
   var parsed = parseBalance(balance)
   var beforeDecimal = parsed[0]
   var afterDecimal = parsed[1]
-  var formatted = 'None'
+  var formatted
   if (decimalsToKeep === undefined) {
     if (beforeDecimal === '0') {
       if (afterDecimal !== '0') {
@@ -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)}`
   }