Release: v3.11.3.3

MyEtherWallet · Feb 5, 2018 · 856a2b6 · 856a2b6
1 parent ba7a2e1
commit 856a2b6
Show file tree

Hide file tree

Showing 19 changed files with 309 additions and 136 deletions.
diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -98,18 +98,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.11.3.2</p>
+        <p class="small visible-xs">3.11.3.3</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.11.3.2</p>
+        <p class="small visible-xs">3.11.3.3</p>
       </a>
     }
     <div class="tagline">
 
-    <span class="hidden-xs">3.11.3.2</span>
+    <span class="hidden-xs">3.11.3.3</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  btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

diff --git a/app/layouts/helpers.html b/app/layouts/helpers.html
@@ -1,4 +1,3 @@
-
 @@include( '../includes/header.tpl', { "site": "mew" } )
 
 <section class="container" style="min-height: 50%" ng-controller='viewCtrl'>

diff --git a/app/layouts/index.html b/app/layouts/index.html
@@ -1,4 +1,3 @@
-
 @@include( '../includes/header.tpl', { "site": "mew" } )
 
 <section class="container" style="min-height: 50%" ng-controller='viewCtrl'>
@@ -32,15 +31,6 @@
 
   @@include('../includes/alerts.tpl')
 
-
-  <!--
-  <section class="loading-wrap" ng-hide="1==1">
-    <div class="loading">
-      <img src="images/loading.gif" />
-      <h1> Loading... </h1>
-  </section>
-  -->
-
 </section>
 
 @@include( '../includes/footer.tpl', { "site": "mew" } )
diff --git a/app/manifest.json b/app/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet",
-  "version": "3.11.3.2",
+  "version": "3.11.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.11.3.2",
+    "version": "3.11.3.3",
     "description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
     "author": "MyEtherWallet",
     "license": "ISC",

diff --git a/app/scripts/controllers/walletBalanceCtrl.js b/app/scripts/controllers/walletBalanceCtrl.js
@@ -10,7 +10,7 @@ var walletBalanceCtrl = function($scope, $sce, $rootScope) {
         type: "custom",
     };
 
-    $scope.slide = 2;
+    $scope.slide = 1;
 
     $scope.customTokenField = false;
 
@@ -96,4 +96,5 @@ var walletBalanceCtrl = function($scope, $sce, $rootScope) {
     }
 
 };
+
 module.exports = walletBalanceCtrl;
diff --git a/app/scripts/directives/balanceDrtv.html b/app/scripts/directives/balanceDrtv.html
@@ -75,29 +75,9 @@ <h5 class="swap__cta" ng-show="wallet.balance>=50">Time to beef up your security
     </div>
   </a>
 
-  <!-- Coinbase -->
-  <a href="https://buy.coinbase.com?code=a6e1bd98-6464-5552-84dd-b27f0388ac7d&address={{wallet.getChecksumAddressString()}}&crypto_currency=ETH&currency=USD"
-     ng-show="ajaxReq.type=='ETH' && slide==2"
-     class="block swap--usd"
-     target="_blank" rel="noopener noreferrer">
-    <div class="col-sm-7">
-      <p class="swap__subhead" ng-show="wallet.balance<=0">Aw...you don't have any ETH</p>
-      <p class="swap__subhead" ng-show="wallet.balance>0">It's now easier to get more ETH</p>
-      <h5 class="swap__cta">Buy ETH with USD</h5>
-    </div>
-    <div class="col-sm-5">
-      <img src="images/logo-coinbase.svg" width="64" height="auto" class="swap__logo">
-      <p class="swap-flag--price">1 ETH ≈ <br /> {{wallet.usdPrice}} USD</p>
-    </div>
-  </a>
-
-
-
-
-
   <!-- Bity -->
   <a ng-click="globalService.currentTab=globalService.tabs.swap.id"
-     ng-show="ajaxReq.type=='ETH' && slide==3"
+     ng-show="ajaxReq.type=='ETH' && slide==2"
      class="block swap--btc"
      target="_blank" rel="noopener noreferrer">
     <div class="col-sm-7">
@@ -112,10 +92,26 @@ <h5 class="swap__cta">Swap BTC <-> ETH</h5>
     </div>
   </a>
 
+  <!-- Coinbase
+  <a href="#"
+     ng-show="ajaxReq.type=='ETH' && slide==2"
+     class="block swap--usd"
+     target="_blank" rel="noopener noreferrer">
+    <div class="col-sm-7">
+      <p class="swap__subhead" ng-show="wallet.balance<=0">Aw...you don't have any ETH</p>
+      <p class="swap__subhead" ng-show="wallet.balance>0">It's now easier to get more ETH</p>
+      <h5 class="swap__cta">Buy ETH with USD</h5>
+    </div>
+    <div class="col-sm-5">
+      <img src="images/logo-coinbase.svg" width="64" height="auto" class="swap__logo">
+      <p class="swap-flag--price">1 ETH ≈ <br /> {{wallet.usdPrice}} USD</p>
+    </div>
+  </a>
+  -->
+
   <div class="swap__nav" ng-show="ajaxReq.type=='ETH'">
     <a ng-click="slide=1"> &bull; </a>
     <a ng-click="slide=2"> &bull; </a>
