Ignore meta.deleted for account name display

openethereum · Dec 7, 2016 · 5bdb6e4 · 5bdb6e4
1 parent f758610
commit 5bdb6e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/js/src/redux/providers/personalActions.js b/js/src/redux/providers/personalActions.js
@@ -27,18 +27,17 @@ export function personalAccountsInfo (accountsInfo) {
 
   Object.keys(accountsInfo || {})
     .map((address) => Object.assign({}, accountsInfo[address], { address }))
+    .filter((account) => account.uuid || !account.meta.deleted)
     .forEach((account) => {
       if (account.uuid) {
         accounts[account.address] = account;
-      } else if (!account.meta.deleted) {
-        if (account.meta.wallet) {
-          account.wallet = true;
-          wallets[account.address] = account;
-        } else if (account.meta.contract) {
-          contracts[account.address] = account;
-        } else {
-          contacts[account.address] = account;
-        }
+      } else if (account.meta.wallet) {
+        account.wallet = true;
+        wallets[account.address] = account;
+      } else if (account.meta.contract) {
+        contracts[account.address] = account;
+      } else {
+        contacts[account.address] = account;
       }
     });
 

diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
@@ -37,7 +37,7 @@ class IdentityName extends Component {
   render () {
     const { address, accountsInfo, tokens, empty, name, shorten, unknown, className } = this.props;
     const account = accountsInfo[address] || tokens[address];
-    const hasAccount = account && (!account.meta || !account.meta.deleted);
+    const hasAccount = account && (account.uuid || !account.meta || !account.meta.deleted);
 
     if (!hasAccount && empty) {
       return null;