Live update blacklist from Infura

1 files changed, 6 insertions, 8 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index c9505b237..01bb39186 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -91,7 +91,7 @@ function setupController (initState) {
   extension.runtime.onConnect.addListener(connectRemote)
   function connectRemote (remotePort) {
     if (remotePort.name === 'blacklister') {
-      return setupBlacklist(connectRemote)
+      return checkBlacklist(remotePort)
     }
 
     var isMetaMaskInternalProcess = remotePort.name === 'popup' || remotePort.name === 'notification'
@@ -140,25 +140,23 @@ function setupController (initState) {
 }
 
 // Listen for new pages and return if blacklisted:
-function setupBlacklist (port) {
-  console.log('Blacklist connection established')
-  const handler = handleNewPageLoad.bind(port)
+function checkBlacklist (port) {
+  const handler = handleNewPageLoad.bind(null, port)
   port.onMessage.addListener(handler)
   setTimeout(() => {
     port.onMessage.removeListener(handler)
   }, 30000)
 }
 
-function handleNewPageLoad (message) {
+function handleNewPageLoad (port, message) {
   const { pageLoaded } = message
-  console.log('blaclist message received', message.pageLoaded)
   if (!pageLoaded || !global.metamaskController) return
 
   const state = global.metamaskController.getState()
-  const { blacklist } = state.metamask
+  const { blacklist } = state
 
   if (blacklist && blacklist.includes(pageLoaded)) {
-    this.postMessage({ 'blacklist': pageLoaded })
+    port.postMessage({ 'blacklist': pageLoaded })
   }
 }