From 9359fc875df061c39807d90c3ca92356960ec4c3 Mon Sep 17 00:00:00 2001
From: Paul Bouchon <mail@bitpshr.net>
Date: Wed, 26 Sep 2018 10:48:17 -0400
Subject: EIP-1102: Add deprecation message (#5353)

---
 app/scripts/inpage.js          | 6 ++++++
 app/scripts/lib/auto-reload.js | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index d9fda1feb..d924be516 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -9,6 +9,11 @@ restoreContextAfterImports()
 
 log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn')
 
+console.warn('ATTENTION: In an effort to improve user privacy, MetaMask will ' +
+'stop exposing user accounts to dapps by default beginning November 2nd, 2018. ' +
+'Dapps should call provider.enable() in order to view and use accounts. Please see ' +
+'https://bit.ly/2QQHXvF for complete information and up-to-date example code.')
+
 //
 // setup plugin communication
 //
@@ -52,6 +57,7 @@ if (typeof window.web3 !== 'undefined') {
      or MetaMask and another web3 extension. Please remove one
      and try again.`)
 }
+
 var web3 = new Web3(inpageProvider)
 web3.setProvider = function () {
   log.debug('MetaMask - overrode web3.setProvider')
diff --git a/app/scripts/lib/auto-reload.js b/app/scripts/lib/auto-reload.js
index cce31c3d2..558391a06 100644
--- a/app/scripts/lib/auto-reload.js
+++ b/app/scripts/lib/auto-reload.js
@@ -2,18 +2,12 @@ module.exports = setupDappAutoReload
 
 function setupDappAutoReload (web3, observable) {
   // export web3 as a global, checking for usage
-  let hasBeenWarned = false
   let reloadInProgress = false
   let lastTimeUsed
   let lastSeenNetwork
 
   global.web3 = new Proxy(web3, {
     get: (_web3, key) => {
-      // show warning once on web3 access
-      if (!hasBeenWarned && key !== 'currentProvider') {
-        console.warn('MetaMask: web3 will be deprecated in the near future in favor of the ethereumProvider \nhttps://github.com/MetaMask/faq/blob/master/detecting_metamask.md#web3-deprecation')
-        hasBeenWarned = true
-      }
       // get the time of use
       lastTimeUsed = Date.now()
       // return value normally
-- 
cgit v1.2.3