Release: v3.5.5

MyEtherWallet · Mar 18, 2017 · cc0d750 · cc0d750
1 parent 943d332
commit cc0d750
Show file tree

Hide file tree

Showing 31 changed files with 94,072 additions and 106,007 deletions.
diff --git a/app/includes/swap-stage-3.tpl b/app/includes/swap-stage-3.tpl
@@ -99,7 +99,11 @@
     <label translate="x_Address"> Your Address </label>
     <div class="qr-code" qr-code="{{'bitcoin:'+orderResult.payment_address+'?amount='+orderResult.input.amount}}" watch-var="orderResult" ></div>
 
-    <div class="alert alert-warning"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24"><path d="M505.403 406.394L295.389 58.102c-8.274-13.721-23.367-22.245-39.39-22.245s-31.116 8.524-39.391 22.246L6.595 406.394c-8.551 14.182-8.804 31.95-.661 46.37 8.145 14.42 23.491 23.378 40.051 23.378h420.028c16.56 0 31.907-8.958 40.052-23.379 8.143-14.421 7.89-32.189-.662-46.369zm-28.364 29.978a12.684 12.684 0 0 1-11.026 6.436H45.985a12.68 12.68 0 0 1-11.025-6.435 12.683 12.683 0 0 1 .181-12.765L245.156 75.316A12.732 12.732 0 0 1 256 69.192c4.41 0 8.565 2.347 10.843 6.124l210.013 348.292a12.677 12.677 0 0 1 .183 12.764z" fill="#FFF"/><path d="M256.154 173.005c-12.68 0-22.576 6.804-22.576 18.866 0 36.802 4.329 89.686 4.329 126.489.001 9.587 8.352 13.607 18.248 13.607 7.422 0 17.937-4.02 17.937-13.607 0-36.802 4.329-89.686 4.329-126.489 0-12.061-10.205-18.866-22.267-18.866zM256.465 353.306c-13.607 0-23.814 10.824-23.814 23.814 0 12.68 10.206 23.814 23.814 23.814 12.68 0 23.505-11.134 23.505-23.814 0-12.99-10.826-23.814-23.505-23.814z" fill="#FFF"/></svg>&nbsp; Be sure to provide enough gas for the transaction to be completely in a timely manner. </div>
+    <div class="alert alert-danger"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24"><path d="M505.403 406.394L295.389 58.102c-8.274-13.721-23.367-22.245-39.39-22.245s-31.116 8.524-39.391 22.246L6.595 406.394c-8.551 14.182-8.804 31.95-.661 46.37 8.145 14.42 23.491 23.378 40.051 23.378h420.028c16.56 0 31.907-8.958 40.052-23.379 8.143-14.421 7.89-32.189-.662-46.369zm-28.364 29.978a12.684 12.684 0 0 1-11.026 6.436H45.985a12.68 12.68 0 0 1-11.025-6.435 12.683 12.683 0 0 1 .181-12.765L245.156 75.316A12.732 12.732 0 0 1 256 69.192c4.41 0 8.565 2.347 10.843 6.124l210.013 348.292a12.677 12.677 0 0 1 .183 12.764z" fill="#FFF"/><path d="M256.154 173.005c-12.68 0-22.576 6.804-22.576 18.866 0 36.802 4.329 89.686 4.329 126.489.001 9.587 8.352 13.607 18.248 13.607 7.422 0 17.937-4.02 17.937-13.607 0-36.802 4.329-89.686 4.329-126.489 0-12.061-10.205-18.866-22.267-18.866zM256.465 353.306c-13.607 0-23.814 10.824-23.814 23.814 0 12.68 10.206 23.814 23.814 23.814 12.68 0 23.505-11.134 23.505-23.814 0-12.99-10.826-23.814-23.505-23.814z" fill="#FFF"/></svg>&nbsp;
+       <a href="https://shapeshift.io/#/btcfee" target="_blank">Please use the recommended TX fees seen here.</a>
+       <br />
+       Orders that take too long will have to be processed manually.
+    </div>
   </section>
 
 

diff --git a/app/includes/swap.tpl b/app/includes/swap.tpl
@@ -1,7 +1,6 @@
 <!-- Swap Page -->
 <main class="tab-pane swap-tab active" ng-if="globalService.currentTab==globalService.tabs.swap.id" ng-controller='swapCtrl'  ng-cloak>
 
-
   @@if (site === 'mew' ) { @@include( '../includes/swap-stage-1.tpl', { "site": "mew" } ) }
   @@if (site === 'cx'  ) { @@include( '../includes/swap-stage-1.tpl', { "site": "cx"  } ) }
 
