diff options
Merge branch 'develop' into TokensPerAccountBasis
Diffstat (limited to 'app')
| -rw-r--r-- | app/_locales/en/messages.json | 3 | ||||
| -rw-r--r-- | app/phishing.html | 49 | ||||
| -rw-r--r-- | app/scripts/lib/inpage-provider.js | 5 |
3 files changed, 34 insertions, 23 deletions
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." }, 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> diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index 4e65f0a23..6ef511453 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -54,6 +54,11 @@ function MetamaskInpageProvider (connectionStream) { // also remap ids inbound and outbound MetamaskInpageProvider.prototype.sendAsync = function (payload, cb) { const self = this + + if (payload.method === 'eth_signTypedData') { + console.warn('MetaMask: This experimental version of eth_signTypedData will be deprecated in the next release in favor of the standard as defined in EIP-712. See https://git.io/fNzPl for more information on the new standard.') + } + self.rpcEngine.handle(payload, cb) } |