Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

Commit 342a524

Browse files
SteveMieskoskiSteveMieskoski
committed
fix merge conflicts
1 parent 35744bc commit 342a524

20 files changed

+182369
-170626
lines changed

‎app/scripts/controllers/decryptWalletCtrl.js‎

Lines changed: 335 additions & 336 deletions
Large diffs are not rendered by default.

‎chrome-extension/contest.html‎

Lines changed: 1154 additions & 1289 deletions
Large diffs are not rendered by default.

‎chrome-extension/css/etherwallet-master.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chrome-extension/cx-wallet.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ <h2 class="modal-title text-info" translate="NODE_Title"> Set Up Your Custom Nod
255255

256256
<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>
257257

258-
<div ng-show="browserProtocol=='https:'" class="alert alert-danger small" translate="NODE_Warning">
258+
<div ng-show="browserProtocol!='https:'" class="alert alert-danger small" translate="NODE_Warning">
259259
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>.
260260
</div>
261261

@@ -7373,7 +7373,7 @@ <h4 translate="tx_Details" class="cont-md">
73737373
TX Hash
73747374
</td>
73757375
<td>
7376-
<a href="https://etherscan.io/tx/{{ txInfo.hash }}" target="_blank" rel="noopener noreferrer">
7376+
<a href="{{ txInfo.txExplorerUrl }}" target="_blank" rel="noopener noreferrer">
73777377
{{ txInfo.hash }}
73787378
</a>
73797379
</td>
@@ -7383,7 +7383,7 @@ <h4 translate="tx_Details" class="cont-md">
73837383
From Address
73847384
</td>
73857385
<td>
7386-
<a href="https://etherscan.io/address/{{ txInfo.from }}" target="_blank" rel="noopener noreferrer">
7386+
<a href="{{ txInfo.fromExplorerUrl }}" target="_blank" rel="noopener noreferrer">
73877387
{{ txInfo.from }}
73887388
</a>
73897389
</td>
@@ -7393,7 +7393,7 @@ <h4 translate="tx_Details" class="cont-md">
73937393
To Address
73947394
</td>
73957395
<td>
7396-
<a href="https://etherscan.io/address/{{ txInfo.to }}" target="_blank" rel="noopener noreferrer">
7396+
<a href="{{ txInfo.toExplorerUrl }}" target="_blank" rel="noopener noreferrer">
73977397
{{ txInfo.to }}
73987398
</a>
73997399
</td>

‎chrome-extension/helpers.html‎

Lines changed: 1562 additions & 1699 deletions
Large diffs are not rendered by default.

‎chrome-extension/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@
9999

100100
<a class="brand" href="/" aria-label="Go to homepage">
101101
<img src="images/logo-myetherwallet.svg" height="64px" width="245px" alt="MyEtherWallet" />
102-
<p class="small visible-xs">3.22.3</p>
102+
<p class="small visible-xs">3.23.0</p>
103103
</a>
104104

105105

106106
<div class="tagline">
107107

108-
<span class="hidden-xs">3.22.3</span>
108+
<span class="hidden-xs">3.23.0</span>
109109

110110
<span class="dropdown dropdown-lang" ng-cloak>
111111
<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>
@@ -271,7 +271,7 @@ <h2 class="modal-title text-info" translate="NODE_Title"> Set Up Your Custom Nod
271271

272272
<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>
273273

274-
<div ng-show="browserProtocol=='https:'" class="alert alert-danger small" translate="NODE_Warning">
274+
<div ng-show="browserProtocol!='https:'" class="alert alert-danger small" translate="NODE_Warning">
275275
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>.
276276
</div>
277277

@@ -6925,7 +6925,7 @@ <h4 translate="tx_Details" class="cont-md">
69256925
TX Hash
69266926
</td>
69276927
<td>
6928-
<a href="https://etherscan.io/tx/{{ txInfo.hash }}" target="_blank" rel="noopener noreferrer">
6928+
<a href="{{ txInfo.txExplorerUrl }}" target="_blank" rel="noopener noreferrer">
69296929
{{ txInfo.hash }}
69306930
</a>
69316931
</td>
@@ -6935,7 +6935,7 @@ <h4 translate="tx_Details" class="cont-md">
69356935
From Address
69366936
</td>
69376937
<td>
6938-
<a href="https://etherscan.io/address/{{ txInfo.from }}" target="_blank" rel="noopener noreferrer">
6938+
<a href="{{ txInfo.fromExplorerUrl }}" target="_blank" rel="noopener noreferrer">
69396939
{{ txInfo.from }}
69406940
</a>
69416941
</td>
@@ -6945,7 +6945,7 @@ <h4 translate="tx_Details" class="cont-md">
69456945
To Address
69466946
</td>
69476947
<td>
6948-
<a href="https://etherscan.io/address/{{ txInfo.to }}" target="_blank" rel="noopener noreferrer">
6948+
<a href="{{ txInfo.toExplorerUrl }}" target="_blank" rel="noopener noreferrer">
69496949
{{ txInfo.to }}
69506950
</a>
69516951
</td>

0 commit comments

Comments
 (0)