diff options
| author | kumavis <aaron@kumavis.me> | 2017-02-01 16:31:26 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-02-01 16:31:26 +0800 |
| commit | 1cb730144d6b1c05007323bbc31e4375373628fb (patch) | |
| tree | 6179fd2b6ea1130561fff4b0ffa4bbd71fa0d854 /app/scripts/metamask-controller.js | |
| parent | cd5d95260026333735f25a179c7018077e0da44e (diff) | |
| download | tangerine-wallet-browser-1cb730144d6b1c05007323bbc31e4375373628fb.tar.gz tangerine-wallet-browser-1cb730144d6b1c05007323bbc31e4375373628fb.tar.zst tangerine-wallet-browser-1cb730144d6b1c05007323bbc31e4375373628fb.zip | |
metamask - adopt isInitialized from keyring controller
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 23ced75f1..222a1d618 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -169,14 +169,21 @@ module.exports = class MetamaskController extends EventEmitter { // getState () { + const wallet = this.configManager.getWallet() + const vault = this.keyringController.store.getState().vault + const isInitialized = (!!wallet || !!vault) return extend( + { + isInitialized, + }, this.state, this.ethStore.getState(), - this.configManager.getConfig(), this.txManager.getState(), this.keyringController.getState(), this.preferencesController.store.getState(), this.noticeController.getState(), + // config manager + this.configManager.getConfig(), { shapeShiftTxList: this.configManager.getShapeShiftTxList(), lostAccounts: this.configManager.getLostAccounts(), |