diff options
| author | kumavis <aaron@kumavis.me> | 2017-01-31 07:38:32 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-01-31 07:38:32 +0800 |
| commit | 7ccaa263d265edc2f987dc66af0caf5fedb42296 (patch) | |
| tree | c9d24506dd8977d8496bc2ca61f4294417586888 /app | |
| parent | 2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1 (diff) | |
| download | tangerine-wallet-browser-7ccaa263d265edc2f987dc66af0caf5fedb42296.tar.gz tangerine-wallet-browser-7ccaa263d265edc2f987dc66af0caf5fedb42296.tar.zst tangerine-wallet-browser-7ccaa263d265edc2f987dc66af0caf5fedb42296.zip | |
inpage - set web3.eth.defaultAccount correctly
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/inpage.js | 2 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 599604a82..419f78cd6 100644 --- 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 }) // diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index fc7df5137..2c379f8d9 100644 --- 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 } |