From dbc9008295f96b8917c5b66d8df2c2e2360c2814 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Wed, 13 Jul 2016 15:46:36 -0700
Subject: Fix eth balance tooltip to show 6 decimals (#440)

* Fix tooltip to show to the 6 decimal place on balances ovr 0...

* Change font size for balance component in tx-list so it fits the notation

* Add to change log

* Linting

* change log
---
 ui/app/util.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/ui/app/util.js b/ui/app/util.js
index c04612455..a08006077 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -122,7 +122,11 @@ function generateBalanceObject (formattedBalance, decimalsToKeep = 1) {
   var afterDecimal = balance.split('.')[1]
   var shortBalance = shortenBalance(balance, decimalsToKeep)
 
-  if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') { balance = '<1.0e-5' }
+  if (beforeDecimal === '0' && afterDecimal.substr(0, 5) === '00000') {
+    balance = '<1.0e-5'
+  } else if (beforeDecimal !== '0') {
+    balance = `${beforeDecimal}.${afterDecimal.slice(0, decimalsToKeep)}`
+  }
 
   return { balance, label, shortBalance }
 }
@@ -141,7 +145,7 @@ function shortenBalance (balance, decimalsToKeep = 1) {
     truncatedValue = (convertedBalance * Math.pow(10, exponent)).toFixed(decimalsToKeep)
     return `<${truncatedValue}e-${exponent}`
   } else {
-    return balance
+    return convertedBalance.toFixed(decimalsToKeep)
   }
 }
 
-- 
cgit v1.2.3