From 4c0cb9d92e7d00da8219c82f24337e0a776e14f8 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 1 Feb 2017 16:38:09 -0800
Subject: metamask - memState - adopt configManager.isDisclaimerConfirmed from
 keyring controller

---
 app/scripts/keyring-controller.js  | 1 -
 app/scripts/metamask-controller.js | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index e2752831a..d1d706165 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -82,7 +82,6 @@ class KeyringController extends EventEmitter {
       keyrings: memState.keyrings,
       // configManager
       seedWords: this.configManager.getSeedWords(),
-      isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
     }
     return result
   }
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fb5234c24..a56203a88 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -189,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter {
         currentFiat: this.configManager.getCurrentFiat(),
         conversionRate: this.configManager.getConversionRate(),
         conversionDate: this.configManager.getConversionDate(),
+        isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
       }
     )
   }
-- 
cgit