mirror of https://github.com/BTCPrivate/copay.git
Fix % of the transaction. Show fee level
This commit is contained in:
parent
db62855693
commit
66dc5e1933
|
@ -18,11 +18,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="text-bold m10t size-12" ng-init="confirm.processFee(tx.amount, tx.fee)">
|
<div class="text-bold m10t size-12" ng-init="confirm.processFee(tx.amount, tx.fee)">
|
||||||
<div ng-show="!showPercentage" ng-click="showPercentage = true">
|
<div ng-show="!showPercentage" ng-click="showPercentage = true">
|
||||||
<span translate>Fee</span>: {{tx.feeStr}}
|
<span translate>Fee</span> {{confirm.feeLevel|translate}}: {{tx.feeStr}}
|
||||||
<span class="label gray radius">{{confirm.feeAlternativeStr}}</span>
|
<span class="label gray radius">{{confirm.feeAlternativeStr}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="showPercentage" ng-click="showPercentage = false" translate>
|
<div ng-show="showPercentage" ng-click="showPercentage = false" translate>
|
||||||
{{confirm.feeLevel|translate}} ·
|
|
||||||
{{confirm.feeRateStr}} of the transaction
|
{{confirm.feeRateStr}} of the transaction
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,7 +9,7 @@ angular.module('copayApp.controllers').controller('confirmTxController', functio
|
||||||
|
|
||||||
this.feeLevel = feeService.feeOpts[feeService.getCurrentFeeLevel()];
|
this.feeLevel = feeService.feeOpts[feeService.getCurrentFeeLevel()];
|
||||||
this.feeAlternativeStr = parseFloat((rateService.toFiat(fee, feeAlternativeIsoCode)).toFixed(2), 10) + ' ' + feeAlternativeIsoCode;
|
this.feeAlternativeStr = parseFloat((rateService.toFiat(fee, feeAlternativeIsoCode)).toFixed(2), 10) + ' ' + feeAlternativeIsoCode;
|
||||||
this.feeRateStr = (fee / amount * 100).toFixed(2) + '%' ;
|
this.feeRateStr = (fee / (amount + fee) * 100).toFixed(2) + '%' ;
|
||||||
};
|
};
|
||||||
|
|
||||||
this.close = function(cb) {
|
this.close = function(cb) {
|
||||||
|
|
Loading…
Reference in New Issue