Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev

1 files changed, 8 insertions, 2 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 3e27272b9..c0d2f3b4c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -60,6 +60,8 @@ module.exports = class MetamaskController {
     this.idStoreMigrator = new IdStoreMigrator({
       configManager: this.configManager,
     })
+
+    this.ethStore.on('update', this.sendUpdate.bind(this))
   }
 
   getState () {
@@ -161,8 +163,12 @@ module.exports = class MetamaskController {
   }
 
   sendUpdate () {
-    this.listeners.forEach((remote) => {
-      remote.sendUpdate(this.getState())
+    this.getState()
+    .then((state) => {
+
+      this.listeners.forEach((remote) => {
+        remote.sendUpdate(state)
+      })
     })
   }