added a failing case and fixed it by refactoring everything to strings

1 files changed, 8 insertions, 10 deletions

diff --git a/ui/app/util.js b/ui/app/util.js
index 6ece28a9e..56a16a4cd 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -85,22 +85,20 @@ function weiToEth(bn) {
 
 // Takes  hex, returns [beforeDecimal, afterDecimal]
 function parseBalance(balance) {
-  if (!balance || balance === '0x0') return ['0', '0']
-  var wei = numericBalance(balance).toString(10)
-  var eth = String(wei/valueTable['wei'])
-  var beforeDecimal = String(Math.floor(eth))
-  var afterDecimal
-  if(eth.indexOf('.') > -1){
-    afterDecimal = eth.slice(eth.indexOf('.') + 1)
-  }else{
-    afterDecimal = '0'
-  }
+  let beforeDecimal, afterDecimal
+  let wei = numericBalance(balance).toString()
+  let trailingZeros = /0+$/
+
+  beforeDecimal = wei.length > 18 ?  wei.slice(0, wei.length - 18) : '0'
+  afterDecimal = ("000000000000000000" + wei).slice(-18).replace(trailingZeros, "")
+  if(afterDecimal == ""){afterDecimal = "0" }
   return [beforeDecimal, afterDecimal]
 }
 
 // Takes wei hex, returns "None" or "${formattedAmount} ETH"
 function formatBalance(balance, decimalsToKeep) {
   var parsed = parseBalance(balance)
+  console.log(parsed)
   var beforeDecimal = parsed[0]
   var afterDecimal = parsed[1]
   var formatted = "None"