Release: v3.9.3.2

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

Hide file tree

Showing 36 changed files with 97,813 additions and 114,341 deletions.
diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl
@@ -20,8 +20,6 @@
 
         <a role="link" tabindex="0" data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a>
 
-        <p ng-show="showBlocks" style="font-size: 12px">Latest Block#: {{currentBlockNumber}}</p>
-
       </section>
 
       <section class="footer--cent">
@@ -56,9 +54,10 @@
 
       <section class="footer--righ">
         <div class="footer--gas">
+          <p ng-show="showBlocks" style="color: yellow; font-size: 26px;">Latest Block#: {{currentBlockNumber}}</p>
           <p>
-            <span translate="OFFLINE_Step2_Label_3">Gas Price</span>:
-            <strong><a href="http://ethgasstation.info/minerTable.php" target="_blank" rel="noopener">{{gas.value}} Gwei</a></strong>
+            <span translate="OFFLINE_Step2_Label_3" style="color: yellow; font-size: 26px;">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()"/>
           <p style="padding: .25rem 0;" class="small col-xs-4">Not So Fast</p>

diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -31,11 +31,9 @@
 
 <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">A Token Creation Period (ICO) may cause delays in transactions today. <a href="https://www.google.com/search?q=what+time+is+it+gmt&oq=what+time+is+it+gmt" target="_blank" rel="noopener"> What time is it now? </a> <br /> If your TX is not urgent, we recommend waiting for faster &amp; cheaper TXs. You can also use a gas price of 50 GWEI, which you can adjust in the footer. Thank you for understanding. </div>
