From 8527d051b0a02bbf9d5f26f10299daf10d647019 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 14 Apr 2016 13:20:19 -0700
Subject: [PATCH] Fix eth resolution

utils.formatBalance was returning rounded ether, was not useful for displaying account balances.

Now returns four decimal points, and is easily configurable for more, with passing tests.

Spoiler alert:  Don't you dare divide bignumber wei. Bignumber does not have decimals. Keep it as wei, format it as ether.
---
 ui/app/util.js            |  9 +++++++--
 ui/test/unit/util_test.js | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ui/app/util.js b/ui/app/util.js
index 4c31e54f4..74e2c19aa 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -64,11 +64,16 @@ function weiToEth(bn) {
   return eth
 }
 
+var decimalsToKeep = 4
 function formatBalance(balance) {
   if (!balance) return 'None'
   var wei = numericBalance(balance)
-  var eth = weiToEth(wei)
-  return eth.toString(10) + ' ETH'
+  var padded = wei.toString(10)
+  var len = padded.length
+  var nonZeroIndex = padded.match(/[^0]/).index
+  var beforeDecimal = padded.substr(nonZeroIndex ? nonZeroIndex : 0, len - 18)
+  var afterDecimal = padded.substr(len - 18, decimalsToKeep)
+  return `${beforeDecimal}.${afterDecimal} ETH`
 }
 
 function dataSize(data) {
diff --git a/ui/test/unit/util_test.js b/ui/test/unit/util_test.js
index 52635eb89..7e34bba1c 100644
--- a/ui/test/unit/util_test.js
+++ b/ui/test/unit/util_test.js
@@ -63,9 +63,21 @@ describe('util', function() {
     })
 
     it('should return eth as string followed by ETH', function() {
-      var input = new ethUtil.BN(ethInWei).toJSON()
+      var input = new ethUtil.BN(ethInWei, 10).toJSON()
       var result = util.formatBalance(input)
-      assert.equal(result, '1 ETH')
+      assert.equal(result, '1.0000 ETH')
+    })
+
+    it('should return eth as string followed by ETH', function() {
+      var input = new ethUtil.BN(ethInWei, 10).div(new ethUtil.BN('2', 10)).toJSON()
+      var result = util.formatBalance(input)
+      assert.equal(result, '.5000 ETH')
+    })
+
+    it('should display four decimal points', function() {
+      var input = "0x128dfa6a90b28000"
+      var result = util.formatBalance(input)
+      assert.equal(result, '1.3370 ETH')
     })
 
   })