1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge branch 'master' into i1089-networkfront

This commit is contained in:
Dan Finlay 2017-02-15 16:33:41 -08:00 committed by GitHub
commit 006804513a

View File

@ -169,6 +169,7 @@ class KeyringController extends EventEmitter {
.then(() => this.persistAllKeyrings()) .then(() => this.persistAllKeyrings())
.then(() => this.fullUpdate()) .then(() => this.fullUpdate())
.then(() => { .then(() => {
this._updateMemStoreKeyrings()
return keyring return keyring
}) })
} }
@ -424,6 +425,7 @@ class KeyringController extends EventEmitter {
}) })
.then(() => { .then(() => {
this.keyrings.push(keyring) this.keyrings.push(keyring)
this._updateMemStoreKeyrings()
return keyring return keyring
}) })
} }