aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-02-01 16:02:10 +0800
committerkumavis <aaron@kumavis.me>2017-02-01 16:02:10 +0800
commit41c93ceb7eccd4c77f95e21b5965d306e4122e8e (patch)
treeffce3e83c086bf67cdeb5c43a44c23785ab34f99 /app
parentd326e7d11efff754670164560964a146cdf7f53b (diff)
downloadtangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.tar
tangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.tar.gz
tangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.tar.bz2
tangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.tar.lz
tangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.tar.xz
tangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.tar.zst
tangerine-wallet-browser-41c93ceb7eccd4c77f95e21b5965d306e4122e8e.zip
keyring - add keyringtypes to memStore
Diffstat (limited to 'app')
-rw-r--r--app/scripts/keyring-controller.js6
1 files 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