inpage - set web3.eth.defaultAccount correctly

8 years ago · 7ccaa263d2
parent 2fa60cfcbf
commit 7ccaa263d2
2 changed files with 2 additions and 2 deletions
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@ -52,7 +52,7 @@ reloadStream.once('data', triggerReload)

 // set web3 defaultAccount
 inpageProvider.publicConfigStore.subscribe(function (state) {
-  web3.eth.defaultAccount = state.PreferencesController.selectedAddress
+  web3.eth.defaultAccount = state.selectedAddress
 })

 //
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@ -156,7 +156,7 @@ module.exports = class MetamaskController extends EventEmitter {
    function selectPublicState(state) {
      const result = { selectedAddress: undefined }
      try {
-        result.selectedAddress = state.KeyringController.selectedAddress
+        result.selectedAddress = state.PreferencesController.selectedAddress
      } catch (_) {}
      return result
    }