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.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@tayvano
tayvano committed May 15, 2017
1 parent 782444e commit 98eaaf8
Show file tree
Hide file tree
Showing 12 changed files with 95,977 additions and 110,279 deletions.
2 changes: 1 addition & 1 deletion app/includes/sendTx-content.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<!-- Gas -->
<label translate="TRANS_gas"> Gas: </label>
<input class="form-control" type="text" placeholder="21000" ng-model="tx.gasLimit" ng-class="Validator.isPositiveNumber(tx.gasLimit) ? 'is-valid' : 'is-invalid'" ng-change="gasLimitChanged=false"/>
<input class="form-control" type="text" placeholder="21000" ng-model="tx.gasLimit" ng-class="Validator.isPositiveNumber(tx.gasLimit) ? 'is-valid' : 'is-invalid'" ng-change="gasLimitChanged=true"/>
<!-- / Gas -->

<!-- Advanced Option Panel -->
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/ensCtrl.js
View file
Original file line number Diff line number Diff line change
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.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 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().toString()+'%0A%20revealDate%3A%20'+$scope.objENS.registrationDate.toString()+"%0A%20timer%3A%20"+$scope.objENS.timer+"%0A%20txSent%3A%20"+$scope.objENS.txSent+"%0A%20to%3A%20"+$scope.tx.to+"%0A%20from%20address%3A%20"+$scope.wallet.getAddressString()+"%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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ var sendTxCtrl = function($scope, $sce, walletService) {
// token sale holders should add their address and any add'l data requirements to this array.
// It is recommended to use a reasonable gas limit, but one that ensures transactions will go through
$scope.customGas = [{
to: '0xb9836ec1f42bd48331bceaedb74a6bcdc22832bd',
to: '0x960b236A07cf122663c4303350609A66A7B288C0',
gasLimit: 200000,
data: '0x001111'
data: ''
}]
$scope.tx = {
// if there is no gasLimit or gas key in the URI, use the default value. Otherwise use value of gas or gasLimit. gasLimit wins over gas if both present
Expand Down
6 changes: 3 additions & 3 deletions app/styles/etherwallet-custom.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,9 +625,9 @@ header.Custom {

// TODO MAKE THIS NOT BREAK IF WE ADD OR REDO TABS!!!
.nav-index-7 + .container {
.alert.alert-success,
.alert.alert-warning,
.alert.alert-danger, {
.alert.popup.alert-success,
.alert.popup.alert-warning,
.alert.popup.alert-danger, {
background-color: @brand-warning!important;
min-height: 300px;
font-size: 20px;
Expand Down
2 changes: 1 addition & 1 deletion chrome-extension/css/etherwallet-master.min.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions chrome-extension/cx-wallet.html
View file
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.8 &nbsp;&nbsp;
&middot; v3.7.9 &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 @@ -859,7 +859,7 @@ <h4 class="col-xs-12" translate="SEND_trans">Send Transaction</h4>

<!-- Gas -->
<label translate="TRANS_gas"> Gas: </label>
<input class="form-control" type="text" placeholder="21000" ng-model="tx.gasLimit" ng-class="Validator.isPositiveNumber(tx.gasLimit) ? 'is-valid' : 'is-invalid'" ng-change="gasLimitChanged=false"/>
<input class="form-control" type="text" placeholder="21000" ng-model="tx.gasLimit" ng-class="Validator.isPositiveNumber(tx.gasLimit) ? 'is-valid' : 'is-invalid'" ng-change="gasLimitChanged=true"/>
<!-- / Gas -->

<!-- Advanced Option Panel -->
Expand Down Expand Up @@ -1268,7 +1268,7 @@ <h4 class="col-xs-12" translate="SEND_trans">Send Transaction</h4>

<!-- Gas -->
<label translate="TRANS_gas"> Gas: </label>
<input class="form-control" type="text" placeholder="21000" ng-model="tx.gasLimit" ng-class="Validator.isPositiveNumber(tx.gasLimit) ? 'is-valid' : 'is-invalid'" ng-change="gasLimitChanged=false"/>
<input class="form-control" type="text" placeholder="21000" ng-model="tx.gasLimit" ng-class="Validator.isPositiveNumber(tx.gasLimit) ? 'is-valid' : 'is-invalid'" ng-change="gasLimitChanged=true"/>
<!-- / Gas -->

<!-- Advanced Option Panel -->
Expand Down
Loading

0 comments on commit 98eaaf8

Please sign in to comment.