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

Commit

Permalink
v0.3.2.2 - golem tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
@tayvano
tayvano committed Nov 11, 2016
1 parent fe90193 commit 5db16a9
Show file tree
Hide file tree
Showing 11 changed files with 70,828 additions and 80,531 deletions.
2 changes: 1 addition & 1 deletion app/includes/offlineTransaction.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div class="input-group">
<input class="form-control" type="text" placeholder="{{ 'SEND_amount_short' | translate }}" ng-model="tx.value"/>
<div class="input-group-btn">
<a class="btn btn-default dropdown-toggle" class="dropdown-toggle" ng-click="dropdownAmount = !dropdownAmount"> {{unitReadable}} <span class="caret"></span></a>
<a class="btn btn-default dropdown-toggle" class="dropdown-toggle" ng-click="dropdownAmount = !dropdownAmount" ng-class="dropdownEnabled ? '' : 'disabled'"> {{unitReadable}} <span class="caret"></span></a>
<ul class="dropdown-menu dropdown-menu-right" ng-show="dropdownAmount">
<li>
<a name="currencyRadioOffline" ng-class="{true:'active'}[tokenTx.id == 'ether']" ng-click="setSendMode('ether')">ETH</a>
Expand Down
2 changes: 1 addition & 1 deletion app/includes/sendTransaction.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<!-- / Gas -->

