anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

show feelevel, remove arrow, add margin left to memo

Browse source
This commit is contained in:
Gabriel Bazán 2016-10-13 10:24:15 -03:00
commit 9030eba0b8
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/confirm.js
View file

@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.data = {}; $scope.data = {};
var config = configService.getSync().wallet; var config = configService.getSync().wallet;
$scope.feeLevel = config.settings ? config.settings.feeLevel : ''; $scope.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
$scope.toAmount = parseInt($scope.toAmount); $scope.toAmount = parseInt($scope.toAmount);
$scope.amountStr = txFormatService.formatAmountStr($scope.toAmount); $scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
@ -273,7 +273,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txp.message = description; txp.message = description;
txp.payProUrl = paypro; txp.payProUrl = paypro;
txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true; txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
txp.feeLevel = config.settings.feeLevel || 'normal'; txp.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
txp.dryRun = dryRun; txp.dryRun = dryRun;
walletService.createTx(wallet, txp, function(err, ctxp) { walletService.createTx(wallet, txp, function(err, ctxp) {

11
www/views/confirm.html
View file

@ -42,19 +42,18 @@
</div> </div>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds"> <a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showDescriptionPopup()">
<span class="label" translate>{{'Add Memo'|translate}}</span> <span class="label" translate>Add Memo</span>
<span class="item-note"> <span class="item-note m10l">
{{description}} {{description}}
</span> </span>
<i class="icon bp-arrow-right"></i> <i class="icon bp-arrow-right"></i>
</a> </a>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds"> <a class="item single-line" ng-hide="insuffientFunds">
<span class="label" translate>Fee</span> <span class="label" translate>Fee: {{feeLevel}}</span>
<span class="item-note"> <span class="item-note">
{{fee}} {{fee}}
</span> </span>
<i class="icon bp-arrow-right"></i>
</a> </a>
</div> </div>
</div> </div>