diff options
| author | Filip Š <filip.stamcar@hotmail.com> | 2019-01-10 21:27:21 +0800 |
|---|---|---|
| committer | Filip Š <filip.stamcar@hotmail.com> | 2019-01-10 21:27:21 +0800 |
| commit | 7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554 (patch) | |
| tree | 2c3b47607f45e214652bd9082052c02e0e3510b2 /app | |
| parent | dc2d16ca47841a7e69304bde7b7c2f932eb3d990 (diff) | |
| parent | cef4caeb61f2564e1ed871c12449f1e5c8d66427 (diff) | |
| download | tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.tar tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.tar.gz tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.tar.bz2 tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.tar.lz tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.tar.xz tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.tar.zst tangerine-wallet-browser-7ff8d6c6b160ce2a032b53e5cf6ea5b3e4a83554.zip | |
Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into patch-1
Diffstat (limited to 'app')
| -rw-r--r-- | app/_locales/en/messages.json | 2 | ||||
| -rw-r--r-- | app/_locales/fr/messages.json | 12 | ||||
| -rw-r--r-- | app/images/icons/down-arrow.svg | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/phishing.html | 2 | ||||
| -rw-r--r-- | app/scripts/platforms/extension.js | 2 |
6 files changed, 14 insertions, 10 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 5f42ac437..34415232a 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -102,7 +102,7 @@ "message": "Amount + TX Fee" }, "appDescription": { - "message": "Ethereum Browser Extension", + "message": "An Ethereum Wallet in your Browser", "description": "The description of the application" }, "appName": { diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index e60aa3218..9018ef578 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -204,22 +204,22 @@ "message": "Connecter" }, "connecting": { - "message": "Connection..." + "message": "Connexion..." }, "connectingToKovan": { - "message": "Connection au réseau de test Kovan" + "message": "Connexion au réseau de test Kovan" }, "connectingToMainnet": { - "message": "Connection au réseau principal Ethereum" + "message": "Connexion au réseau principal Ethereum" }, "connectingToRopsten": { - "message": "Connection au réseau de test Ropsten" + "message": "Connexion au réseau de test Ropsten" }, "connectingToRinkeby": { - "message": "Connection au réseau de test Rinkeby" + "message": "Connexion au réseau de test Rinkeby" }, "connectingToUnknown": { - "message": "Connection à un réseau inconnu" + "message": "Connexion à un réseau inconnu" }, "connectToLedger": { "message": "Connecter un Ledger" diff --git a/app/images/icons/down-arrow.svg b/app/images/icons/down-arrow.svg new file mode 100644 index 000000000..6cfb4a38b --- /dev/null +++ b/app/images/icons/down-arrow.svg @@ -0,0 +1,4 @@ +<svg width="27" height="27" viewBox="0 0 27 27" fill="none" xmlns="http://www.w3.org/2000/svg"> +<circle cx="13.5" cy="13.5" r="13" fill="white" fill-opacity="0.25" stroke="#DCDDE6"/> +<path d="M19.2 14.1L18.5 13.4L14.1 17.8V7H13.1V17.8L8.7 13.4L8 14.1L13.1 19.2L13.6 19.7L14.1 19.2L19.2 14.1Z" fill="#DCDDE6"/> +</svg> diff --git a/app/manifest.json b/app/manifest.json index 4f4598a18..6c35c6989 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "5.2.2", + "version": "5.3.0", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", diff --git a/app/phishing.html b/app/phishing.html index 284d0fcac..207489a12 100644 --- a/app/phishing.html +++ b/app/phishing.html @@ -3,7 +3,7 @@ <html> <head> - <title>Ethereum Phishing Detection - MetMask</title> + <title>Ethereum Phishing Detection - MetaMask</title> <style> body { diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index 3f1cb0f27..e8779739c 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -111,7 +111,7 @@ class ExtensionPlatform { _viewOnEtherScan (txId) { if (txId.startsWith('http://')) { - global.metamaskController.platform.openWindow({ url: txId }) + extension.tabs.create({ url: txId }) } } } |
