BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix % of the transaction. Show fee level

This commit is contained in:
Gustavo Maximiliano Cortez 2016-04-07 11:32:06 -03:00
parent db62855693
commit 66dc5e1933
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/views/includes/confirm-tx.html
View File

@ -18,11 +18,10 @@
</div>
<div class="text-bold m10t size-12" ng-init="confirm.processFee(tx.amount, tx.fee)">
<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>
</div>
<div ng-show="showPercentage" ng-click="showPercentage = false" translate>
{{confirm.feeLevel|translate}} &middot;
{{confirm.feeRateStr}} of the transaction
</div>
</div>

2
src/js/controllers/confirmTx.js
View File

@ -9,7 +9,7 @@ angular.module('copayApp.controllers').controller('confirmTxController', functio
this.feeLevel = feeService.feeOpts[feeService.getCurrentFeeLevel()];
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) {