Release: v3.9.3.3

MyEtherWallet · Jun 20, 2017 · d3c9ad7 · d3c9ad7
1 parent 503493d
commit d3c9ad7
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 39 deletions.
diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl
@@ -54,9 +54,9 @@
 
       <section class="footer--righ">
         <div class="footer--gas">
-          <p ng-show="showBlocks" style="color: yellow; font-size: 26px;">Latest Block#: {{currentBlockNumber}}</p>
+          <p ng-show="showBlocks" >Latest Block#: {{currentBlockNumber}}</p>
           <p>
-            <span translate="OFFLINE_Step2_Label_3" style="color: yellow; font-size: 26px;">Gas Price</span>:
+            <span translate="OFFLINE_Step2_Label_3">Gas Price</span>:
             <strong><a href="http://ethgasstation.info/minerTable.php" target="_blank" rel="noopener" style="color: yellow; font-size: 26px;">{{gas.value}} Gwei</a></strong>
           </p>
           <input type="range" ng-model="gas.value" min="{{gas.min}}" max="{{gas.max}}" steps="1" ng-change="gasChanged()"/>

diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -31,10 +31,11 @@
 
 <header class="{{curNode.name}} {{curNode.service}} {{curNode.service}} nav-index-{{gService.currentTab}}" aria-label="header" ng-controller='tabsCtrl' >
 
+<!--
     <div class="small announcement annoucement-warning">
       <div class="container">The #FOMO is Real. Breath. If you are trying to get in on Status.im, <strong> wait until BLOCK 3903900!</strong> <br /> If your TX is not urgent, we recommend NOT SENDING TODAY. Thank you for understanding. </div>
     </div>