@@ -11,6 +10,8 @@
   @@if (site === 'mew' ) { @@include( '../includes/swap-stage-3.tpl', { "site": "mew" } ) }
   @@if (site === 'cx'  ) { @@include( '../includes/swap-stage-3.tpl', { "site": "cx"  } ) }
 
+ <div class="text-center col-xs-12" style="margin-top: 100px;margin-bottom: -60px;"><a href="mailto:[email protected],[email protected]?Subject=Issue%20regarding%20my%20Swap%20on%20MEW&Body=%0APlease%20include%20the%20below%20if%20this%20issue%20is%20regarding%20your%20order.%20%0A%0AREF%20ID%23%3A%20{{orderResult.reference}}%0A%0AAmount%20to%20send%3A%20{{orderResult.input.amount}}%20{{orderResult.input.currency}}%0A%0AAmount%20to%20receive%3A%20{{orderResult.output.amount}}%20{{orderResult.output.currency}}%0A%0APayment%20Address%3A%20{{orderResult.payment_address}}%0A%0ARate%3A%20{{swapOrder.swapRate}}%20{{swapOrder.swapPair}}%0A%0A"> Issue with your Swap? Contact support. </a></div>
 
 </main>
 <!-- / Swap Page -->
+
diff --git a/app/includes/viewWalletInfo.tpl b/app/includes/viewWalletInfo.tpl
@@ -88,16 +88,16 @@
         <a class="btn btn-info btn-block" href="{{blob}}" download="{{wallet.getChecksumAddressString()}}-unencrypted.json" translate="x_Download">DOWNLOAD</a>
       </div>
 
-      <hr/>
+      <br /><hr />
 
       <div ng-show="wallet.type=='default'">
         @@if (site === 'cx' )  {
-          <main ng-controller='signMsgCtrl' ng-show="wallet!=null" ng-cloak>
+          <main ng-controller='signMsgCtrl' ng-show="wallet!=null">
             @@if (site === 'cx' ) {  @@include( './signMsg.tpl', { "site": "cx" } )    }
           </main>
         }
         @@if (site === 'mew' ) {
-          <main class="tab-pane active" ng-show="wallet!=null" ng-controller='signMsgCtrl'  ng-cloak>
+          <main class="tab-pane active" ng-show="wallet!=null" ng-controller='signMsgCtrl' >
             @@if (site === 'mew') {  @@include( './signMsg.tpl', { "site": "mew" } )   }
           </main>
         }

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

diff --git a/app/scripts/controllers/swapCtrl.js b/app/scripts/controllers/swapCtrl.js
@@ -48,7 +48,7 @@ var swapCtrl = function($scope, $sce, walletService) {
         if (vResult == errors.noErrors) return true;
         else if (vResult == errors.priceNotLoaded) return false;
         else if (vResult == errors.lessThanMin || vResult == errors.greaterThanMax) {
-            if ($scope.swapOrder.toVal && $scope.swapOrder.fromVal) uiFuncs.notifier.danger(globalFuncs.errorMsgs[27] + bity.max + " BTC/" + (bity.max / $scope.bity.curRate['ETHBTC']).toFixed(3) + " ETH/" + (bity.max / $scope.bity.curRate['REPBTC']).toFixed(3) + " REP");
+            if (!isStorageOrderExists()) uiFuncs.notifier.danger(globalFuncs.errorMsgs[27] + bity.max + " BTC, " + (bity.max / $scope.bity.curRate['ETHBTC']).toFixed(3) + " ETH, or " + (bity.max / $scope.bity.curRate['REPBTC']).toFixed(3) + " REP");
             return false;
         }
     }

diff --git a/app/scripts/globalFuncs.js b/app/scripts/globalFuncs.js
@@ -33,7 +33,7 @@ globalFuncs.getDangerText = function(str) {
 globalFuncs.errorMsgs = ["Please enter valid amount.", "Your password must be at least 9 characters. Please ensure it is a strong password. ", "Sorry! We don\'t recognize this type of wallet file. ", "This is not a valid wallet file. ", "This unit doesn\'t exists, please use the one of the following units ", "Invalid address. ", "Invalid password. ", "Invalid amount. ", "Invalid gas limit. ", "Invalid data value. ", "Invalid gas amount. ", // 10
 "Invalid nonce. ", "Invalid signed transaction. ", "A wallet with this nickname already exists. ", "Wallet not found. ", "Whoops. It doesnt look like a proposal with this ID exists yet or there is an error reading this proposal. ", // 15
 "A wallet with this address already exists in storage. Please check your wallets page. ", "You need to have at least 0.01 ETH in your account to cover the cost of gas. Please add some ETH and try again. ", "All gas would be used on this transaction. This means you have already voted on this proposal or the debate period has ended.", "Invalid symbol", "Not a valid ERC-20 token", "Could not estimate gas. There are not enough funds in the account, or the receiving contract address would throw an error. Feel free to manually set the gas and proceed. The error message upon sending may be more informative.",
-"Please enter valid node name", "Enter valid url, if you are on https your url must be https", "Please enter valid port","Please enter valid chain ID", "Please enter valid ABI", "Minimum amount 0.01 and max","You need your Keystore File & Password (or Private Key) to access this wallet in the future.", "Please enter valid user and password", "Invalid name", "Invalid secret phrase"];
+"Please enter valid node name", "Enter valid url, if you are on https your url must be https", "Please enter valid port","Please enter valid chain ID", "Please enter valid ABI", "Minimum amount: 0.01. Max amount: ","You need your Keystore File & Password (or Private Key) to access this wallet in the future.", "Please enter valid user and password", "Invalid name", "Invalid secret phrase"];
 // These are translated in the translation files
 globalFuncs.successMsgs = ["Valid address", "Wallet successfully decrypted", "Transaction submitted. TX ID: ", "Your wallet was successfully added: ", "File Selected: "];
 // These are translated in the translation files

diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -92,7 +92,7 @@ if (IS_CX) {
 }
 var app = angular.module('mewApp', ['pascalprecht.translate', 'ngSanitize','ngAnimate']);
 app.config(['$compileProvider', function($compileProvider) {
-  $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|):/);
+  $compileProvider.aHrefSanitizationWhitelist(/^\s*(|blob|https|mailto):/);
 }]);
 app.config(['$translateProvider', function($translateProvider) {
   $translateProvider.useMissingTranslationHandlerLog();

diff --git a/app/scripts/translations/de.js b/app/scripts/translations/de.js
@@ -330,7 +330,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**Du benötigst deine Keystore-Datei & das Passwort** (oder den privaten Schlüssel) um künftig auf dein Wallet zugreifen zu können. Bitte sichere diese Datei daher auf einem externen Medium! Es gibt KEINE Möglichkeit, ein Wallet wiederherzustellen, wenn du diese Datei und das Passwort nicht sicherst. Lies die [Hilfe-Seite](https://www.myetherwallet.com/#help) für weitere Informationen. ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Gültige Addresse ',

diff --git a/app/scripts/translations/el.js b/app/scripts/translations/el.js
@@ -332,7 +332,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : 'Προκειμένου να έχετε πρόσβαση σε αυτό το πορτοφόλι στο μέλλον **είναι απαραίτητο το αρχείο Keystore/JSON & ο κωδικός ή το Ιδιωτικό Κλειδί σας**. Παρακαλούμε κρατήστε ένα εξωτερικό αντίγραφο ασφαλείας! Δεν υπάρχει τρόπος ανάκτησης ενός πορτοφολιού άν δεν το αποθηκέυσετε. Διαβάστε την σελίδα [Βοήθειας](https://www.myetherwallet.com/#help) για οδηγίες. ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Έγκυρη διεύθυνση ',

diff --git a/app/scripts/translations/en.js b/app/scripts/translations/en.js
@@ -298,7 +298,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 and max',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**You need your Keystore File & Password** (or Private Key) to access this wallet in the future. Please save & back it up externally! There is no way to recover a wallet if you do not save it. Read the [help page](https://www.myetherwallet.com/#help) for instructions. ',
 ERROR_29                    : 'Please enter valid user and password ',
 ERROR_30                    : 'Please enter valid ENS name ',

diff --git a/app/scripts/translations/fi.js b/app/scripts/translations/fi.js
@@ -353,7 +353,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**Tarvitset Avainsäilö Tiedostosi & salasanan tai Yksityisen salausavaimesi** saadaksesi pääsyn tähän lompakkoon tulevaisuudessa. Ole hyvä ja tallenna sekä varmuuskopioi se ulkoisesti! Ei ole mitään keinoa palauttaa sitä jos et tallenna sitä. Voit lukea ohjeet [Apua sivulta](https://www.myetherwallet.com/#help). ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Validi osoite ',
@@ -376,20 +376,20 @@ GETH_NegativeValue          : 'Negatiivinen arvo ',
 /* Tranlsation Info */
 translate_version           : '0.4 ',
 Translator_Desc             : 'Kiitos kääntäjillemme... ',
-TranslatorName_1            : 'Smokyish ',
-TranslatorAddr_1            : '0xac9a2c1dd946da64c0dc8e70cec2cfb14304fd4f ',
+TranslatorName_1            : '[Smokyish](https://www.myetherwallet.com/?gaslimit=21000&to=0xac9a2c1dd946da64c0dc8e70cec2cfb14304fd4f&value=1.0#send-transaction)',
+TranslatorAddr_1            : '',
 /* Translator 1             : Insert Comments Here */
-TranlsatorName_2            : '',
-TranlsatorAddr_2            : '',
+TranslatorName_2            : '',
+TranslatorAddr_2            : '',
 /* Translator 2             : Insert Comments Here */
-TranlsatorName_3            : '',
-TranlsatorAddr_3            : '',
+TranslatorName_3            : '',
+TranslatorAddr_3            : '',
 /* Translator 3             : Insert Comments Here */
-TranlsatorName_4            : '',
-TranlsatorAddr_4            : '',
+TranslatorName_4            : '',
+TranslatorAddr_4            : '',
 /* Translator 4             : Insert Comments Here */
-TranlsatorName_5            : '',
-TranlsatorAddr_5            : '',
+TranslatorName_5            : '',
+TranslatorAddr_5            : '',
 /* Translator 5             : Insert Comments Here */
 
 /* Help - Nothing after this point has to be translated. If you feel like being extra helpful, go for it. */

diff --git a/app/scripts/translations/hu.js b/app/scripts/translations/hu.js
@@ -325,7 +325,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**Szükséged lesz a Keystore Fájlra és a jelszóra vagy a Privát Kulcsra**, ahhoz, hogy hozzáférj ehhez a tárcához a jövőben. Kérlek mentsd el és készíts külső biztonsági mentést is! Nincs lehetőség egy tárca visszaszerzésére, ha nem mented el. Olvasd el a [Segítség lapot](https://www.myetherwallet.com/#help) további instrukciókért. ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Érvényes cím ',

diff --git a/app/scripts/translations/id.js b/app/scripts/translations/id.js
@@ -333,7 +333,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**DIPERLUKAN File Keystore & password** (atau Private Key) untuk mengakses dompet Anda. Simpan dan backup dengan baik file ini! Tidak ada mekanisme untuk me-recover dompet jika file-nya hilang. Baca instruksi lengkapnya [di sini](https://www.myetherwallet.com/#help). ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Alamat valid ',

diff --git a/app/scripts/translations/it.js b/app/scripts/translations/it.js
@@ -321,7 +321,7 @@ ERROR_23                    : 'Inserisci un url valido, se stai usando https l\'
 ERROR_24                    : 'Inserisci una porta valida ',
 ERROR_25                    : 'Inserisci un ID catena valido ',
 ERROR_26                    : 'Inserisci una ABI valida ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**Avrai bisogno del tuo file Keystore e della password** (o della chiave privata) per avere accesso a questo portafoglio in futuro. Ti preghiamo di salvarlo e copiarlo su un supporto esterno! Non c\'è alcun modo per recuperare un portafoglio se non lo salvi. Leggi la [pagina di aiuto](https://www.myetherwallet.com/#help) per le istruzioni. ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Indirizzo valido ',

diff --git a/app/scripts/translations/ja.js b/app/scripts/translations/ja.js
@@ -312,7 +312,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : 'ウォレットを操作するためには**Keystore/JSONとパスワードかプライベートキーが必要** 保存してから、外部バックアップしてください！ここで保存しないとウォレットが使用できなくなります。詳細はヘルプページを参照してください。(https://www.myetherwallet.com/#help) ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : '有効なアドレス ',

diff --git a/app/scripts/translations/pl.js b/app/scripts/translations/pl.js
@@ -320,7 +320,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**Potrzebujesz plik Keystore i hasło, lub Klucz Prywatny** aby uzyskać dostęp do tego portfela w przyszłości. Wykonaj zewnętrzną kopię bezpieczeństwa! Nie ma możliwości odzyskania portfela jeżeli go nie zapiszesz. Wejdź na [stronę pomocy](https://www.myetherwallet.com/#help) po instrukcje. ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Prawidłowy adres ',

diff --git a/app/scripts/translations/pt.js b/app/scripts/translations/pt.js
@@ -98,7 +98,7 @@ ERROR_23                    : 'Enter valid url, if you are on https your url mus
 ERROR_24                    : 'Please enter valid port ',
 ERROR_25                    : 'Please enter valid chain ID ',
 ERROR_26                    : 'Please enter valid ABI ',
-ERROR_27                    : 'Minimum amount 0.01 ',
+ERROR_27                    : 'Minimum amount: 0.01. Maximum Amount: ',
 ERROR_28                    : '**Você precisa do seu arquivo de armazenamento de chaves & senha** (ou Chave Privada) para acessar essa carteira no futuro. Por favor, salve e armazene ela externamente! Não há como recuperar uma carteira se você não salvar isso. Leia a [página de ajuda](https://www.myetherwallet.com/#help) para instruções. ',
 ERROR_29                    : 'Please enter valid user and password ',
 SUCCESS_1                   : 'Valid address ',