aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-02-16 08:30:04 +0800
committerGitHub <noreply@github.com>2017-02-16 08:30:04 +0800
commitd5fcfd60781e9205144658ce0345032018d88676 (patch)
treed7171d242f9d1f17fb6acc8b2f9d78360f79563a
parent3bd23564fbdc5dc81c23f5246956c4de07fb1601 (diff)
parent48ab446436a84c9d3409aab36e726653ecf1c0e9 (diff)
downloadtangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.tar
tangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.tar.gz
tangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.tar.bz2
tangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.tar.lz
tangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.tar.xz
tangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.tar.zst
tangerine-wallet-browser-d5fcfd60781e9205144658ce0345032018d88676.zip
Merge pull request #1123 from MetaMask/kumavis-patch-1
keyring controller - update memStore after restoreKeyring
-rw-r--r--app/scripts/keyring-controller.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 348f81fc9..b30161003 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -169,6 +169,7 @@ class KeyringController extends EventEmitter {
.then(() => this.persistAllKeyrings())
.then(() => this.fullUpdate())
.then(() => {
+ this._updateMemStoreKeyrings()
return keyring
})
}
@@ -424,6 +425,7 @@ class KeyringController extends EventEmitter {
})
.then(() => {
this.keyrings.push(keyring)
+ this._updateMemStoreKeyrings()
return keyring
})
}