From f461bd881259183b1f76af27e7662d1c37da672f Mon Sep 17 00:00:00 2001
From: Erik Marks <rekmarks@kolabnow.com>
Date: Tue, 12 Jun 2018 09:28:50 -0700
Subject: wip

---
 app/scripts/lib/auto-reload.js | 40 ++--------------------------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

(limited to 'app/scripts/lib/auto-reload.js')

diff --git a/app/scripts/lib/auto-reload.js b/app/scripts/lib/auto-reload.js
index cce31c3d2..63dc3e921 100644
--- a/app/scripts/lib/auto-reload.js
+++ b/app/scripts/lib/auto-reload.js
@@ -1,11 +1,9 @@
-module.exports = setupDappAutoReload
+module.exports = exportWeb3Global
 
-function setupDappAutoReload (web3, observable) {
+function exportWeb3Global (web3) {
   // 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) => {
@@ -24,38 +22,4 @@ function setupDappAutoReload (web3, observable) {
       _web3[key] = value
     },
   })
-
-  observable.subscribe(function (state) {
-    // if reload in progress, no need to check reload logic
-    if (reloadInProgress) return
-
-    const currentNetwork = state.networkVersion
-
-    // set the initial network
-    if (!lastSeenNetwork) {
-      lastSeenNetwork = currentNetwork
-      return
-    }
-
-    // skip reload logic if web3 not used
-    if (!lastTimeUsed) return
-
-    // if network did not change, exit
-    if (currentNetwork === lastSeenNetwork) return
-
-    // initiate page reload
-    reloadInProgress = true
-    const timeSinceUse = Date.now() - lastTimeUsed
-    // if web3 was recently used then delay the reloading of the page
-    if (timeSinceUse > 500) {
-      triggerReset()
-    } else {
-      setTimeout(triggerReset, 500)
-    }
-  })
-}
-
-// reload the page
-function triggerReset () {
-  global.location.reload()
 }
-- 
cgit 


From b98296138146fcd304a21637ea83a13670cff6ed Mon Sep 17 00:00:00 2001
From: Erik Marks <rekmarks@kolabnow.com>
Date: Tue, 12 Jun 2018 11:04:37 -0700
Subject: removed auto-reload.js, moved global web3 export to inpage.js

---
 app/scripts/lib/auto-reload.js | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 app/scripts/lib/auto-reload.js

(limited to 'app/scripts/lib/auto-reload.js')

diff --git a/app/scripts/lib/auto-reload.js b/app/scripts/lib/auto-reload.js
deleted file mode 100644
index 63dc3e921..000000000
--- a/app/scripts/lib/auto-reload.js
+++ /dev/null
@@ -1,25 +0,0 @@
-module.exports = exportWeb3Global
-
-function exportWeb3Global (web3) {
-  // export web3 as a global, checking for usage
-  let hasBeenWarned = false
-  let lastTimeUsed
-
-  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
-      return _web3[key]
-    },
-    set: (_web3, key, value) => {
-      // set value normally
-      _web3[key] = value
-    },
-  })
-}
-- 
cgit