<!-- Advanced Option Panel -->
<div ng-show="tx.sendMode==0">
<div ng-show="tx.sendMode==0">
<a ng-click="toggleShowAdvance()">
<p class="strong" translate="TRANS_advanced"> + Advanced: Add Data </p>
</a>
Expand Down
14 changes: 13 additions & 1 deletion app/scripts/controllers/sendOfflineTxCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var sendOfflineTxCtrl = function($scope, $sce, walletService) {
$scope.unitReadable = "ETH";
$scope.valueReadable = "";
$scope.showAdvance = false;
$scope.dropdownEnabled = true;
$scope.showRaw = false;
$scope.showWalletInfo = false;
$scope.gasPriceDec = 0;
Expand Down Expand Up @@ -67,13 +68,24 @@ var sendOfflineTxCtrl = function($scope, $sce, walletService) {
$scope.showRaw = false;
$scope.sendTxStatus = "";
}, true);
$scope.$watch('tokenTx.id', function() {
$scope.$watch('tokenTx.id', function() {
if($scope.tokenTx.id!='ether'){
$scope.tx.gasLimit = 150000;
} else {
$scope.tx.gasLimit = globalFuncs.defaultTxGasLimit;
}
});
$scope.$watch('[tx.to]', function() {
// if golem crowdfund address
if ( $scope.tx.to == "0xa74476443119A942dE498590Fe1f2454d7D4aC0d" ) {
$scope.setSendMode('ether')
$scope.dropdownEnabled = false
$scope.tx.data = '0xefc81a8c'
$scope.tx.gasLimit = 70000
} else {
$scope.dropdownEnabled = true
}
}, true);
$scope.setSendMode = function(index) {
$scope.tokenTx.id = index;
if (index == 'ether') {
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 @@ -66,10 +66,10 @@ var sendTxCtrl = function($scope, $sce, walletService) {

$scope.$watch('[tx.to]', function() {
if ( $scope.tx.to == "0xa74476443119A942dE498590Fe1f2454d7D4aC0d" ) { // if golem crowdfund address
$scope.tx.data = '0xefc81a8c'
$scope.showAdvance = true
$scope.setSendMode(0);
$scope.dropdownEnabled = false
$scope.tx.data = '0xefc81a8c'
$scope.showAdvance = true
} else {
$scope.dropdownEnabled = true
}
Expand Down
Binary file renamed ...on-releases/chrome-extension-v0.3.2.1.zip → ...on-releases/chrome-extension-v0.3.2.2.zip
View file
Binary file not shown.
Binary file added chrome-extension-releases/dist-v0.3.2.2.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions chrome-extension/cx-wallet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ <h4 translate="SEND_trans">Send Transaction</h4>
<!-- / Gas -->

<!-- Advanced Option Panel -->
<div ng-show="tx.sendMode==0">
<div ng-show="tx.sendMode==0">
<a ng-click="toggleShowAdvance()">
<p class="strong" translate="TRANS_advanced"> + Advanced: Add Data </p>
</a>
Expand Down Expand Up @@ -965,7 +965,7 @@ <h4 class="col-xs-12" translate="OFFLINE_Step2_Title"> Step 2: Generate Transact
<div class="input-group">
<input class="form-control" type="text" placeholder="{{ 'SEND_amount_short' | translate }}" ng-model="tx.value"/>
<div class="input-group-btn">
<a class="btn btn-default dropdown-toggle" class="dropdown-toggle" ng-click="dropdownAmount = !dropdownAmount"> {{unitReadable}} <span class="caret"></span></a>
<a class="btn btn-default dropdown-toggle" class="dropdown-toggle" ng-click="dropdownAmount = !dropdownAmount" ng-class="dropdownEnabled ? '' : 'disabled'"> {{unitReadable}} <span class="caret"></span></a>
<ul class="dropdown-menu dropdown-menu-right" ng-show="dropdownAmount">
<li>
<a name="currencyRadioOffline" ng-class="{true:'active'}[tokenTx.id == 'ether']" ng-click="setSendMode('ether')">ETH</a>
Expand Down
18 changes: 15 additions & 3 deletions chrome-extension/js/etherwallet-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,7 @@ var sendOfflineTxCtrl = function($scope, $sce, walletService) {
$scope.unitReadable = "ETH";
$scope.valueReadable = "";
$scope.showAdvance = false;
$scope.dropdownEnabled = true;
$scope.showRaw = false;
$scope.showWalletInfo = false;
$scope.gasPriceDec = 0;
Expand Down Expand Up @@ -1132,13 +1133,24 @@ var sendOfflineTxCtrl = function($scope, $sce, walletService) {
$scope.showRaw = false;
$scope.sendTxStatus = "";
}, true);
$scope.$watch('tokenTx.id', function() {
$scope.$watch('tokenTx.id', function() {
if($scope.tokenTx.id!='ether'){
$scope.tx.gasLimit = 150000;
} else {
$scope.tx.gasLimit = globalFuncs.defaultTxGasLimit;
}
});
$scope.$watch('[tx.to]', function() {
// if golem crowdfund address
if ( $scope.tx.to == "0xa74476443119A942dE498590Fe1f2454d7D4aC0d" ) {
$scope.setSendMode('ether')
$scope.dropdownEnabled = false
$scope.tx.data = '0xefc81a8c'
$scope.tx.gasLimit = 70000
} else {
$scope.dropdownEnabled = true
}
}, true);
$scope.setSendMode = function(index) {
$scope.tokenTx.id = index;
if (index == 'ether') {
Expand Down Expand Up @@ -1280,10 +1292,10 @@ var sendTxCtrl = function($scope, $sce, walletService) {

$scope.$watch('[tx.to]', function() {
if ( $scope.tx.to == "0xa74476443119A942dE498590Fe1f2454d7D4aC0d" ) { // if golem crowdfund address
$scope.tx.data = '0xefc81a8c'
$scope.showAdvance = true
$scope.setSendMode(0);
$scope.dropdownEnabled = false
$scope.tx.data = '0xefc81a8c'
$scope.showAdvance = true
} else {
$scope.dropdownEnabled = true
}
Expand Down
2 changes: 1 addition & 1 deletion chrome-extension/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet CX",
"version": "0.3.2.1",
"version": "0.3.2.2",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
Expand Down
4 changes: 2 additions & 2 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ <h4 translate="SEND_trans">Send Transaction</h4>
<!-- / Gas -->

<!-- Advanced Option Panel -->
<div ng-show="tx.sendMode==0">
<div ng-show="tx.sendMode==0">
<a ng-click="toggleShowAdvance()">
<p class="strong" translate="TRANS_advanced"> + Advanced: Add Data </p>
</a>
Expand Down Expand Up @@ -712,7 +712,7 @@ <h4 class="col-xs-12" translate="OFFLINE_Step2_Title"> Step 2: Generate Transact
<div class="input-group">
<input class="form-control" type="text" placeholder="{{ 'SEND_amount_short' | translate }}" ng-model="tx.value"/>
<div class="input-group-btn">
<a class="btn btn-default dropdown-toggle" class="dropdown-toggle" ng-click="dropdownAmount = !dropdownAmount"> {{unitReadable}} <span class="caret"></span></a>
<a class="btn btn-default dropdown-toggle" class="dropdown-toggle" ng-click="dropdownAmount = !dropdownAmount" ng-class="dropdownEnabled ? '' : 'disabled'"> {{unitReadable}} <span class="caret"></span></a>
<ul class="dropdown-menu dropdown-menu-right" ng-show="dropdownAmount">
<li>
<a name="currencyRadioOffline" ng-class="{true:'active'}[tokenTx.id == 'ether']" ng-click="setSendMode('ether')">ETH</a>
Expand Down
Loading

0 comments on commit 5db16a9

Please sign in to comment.