From 19d24e808493b8f63738a0479ca33ef50a054749 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 13 Aug 2015 11:07:24 -0300
Subject: [PATCH] Fix tx-details

---
 public/views/modals/tx-details.html | 20 +++++++-------------
 src/js/services/feeService.js       |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index ad1160134..d4c04665a 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -20,21 +20,11 @@
     <div class="size-42" ng-show="btx.action == 'invalid'">
       -
     </div>
- 
-    <div class="size-18 m5t text-gray" ng-show="btx.alternativeAmount">
-      {{btx.alternativeAmount}} {{settings.alternativeIsoCode}}
-    </div>
   </div>
 
   <h4 class="title m0" translate>Details</h4>
 
-  <ul class="no-bullet size-14 m0">
-    <div ng-if="btx.action == 'received'">
-      <li class="line-b p10 oh" ng-if="btx.message">
-        <span class="text-gray" translate>Note</span>:
-        <span class="right">{{btx.message}}</span>
-      </li>
-    </div>
+  <ul class="no-bullet size-14 m0"> 
     <div ng-if="btx.action != 'received'">
       <div ng-if="!btx.showSingle"
         ng-repeat="output in [ btx.outputs.summary ]"
@@ -53,7 +43,7 @@
         <span ng-show="!btx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{btx.merchant.domain}}</span>
       </span>
       <span ng-if="!btx.merchant">
-        <span class="text-gray enable_text_select"> {{btx.labelTo || btx.addressTo}}</span>
+        <span class="enable_text_select"> {{btx.labelTo || btx.addressTo}}</span>
       </span>
     </span>
     </li>
@@ -67,10 +57,14 @@
       <time>{{ btx.time * 1000 | amCalendar}}</time>
     </span>
     </li>
-    <li class="line-b p10">
+    <li class="line-b p10" ng-show="btx.action != 'received'">
       <span class="text-gray" translate>Fee</span>:
       <span class="right">{{feeStr}}</span>
     </li>
+    <li class="line-b p10 oh" ng-if="btx.message && btx.action != 'received'">
+      <span class="text-gray" translate>Note</span>:
+      <span class="right">{{btx.message}}</span>
+    </li>
     <li ng-if="btx.merchant" class="line-b p10 oh">
     <span class="text-gray" translate>Merchant message</span>:
     <span class="right">
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index 1924d0ac8..f2316f733 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -22,7 +22,7 @@ angular.module('copayApp.services').factory('feeService', function($log, profile
       }
       else {
         fee = lodash.find(levels, { level: feeLevel }).feePerKB;
-        $log.debug('Dynamic fee for:' + feeLevel + ': ' + fee +  ' SAT');
+        $log.debug('Dynamic fee: ' + feeLevel + ' ' + fee +  ' SAT');
         return cb(null, fee); 
       }
     });