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

Commit

Permalink
new wallet decrypts with warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
tayvano committed Jan 7, 2018
1 parent e86f6b6 commit 6b16fb9
Show file tree
Hide file tree
Showing 35 changed files with 564 additions and 401 deletions.
8 changes: 4 additions & 4 deletions app/includes/addWallet.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@



<!-- Paste/Type Your Private Key -->
<!-- Paste Your Private Key -->
<section ng-show="walletType=='pasteprivkey'">
<h4 translate="ADD_Radio_3">
Paste / type your private key:
Paste your private key:
</h4>

<div class="form-group">
Expand Down Expand Up @@ -161,10 +161,10 @@



<!-- Paste/Type Your Mnemonic -->
<!-- Paste Your Mnemonic -->
<section ng-show="walletType=='pastemnemonic'">
<h4 translate="ADD_Radio_5">
Paste / type your mnemonic:
Paste your mnemonic:
</h4>
<div class="form-group">
<textarea rows="4"
Expand Down
2 changes: 1 addition & 1 deletion app/includes/footer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<p>
<span translate="FOOTER_1">
Free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( .com ) before unlocking your wallet.
Free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( myetherwallet.com ) before unlocking your wallet.
</span>
</p>

Expand Down
2 changes: 1 addition & 1 deletion app/includes/footerEmbedded.tpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<footer>

<script type='application/ld+json'>{"@context":"http://schema.org","@type":"Organization","@id":"#organization","url":"https://www.myetherwallet.com/","name":"MyEtherWallet",
"logo":"https://myetherwallet.com/images/myetherwallet-logo-banner.png","description": "MyEtherWallet.com is a free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( .com ) before unlocking your wallet.","sameAs":["https://www.myetherwallet.com/","https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm","https://www.facebook.com/MyEtherWallet/","https://twitter.com/myetherwallet","https://medium.com/@myetherwallet_96408","https://myetherwallet.github.io/knowledge-base/","https://github.com/kvhnuke/etherwallet","https://github.com/MyEtherWallet","https://kvhnuke.github.io/etherwallet/","https://github.com/kvhnuke/etherwallet/releases/latest","https://github.com/409H/EtherAddressLookup","https://myetherwallet.slack.com/","https://myetherwallet.herokuapp.com/","https://www.reddit.com/r/MyEtherWallet/","https://www.reddit.com/user/insomniasexx/","https://www.reddit.com/user/kvhnuke/","https://www.reddit.com/user/myetherwallet"]}</script>
"logo":"https://myetherwallet.com/images/myetherwallet-logo-banner.png","description": "MyEtherWallet.com is a free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( myetherwallet.com ) before unlocking your wallet.","sameAs":["https://www.myetherwallet.com/","https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm","https://www.facebook.com/MyEtherWallet/","https://twitter.com/myetherwallet","https://medium.com/@myetherwallet_96408","https://myetherwallet.github.io/knowledge-base/","https://github.com/kvhnuke/etherwallet","https://github.com/MyEtherWallet","https://kvhnuke.github.io/etherwallet/","https://github.com/kvhnuke/etherwallet/releases/latest","https://github.com/409H/EtherAddressLookup","https://myetherwallet.slack.com/","https://myetherwallet.herokuapp.com/","https://www.reddit.com/r/MyEtherWallet/","https://www.reddit.com/user/insomniasexx/","https://www.reddit.com/user/kvhnuke/","https://www.reddit.com/user/myetherwallet"]}</script>
</body>
Expand Down
10 changes: 5 additions & 5 deletions app/includes/generateWallet.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,13 @@
<br />

<h1 translate="GEN_Label_5"> Save your Private Key</h1>
<input aria-label="{{'x_PrivKey'|translate}}" aria-describedby="x_PrivKeyDesc"
value="{{wallet.getPrivateKeyString()}}"
<textarea aria-label="{{'x_PrivKey'|translate}}"
aria-describedby="{{'x_PrivKeyDesc'|translate}}"
class="form-control"
type="text"
readonly="readonly"
style="max-width: 50rem;margin: auto;"/>

rows="3"
style="max-width: 50rem;margin: auto;"
>{{wallet.getPrivateKeyString()}}</textarea>
<br />

<a tabindex="0"
Expand Down
2 changes: 1 addition & 1 deletion app/includes/headerEmbedded.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>MyEtherWallet.com</title>
<link rel="canonical" href="https://www.myetherwallet.com" />
<meta name="description" content="MyEtherWallet.com is a free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( .com ) before unlocking your wallet.">
<meta name="description" content="MyEtherWallet.com is a free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( myetherwallet.com ) before unlocking your wallet.">
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/etherwallet-master.min.css">
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/directives/cxWalletDecryptDrtv.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var cxWalletDecryptDrtv = function() {
<input class="form-control" type="password" placeholder="{{ \'x_Password\' | translate }}" ng-model="password" ng-keyup="$event.keyCode == 13 && decryptWallet()" >\n \
</div>\n \
<div class="col-md-4 col-sm-6" id="walletuploadbutton" ng-show="password.length>0">\n \
<h4 id="uploadbtntxt-wallet" translate="ADD_Label_6"> Unlock Your Wallet:</h4>\n \
<h4 translate="ADD_Label_6"> Unlock Your Wallet:</h4>\n \
<div class="form-group"><a ng-click="decryptWallet()" class="btn btn-primary btn-block" translate="ADD_Label_6_short">UNLOCK</a></div>\n \
</div>\n \
</div>'
Expand Down
Loading

0 comments on commit 6b16fb9

Please sign in to comment.