From dd529575f6c9a7243c4a599dbe274681f314b7bb Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Fri, 10 Mar 2017 15:46:13 +0100
Subject: [PATCH] Subscribe to accounts info in Signer / ParityBar (#4738)
 (#4856)

---
 js/src/views/ParityBar/accountStore.js | 48 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/js/src/views/ParityBar/accountStore.js b/js/src/views/ParityBar/accountStore.js
index 0a35a27ba..2b0fe17a0 100644
--- a/js/src/views/ParityBar/accountStore.js
+++ b/js/src/views/ParityBar/accountStore.js
@@ -74,28 +74,27 @@ export default class AccountStore {
         this._api.parity.getNewDappsAddresses(),
         this._api.parity.allAccountsInfo()
       ])
-      .then(([whitelist, accounts]) => {
+      .then(([whitelist, allAccounts]) => {
         transaction(() => {
+          const accounts = Object
+            .keys(allAccounts)
+            .filter((address) => {
+              const account = allAccounts[address];
+              const isAccount = account.uuid || (account.meta && account.meta.hardware);
+              const isWhitelisted = !whitelist || whitelist.includes(address);
+
+              return isAccount && isWhitelisted;
+            })
+            .map((address) => {
+              return {
+                ...allAccounts[address],
+                checked: address === this.defaultAccount,
+                address
+              };
+            });
+
           this.setLoading(false);
-          this.setAccounts(
-            Object
-              .keys(accounts)
-              .filter((address) => {
-                const account = accounts[address];
-                const isAccount = account.uuid || (account.meta && account.meta.hardware);
-                const isWhitelisted = !whitelist || whitelist.includes(address);
-
-                return isAccount && isWhitelisted;
-              })
-              .map((address) => {
-                const account = accounts[address];
-
-                account.address = address;
-                account.checked = address === this.defaultAccount;
-
-                return account;
-              })
-          );
+          this.setAccounts(accounts);
         });
       })
       .catch((error) => {
@@ -117,6 +116,13 @@ export default class AccountStore {
       }
     });
 
-    return Promise.all([ promiseDefaultAccount, promiseEthAccounts ]);
+    const promiseAccountsInfo = this._api
+      .subscribe('parity_allAccountsInfo', (error, accountsInfo) => {
+        if (!error) {
+          this.loadAccounts();
+        }
+      });
+
+    return Promise.all([ promiseDefaultAccount, promiseEthAccounts, promiseAccountsInfo ]);
   }
 }