registry accounts selector works

openethereum · Oct 25, 2016 · 8a0cd0e · 8a0cd0e
1 parent 755dd06
commit 8a0cd0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/js/src/dapps/registry/addresses/actions.js b/js/src/dapps/registry/addresses/actions.js
@@ -25,13 +25,9 @@ export const fetch = () => (dispatch) => {
       null // api.personal.accountsInfo()
     ])
     .then(([ accounts, data ]) => {
-      data = data || {};
-      const addresses = Object.keys(data)
-        .filter((address) => data[address] && !data[address].meta.deleted)
-        .map((address) => ({
-          ...data[address], address,
-          isAccount: accounts.includes(address)
-        }));
+      const addresses = accounts.map((address) => {
+        return { address, isAccount: true };
+      });
       dispatch(set(addresses));
     })
     .catch((error) => {

diff --git a/js/src/dapps/registry/ui/address.js b/js/src/dapps/registry/ui/address.js
@@ -32,9 +32,9 @@ const align = {
 export default (address, accounts, contacts, shortenHash = true) => {
   let caption;
   if (accounts[address]) {
-    caption = (<abbr title={ address } style={ align }>{ accounts[address].name }</abbr>);
+    caption = (<abbr title={ address } style={ align }>{ accounts[address].name || address }</abbr>);
   } else if (contacts[address]) {
-    caption = (<abbr title={ address } style={ align }>{ contacts[address].name }</abbr>);
+    caption = (<abbr title={ address } style={ align }>{ contacts[address].name || address }</abbr>);
   } else {
     caption = (<code style={ align }>{ shortenHash ? renderHash(address) : address }</code>);
   }