diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-02-16 08:33:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 08:33:41 +0800 |
| commit | 006804513aae2ab25baa4a2da3d132773225a4d0 (patch) | |
| tree | e27674433897de8a6f547036ab304739c0cecb11 | |
| parent | c12bea5b2ef51abe4e889a00d19aad5493d534e6 (diff) | |
| parent | d5fcfd60781e9205144658ce0345032018d88676 (diff) | |
| download | tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.tar tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.tar.gz tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.tar.bz2 tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.tar.lz tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.tar.xz tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.tar.zst tangerine-wallet-browser-006804513aae2ab25baa4a2da3d132773225a4d0.zip | |
Merge branch 'master' into i1089-networkfront
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 |
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 }) } |