diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-08-08 02:31:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 02:31:42 +0800 |
| commit | 0601df9dae488d997277bb6b52c28df27546e27c (patch) | |
| tree | ae33a0c4610b9a9e865c797258232542a72f57b6 /app/scripts/contentscript.js | |
| parent | 4598554fea7b9435e5cbecc4735c479ffbadf37e (diff) | |
| parent | f6490a2a6eda943a374c01df5884acb07ba28869 (diff) | |
| download | tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.tar tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.tar.gz tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.tar.bz2 tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.tar.lz tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.tar.xz tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.tar.zst tangerine-wallet-browser-0601df9dae488d997277bb6b52c28df27546e27c.zip | |
Merge pull request #4954 from MetaMask/v4.9.0
V4.9.0
Diffstat (limited to 'app/scripts/contentscript.js')
| -rw-r--r-- | app/scripts/contentscript.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 75e0a95b3..b7496f318 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -115,8 +115,8 @@ function logStreamDisconnectWarning (remoteLabel, err) { * @returns {boolean} {@code true} if Web3 should be injected */ function shouldInjectWeb3 () { - return doctypeCheck() && suffixCheck() - && documentElementCheck() && !blacklistedDomainCheck() + return doctypeCheck() && suffixCheck() && + documentElementCheck() && !blacklistedDomainCheck() } /** @@ -177,6 +177,9 @@ function blacklistedDomainCheck () { 'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html', 'adyen.com', 'gravityforms.com', + 'harbourair.com', + 'ani.gamer.com.tw', + 'blueskybooking.com', ] var currentUrl = window.location.href var currentRegex @@ -194,6 +197,7 @@ function blacklistedDomainCheck () { * Redirects the current page to a phishing information page */ function redirectToPhishingWarning () { - console.log('MetaMask - redirecting to phishing warning') - window.location.href = 'https://metamask.io/phishing.html' + console.log('MetaMask - routing to Phishing Warning component') + let extensionURL = extension.runtime.getURL('phishing.html') + window.location.href = extensionURL } |