From 2cc44df584daae2b03ef44f5a025f9192f4f00c6 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 7 Jul 2016 11:20:02 -0700
Subject: Revert back to original formatBalance

---
 ui/app/util.js | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to 'ui/app/util.js')

diff --git a/ui/app/util.js b/ui/app/util.js
index a09c180a1..db12a1282 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -99,29 +99,22 @@ function formatBalance (balance, decimalsToKeep) {
   var parsed = parseBalance(balance)
   var beforeDecimal = parsed[0]
   var afterDecimal = parsed[1]
-  var formatted, formattedBalance
-
-  if (beforeDecimal === '0') {
-    if (afterDecimal !== '0') {
-      var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits
-      if (sigFigs) { afterDecimal = sigFigs[0] }
-      formattedBalance = afterDecimal.substr(0, 5) === '00000' ? '<0.00001' : `0.${afterDecimal.slice(0, 6)}`
+  var formatted = 'None'
+  if (decimalsToKeep === undefined) {
+    if (beforeDecimal === '0') {
+      if (afterDecimal !== '0') {
+        var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits
+        if (sigFigs) { afterDecimal = sigFigs[0] }
+        formatted = '0.' + afterDecimal + ' ETH'
+      }
+    } else {
+      formatted = beforeDecimal + '.' + afterDecimal.slice(0, 3) + ' ETH'
     }
   } else {
-    formattedBalance = `${beforeDecimal}.${afterDecimal.slice(0, 2)}`
-  }
-  if (decimalsToKeep) {
-    formattedBalance = `${beforeDecimal}.${afterDecimal.slice(0, decimalsToKeep)}`
-  }
-
-  formatted = `${formattedBalance} ETH`
-
-  if (formattedBalance === '0.0' || formattedBalance === undefined) {
-    formatted = 'None'
-    formattedBalance = 'None'
+    afterDecimal += Array(decimalsToKeep).join('0')
+    formatted = beforeDecimal + '.' + afterDecimal.slice(0, decimalsToKeep) + ' ETH'
   }
-
-  return {formattedBalance, balance: parsed.join('.'), formatted}
+  return formatted
 }
 
 function dataSize (data) {
-- 
cgit