diff options
author | kumavis <aaron@kumavis.me> | 2017-09-08 13:37:44 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-09-08 13:37:44 +0800 |
commit | 671dafea9e8d379578c73672ba051205456219e3 (patch) | |
tree | c733017a12b83d70db21c61d16a07033ddefecbb /app/scripts/keyring-controller.js | |
parent | 70401626e2544f254ddb06a21b5d3de7fdd7fb82 (diff) | |
parent | a704e1d14370056a9a1a8af43c702bb00142532d (diff) | |
download | tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.tar.gz tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.tar.zst tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 2edc8060e..fd57fac70 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -171,9 +171,9 @@ class KeyringController extends EventEmitter { return this.setupAccounts(checkedAccounts) }) .then(() => this.persistAllKeyrings()) + .then(() => this._updateMemStoreKeyrings()) .then(() => this.fullUpdate()) .then(() => { - this._updateMemStoreKeyrings() return keyring }) } @@ -208,6 +208,7 @@ class KeyringController extends EventEmitter { return selectedKeyring.addAccounts(1) .then(this.setupAccounts.bind(this)) .then(this.persistAllKeyrings.bind(this)) + .then(this._updateMemStoreKeyrings.bind(this)) .then(this.fullUpdate.bind(this)) } |