From 73f7d9a22b6de4e85ce6e4f671b372146ebef93c Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 17 Jul 2015 14:30:55 -0300
Subject: [PATCH] add fee to tx history

---
 public/views/modals/tx-details.html | 4 ++++
 src/js/controllers/index.js         | 4 ++++
 src/js/controllers/walletHome.js    | 1 +
 3 files changed, 9 insertions(+)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 7127f0360..459d6601e 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -50,6 +50,10 @@
       <time>{{ btx.time * 1000 | amCalendar}}</time>
     </span>
     </li>
+    <li class="line-b p10">
+      <span class="text-gray" translate>Fee</span>:
+      <span class="right">{{feeStr}}</span>
+    </li>
     <li ng-if="btx.message" class="line-b p10 oh">
     <span class="text-gray" translate>Note</span>:
     <span class="right">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 845e78dd2..b737b38fb 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -442,6 +442,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   };
 
   self.setTxHistory = function(txs) {
+    var config = configService.getSync().wallet.settings;
     var now = Math.floor(Date.now() / 1000);
     var c = 0;
     self.txHistoryPaging = txs[self.limitHistory] ? true : false;
@@ -453,6 +454,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
       tx.rateTs = Math.floor((tx.ts || now) / 1000);
       tx.amountStr = profileService.formatAmount(tx.amount); //$filter('noFractionNumber')(
+      if (tx.fees)
+        tx.feeStr = profileService.formatAmount(tx.fees) + ' ' + config.unitName;
+
       if (c < self.limitHistory) {
         self.txHistory.push(tx);
         c++;
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index cd6129406..4ada49f85 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -994,6 +994,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.color = fc.backgroundColor;
       $scope.copayerId = fc.credentials.copayerId;
       $scope.isShared = fc.credentials.n > 1;
+      $scope.feeStr = btx.feeStr;
 
       $scope.getAmount = function(amount) {
         return self.getAmount(amount);