From d1c55e087691f639af8f2407521144ac125aa7e3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 22 Jun 2015 11:33:53 -0300 Subject: [PATCH] Adds Fee to TXP modal --- public/views/modals/txp-details.html | 4 ++++ src/js/controllers/index.js | 1 + src/js/controllers/walletHome.js | 1 + 3 files changed, 6 insertions(+) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 2b24ff00d..e1aaa244d 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -24,6 +24,10 @@ {{alternativeAmountStr}} +
  • + Fee: + {{feeStr}} +
  • Time: diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 664e67d3b..9d2501bb5 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -349,6 +349,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r lodash.each(txps, function(tx) { var amount = tx.amount * self.satToUnit; tx.amountStr = profileService.formatAmount(tx.amount) + ' ' + config.unitName; + tx.feeStr = profileService.formatAmount(tx.fee) + ' ' + config.unitName; tx.alternativeAmount = rateService.toFiat(tx.amount, config.alternativeIsoCode) ? rateService.toFiat(tx.amount, config.alternativeIsoCode).toFixed(2) : 'N/A'; tx.alternativeAmountStr = tx.alternativeAmount + " " + config.alternativeIsoCode; tx.alternativeIsoCode = config.alternativeIsoCode; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 6a53c4401..0f909c3a7 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -132,6 +132,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $scope.error = null; $scope.tx = tx; $scope.amountStr = tx.amountStr; + $scope.feeStr = tx.feeStr; $scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.copayers = copayers $scope.copayerId = fc.credentials.copayerId;