diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-11-02 08:00:17 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-11-02 08:00:17 +0800 |
| commit | b5f6ef8c013f2f742546a04e148bac99fbc4691c (patch) | |
| tree | fcd77a4e15ef11fb168ee6dc82f1a3015bcd3b7f /app/scripts/metamask-controller.js | |
| parent | 72729060dc8366dbe965bd66c3b98b88bdb21830 (diff) | |
| download | tangerine-wallet-browser-b5f6ef8c013f2f742546a04e148bac99fbc4691c.tar.gz tangerine-wallet-browser-b5f6ef8c013f2f742546a04e148bac99fbc4691c.tar.zst tangerine-wallet-browser-b5f6ef8c013f2f742546a04e148bac99fbc4691c.zip | |
Fixed bugs related to clearing caches when restoring to a new vault
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 7ce22b642..6dffefe98 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -38,8 +38,8 @@ module.exports = class MetamaskController { return extend( this.state, this.ethStore.getState(), - this.keyringController.getState(), - this.configManager.getConfig() + this.configManager.getConfig(), + this.keyringController.getState() ) } @@ -73,7 +73,6 @@ module.exports = class MetamaskController { setLocked: keyringController.setLocked.bind(keyringController), exportAccount: keyringController.exportAccount.bind(keyringController), saveAccountLabel: keyringController.saveAccountLabel.bind(keyringController), - tryPassword: keyringController.tryPassword.bind(keyringController), // coinbase buyEth: this.buyEth.bind(this), // shapeshift |