1 files changed, 15 insertions, 5 deletions
diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 4e0d69ed7..16019c88a 100644
--- a/ui/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
@@ -15,19 +15,21 @@ function AccountListItem () {
 }
 
 AccountListItem.prototype.render = function () {
-  const identity = this.props.identity
-  var isSelected = this.props.selectedAddress === identity.address
-  var account = this.props.accounts[identity.address]
+  const { identity, selectedAccount, accounts, onShowDetail } = this.props
+
+  const isSelected = selectedAccount === identity.address
+  const account = accounts[identity.address]
   const selectedClass = isSelected ? '.selected' : ''
 
   return (
     h(`.accounts-list-option.flex-row.flex-space-between.pointer.hover-white${selectedClass}`, {
       key: `account-panel-${identity.address}`,
-      onClick: (event) => this.props.onShowDetail(identity.address, event),
+      onClick: (event) => onShowDetail(identity.address, event),
     }, [
 
       h('.identicon-wrapper.flex-column.flex-center.select-none', [
         this.pendingOrNot(),
+        this.indicateIfLoose(),
         h(Identicon, {
           address: identity.address,
           imageify: true,
@@ -48,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',
@@ -70,6 +72,14 @@ AccountListItem.prototype.render = function () {
   )
 }
 
+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('.keyring-label', 'LOOSE') : null
+  } catch (e) { return }
+}
+
 AccountListItem.prototype.pendingOrNot = function () {
   const pending = this.props.pending
   if (pending.length === 0) return null