From 66dc5e19338569d52d15943ec893922493cef802 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 7 Apr 2016 11:32:06 -0300 Subject: [PATCH] Fix % of the transaction. Show fee level --- public/views/includes/confirm-tx.html | 3 +-- src/js/controllers/confirmTx.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/views/includes/confirm-tx.html b/public/views/includes/confirm-tx.html index 4fcd1eee6..ab920c6c8 100644 --- a/public/views/includes/confirm-tx.html +++ b/public/views/includes/confirm-tx.html @@ -18,11 +18,10 @@
- Fee: {{tx.feeStr}} + Fee {{confirm.feeLevel|translate}}: {{tx.feeStr}} {{confirm.feeAlternativeStr}}
- {{confirm.feeLevel|translate}} · {{confirm.feeRateStr}} of the transaction
diff --git a/src/js/controllers/confirmTx.js b/src/js/controllers/confirmTx.js index d63c1ac33..66180c8c5 100644 --- a/src/js/controllers/confirmTx.js +++ b/src/js/controllers/confirmTx.js @@ -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) {