2 files changed, 28 insertions, 40 deletions
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 288a0fcaf..113e698ad 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -2,7 +2,6 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const formatBalance = require('../util').formatBalance
-const Tooltip = require('./tooltip')
 
 module.exports = EthBalanceComponent
 
@@ -32,32 +31,28 @@ EthBalanceComponent.prototype.render = function () {
   )
 }
 EthBalanceComponent.prototype.renderBalance = function (value) {
+
   if (value === 'None') return value
 
-  var balance = value.formatted.split(' ')[0]
-  var label = value.formatted.split(' ')[1]
+  var balance = value.split(' ')[0]
+  var label = value.split(' ')[1]
 
   return (
-    h(Tooltip, {
-      title: value.balance,
-      position: 'bottom',
+    h('.flex-column', {
+      style: {
+        alignItems: 'flex-end',
+        lineHeight: '13px',
+        fontFamily: 'Montserrat Thin',
+        textRendering: 'geometricPrecision',
+      },
     }, [
-      h('.flex-column', {
+      h('div', balance),
+      h('div', {
         style: {
-          alignItems: 'flex-end',
-          lineHeight: '13px',
-          fontFamily: 'Montserrat Light',
-          textRendering: 'geometricPrecision',
+          color: ' #AEAEAE',
+          fontSize: '12px',
         },
-      }, [
-        h('div', balance),
-        h('div', {
-          style: {
-            color: ' #AEAEAE',
-            fontSize: '12px',
-          },
-        }, label),
-      ]),
+      }, label),
     ])
   )
 }
diff --git a/ui/app/util.js b/ui/app/util.js
index 0a243387a..89853d746 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -110,29 +110,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) {