+      <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">

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 = true;
+    $scope.tokensLoaded = false;
     $scope.localToken = {
         contractAdd: "",
         symbol: "",

diff --git a/app/scripts/customGas.js b/app/scripts/customGas.js
@@ -8,6 +8,9 @@
 // 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 = [
 {
   // DCORP
@@ -21,7 +24,7 @@ module.exports = [
   to:         '0x55d34b686aa8C04921397c5807DB9ECEdba00a4c',
   gasLimit:   200000,
   data:       '',
-  msg:        '⚠ The Status.im Contribution Period has ENDED. Please stop clogging the blockchain with your FOMO. Thanks! 🤗'
+  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'
 },
 {
   // Status

diff --git a/app/scripts/translations/ar.js b/app/scripts/translations/ar.js
@@ -318,7 +318,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Adresse valide ',
 SUCCESS_2                   : 'Portefeuille déchiffré avec succès ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transaction successfully broadcasted to the blockchain. **CLICK THE LINK TO ENSURE IT DID NOT FAIL DUE TO OUT OF GAS OR CONTRACT EXECUTION ERROR ON THE BLOCKCHAIN.** TX ID ', //'Transaction envoyée. Identifiant de transaction ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transaction successfully broadcasted to the blockchain. **CLICK THE LINK TO ENSURE IT DID NOT FAIL DUE TO OUT OF GAS OR CONTRACT EXECUTION ERROR ON THE BLOCKCHAIN.** TX ID ', //'Transaction envoyée. Identifiant de transaction ',
 SUCCESS_4                   : 'Votre portefeuille a été ajouté avec succès ',
 SUCCESS_5                   : 'Fichier sélectionné ',
 SUCCESS_6                   : 'Vous êtes bien connecté ',

diff --git a/app/scripts/translations/de.js b/app/scripts/translations/de.js
@@ -321,7 +321,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Gültige Addresse ',
 SUCCESS_2                   : 'Wallet erfolgreich entschlüsselt ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transaktion übermittelt. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transaktion übermittelt. TX ID ',
 SUCCESS_4                   : 'Dein Wallet wurde erfolgreich hinzugefügt ',
 SUCCESS_5                   : 'Ausgewählte Datei ',
 SUCCESS_6                   : 'Erfolgreich verbunden ',

diff --git a/app/scripts/translations/el.js b/app/scripts/translations/el.js
@@ -318,7 +318,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Έγκυρη διεύθυνση ',
 SUCCESS_2                   : 'Το πορτοφόλι αποκρυπτογραφήθηκε επιτυχώς ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Η συναλλαγή υποβλήθηκε. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Η συναλλαγή υποβλήθηκε. TX ID ',
 SUCCESS_4                   : 'Το πορτοφόλι σας προστέθηκε επιτυχώς ',
 SUCCESS_5                   : 'File Selected ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/en.js b/app/scripts/translations/en.js
@@ -311,7 +311,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Valid address ',
 SUCCESS_2                   : 'Wallet successfully decrypted ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID: ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:  ',
 SUCCESS_4                   : 'Your wallet was successfully added ',
 SUCCESS_5                   : 'File Selected ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/es.js b/app/scripts/translations/es.js
@@ -320,7 +320,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Dirección válida ',
 SUCCESS_2                   : 'Cartera descifrada con éxito ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transacción enviada. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transacción enviada. TX ID ',
 SUCCESS_4                   : 'Se ha añadido tu cartera ',
 SUCCESS_5                   : 'Archivo seleccionado ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/fi.js b/app/scripts/translations/fi.js
@@ -335,7 +335,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Validi osoite ',
 SUCCESS_2                   : 'Lompakon salaus onnistuneesti purettu ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Siirto lähetetty. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Siirto lähetetty. TX ID ',
 SUCCESS_4                   : 'Lompakkosi lisätty onnistuneesti ',
 SUCCESS_5                   : 'Valittu Tiedosto ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/fr.js b/app/scripts/translations/fr.js
@@ -318,7 +318,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Adresse valide ',
 SUCCESS_2                   : 'Portefeuille déchiffré avec succès ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transaction envoyée. Identifiant de transaction ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transaction envoyée. Identifiant de transaction ',
 SUCCESS_4                   : 'Votre portefeuille a été ajouté avec succès ',
 SUCCESS_5                   : 'Fichier sélectionné ',
 SUCCESS_6                   : 'Vous êtes bien connecté ',

diff --git a/app/scripts/translations/ht.js b/app/scripts/translations/ht.js
@@ -310,7 +310,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Valid address ',
 SUCCESS_2                   : 'Wallet successfully decrypted ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID: ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:  ',
 SUCCESS_4                   : 'Your wallet was successfully added ',
 SUCCESS_5                   : 'File Selected ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/hu.js b/app/scripts/translations/hu.js
@@ -320,7 +320,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Érvényes cím ',
 SUCCESS_2                   : 'Tárca sikeresen dekódolva ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Tranzakció elküldve. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Tranzakció elküldve. TX ID ',
 SUCCESS_4                   : 'Tárcád sikeresen hozzáadva ',
 SUCCESS_5                   : 'File Selected ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/id.js b/app/scripts/translations/id.js
@@ -318,7 +318,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Alamat valid ',
 SUCCESS_2                   : 'Dompet telah ter-dekripsi ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transaksi diajukan. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transaksi diajukan. TX ID ',
 SUCCESS_4                   : 'Dompet Anda telah ditambahkan ',
 SUCCESS_5                   : 'File Terpilih ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/ko.js b/app/scripts/translations/ko.js
@@ -310,7 +310,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : '유효한 주소 ',
 SUCCESS_2                   : '지갑이 성공적으로 복호화 되었습니다. ',
-SUCCESS_3                   : '트랜잭션이 블록체인으로 공개됩니다. 트랜잭션 내역과 가스가 채굴되었는지 확인려면 클릭해주세요. 가스 또는 컨트랙트 실행 오류가 없는지 확인해주세요. TX ID : ', //'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //
+SUCCESS_3                   : '트랜잭션이 블록체인으로 공개됩니다. 트랜잭션 내역과 가스가 채굴되었는지 확인려면 클릭해주세요. 가스 또는 컨트랙트 실행 오류가 없는지 확인해주세요. TX ID : ', //'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //
 SUCCESS_4                   : '지갑이 성공적으로 추가되었습니다. ',
 SUCCESS_5                   : '파일이 선택되었습니다. ',
 SUCCESS_6                   : '성공적으로 연결되었습니다. ',

diff --git a/app/scripts/translations/nl.js b/app/scripts/translations/nl.js
@@ -310,7 +310,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Geldig adres ',
 SUCCESS_2                   : 'Wallet succesvol ontsleuteld ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transactie verzonden. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transactie verzonden. TX ID ',
 SUCCESS_4                   : 'Je Wallet is succesvol toegevoegd ',
 SUCCESS_5                   : 'Bestand Geselecteerd ',
 SUCCESS_6                   : 'You are successfully connected ',

diff --git a/app/scripts/translations/pl.js b/app/scripts/translations/pl.js
@@ -320,7 +320,7 @@ ERROR_35                    : 'Input address is not checksummed. <a href="https:
 
 SUCCESS_1                   : 'Prawidłowy adres ',
 SUCCESS_2                   : 'Portfel został odszyfrowany ',
-SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after 10 minutes & you sent with < 50 GWEI gas, you can try sending again.  TX ID:  ', //'Transakcja zgłoszona. TX ID ',
+SUCCESS_3                   : 'Your TX was **broadcast to the network**. It still needs to be mined & confirmed. (1) Click the link. (2) Refresh until you can see your TX details. (3) Check that there are no red ( ! ) errors. (4) If no transaction details show after **3 HOURS** & please try sending again. TX ID:   ', //'Transakcja zgłoszona. TX ID ',
 SUCCESS_4                   : 'Twój portfel został dodany ',
 SUCCESS_5                   : 'Wybrany plik ',
 SUCCESS_6                   : 'Uzyskano połączenie: ',