aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-01-12 02:00:53 +0800
committerGitHub <noreply@github.com>2017-01-12 02:00:53 +0800
commit479da078979f0eaee05b2e25e1bb7113a5a62d6d (patch)
treea4b5e79b57326a21a1489372c121c3bc3611f2c7
parent84445b01c487b53f7e6e6dd2b0ba24d40c7764a6 (diff)
parent26e4ff40e15c74d5fc2613d33686d480f6eed25a (diff)
downloadtangerine-wallet-browser-479da078979f0eaee05b2e25e1bb7113a5a62d6d.tar.gz
tangerine-wallet-browser-479da078979f0eaee05b2e25e1bb7113a5a62d6d.tar.zst
tangerine-wallet-browser-479da078979f0eaee05b2e25e1bb7113a5a62d6d.zip
Merge pull request #990 from MetaMask/sync-accounts
rpc - fix sync account cache setting
-rw-r--r--app/scripts/metamask-controller.js18
1 files changed, 1 insertions, 17 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d79fd3cd3..1fc97e81d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -228,37 +228,21 @@ module.exports = class MetamaskController extends EventEmitter {
initPublicConfigStore () {
// get init state
- var initPublicState = extend(
- keyringControllerToPublic(this.keyringController.getState()),
- configToPublic(this.configManager.getConfig())
- )
-
+ var initPublicState = configToPublic(this.configManager.getConfig())
var publicConfigStore = new HostStore(initPublicState)
// subscribe to changes
this.configManager.subscribe(function (state) {
storeSetFromObj(publicConfigStore, configToPublic(state))
})
- this.keyringController.on('update', () => {
- const state = this.keyringController.getState()
- storeSetFromObj(publicConfigStore, keyringControllerToPublic(state))
- this.sendUpdate()
- })
this.keyringController.on('newAccount', (account) => {
autoFaucet(account)
})
- // keyringController substate
- function keyringControllerToPublic (state) {
- return {
- selectedAccount: state.selectedAccount,
- }
- }
// config substate
function configToPublic (state) {
return {
- provider: state.provider,
selectedAccount: state.selectedAccount,
}
}