From d1734b8d7cc6cc96b133f3638783b153026b8618 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.b.huang@gmail.com>
Date: Fri, 27 Jul 2018 14:10:18 -0700
Subject: Update Phishing Html

---
 app/phishing.html | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'app')
diff --git a/app/phishing.html b/app/phishing.html
index 86f2985cc..e20c9ac9c 100644
--- a/app/phishing.html
+++ b/app/phishing.html
@@ -3,26 +3,29 @@
 <html>
 
   <head>
-    <title>Phishing Warning</title>
+    <title>Dangerous Website Warning</title>
 
     <style>
-body {
-  background: #c50000;
-  padding: 50px;
-  display: flex;
-  justify-content: center;
-  font-family: sans-serif;
-}
-.centered {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  color: white;
-  max-width: 600px;
-}
-a {
-  color: white;
-}
+      body {
+        background: #c50000;
+        padding: 50px;
+        display: flex;
+        justify-content: center;
+        font-family: sans-serif;
+      }
+
+      .centered {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        color: white;
+        max-width: 600px;
+      }
+
+      a {
+        color: white;
+      }
+
     </style>
 
     <script>
@@ -50,11 +53,11 @@ a {
 
       <img src="/images/ethereum-metamask-chrome.png" style="width:100%">
       <h3>ATTENTION</h3>
-      <p>MetaMask believes this domain to have malicious intent and has prevented you from interacting with it.</p>
-      <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>.</p>
-      <p>You can turn MetaMask off to interact with this site, but it's advised not to.</p>
-      <p>If you think this domain is incorrectly flagged, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>.</p>
+      <p>MetaMask believes this domain could currently compromise your security and has prevented you from interacting with it.</p>
+      <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>. This includes outright malicious websites and legitimate websites that have been compromised by a malicious actor.</p>
+      <p>You can turn MetaMask off to interact with this site, but it is advised not to.</p>
+      <p>If you think this domain is incorrectly flagged or if a blocked legitimate website has resolved its security issues, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>.</p>
 
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit 


From d0611741a2ca0ef027238bc9022c728e973ce827 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Tue, 7 Aug 2018 02:07:16 -0230
Subject: Show invalid seed phrase error when importing new account

---
 app/_locales/en/messages.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app')

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 8d65bc596..1b0183c92 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -510,6 +510,9 @@
   "invalidRPC": {
     "message": "Invalid RPC URI"
   },
+  "invalidSeedPhrase": {
+    "message": "Invalid seed phrase"
+  },
   "jsonFail": {
     "message": "Something went wrong. Please make sure your JSON file is properly formatted."
   },
-- 
cgit 

