From e9cdbf4f89085cc6c31991416eaac7ca91f9c1d4 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Sat, 28 Jan 2017 13:12:12 -0800
Subject: keyring - add and initialize obs-store

---
 app/scripts/metamask-controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/scripts/metamask-controller.js')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bef791ec9..f3da6f53e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -29,9 +29,10 @@ module.exports = class MetamaskController extends EventEmitter {
     super()
     this.opts = opts
     this.state = { network: 'loading' }
+    let initState = opts.initState || {}
 
     // observable state store
-    this.store = new ObservableStore(opts.initState)
+    this.store = new ObservableStore(initState)
     
     // config manager
     this.configManager = new ConfigManager({
@@ -50,6 +51,7 @@ module.exports = class MetamaskController extends EventEmitter {
     
     // key mgmt
     this.keyringController = new KeyringController({
+      initState: initState.KeyringController,
       ethStore: this.ethStore,
       configManager: this.configManager,
       getNetwork: this.getStateNetwork.bind(this),
-- 
cgit