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

Commit

Permalink
Release: v3.7.8
Browse files Browse the repository at this point in the history
  • Loading branch information
tayvano committed May 14, 2017
1 parent 430a3e0 commit e6c3f07
Show file tree
Hide file tree
Showing 19 changed files with 95,723 additions and 110,035 deletions.
2 changes: 1 addition & 1 deletion app/includes/ens-action-primary.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<!-- After Sent: Reveal -->
<div class="form-group" ng-show="objENS.txSent && objENS.status==ensModes.reveal">
<h4 class="text-warning">Click your TX hash to see if you successfully revealed your {{objENS.bidValue}} bid for {{objENS.name}}.eth.</h4>
<p>Please return on <strong>{{objENS.registrationDate.toLocaleString()}}</strong> to finalize the auction and see if you won!</p>
<p>Please return on <strong>{{objENS.registrationDate.toString()}}</strong> to finalize the auction and see if you won!</p>
</div>
<!-- / After Sent: Reveal -->

Expand Down
4 changes: 2 additions & 2 deletions app/includes/ens-confirm-table.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<td>From Account</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>
</tr>
<tr class="text-danger">
<td>⚠ Reveal Date ⚠</td><td><small>{{getRevealTime().toLocaleString()}}</small></td>
<td>⚠ Reveal Date ⚠</td><td><small>{{getRevealTime().toString()}}</small></td>
</tr>
<tr>
<td>Auction Ends</td><td><small>{{objENS.registrationDate.toLocaleString()}}</small></td>
<td>Auction Ends</td><td><small>{{objENS.registrationDate.toString()}}</small></td>
</tr>
<tr ng-show="objENS.status!=ensModes.reveal">
<td colspan="2">
Expand Down
4 changes: 2 additions & 2 deletions app/includes/ens-general-information.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
<li> Once the auction has ended (after 5 days / 120 hours), the winner needs to finalize the auction in order to claim their new name.</li>
<li> The winner will be refunded the difference between their bid and the next-highest bid. If you are the only bidder, you will refunded all but 0.01 ETH. </li>
</ul>

<h6 ng-click="ensMore = !ensMore">
<span ng-show="!ensMore">+</span><span ng-show="ensMore">-</span>
More Information
Expand All @@ -54,8 +53,9 @@
<li><a href="http://docs.ens.domains/en/latest/userguide.html#registering-a-name-with-the-auction-registrar" target="_blank">ENS: Read the Docs</a></li>
<li><a href="https://medium.com/the-ethereum-name-service/announcing-the-ethereum-name-service-relaunch-date-4390af6dd9a2" target="_blank">Announcing the Ethereum Name Service Relaunch Date!</a></li>
</ul>
<hr />
<p class="text-danger"><strong> Due to an overwhelming number of support requests regarding the ENS, we will NOT providing support to those who are attempting to start a name business (aka "domain squatting") via our free, open source service. </strong> If you are bidding on hundreds of names, brand names, or the entire human-readable dictionary, do not expect a response. If you are a typical user who wants few cool names, you're safe.</p>

</section>

</article>

4 changes: 2 additions & 2 deletions app/includes/ens-status-available.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<section class="order-info-wrap row" ng-show="objENS.status==ensModes.auction">
<div class="col-sm-6 col-xs-12 order-info">
<p> Reveal Bids On </p>
<h4> {{getRevealTime().toLocaleString()}} </h4>
<h4> {{getRevealTime().toString()}} </h4>
<p> {{objENS.timeRemainingReveal}} </p>
</div>
<div class="col-sm-6 col-xs-12 order-info">
<p> Auction Closes On </p>
<h4> {{objENS.registrationDate.toLocaleString()}}</h4>
<h4> {{objENS.registrationDate.toString()}}</h4>
<p> {{objENS.timeRemaining}} </p>
</div>
</section>
Expand Down
6 changes: 3 additions & 3 deletions app/includes/ens-status-notavailable.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</article>

