Merge pull request #1572 from MetaMask/mascaraUpkeep

Mascara upkeep

4 files changed, 9 insertions, 11 deletions

diff --git a/mascara/src/background.js b/mascara/src/background.js
index dff5e6a7c..d9dbf593a 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -33,11 +33,6 @@ self.addEventListener('install', function(event) {
 })
 self.addEventListener('activate', function(event) {
   event.waitUntil(self.clients.claim())
-  self.clients.matchAll()
-  .then((clients) => {
-    if (connectedClientCount < clients.length) sendMessageToAllClients('reconnect')
-  })
-
 })
 
 console.log('inside:open')
diff --git a/mascara/src/mascara.js b/mascara/src/mascara.js
index 0fc2868e1..1655d1f64 100644
--- a/mascara/src/mascara.js
+++ b/mascara/src/mascara.js
@@ -1,6 +1,6 @@
 const Web3 = require('web3')
 const setupProvider = require('./lib/setup-provider.js')
-
+const setupDappAutoReload = require('../../app/scripts/lib/auto-reload.js')
 const MASCARA_ORIGIN = process.env.MASCARA_ORIGIN || 'http://localhost:9001'
 console.log('MASCARA_ORIGIN:', MASCARA_ORIGIN)
 
@@ -14,8 +14,7 @@ const provider = setupProvider({
 instrumentForUserInteractionTriggers(provider)
 
 const web3 = new Web3(provider)
-global.web3 = web3
-
+setupDappAutoReload(web3, provider.publicConfigStore)
 //
 // ui stuff
 //
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index e798847a7..5f9be542f 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -40,7 +40,6 @@ const connectApp = function (readSw) {
     })
   })
 }
-
 background.on('ready', (sw) => {
   background.removeListener('updatefound', connectApp)
   connectApp(sw)
@@ -48,5 +47,10 @@ background.on('ready', (sw) => {
 background.on('updatefound', () => window.location.reload())
 
 background.startWorker()
-// background.startWorker()
+.then(() => {
+  setTimeout(() => {
+    const appContent = document.getElementById(`app-content`)
+    if (!appContent.children.length) window.location.reload()
+  }, 2000)
+})
 console.log('hello from MetaMascara ui!')
diff --git a/package.json b/package.json
index c6c3add8e..341af49a7 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "bluebird": "^3.5.0",
     "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
-    "client-sw-ready-event": "^3.0.3",
+    "client-sw-ready-event": "^3.3.0",
     "clone": "^1.0.2",
     "copy-to-clipboard": "^2.0.0",
     "debounce": "^1.0.0",