Merge pull request #996 from MetaMask/i981-UpdateOnAccountChange

Send update to UI when changing selected account

2 files changed, 5 insertions, 6 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index c58be0aae..d4c0d863e 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -273,7 +273,7 @@ module.exports = class KeyringController extends EventEmitter {
   setSelectedAccount (address) {
     var addr = normalize(address)
     this.configManager.setSelectedAccount(addr)
-    return Promise.resolve(addr)
+    return this.fullUpdate()
   }
 
   // Save Account Label
diff --git a/ui/app/actions.js b/ui/app/actions.js
index d63d36f19..5a3968f82 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -263,9 +263,7 @@ function showInfoPage () {
 }
 
 function setSelectedAccount (address) {
-  return (dispatch) => {
-    background.setSelectedAccount(address)
-  }
+  return callBackgroundThenUpdate(background.setSelectedAccount, address)
 }
 
 function setCurrentFiat (fiat) {
@@ -457,15 +455,16 @@ function lockMetamask () {
 function showAccountDetail (address) {
   return (dispatch) => {
     dispatch(actions.showLoadingIndication())
-    background.setSelectedAccount(address, (err, address) => {
+    background.setSelectedAccount(address, (err, newState) => {
       dispatch(actions.hideLoadingIndication())
       if (err) {
         return dispatch(actions.displayWarning(err.message))
       }
 
+      dispatch(actions.updateMetamaskState(newState))
       dispatch({
         type: actions.SHOW_ACCOUNT_DETAIL,
-        value: address,
+        value: newState.selectedAccount,
       })
     })
   }