From 7de6b12aad4a674bdbb0749d2e61d9fd5f69c536 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Mon, 14 Nov 2016 16:49:16 -0800
Subject: Re-enable disclaimer screen. Rename variables to reflect role more
 clearly.

---
 app/scripts/keyring-controller.js  | 2 +-
 app/scripts/lib/config-manager.js  | 8 ++++----
 app/scripts/lib/idStore.js         | 2 +-
 app/scripts/metamask-controller.js | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index c9f7e503e..c7e3c32a4 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -55,7 +55,7 @@ module.exports = class KeyringController extends EventEmitter {
       seedWords: this.configManager.getSeedWords(),
       isInitialized: (!!wallet || !!vault),
       isUnlocked: !!this.key,
-      isConfirmed: true, // AUDIT this.configManager.getConfirmed(),
+      isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), // AUDIT this.configManager.getConfirmedDisclaimer(),
       unconfTxs: this.configManager.unconfirmedTxs(),
       transactions: this.configManager.getTxList(),
       unconfMsgs: messageManager.unconfirmedMsgs(),
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 0c5daa8e6..faf64bfdc 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -313,15 +313,15 @@ ConfigManager.prototype._emitUpdates = function (state) {
   })
 }
 
-ConfigManager.prototype.setConfirmed = function (confirmed) {
+ConfigManager.prototype.setConfirmedDisclaimer = function (confirmed) {
   var data = this.getData()
-  data.isConfirmed = confirmed
+  data.isDisclaimerConfirmed = confirmed
   this.setData(data)
 }
 
-ConfigManager.prototype.getConfirmed = function () {
+ConfigManager.prototype.getConfirmedDisclaimer = function () {
   var data = this.getData()
-  return ('isConfirmed' in data) && data.isConfirmed
+  return ('isDisclaimerConfirmed' in data) && data.isDisclaimerConfirmed
 }
 
 ConfigManager.prototype.setTOSHash = function (hash) {
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 2a46b1b5d..31895b9bc 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -102,7 +102,7 @@ IdentityStore.prototype.getState = function () {
     isInitialized: !!configManager.getWallet() && !seedWords,
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
-    isConfirmed: configManager.getConfirmed(),
+    isDisclaimerConfirmed: configManager.getConfirmedDisclaimer(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 83220b7b2..3d6c0eb50 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -278,7 +278,7 @@ module.exports = class MetamaskController {
 
   agreeToDisclaimer (cb) {
     try {
-      this.configManager.setConfirmed(true)
+      this.configManager.setConfirmedDisclaimer(true)
       cb()
     } catch (e) {
       cb(e)
@@ -287,7 +287,7 @@ module.exports = class MetamaskController {
 
   resetDisclaimer () {
     try {
-      this.configManager.setConfirmed(false)
+      this.configManager.setConfirmedDisclaimer(false)
     } catch (e) {
       console.error(e)
     }
-- 
cgit