From 41c93ceb7eccd4c77f95e21b5965d306e4122e8e Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 1 Feb 2017 00:02:10 -0800 Subject: keyring - add keyringtypes to memStore --- app/scripts/keyring-controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index a7e5fed71..c5ecac089 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -31,14 +31,15 @@ class KeyringController extends EventEmitter { constructor (opts) { super() const initState = opts.initState || {} + this.keyringTypes = keyringTypes this.store = new ObservableStore(initState) this.memStore = new ObservableStore({ keyrings: [], + keyringTypes: this.keyringTypes.map(krt => krt.type), }) this.configManager = opts.configManager this.ethStore = opts.ethStore this.encryptor = encryptor - this.keyringTypes = keyringTypes this.keyrings = [] this.identities = {} // Essentially a name hash @@ -85,9 +86,8 @@ class KeyringController extends EventEmitter { // computed isInitialized: (!!wallet || !!state.vault), isUnlocked: (!!this.password), - // hard coded - keyringTypes: this.keyringTypes.map(krt => krt.type), // memStore + keyringTypes: memState.keyringTypes, identities: this.identities, keyrings: memState.keyrings, // messageManager -- cgit v1.2.3