aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/pages/home/home.container.js
diff options
context:
space:
mode:
authorMark Stacey <markjstacey@gmail.com>2019-08-03 02:59:28 +0800
committerGitHub <noreply@github.com>2019-08-03 02:59:28 +0800
commit75d53745826fd7927ec24240f4462bf4226464de (patch)
treecd03881a1ab0142951b33131e3c29f1577fe2afb /ui/app/pages/home/home.container.js
parent2649b9b8bb5b675217e3ab9258d96797f3bcdfba (diff)
downloadtangerine-wallet-browser-75d53745826fd7927ec24240f4462bf4226464de.tar.gz
tangerine-wallet-browser-75d53745826fd7927ec24240f4462bf4226464de.tar.zst
tangerine-wallet-browser-75d53745826fd7927ec24240f4462bf4226464de.zip
Restrict unconnected notice to specific protocols (#6954)
The notice asking whether you wanted to connect to a site was showing up in places it shouldn't, like on the Firefox/Chrome settings pages and on our fullscreen extension. It has now been restricted to only be displayed for active tabs with specific protocols: * http * https * dat * dweb * ipfs * ipns * ssb This prevents the notice from being shown on settings pages, browser extensions, and files such as PDFs.
Diffstat (limited to 'ui/app/pages/home/home.container.js')
-rw-r--r--ui/app/pages/home/home.container.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index 2ef05679d..064c914cd 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -11,6 +11,8 @@ import {
import { getEnvironmentType } from '../../../../app/scripts/lib/util'
import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
+const activeTabDappProtocols = ['http:', 'https:', 'dweb:', 'ipfs:', 'ipns:', 'ssb:']
+
const mapStateToProps = state => {
const { activeTab, metamask, appState } = state
const {
@@ -28,7 +30,12 @@ const mapStateToProps = state => {
const accountBalance = getCurrentEthBalance(state)
const { forgottenPassword } = appState
- const isUnconnected = Boolean(activeTab && privacyMode && !approvedOrigins[activeTab.origin])
+ const isUnconnected = Boolean(
+ activeTab &&
+ activeTabDappProtocols.includes(activeTab.protocol) &&
+ privacyMode &&
+ !approvedOrigins[activeTab.origin]
+ )
const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
return {