4 files changed, 0 insertions, 73 deletions
diff --git a/app/scripts/config.js b/app/scripts/config.js
index e09206c5f..b4541a04a 100644
--- a/app/scripts/config.js
+++ b/app/scripts/config.js
@@ -3,7 +3,6 @@ const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask'
 const DEFAULT_RPC_URL = TESTNET_RPC_URL
 
 global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
-global.TOS_HASH = 'GULP_TOS_HASH'
 
 module.exports = {
   network: {
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 7ae2d4400..6267eab68 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -228,28 +228,6 @@ ConfigManager.prototype._emitUpdates = function (state) {
   })
 }
 
-ConfigManager.prototype.setConfirmedDisclaimer = function (confirmed) {
-  var data = this.getData()
-  data.isDisclaimerConfirmed = confirmed
-  this.setData(data)
-}
-
-ConfigManager.prototype.getConfirmedDisclaimer = function () {
-  var data = this.getData()
-  return data.isDisclaimerConfirmed
-}
-
-ConfigManager.prototype.setTOSHash = function (hash) {
-  var data = this.getData()
-  data.TOSHash = hash
-  this.setData(data)
-}
-
-ConfigManager.prototype.getTOSHash = function () {
-  var data = this.getData()
-  return data.TOSHash
-}
-
 ConfigManager.prototype.getGasMultiplier = function () {
   var data = this.getData()
   return data.gasMultiplier
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 1afe5f651..7a6968c6c 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -94,7 +94,6 @@ IdentityStore.prototype.getState = function () {
     isInitialized: !!configManager.getWallet() && !seedWords,
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
-    isDisclaimerConfirmed: configManager.getConfirmedDisclaimer(),
     selectedAddress: configManager.getSelectedAccount(),
     gasMultiplier: configManager.getGasMultiplier(),
   }))
@@ -343,4 +342,3 @@ IdentityStore.prototype._autoFaucet = function () {
 }
 
 // util
-
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fb2040c63..6830bd947 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -107,8 +107,6 @@ module.exports = class MetamaskController extends EventEmitter {
     this.messageManager = new MessageManager()
     this.publicConfigStore = this.initPublicConfigStore()
 
-    this.checkTOSChange()
-
     // TEMPORARY UNTIL FULL DEPRECATION:
     this.idStoreMigrator = new IdStoreMigrator({
       configManager: this.configManager,
@@ -219,7 +217,6 @@ module.exports = class MetamaskController extends EventEmitter {
       this.shapeshiftController.store.getState(),
       {
         lostAccounts: this.configManager.getLostAccounts(),
-        isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
         seedWords: this.configManager.getSeedWords(),
       }
     )
@@ -242,11 +239,7 @@ module.exports = class MetamaskController extends EventEmitter {
       setRpcTarget:          this.setRpcTarget.bind(this),
       setProviderType:       this.setProviderType.bind(this),
       useEtherscanProvider:  this.useEtherscanProvider.bind(this),
-      agreeToDisclaimer:     this.agreeToDisclaimer.bind(this),
-      resetDisclaimer:       this.resetDisclaimer.bind(this),
       setCurrentCurrency:    this.setCurrentCurrency.bind(this),
-      setTOSHash:            this.setTOSHash.bind(this),
-      checkTOSChange:        this.checkTOSChange.bind(this),
       setGasMultiplier:      this.setGasMultiplier.bind(this),
       markAccountsFound:     this.markAccountsFound.bind(this),
       // coinbase
@@ -519,47 +512,6 @@ module.exports = class MetamaskController extends EventEmitter {
   }
 
   //
-  // disclaimer
-  //
-
-  agreeToDisclaimer (cb) {
-    try {
-      this.configManager.setConfirmedDisclaimer(true)
-      cb()
-    } catch (err) {
-      cb(err)
-    }
-  }
-
-  resetDisclaimer () {
-    try {
-      this.configManager.setConfirmedDisclaimer(false)
-    } catch (e) {
-      console.error(e)
-    }
-  }
-
-  setTOSHash (hash) {
-    try {
-      this.configManager.setTOSHash(hash)
-    } catch (err) {
-      console.error('Error in setting terms of service hash.')
-    }
-  }
-
-  checkTOSChange () {
-    try {
-      const storedHash = this.configManager.getTOSHash() || 0
-      if (storedHash !== global.TOS_HASH) {
-        this.resetDisclaimer()
-        this.setTOSHash(global.TOS_HASH)
-      }
-    } catch (err) {
-      console.error('Error in checking TOS change.')
-    }
-  }
-
-  //
   // config
   //