Don't execute script for Dapp detection after being dismissed

Fix #11537
brave · Oct 15, 2017 · b3f61ee · b3f61ee
1 parent 24b6cb9
commit b3f61ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/browser/reducers/dappReducer.js b/app/browser/reducers/dappReducer.js
@@ -15,7 +15,7 @@ const getSetting = require('../../../js/settings').getSetting
 const tabActions = require('../../common/actions/tabActions')
 const tabState = require('../../common/state/tabState')
 const config = require('../../../js/constants/config')
-const {getOrigin} = require('../../../js/lib/urlutil')
+const {getOrigin} = require('../../../js/state/siteUtil')
 
 let notificationCallbacks = []
 

diff --git a/app/extensions/brave/content/scripts/dappListener.js b/app/extensions/brave/content/scripts/dappListener.js
@@ -31,7 +31,10 @@ const script =
     })
   }`
 
-executeScript(script)
+if (chrome.contentSettings.dappDetection == 'allow') {
+  executeScript(script)
+}
+
 setTimeout(function () {
   console.log('checking now for toolbar')
   const isDapp = document.querySelector('meta[name="web3-installed"]')

diff --git a/js/state/contentSettings.js b/js/state/contentSettings.js
@@ -111,6 +111,10 @@ const getDefaultUserPrefContentSettings = (braveryDefaults, appSettings, appConf
       setting: 'block',
       primaryPattern: '*'
     }],
+    dappDetection: [{
+      setting: getSetting(settings.METAMASK_PROMPT_DISMISSED) ? 'block' : 'allow',
+      primaryPattern: '*'
+    }],
     popups: [{
       setting: 'block',
       primaryPattern: '*'