diff options
author | kumavis <aaron@kumavis.me> | 2017-01-29 05:12:12 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-01-29 05:12:12 +0800 |
commit | e9cdbf4f89085cc6c31991416eaac7ca91f9c1d4 (patch) | |
tree | 170305624e085f7774c35c537627ca708b258d40 /app/scripts/metamask-controller.js | |
parent | 1fd17467442fb60f308b116fea53f87a4cc16dca (diff) | |
download | tangerine-wallet-browser-e9cdbf4f89085cc6c31991416eaac7ca91f9c1d4.tar.gz tangerine-wallet-browser-e9cdbf4f89085cc6c31991416eaac7ca91f9c1d4.tar.zst tangerine-wallet-browser-e9cdbf4f89085cc6c31991416eaac7ca91f9c1d4.zip |
keyring - add and initialize obs-store
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 4 |
1 files changed, 3 insertions, 1 deletions
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), |