-    <a ng-click="slide=3"> &bull; </a>
   </div>
 
 

diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js
@@ -45,18 +45,6 @@ nodes.nodeList = {
         'service': 'myetherapi.com',
         'lib': new nodes.customNode('https://api.myetherapi.com/eth', '')
     },
-    'eth_mycrypto': {
-        'name': 'ETH',
-        'blockExplorerTX': 'https://etherscan.io/tx/[[txHash]]',
-        'blockExplorerAddr': 'https://etherscan.io/address/[[address]]',
-        'type': nodes.nodeTypes.ETH,
-        'eip155': true,
-        'chainId': 1,
-        'tokenList': require('./tokens/ethTokens.json'),
-        'abiList': require('./abiDefinitions/ethAbi.json'),
-        'service': 'mycryptoapi.com',
-        'lib': new nodes.customNode('https://api.mycryptoapi.com/eth', '')
-    },
     'eth_ethscan': {
         'name': 'ETH',
         'blockExplorerTX': 'https://etherscan.io/tx/[[txHash]]',

diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less
@@ -539,46 +539,45 @@ label small {
   li:nth-child(1),
   li:nth-child(2),
   li:nth-child(3),
-  li:nth-child(4),
-  li:nth-child(5) {
+  li:nth-child(4){
     border-left: 2px solid @brand-eth;
   }
-  li:nth-child(6) {
+  li:nth-child(5) {
     border-left: 2px solid @brand-etc;
   }
+  li:nth-child(6),
   li:nth-child(7),
   li:nth-child(8),
   li:nth-child(9),
   li:nth-child(10),
-  li:nth-child(11),
-  li:nth-child(12) {
+  li:nth-child(11) {
     border-left: 2px solid @brand-test;
   }
-  li:nth-child(13) {
+  li:nth-child(12) {
     border-left: 2px solid @brand-exp;
   }
-  li:nth-child(14) {
+  li:nth-child(13) {
     border-left: 2px solid @brand-ubq;
   }
-  li:nth-child(15) {
+  li:nth-child(14) {
     border-left: 2px solid @brand-poa;
   }
-  li:nth-child(16) {
+  li:nth-child(15) {
     border-left: 2px solid @brand-tomo;
   }
-  li:nth-child(17) {
+  li:nth-child(16) {
     border-left: 2px solid @brand-ella;
   }
   li:last-child {
     border-left: 2px solid @gray-light;
   }
+  li:nth-child(4),
   li:nth-child(5),
-  li:nth-child(6),
+  li:nth-child(11),
   li:nth-child(12),
   li:nth-child(13),
   li:nth-child(14),
-  li:nth-child(15),
-  li:nth-child(16) {
+  li:nth-child(15) {
     border-bottom: 1px solid @gray-lighter;
   }
 }

diff --git a/chrome-extension/css/etherwallet-master.min.css b/chrome-extension/css/etherwallet-master.min.css
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.11.3.2</p>
+        <p class="small visible-xs">3.11.3.3</p>
       </a>
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.11.3.2</span>
+    <span class="hidden-xs">3.11.3.3</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  btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

diff --git a/chrome-extension/helpers.html b/chrome-extension/helpers.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="en" ng-app="mewApp">
 <head>
@@ -99,13 +98,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.11.3.2</p>
+        <p class="small visible-xs">3.11.3.3</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.11.3.2</span>
+    <span class="hidden-xs">3.11.3.3</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  btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

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

diff --git a/dist/css/etherwallet-master.min.css b/dist/css/etherwallet-master.min.css
diff --git a/dist/helpers.html b/dist/helpers.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="en" ng-app="mewApp">
 <head>
@@ -99,13 +98,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.11.3.2</p>
+        <p class="small visible-xs">3.11.3.3</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.11.3.2</span>
+    <span class="hidden-xs">3.11.3.3</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  btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>

diff --git a/dist/index.html b/dist/index.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="en" ng-app="mewApp">
 <head>
@@ -99,13 +98,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.11.3.2</p>
+        <p class="small visible-xs">3.11.3.3</p>
       </a>
 
 
     <div class="tagline">
 
-    <span class="hidden-xs">3.11.3.2</span>
+    <span class="hidden-xs">3.11.3.3</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  btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
@@ -6144,15 +6143,6 @@ <h1 translate="BULK_SuccessMsg">
 </div>
 
 
-
-  <!--
-  <section class="loading-wrap" ng-hide="1==1">
-    <div class="loading">
-      <img src="images/loading.gif" />
-      <h1> Loading... </h1>
-  </section>
-  -->
-
 </section>
 
 <section class="pre-footer">
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		@@include( '../includes/header.tpl', { "site": "mew" } )

		<section class="container" style="min-height: 50%" ng-controller='viewCtrl'>
Expand Down