-
+-->
   @@if (site === 'cx' ) {
     <div class="small announcement annoucement-warning" target="_blank" rel="noopener">
       <div class="container" translate="CX_Warning_1">Make sure you have <strong>external backups</strong> of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling the extension. This extension is a way to easily access your wallets, <strong>not</strong> a way to back them up.</div>
@@ -48,7 +49,7 @@
 
       <div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>
 
-        &middot; v3.9.3.2 &nbsp;&nbsp;
+        &middot; v3.9.3.3 &nbsp;&nbsp;
 
         <span class="dropdown" 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 CX",
-  "version": "3.9.3.2",
+  "version": "3.9.3.3",
   "manifest_version": 2,
   "description": "MyEtherWallet Chrome Extension",
   "homepage_url": "https://www.myetherwallet.com/",

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "MyEtherWallet",
-    "version": "3.9.3.2",
+    "version": "3.9.3.3",
     "description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
     "author": "MyEtherWallet",
     "license": "ISC",

diff --git a/app/scripts/controllers/footerCtrl.js b/app/scripts/controllers/footerCtrl.js
@@ -21,7 +21,7 @@ var footerCtrl = function($scope, globalService) {
         $scope.gas = {
             curVal: 21,
             value: globalFuncs.localStorage.getItem(gasPriceKey, null) ? parseInt(globalFuncs.localStorage.getItem(gasPriceKey)) : 21,
-            max: 50,
+            max: 60,
             min: 1
         }
         ethFuncs.gasAdjustment = $scope.gas.value;

diff --git a/app/scripts/controllers/sendTxCtrl.js b/app/scripts/controllers/sendTxCtrl.js
@@ -77,7 +77,7 @@ var sendTxCtrl = function($scope, $sce, walletService) {
         $scope.wallet = walletService.wallet;
         $scope.wd = true;
         $scope.wallet.setBalance(applyScope);
-        //$scope.wallet.setTokens();
+        $scope.wallet.setTokens();
         if ($scope.parentTxConfig) {
             var setTxObj = function() {
                 $scope.addressDrtv.ensAddressField = $scope.parentTxConfig.to;

diff --git a/app/scripts/controllers/walletBalanceCtrl.js b/app/scripts/controllers/walletBalanceCtrl.js
@@ -1,7 +1,7 @@
 'use strict';
 var walletBalanceCtrl = function($scope, $sce) {
     $scope.ajaxReq = ajaxReq;
-    $scope.tokensLoaded = false;
+    $scope.tokensLoaded = true;
     $scope.localToken = {
         contractAdd: "",
         symbol: "",

diff --git a/app/scripts/customGas.js b/app/scripts/customGas.js
@@ -8,7 +8,7 @@
 // http://www.tokensalecalendar.com/
 // If you aren't on the above, you should get on it.
 
-//   msg:        '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
+//
 
 
 module.exports = [
@@ -24,7 +24,7 @@ module.exports = [
   to:         '0x55d34b686aa8C04921397c5807DB9ECEdba00a4c',
   gasLimit:   200000,
   data:       '',
-  msg:        'DONT SEND UNTIL BLOCK 3903900!!!! Status.im https://contribute.status.im ______________________________________________________________________________________________________________________ STARTS: Block 3903900______________________________________________________________________ GAS_PRICE:_50 GWEI. Change via slider in the footer_____________________________________________________________________ GAS_LIMIT:_200000___________________________________________________________________________________________________ NOT_LOADING:_Change the node in upper right corner to ETH (Etherscan.io)_____________________________________________ SUPPORT:_https://www.reddit.com/r/statusim/   https://twitter.com/ethstatus'
+  msg:        '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
 },
 {
   // Status

diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
@@ -31,10 +31,11 @@
 
 <header class="{{curNode.name}} {{curNode.service}} {{curNode.service}} nav-index-{{gService.currentTab}}" aria-label="header" ng-controller='tabsCtrl' >
 
+<!--
     <div class="small announcement annoucement-warning">
       <div class="container">The #FOMO is Real. Breath. If you are trying to get in on Status.im, <strong> wait until BLOCK 3903900!</strong> <br /> If your TX is not urgent, we recommend NOT SENDING TODAY. Thank you for understanding. </div>
     </div>
-
+-->
 
     <div class="small announcement annoucement-warning" target="_blank" rel="noopener">
       <div class="container" translate="CX_Warning_1">Make sure you have <strong>external backups</strong> of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling the extension. This extension is a way to easily access your wallets, <strong>not</strong> a way to back them up.</div>
@@ -48,7 +49,7 @@
 
       <div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>
 
-        &middot; v3.9.3.2 &nbsp;&nbsp;
+        &middot; v3.9.3.3 &nbsp;&nbsp;
 
         <span class="dropdown" 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>
@@ -3318,9 +3319,9 @@ <h5> <i ng-hide="curLang=='en'">🏅</i> <span translate="Translator_Desc"> Than
 
       <section class="footer--righ">
         <div class="footer--gas">
-          <p ng-show="showBlocks" style="color: yellow; font-size: 26px;">Latest Block#: {{currentBlockNumber}}</p>
+          <p ng-show="showBlocks" >Latest Block#: {{currentBlockNumber}}</p>
           <p>
-            <span translate="OFFLINE_Step2_Label_3" style="color: yellow; font-size: 26px;">Gas Price</span>:
+            <span translate="OFFLINE_Step2_Label_3">Gas Price</span>:
             <strong><a href="http://ethgasstation.info/minerTable.php" target="_blank" rel="noopener" style="color: yellow; font-size: 26px;">{{gas.value}} Gwei</a></strong>
           </p>
           <input type="range" ng-model="gas.value" min="{{gas.min}}" max="{{gas.max}}" steps="1" ng-change="gasChanged()"/>

diff --git a/chrome-extension/helpers.html b/chrome-extension/helpers.html
@@ -32,10 +32,11 @@
 
 <header class="{{curNode.name}} {{curNode.service}} {{curNode.service}} nav-index-{{gService.currentTab}}" aria-label="header" ng-controller='tabsCtrl' >
 
+<!--
     <div class="small announcement annoucement-warning">
       <div class="container">The #FOMO is Real. Breath. If you are trying to get in on Status.im, <strong> wait until BLOCK 3903900!</strong> <br /> If your TX is not urgent, we recommend NOT SENDING TODAY. Thank you for understanding. </div>
     </div>
-
+-->
 
   <section class="bg-gradient header-branding">
     <section class="container">
@@ -45,7 +46,7 @@
 
       <div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>
 
-        &middot; v3.9.3.2 &nbsp;&nbsp;
+        &middot; v3.9.3.3 &nbsp;&nbsp;
 
         <span class="dropdown" 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>
@@ -591,9 +592,9 @@ <h5> <i ng-hide="curLang=='en'">🏅</i> <span translate="Translator_Desc"> Than
 
       <section class="footer--righ">
         <div class="footer--gas">
-          <p ng-show="showBlocks" style="color: yellow; font-size: 26px;">Latest Block#: {{currentBlockNumber}}</p>
+          <p ng-show="showBlocks" >Latest Block#: {{currentBlockNumber}}</p>
           <p>
-            <span translate="OFFLINE_Step2_Label_3" style="color: yellow; font-size: 26px;">Gas Price</span>:
+            <span translate="OFFLINE_Step2_Label_3">Gas Price</span>:
             <strong><a href="http://ethgasstation.info/minerTable.php" target="_blank" rel="noopener" style="color: yellow; font-size: 26px;">{{gas.value}} Gwei</a></strong>
           </p>
           <input type="range" ng-model="gas.value" min="{{gas.min}}" max="{{gas.max}}" steps="1" ng-change="gasChanged()"/>

diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js
@@ -1604,7 +1604,7 @@ var footerCtrl = function footerCtrl($scope, globalService) {
         $scope.gas = {
             curVal: 21,
             value: globalFuncs.localStorage.getItem(gasPriceKey, null) ? parseInt(globalFuncs.localStorage.getItem(gasPriceKey)) : 21,
-            max: 50,
+            max: 60,
             min: 1
         };
         ethFuncs.gasAdjustment = $scope.gas.value;
@@ -2020,7 +2020,7 @@ var sendTxCtrl = function sendTxCtrl($scope, $sce, walletService) {
         $scope.wallet = walletService.wallet;
         $scope.wd = true;
         $scope.wallet.setBalance(applyScope);
-        //$scope.wallet.setTokens();
+        $scope.wallet.setTokens();
         if ($scope.parentTxConfig) {
             var setTxObj = function setTxObj() {
                 $scope.addressDrtv.ensAddressField = $scope.parentTxConfig.to;
@@ -2795,7 +2795,7 @@ module.exports = viewWalletCtrl;
 
 var walletBalanceCtrl = function walletBalanceCtrl($scope, $sce) {
     $scope.ajaxReq = ajaxReq;
-    $scope.tokensLoaded = false;
+    $scope.tokensLoaded = true;
     $scope.localToken = {
         contractAdd: "",
         symbol: "",
@@ -2912,7 +2912,7 @@ module.exports = walletGenCtrl;
 // http://www.tokensalecalendar.com/
 // If you aren't on the above, you should get on it.
 
-//   msg:        '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
+//
 
 
 module.exports = [{
@@ -2926,7 +2926,7 @@ module.exports = [{
   to: '0x55d34b686aa8C04921397c5807DB9ECEdba00a4c',
   gasLimit: 200000,
   data: '',
-  msg: 'DONT SEND UNTIL BLOCK 3903900!!!! Status.im https://contribute.status.im ______________________________________________________________________________________________________________________ STARTS: Block 3903900______________________________________________________________________ GAS_PRICE:_50 GWEI. Change via slider in the footer_____________________________________________________________________ GAS_LIMIT:_200000___________________________________________________________________________________________________ NOT_LOADING:_Change the node in upper right corner to ETH (Etherscan.io)_____________________________________________ SUPPORT:_https://www.reddit.com/r/statusim/   https://twitter.com/ethstatus'
+  msg: '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
 }, {
   // Status
   to: '0x0000',

diff --git a/chrome-extension/manifest.json b/chrome-extension/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet CX",
-  "version": "3.9.3.2",
+  "version": "3.9.3.3",
   "manifest_version": 2,
   "description": "MyEtherWallet Chrome Extension",
   "homepage_url": "https://www.myetherwallet.com/",

diff --git a/dist/helpers.html b/dist/helpers.html
@@ -32,10 +32,11 @@
 
 <header class="{{curNode.name}} {{curNode.service}} {{curNode.service}} nav-index-{{gService.currentTab}}" aria-label="header" ng-controller='tabsCtrl' >
 
+<!--
     <div class="small announcement annoucement-warning">
       <div class="container">The #FOMO is Real. Breath. If you are trying to get in on Status.im, <strong> wait until BLOCK 3903900!</strong> <br /> If your TX is not urgent, we recommend NOT SENDING TODAY. Thank you for understanding. </div>
     </div>
-
+-->
 
   <section class="bg-gradient header-branding">
     <section class="container">
@@ -45,7 +46,7 @@
 
       <div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>
 
-        &middot; v3.9.3.2 &nbsp;&nbsp;
+        &middot; v3.9.3.3 &nbsp;&nbsp;
 
         <span class="dropdown" 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>
@@ -591,9 +592,9 @@ <h5> <i ng-hide="curLang=='en'">🏅</i> <span translate="Translator_Desc"> Than
 
       <section class="footer--righ">
         <div class="footer--gas">
-          <p ng-show="showBlocks" style="color: yellow; font-size: 26px;">Latest Block#: {{currentBlockNumber}}</p>
+          <p ng-show="showBlocks" >Latest Block#: {{currentBlockNumber}}</p>
           <p>
-            <span translate="OFFLINE_Step2_Label_3" style="color: yellow; font-size: 26px;">Gas Price</span>:
+            <span translate="OFFLINE_Step2_Label_3">Gas Price</span>:
             <strong><a href="http://ethgasstation.info/minerTable.php" target="_blank" rel="noopener" style="color: yellow; font-size: 26px;">{{gas.value}} Gwei</a></strong>
           </p>
           <input type="range" ng-model="gas.value" min="{{gas.min}}" max="{{gas.max}}" steps="1" ng-change="gasChanged()"/>

diff --git a/dist/index.html b/dist/index.html
@@ -32,10 +32,11 @@
 
 <header class="{{curNode.name}} {{curNode.service}} {{curNode.service}} nav-index-{{gService.currentTab}}" aria-label="header" ng-controller='tabsCtrl' >
 
+<!--
     <div class="small announcement annoucement-warning">
       <div class="container">The #FOMO is Real. Breath. If you are trying to get in on Status.im, <strong> wait until BLOCK 3903900!</strong> <br /> If your TX is not urgent, we recommend NOT SENDING TODAY. Thank you for understanding. </div>
     </div>
-
+-->
 
   <section class="bg-gradient header-branding">
     <section class="container">
@@ -45,7 +46,7 @@
 
       <div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>
 
-        &middot; v3.9.3.2 &nbsp;&nbsp;
+        &middot; v3.9.3.3 &nbsp;&nbsp;
 
         <span class="dropdown" 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>
@@ -3320,9 +3321,9 @@ <h5> <i ng-hide="curLang=='en'">🏅</i> <span translate="Translator_Desc"> Than
 
       <section class="footer--righ">
         <div class="footer--gas">
-          <p ng-show="showBlocks" style="color: yellow; font-size: 26px;">Latest Block#: {{currentBlockNumber}}</p>
+          <p ng-show="showBlocks" >Latest Block#: {{currentBlockNumber}}</p>
           <p>
-            <span translate="OFFLINE_Step2_Label_3" style="color: yellow; font-size: 26px;">Gas Price</span>:
+            <span translate="OFFLINE_Step2_Label_3">Gas Price</span>:
             <strong><a href="http://ethgasstation.info/minerTable.php" target="_blank" rel="noopener" style="color: yellow; font-size: 26px;">{{gas.value}} Gwei</a></strong>
           </p>
           <input type="range" ng-model="gas.value" min="{{gas.min}}" max="{{gas.max}}" steps="1" ng-change="gasChanged()"/>

diff --git a/dist/js/etherwallet-master.js b/dist/js/etherwallet-master.js
@@ -1604,7 +1604,7 @@ var footerCtrl = function footerCtrl($scope, globalService) {
         $scope.gas = {
             curVal: 21,
             value: globalFuncs.localStorage.getItem(gasPriceKey, null) ? parseInt(globalFuncs.localStorage.getItem(gasPriceKey)) : 21,
-            max: 50,
+            max: 60,
             min: 1
         };
         ethFuncs.gasAdjustment = $scope.gas.value;
@@ -2020,7 +2020,7 @@ var sendTxCtrl = function sendTxCtrl($scope, $sce, walletService) {
         $scope.wallet = walletService.wallet;
         $scope.wd = true;
         $scope.wallet.setBalance(applyScope);
-        //$scope.wallet.setTokens();
+        $scope.wallet.setTokens();
         if ($scope.parentTxConfig) {
             var setTxObj = function setTxObj() {
                 $scope.addressDrtv.ensAddressField = $scope.parentTxConfig.to;
@@ -2795,7 +2795,7 @@ module.exports = viewWalletCtrl;
 
 var walletBalanceCtrl = function walletBalanceCtrl($scope, $sce) {
     $scope.ajaxReq = ajaxReq;
-    $scope.tokensLoaded = false;
+    $scope.tokensLoaded = true;
     $scope.localToken = {
         contractAdd: "",
         symbol: "",
@@ -2912,7 +2912,7 @@ module.exports = walletGenCtrl;
 // http://www.tokensalecalendar.com/
 // If you aren't on the above, you should get on it.
 
-//   msg:        '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
+//
 
 
 module.exports = [{
@@ -2926,7 +2926,7 @@ module.exports = [{
   to: '0x55d34b686aa8C04921397c5807DB9ECEdba00a4c',
   gasLimit: 200000,
   data: '',
-  msg: 'DONT SEND UNTIL BLOCK 3903900!!!! Status.im https://contribute.status.im ______________________________________________________________________________________________________________________ STARTS: Block 3903900______________________________________________________________________ GAS_PRICE:_50 GWEI. Change via slider in the footer_____________________________________________________________________ GAS_LIMIT:_200000___________________________________________________________________________________________________ NOT_LOADING:_Change the node in upper right corner to ETH (Etherscan.io)_____________________________________________ SUPPORT:_https://www.reddit.com/r/statusim/   https://twitter.com/ethstatus'
+  msg: '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
 }, {
   // Status
   to: '0x0000',

diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
     "name": "MyEtherWallet",
-    "version": "3.9.3.2",
+    "version": "3.9.3.3",
     "description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
     "author": "MyEtherWallet",
     "license": "ISC",