<article class="order-info-wrap row" ng-show="objENS.status==ensModes.notAvailable">
<div class="col-sm-12 col-xs-12 order-info">
<div class="col-sm-6 col-xs-12 order-info">
<p> Auction Open On </p>
<h4> {{objENS.allowedTime.toLocaleString()}} </h4>
<h4> {{objENS.allowedTime.toString()}} </h4>
</div>
<div class="col-sm-12 col-xs-12 order-info">
<div class="col-sm-6 col-xs-12 order-info">
<p> Auction Opens In</p>
<h4> {{objENS.timeRemaining}} </h4>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/includes/ens-status-reveal.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section class="order-info-wrap row">
<div class="col-xs-12 order-info">
<p> Auction Closes On </p>
<h4> {{objENS.registrationDate.toLocaleString()}}</h4>
<h4> {{objENS.registrationDate.toString()}}</h4>
<p> {{objENS.timeRemaining}} </p>
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion app/includes/header.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>

&middot; v3.7.7 &nbsp;&nbsp;
&middot; v3.7.8 &nbsp;&nbsp;

<span class="dropdown" ng-cloak>
<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>
Expand Down
2 changes: 1 addition & 1 deletion app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet CX",
"version": "3.7.7",
"version": "3.7.8",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
"version": "3.7.7",
"version": "3.7.8",
"description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
"author": "MyEtherWallet",
"license": "ISC",
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/ensCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ var ensCtrl = function($scope, $sce, walletService) {
}
$scope.getRevealTime = function() {
if ($scope.objENS && $scope.objENS.registrationDate) return new Date($scope.objENS.registrationDate - (48 * 60 * 60 * 1000));
return new Date();
return new Date().toString();
}
$scope.bidAuction = function(nonce, gasPrice) {
$scope.tx.gasLimit = $scope.gasLimitDefaults.newBid;
Expand Down Expand Up @@ -272,7 +272,7 @@ var ensCtrl = function($scope, $sce, walletService) {
var signedTx = $scope.generatedTxs.shift();
uiFuncs.sendTx(signedTx, function(resp) {
if (!resp.isError) {
var emailLink = '<a class="strong" href="mailto:[email protected]?Subject=Issue%20regarding%20my%20ENS%20&Body=Hi%20Taylor%2C%20%0A%0AI%20have%20a%20question%20concerning%20my%20ENS%20transaction.%20%0A%0AI%20was%20attempting%20to%3A%0A-%20Start%20an%20ENS%20auction%0A-%20Bid%20on%20an%20ENS%20name%0A-%20Reveal%20my%20ENS%20bid%0A-%20Finalize%20my%20ENS%20name%0A%0AUnfortunately%20it%3A%0A-%20Never%20showed%20on%20the%20blockchain%0A-%20Failed%20due%20to%20out%20of%20gas%0A-%20Failed%20for%20another%20reason%0A-%20Never%20showed%20up%20in%20the%20account%20I%20was%20sending%20to%0A%0APlease%20see%20the%20below%20details%20for%20additional%20information.%0A%0AThank%20you.%20%0A%0A_%0A%0A%20name%3A%20'+$scope.objENS.name+'%0A%20timeRemaining%3A%20'+$scope.objENS.timeRemaining+'%0A%20timeRemainingReveal%3A%20'+$scope.objENS.timeRemainingReveal+"%0A%20timer%3A%20"+$scope.objENS.timer+"%0A%20txSent%3A%20"+$scope.objENS.txSent+"%0A%20to%3A%20"+$scope.tx.to+"%0A%20data%3A%20"+$scope.tx.data+"%0A%20value%3A%20"+$scope.tx.value+'" target="_blank">Confused? Email Us.</a>';
var emailLink = '<a class="strong" href="mailto:[email protected]?Subject=Issue%20regarding%20my%20ENS%20&Body=Hi%20Taylor%2C%20%0A%0AI%20have%20a%20question%20concerning%20my%20ENS%20transaction.%20%0A%0AI%20was%20attempting%20to%3A%0A-%20Start%20an%20ENS%20auction%0A-%20Bid%20on%20an%20ENS%20name%0A-%20Reveal%20my%20ENS%20bid%0A-%20Finalize%20my%20ENS%20name%0A%0AUnfortunately%20it%3A%0A-%20Never%20showed%20on%20the%20blockchain%0A-%20Failed%20due%20to%20out%20of%20gas%0A-%20Failed%20for%20another%20reason%0A-%20Never%20showed%20up%20in%20the%20account%20I%20was%20sending%20to%0A%0APlease%20see%20the%20below%20details%20for%20additional%20information.%0A%0AThank%20you.%20%0A%0A_%0A%0A%20name%3A%20'+$scope.objENS.name+'%0A%20timeRemaining%3A%20'+$scope.getRevealTime()+'%0A%20revealDate%3A%20'+$scope.objENS.registrationDate+"%0A%20timer%3A%20"+$scope.objENS.timer+"%0A%20txSent%3A%20"+$scope.objENS.txSent+"%0A%20to%3A%20"+$scope.tx.to+"%0A%20data%3A%20"+$scope.tx.data+"%0A%20value%3A%20"+$scope.tx.value+'" target="_blank">Confused? Email Us.</a>';
var bExStr = $scope.ajaxReq.type != nodes.nodeTypes.Custom ? "<a class='strong' href='" + $scope.ajaxReq.blockExplorerTX.replace("[[txHash]]", resp.data) + "' target='_blank'> View your transaction </a>" : '';
$scope.sendTxStatus += globalFuncs.successMsgs[2] + "<p>" + resp.data + "</p><p>" + bExStr + "</p><p>" + emailLink + "</p>";
$scope.notifier.success($scope.sendTxStatus);
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/sendTxCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ var sendTxCtrl = function($scope, $sce, walletService) {
$scope.tx.donate = true;
}
$scope.generateTx = function() {
//if (!$scope.Validator.isValidAddress($scope.tx.to)) {
if (!ethFuncs.validateEtherAddress($scope.tx.to)) {
if (!$scope.Validator.isValidAddress($scope.tx.to)) {
//if (!ethFuncs.validateEtherAddress($scope.tx.to)) {
$scope.notifier.danger(globalFuncs.errorMsgs[5]);
return;
}
Expand Down
64 changes: 29 additions & 35 deletions app/scripts/directives/addressFieldDrtv.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,38 @@ var addressFieldDrtv = function($compile) {
<div class=\"addressIdenticon\" title=\"Address Indenticon\" blockie-address=\"{{' + varName + '}}\" watch-var=\"' + varName + '\"></div>\n \
</div>');
scope.$watch('addressDrtv.ensAddressField', function() {
var _ens = new ens();
if (Validator.isValidAddress(scope.addressDrtv.ensAddressField)) {
setValue(scope.addressDrtv.ensAddressField);
/* _ens.getName(scope.addressDrtv.ensAddressField.substring(2) + '.addr.reverse', function(data) {
if (data.error) uiFuncs.notifier.danger(data.msg);
else if (data.data == '0x') {
scope.addressDrtv.showDerivedAddress = false;
} else {
scope.addressDrtv.derivedAddress = data.data;
scope.addressDrtv.showDerivedAddress = true;
}
});*/
} else if (Validator.isValidENSAddress(scope.addressDrtv.ensAddressField)) {
_ens.getAddress(scope.addressDrtv.ensAddressField, function(data) {
if (data.error) uiFuncs.notifier.danger(data.msg);
else if (data.data == '0x0000000000000000000000000000000000000000' || data.data == '0x') {
setValue('0x0000000000000000000000000000000000000000');
scope.addressDrtv.derivedAddress = '0x0000000000000000000000000000000000000000';
scope.addressDrtv.showDerivedAddress = true;
} else {
setValue(data.data);
scope.addressDrtv.derivedAddress = data.data;
scope.addressDrtv.showDerivedAddress = true;
}
});
} else {
setValue('');
scope.addressDrtv.showDerivedAddress = false;
}
var _ens = new ens();
if (Validator.isValidAddress(scope.addressDrtv.ensAddressField)) {
setValue(scope.addressDrtv.ensAddressField);
/* _ens.getName(scope.addressDrtv.ensAddressField.substring(2) + '.addr.reverse', function(data) {
if (data.error) uiFuncs.notifier.danger(data.msg);
else if (data.data == '0x') {
scope.addressDrtv.showDerivedAddress = false;
} else {
scope.addressDrtv.derivedAddress = data.data;
scope.addressDrtv.showDerivedAddress = true;
}
});*/
} else if (Validator.isValidENSAddress(scope.addressDrtv.ensAddressField)) {
_ens.getAddress(scope.addressDrtv.ensAddressField, function(data) {
if (data.error) uiFuncs.notifier.danger(data.msg);
else if (data.data == '0x0000000000000000000000000000000000000000' || data.data == '0x') {
setValue('0x0000000000000000000000000000000000000000');
scope.addressDrtv.derivedAddress = '0x0000000000000000000000000000000000000000';
scope.addressDrtv.showDerivedAddress = true;
} else {
setValue(data.data);
scope.addressDrtv.derivedAddress = data.data;
scope.addressDrtv.showDerivedAddress = true;
}
});
} else {
setValue('');
scope.addressDrtv.showDerivedAddress = false;
}
});
$compile(element.contents())(scope);
}
};
};
module.exports = addressFieldDrtv;


/*
26 <input class=\"form-control\" type=\"text\" placeholder=\"' + placeholder + '\" ng-model=\"addressDrtv.ensAddressField\" ng-disabled=\"' + readOnly + '\" ng-class=\"Validator.isValidENSorEtherAddress(' + varName + ') ? \'is-valid\' : \'is-invalid\'\"/>\n \
27 <p class="ens-response" ng-show="addressDrtv.showDerivedAddress"> ↳ <span class="mono ng-binding"> {{addressDrtv.derivedAddress}} </span> </p>\n \
*/
2 changes: 2 additions & 0 deletions app/scripts/validator.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
'use strict';
var validator = function() {}

validator.isValidAddress = function(address) {
if (address && address == "0x0000000000000000000000000000000000000000") return false;
if (address)
return ethFuncs.validateEtherAddress(address);
return false;
}

validator.isValidENSorEtherAddress = function(address) {
return (validator.isValidAddress(address) || validator.isValidENSAddress(address));
}
Expand Down
28 changes: 14 additions & 14 deletions chrome-extension/cx-wallet.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<div class="tagline"><span style="max-width: 395px">Open-Source & Client-Side Ether Wallet</span>

&middot; v3.7.7 &nbsp;&nbsp;
&middot; v3.7.8 &nbsp;&nbsp;

<span class="dropdown" ng-cloak>
<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>
Expand Down Expand Up @@ -2078,7 +2078,6 @@ <h6 ng-click="ensFinalize = !ensFinalize">
<li> Once the auction has ended (after 5 days / 120 hours), the winner needs to finalize the auction in order to claim their new name.</li>
<li> The winner will be refunded the difference between their bid and the next-highest bid. If you are the only bidder, you will refunded all but 0.01 ETH. </li>
</ul>

<h6 ng-click="ensMore = !ensMore">
<span ng-show="!ensMore">+</span><span ng-show="ensMore">-</span>
More Information
Expand All @@ -2088,11 +2087,12 @@ <h6 ng-click="ensMore = !ensMore">
<li><a href="http://docs.ens.domains/en/latest/userguide.html#registering-a-name-with-the-auction-registrar" target="_blank">ENS: Read the Docs</a></li>
<li><a href="https://medium.com/the-ethereum-name-service/announcing-the-ethereum-name-service-relaunch-date-4390af6dd9a2" target="_blank">Announcing the Ethereum Name Service Relaunch Date!</a></li>
</ul>
<hr />
<p class="text-danger"><strong> Due to an overwhelming number of support requests regarding the ENS, we will NOT providing support to those who are attempting to start a name business (aka "domain squatting") via our free, open source service. </strong> If you are bidding on hundreds of names, brand names, or the entire human-readable dictionary, do not expect a response. If you are a typical user who wants few cool names, you're safe.</p>

</section>

</article>




Expand All @@ -2113,11 +2113,11 @@ <h1 ng-show="objENS.status==ensModes.forbidden">
</article>

<article class="order-info-wrap row" ng-show="objENS.status==ensModes.notAvailable">
<div class="col-sm-12 col-xs-12 order-info">
<div class="col-sm-6 col-xs-12 order-info">
<p> Auction Open On </p>
<h4> {{objENS.allowedTime.toLocaleString()}} </h4>
<h4> {{objENS.allowedTime.toString()}} </h4>
</div>
<div class="col-sm-12 col-xs-12 order-info">
<div class="col-sm-6 col-xs-12 order-info">
<p> Auction Opens In</p>
<h4> {{objENS.timeRemaining}} </h4>
</div>
Expand All @@ -2142,12 +2142,12 @@ <h1 ng-show="objENS.status==ensModes.open">
<section class="order-info-wrap row" ng-show="objENS.status==ensModes.auction">
<div class="col-sm-6 col-xs-12 order-info">
<p> Reveal Bids On </p>
<h4> {{getRevealTime().toLocaleString()}} </h4>
<h4> {{getRevealTime().toString()}} </h4>
<p> {{objENS.timeRemainingReveal}} </p>
</div>
<div class="col-sm-6 col-xs-12 order-info">
<p> Auction Closes On </p>
<h4> {{objENS.registrationDate.toLocaleString()}}</h4>
<h4> {{objENS.registrationDate.toString()}}</h4>
<p> {{objENS.timeRemaining}} </p>
</div>
</section>
Expand All @@ -2164,7 +2164,7 @@ <h1>It's time to reveal the bids for <strong>{{objENS.name}}.eth</strong>. </br>
<section class="order-info-wrap row">
<div class="col-xs-12 order-info">
<p> Auction Closes On </p>
<h4> {{objENS.registrationDate.toLocaleString()}}</h4>
<h4> {{objENS.registrationDate.toString()}}</h4>
<p> {{objENS.timeRemaining}} </p>
</div>
</section>
Expand Down Expand Up @@ -2338,10 +2338,10 @@ <h4 class="text-danger">If you haven't done so already, please screenshot & save
<td>From Account</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>
</tr>
<tr class="text-danger">
<td>⚠ Reveal Date ⚠</td><td><small>{{getRevealTime().toLocaleString()}}</small></td>
<td>⚠ Reveal Date ⚠</td><td><small>{{getRevealTime().toString()}}</small></td>
</tr>
<tr>
<td>Auction Ends</td><td><small>{{objENS.registrationDate.toLocaleString()}}</small></td>
<td>Auction Ends</td><td><small>{{objENS.registrationDate.toString()}}</small></td>
</tr>
<tr ng-show="objENS.status!=ensModes.reveal">
<td colspan="2">
Expand All @@ -2357,7 +2357,7 @@ <h4 class="text-danger">If you haven't done so already, please screenshot & save
<!-- After Sent: Reveal -->
<div class="form-group" ng-show="objENS.txSent && objENS.status==ensModes.reveal">
<h4 class="text-warning">Click your TX hash to see if you successfully revealed your {{objENS.bidValue}} bid for {{objENS.name}}.eth.</h4>
<p>Please return on <strong>{{objENS.registrationDate.toLocaleString()}}</strong> to finalize the auction and see if you won!</p>
<p>Please return on <strong>{{objENS.registrationDate.toString()}}</strong> to finalize the auction and see if you won!</p>
</div>
<!-- / After Sent: Reveal -->

Expand Down Expand Up @@ -2598,10 +2598,10 @@ <h4>Screenshot & save first!</h4>
<td>From Account</td><td><small class="mono">{{wallet.getAddressString()}}</small></td>
</tr>
<tr class="text-danger">
<td>⚠ Reveal Date ⚠</td><td><small>{{getRevealTime().toLocaleString()}}</small></td>
<td>⚠ Reveal Date ⚠</td><td><small>{{getRevealTime().toString()}}</small></td>
</tr>
<tr>
<td>Auction Ends</td><td><small>{{objENS.registrationDate.toLocaleString()}}</small></td>
<td>Auction Ends</td><td><small>{{objENS.registrationDate.toString()}}</small></td>
</tr>
<tr ng-show="objENS.status!=ensModes.reveal">
<td colspan="2">
Expand Down
Loading

0 comments on commit e6c3f07

Please sign in to comment.