From 678301a20e6112d79a052c13f921bb75c451c613 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 25 Oct 2016 13:24:03 -0700
Subject: Phase out extra warning screen.

---
 app/scripts/keyring-controller.js  |  1 -
 app/scripts/lib/config-manager.js  | 15 ---------------
 app/scripts/lib/idStore.js         |  1 -
 app/scripts/metamask-controller.js | 10 ----------
 4 files changed, 27 deletions(-)

(limited to 'app')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 28c920d22..5e7900b10 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -39,7 +39,6 @@ module.exports = class KeyringController extends EventEmitter {
       isInitialized: !!this.configManager.getVault(),
       isUnlocked: !!this.key,
       isConfirmed: true, // AUDIT this.configManager.getConfirmed(),
-      isEthConfirmed: this.configManager.getShouldntShowWarning(),
       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 ae4a84082..abe5dfc87 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -368,21 +368,6 @@ ConfigManager.prototype.getConversionDate = function () {
   return (('conversionDate' in data) && data.conversionDate) || 'N/A'
 }
 
-ConfigManager.prototype.setShouldntShowWarning = function () {
-  var data = this.getData()
-  if (data.isEthConfirmed) {
-    data.isEthConfirmed = !data.isEthConfirmed
-  } else {
-    data.isEthConfirmed = true
-  }
-  this.setData(data)
-}
-
-ConfigManager.prototype.getShouldntShowWarning = function () {
-  var data = this.getData()
-  return ('isEthConfirmed' in data) && data.isEthConfirmed
-}
-
 ConfigManager.prototype.getShapeShiftTxList = function () {
   var data = this.getData()
   var shapeShiftTxList = data.shapeShiftTxList ? data.shapeShiftTxList : []
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 416b65b85..5943826a3 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -103,7 +103,6 @@ IdentityStore.prototype.getState = function () {
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
     isConfirmed: configManager.getConfirmed(),
-    isEthConfirmed: configManager.getShouldntShowWarning(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c0da7cdaa..9c89d752b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -54,7 +54,6 @@ module.exports = class MetamaskController {
       agreeToDisclaimer: this.agreeToDisclaimer.bind(this),
       resetDisclaimer: this.resetDisclaimer.bind(this),
       setCurrentFiat: this.setCurrentFiat.bind(this),
-      agreeToEthWarning: this.agreeToEthWarning.bind(this),
       setTOSHash: this.setTOSHash.bind(this),
       checkTOSChange: this.checkTOSChange.bind(this),
       setGasMultiplier: this.setGasMultiplier.bind(this),
@@ -334,15 +333,6 @@ module.exports = class MetamaskController {
     }, 300000)
   }
 
-  agreeToEthWarning (cb) {
-    try {
-      this.configManager.setShouldntShowWarning()
-      cb()
-    } catch (e) {
-      cb(e)
-    }
-  }
-
   // called from popup
   setRpcTarget (rpcTarget) {
     this.configManager.setRpcTarget(rpcTarget)
-- 
cgit v1.2.3