Merge pull request #2089 from SteveMieskoski/mercury

Improve notification display when using fallback
MyEtherWallet · Oct 16, 2018 · 14af74c · 14af74c
2 parents 280cb97 + 342a524
commit 14af74c
Show file tree

Hide file tree

Showing 29 changed files with 222,971 additions and 181,231 deletions.
diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js
diff --git a/app/scripts/directives/QRCodeDrtv.js b/app/scripts/directives/QRCodeDrtv.js
@@ -16,8 +16,9 @@ var QRCodeDrtv = function() {
 					colorLight: "#ffffff",
 					correctLevel: QRCode.CorrectLevel.M
 				});
+        element[0].title = ''
 			}, delay);
 		});
 	};
 };
-module.exports = QRCodeDrtv;
+module.exports = QRCodeDrtv;
diff --git a/chrome-extension/contest.html b/chrome-extension/contest.html
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
@@ -255,7 +255,7 @@ <h2 class="modal-title text-info" translate="NODE_Title"> Set Up Your Custom Nod
 
         <p class="small"><a href="https://myetherwallet.github.io/knowledge-base/networks/run-your-own-node-with-myetherwallet.html" target="_blank" rel="noopener noreferrer"> Instructions can be found here </a></p>
 
-        <div ng-show="browserProtocol=='https:'" class="alert alert-danger small" translate="NODE_Warning">
+        <div ng-show="browserProtocol!='https:'" class="alert alert-danger small" translate="NODE_Warning">
           Your node must be HTTPS in order to connect to it via MyEtherWallet.com. You can [download the MyEtherWallet repo & run it locally](https://github.com/kvhnuke/etherwallet/releases/latest) to connect to your local node. Or, get free SSL certificate via [LetsEncrypt](https://letsencrypt.org/)</a>.
         </div>
 
@@ -7373,7 +7373,7 @@ <h4 translate="tx_Details" class="cont-md">
               TX Hash
             </td>
             <td>
-              <a href="https://etherscan.io/tx/{{ txInfo.hash }}" target="_blank" rel="noopener noreferrer">
+              <a href="{{ txInfo.txExplorerUrl }}" target="_blank" rel="noopener noreferrer">
                 {{ txInfo.hash }}
               </a>
             </td>
@@ -7383,7 +7383,7 @@ <h4 translate="tx_Details" class="cont-md">
               From Address
             </td>
             <td>
-              <a href="https://etherscan.io/address/{{ txInfo.from }}" target="_blank" rel="noopener noreferrer">
+              <a href="{{ txInfo.fromExplorerUrl }}" target="_blank" rel="noopener noreferrer">
                 {{ txInfo.from }}
               </a>
             </td>
@@ -7393,7 +7393,7 @@ <h4 translate="tx_Details" class="cont-md">
               To Address
             </td>
             <td>
-              <a href="https://etherscan.io/address/{{ txInfo.to }}" target="_blank" rel="noopener noreferrer">
+              <a href="{{ txInfo.toExplorerUrl }}" target="_blank" rel="noopener noreferrer">
                 {{ txInfo.to }}
               </a>
             </td>