Fix rendering of loose accounts

2 files changed, 5 insertions, 3 deletions

diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 624e34581..16019c88a 100644
--- a/ui/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
@@ -50,7 +50,7 @@ AccountListItem.prototype.render = function () {
           },
         }, ethUtil.toChecksumAddress(identity.address)),
         h(EthBalance, {
-          value: account.balance,
+          value: account && account.balance,
           style: {
             lineHeight: '7px',
             marginTop: '10px',
@@ -76,7 +76,7 @@ AccountListItem.prototype.indicateIfLoose = function () {
   try { // Sometimes keyrings aren't loaded yet:
     const type = this.props.keyring.type
     const isLoose = type !== 'HD Key Tree'
-    return isLoose ? h('.pending-dot', 'LOOSE') : null
+    return isLoose ? h('.keyring-label', 'LOOSE') : null
   } catch (e) { return }
 }
 
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 46127bed5..57ca84564 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -15,9 +15,10 @@ function EthBalanceComponent () {
 
 EthBalanceComponent.prototype.render = function () {
   var props = this.props
+  let { value } = props
   var style = props.style
   var needsParse = this.props.needsParse !== undefined ? this.props.needsParse : true
-  const value = formatBalance(props.value, 6, needsParse)
+  value = value ? formatBalance(value, 6, needsParse) : '...'
   var width = props.width
 
   return (
@@ -38,6 +39,7 @@ EthBalanceComponent.prototype.render = function () {
 EthBalanceComponent.prototype.renderBalance = function (value) {
   var props = this.props
   if (value === 'None') return value
+  if (value === '...') return value
   var balanceObj = generateBalanceObject(value, props.shorten ? 1 : 3)
   var balance
   var splitBalance = value.split(' ')