From 949550c35d317e70870072cc135d8c2f424b2016 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Thu, 6 Aug 2015 07:23:47 -0700
Subject: [PATCH] isolate change specific to action = received

---
 public/views/modals/tx-details.html | 18 ++++++++++--------
 src/js/controllers/index.js         |  9 +++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 4ea64630b..ad1160134 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -30,18 +30,20 @@
 
   <ul class="no-bullet size-14 m0">
     <div ng-if="btx.action == 'received'">
-      <li class="line-b p10 oh">
+      <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>
-    <div ng-if="!btx.showSingle && btx.action != 'received'"
-      ng-repeat="output in [ btx.outputs.summary ]"
-      ng-include="'views/includes/output.html'">
-    </div>
-    <div ng-if="!btx.showSingle && btx.outputs.summary.showDetails && btx.action != 'received'"
-      ng-repeat="output in btx.outputs.details"
-      ng-include="'views/includes/output.html'">
+    <div ng-if="btx.action != 'received'">
+      <div ng-if="!btx.showSingle"
+        ng-repeat="output in [ btx.outputs.summary ]"
+        ng-include="'views/includes/output.html'">
+      </div>
+      <div ng-if="!btx.showSingle && btx.outputs.summary.showDetails"
+        ng-repeat="output in btx.outputs.details"
+        ng-include="'views/includes/output.html'">
+      </div>
     </div>
     <li ng-if="btx.showSingle && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
     <span class="text-gray" translate>To</span>:
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 054f43f85..0beb0192e 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -430,11 +430,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     if (tx.outputs) {
       tx.showSingle = false;
       tx.outputs.details = lodash.clone(tx.outputs);
+      var total = lodash.reduce(tx.outputs.details, function(total, o) {
+        formatAmount(o);
+        return total + o.amount;
+      }, 0);
       if (tx.action != 'received') {
-        tx.amount = lodash.reduce(tx.outputs.details, function(total, o) {
-          formatAmount(o);
-          return total + o.amount;
-        }, 0);
+        tx.amount = total;
       }
       tx.outputs.summary = {
         amount: tx.amount,