From 07b9fb39213b676b2a255ed625193de2ebe771a4 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Wed, 5 Aug 2015 15:25:54 -0700
Subject: [PATCH] txhistory of received payments show all outputs, including
 sender's change address

---
 public/views/modals/tx-details.html | 10 ++++++++--
 src/js/controllers/index.js         | 10 ++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 51df05a21..4ea64630b 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -29,11 +29,17 @@
   <h4 class="title m0" translate>Details</h4>
 
   <ul class="no-bullet size-14 m0">
-    <div ng-if="!btx.showSingle"
+    <div ng-if="btx.action == 'received'">
+      <li class="line-b p10 oh">
+        <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"
+    <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>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 5989c3ca3..054f43f85 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -430,10 +430,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     if (tx.outputs) {
       tx.showSingle = false;
       tx.outputs.details = lodash.clone(tx.outputs);
-      tx.amount = 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.outputs.summary = {
         amount: tx.amount,
         message: tx.message,