From b5f6ef8c013f2f742546a04e148bac99fbc4691c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 1 Nov 2016 17:00:17 -0700
Subject: Fixed bugs related to clearing caches when restoring to a new vault

---
 app/scripts/metamask-controller.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

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
-- 
cgit