From a8f745f9fe74751b87f500af3857b66d4c80f45e Mon Sep 17 00:00:00 2001
From: brunobar79 <brunobar79@gmail.com>
Date: Mon, 2 Jul 2018 18:49:33 -0400
Subject: eslint --fix .

---
 app/scripts/contentscript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts/contentscript.js')

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 75e0a95b3..b35a70dd2 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()
 }
 
 /**
-- 
cgit v1.2.3


From c4ae3995778436f44a5465586cd37aa1addc143a Mon Sep 17 00:00:00 2001
From: Dan Finlay <542863+danfinlay@users.noreply.github.com>
Date: Thu, 12 Jul 2018 14:21:32 -0700
Subject: Add harbourair.com to injection block list

This site was getting unexpected results when MetaMask was installed.

https://consensys.zendesk.com/agent/tickets/2312
---
 app/scripts/contentscript.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/scripts/contentscript.js')

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index b35a70dd2..04dd51b01 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -177,6 +177,7 @@ function blacklistedDomainCheck () {
     'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html',
     'adyen.com',
     'gravityforms.com',
+    'harbourair.com',
   ]
   var currentUrl = window.location.href
   var currentRegex
-- 
cgit v1.2.3


From 6be6b9ef29695b405f7d9ef5a2ec780689be4065 Mon Sep 17 00:00:00 2001
From: Dan Finlay <542863+danfinlay@users.noreply.github.com>
Date: Mon, 16 Jul 2018 15:39:35 -0700
Subject: Do not inject on blueskybooking.com

Per zendesk 2312.
---
 app/scripts/contentscript.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/scripts/contentscript.js')

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 04dd51b01..7c775fb04 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -178,6 +178,7 @@ function blacklistedDomainCheck () {
     'adyen.com',
     'gravityforms.com',
     'harbourair.com',
+    'blueskybooking.com',
   ]
   var currentUrl = window.location.href
   var currentRegex
-- 
cgit v1.2.3


From dd9e3587d47c9a233cea5f7b305d8faa08ee6a0e Mon Sep 17 00:00:00 2001
From: Dan Finlay <542863+danfinlay@users.noreply.github.com>
Date: Wed, 18 Jul 2018 15:23:32 -0700
Subject: Do not inject on ani.gamer.com.tw

Fixes #4799
---
 app/scripts/contentscript.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/scripts/contentscript.js')

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 04dd51b01..f2a2469c9 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -178,6 +178,7 @@ function blacklistedDomainCheck () {
     'adyen.com',
     'gravityforms.com',
     'harbourair.com',
+    'ani.gamer.com.tw',
   ]
   var currentUrl = window.location.href
   var currentRegex
-- 
cgit v1.2.3


From 7ca402147df6064c389912ef8136235a9eb2ebc4 Mon Sep 17 00:00:00 2001
From: Kelvin Tan <kelvin.tyb@gmail.com>
Date: Wed, 25 Jul 2018 23:37:04 +0800
Subject: add phishing html page, and redirect to bundled page in-window

---
 app/scripts/contentscript.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/scripts/contentscript.js')

diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 7b7114c35..b7496f318 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -197,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
 }
-- 
cgit v1.2.3