mirror of https://github.com/BTCPrivate/copay.git
show feelevel, remove arrow, add margin left to memo
This commit is contained in:
parent
237cc2f58c
commit
9030eba0b8
|
@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
$scope.data = {};
|
||||
|
||||
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.amountStr = txFormatService.formatAmountStr($scope.toAmount);
|
||||
|
@ -273,7 +273,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
txp.message = description;
|
||||
txp.payProUrl = paypro;
|
||||
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;
|
||||
|
||||
walletService.createTx(wallet, txp, function(err, ctxp) {
|
||||
|
|
|
@ -42,19 +42,18 @@
|
|||
</div>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
</a>
|
||||
<a class="item single-line item-icon-right" ng-hide="insuffientFunds">
|
||||
<span class="label" translate>{{'Add Memo'|translate}}</span>
|
||||
<span class="item-note">
|
||||
<a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showDescriptionPopup()">
|
||||
<span class="label" translate>Add Memo</span>
|
||||
<span class="item-note m10l">
|
||||
{{description}}
|
||||
</span>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
</a>
|
||||
<a class="item single-line item-icon-right" ng-hide="insuffientFunds">
|
||||
<span class="label" translate>Fee</span>
|
||||
<a class="item single-line" ng-hide="insuffientFunds">
|
||||
<span class="label" translate>Fee: {{feeLevel}}</span>
|
||||
<span class="item-note">
|
||||
{{fee}}
|
||||
</span>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue