Merge pull request #2129 from kvhnuke/devop/release-v3.24.0

Devop/release v3.24.0
MyEtherWallet · Oct 29, 2018 · 7c624c2 · 7c624c2
2 parents 73e5d0a + 4aca35e
commit 7c624c2
Show file tree

Hide file tree

Showing 18 changed files with 518 additions and 260 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
+### Release v3.24.0
+
 ### New
 
+- Add C20 contract abi [#2122](https://github.com/kvhnuke/etherwallet/pull/2122)
+- Adds VIC tokens [#2120](https://github.com/kvhnuke/etherwallet/pull/2120)
+- Adds VIC contracts [#2121](https://github.com/kvhnuke/etherwallet/pull/2121)
+- Adds phishfort extension [#2113](https://github.com/kvhnuke/etherwallet/pull/2113)
 - Update POA block explorrer [#2111](https://github.com/kvhnuke/etherwallet/pull/2111)
 - Fix trezor signing [#2109](https://github.com/kvhnuke/etherwallet/pull/2109)
 - Add Credits custom gas [#2107](https://github.com/kvhnuke/etherwallet/pull/2107)

diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -100,18 +100,18 @@
     @@if (site === 'mew' ) {
       <a class="brand" href="/" aria-label="Go to homepage">
         <img src="images/logo-myetherwallet.svg"   height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.23.1</p>
+        <p class="small visible-xs">3.24.0</p>
       </a>
     }
     @@if (site === 'cx'  ) {
       <a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
         <img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.23.1</p>
+        <p class="small visible-xs">3.24.0</p>
       </a>
     }
     <div class="tagline">
 
-    <span class="hidden-xs">3.23.1</span>
+    <span class="hidden-xs">3.24.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet",
-  "version": "3.23.1",
+  "version": "3.24.0",
   "manifest_version": 2,
   "description": "MyEtherWallet Chrome Extension",
   "homepage_url": "https://www.myetherwallet.com/",

diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js
diff --git a/chrome-extension/background/extension.js b/chrome-extension/background/extension.js
@@ -5,7 +5,7 @@
   localStorage.getItem("iosiro-blacklisted-domains") === null
     ? getDomains("iosiro")
     : checkIfDataIsRecent("iosiro");
-  localStorage.getItem("phishfort-blacklisted-domains") === null
+    localStorage.getItem("phishfort-blacklisted-domains") === null
     ? getDomains("phishfort")
     : checkIfDataIsRecent("phishfort");
 
@@ -71,12 +71,14 @@ function querycB(tabs) {
   const ealBlacklisted = localStorage.getItem("eal-blacklisted-domains")
     ? JSON.parse(localStorage.getItem("eal-blacklisted-domains"))
     : eal;
+
   const iosiroBlacklisted = localStorage.getItem("iosiro-blacklisted-domains")
     ? JSON.parse(localStorage.getItem("iosiro-blacklisted-domains"))
     : iosiro;
+
   const phishfortBlacklisted = localStorage.getItem("phishfort-blacklisted-domains")
-    ? JSON.parse(localStorage.getItem("phishfort-blacklisted-domains"))
-    : phishfort;
+  ? JSON.parse(localStorage.getItem("phishfort-blacklisted-domains"))
+  : phishfort;
 
   const whitelisted = localStorage.getItem("409h-whitelisted-domains")
     ? JSON.parse(localStorage.getItem("409h-whitelisted-domains"))
@@ -197,10 +199,10 @@ function getDomains(str) {
 
   let newName;
 
-  if (str && str !== "" && (str === "eal" || str === "iosiro" || str === "phishfort")) {
+  if (str && str !== "" && (str === "eal" || str === "iosiro" || str == "phishfort")) {
     newName = str + "-blacklisted-domains";
     setInStorage(blackListDomains[str], newName);
-  } else if (str && str !== "" && (str !== "eal" || str !== "iosiro" || str !== "phishfort")) {
+  } else if (str && str !== "" && (str !== "eal" || str !== "iosiro" || str != "phishfort")) {
     newName = str + "-whitelisted-domains";
     setInStorage(whiteListDomains[str], newName);
   } else {

diff --git a/chrome-extension/contest.html b/chrome-extension/contest.html
@@ -87,6 +87,8 @@
         or
         <a href="https://kb.myetherwallet.com/migration/moving-from-private-key-to-metamask.html" target="_blank" rel="noopener noreferrer">MetaMask</a>
         or
+        <a href="https://chrome.google.com/webstore/detail/phishfort-protect/bdiohckpogchppdldbckcdjlklanhkfc" target="_blank" rel="noopener noreferrer">PhishFort</a>
+        or
         <a href="https://chrome.google.com/webstore/detail/cryptonite-by-metacert/keghdcpemohlojlglbiegihkljkgnige" target="_blank" rel="noopener noreferrer">Cryptonite</a>
       </span>
     </div>
@@ -98,13 +100,13 @@
 
       <a class="brand" href="/" aria-label="Go to homepage">
         <img src="images/logo-myetherwallet.svg"   height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.23.1</p>
+        <p class="small visible-xs">3.24.0</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.23.1</span>
+    <span class="hidden-xs">3.24.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
@@ -83,12 +83,12 @@
 
       <a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
         <img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.23.1</p>
+        <p class="small visible-xs">3.24.0</p>
       </a>
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.23.1</span>
+    <span class="hidden-xs">3.24.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

diff --git a/chrome-extension/helpers.html b/chrome-extension/helpers.html
@@ -88,6 +88,8 @@
         or
         <a href="https://kb.myetherwallet.com/migration/moving-from-private-key-to-metamask.html" target="_blank" rel="noopener noreferrer">MetaMask</a>
         or
+        <a href="https://chrome.google.com/webstore/detail/phishfort-protect/bdiohckpogchppdldbckcdjlklanhkfc" target="_blank" rel="noopener noreferrer">PhishFort</a>
+        or
         <a href="https://chrome.google.com/webstore/detail/cryptonite-by-metacert/keghdcpemohlojlglbiegihkljkgnige" target="_blank" rel="noopener noreferrer">Cryptonite</a>
       </span>
     </div>
@@ -99,13 +101,13 @@
 
       <a class="brand" href="/" aria-label="Go to homepage">
         <img src="images/logo-myetherwallet.svg"   height="64px" width="245px" alt="MyEtherWallet" />
-        <p class="small visible-xs">3.23.1</p>
+        <p class="small visible-xs">3.24.0</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.23.1</span>
+    <span class="hidden-xs">3.24.0</span>
 
     <span class="dropdown dropdown-lang" ng-cloak>
       <a tabindex="0"  aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>