aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-11 18:33:57 +0800
committerkumavis <aaron@kumavis.me>2017-01-11 18:33:57 +0800
commit26e4ff40e15c74d5fc2613d33686d480f6eed25a (patch)
treea4b5e79b57326a21a1489372c121c3bc3611f2c7 /app/scripts
parenta9bdc76e408283b97365809801b31faf6f5b5039 (diff)
downloadtangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.tar
tangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.tar.gz
tangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.tar.bz2
tangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.tar.lz
tangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.tar.xz
tangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.tar.zst
tangerine-wallet-browser-26e4ff40e15c74d5fc2613d33686d480f6eed25a.zip
rpc - fix sync account cache setting
Diffstat (limited to 'app/scripts')
-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,
}
}