From c18fca0d7ad519bc01f82ffaae0671e4110b7cbc Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Thu, 16 Jul 2015 13:31:46 -0700
Subject: [PATCH] if only one recipient, do not summarize in views

---
 public/views/includes/output.html      |  7 ++++-
 public/views/includes/transaction.html |  6 ++++-
 src/js/controllers/index.js            | 37 +++++++++++---------------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/public/views/includes/output.html b/public/views/includes/output.html
index 905908dfc..82f324b62 100644
--- a/public/views/includes/output.html
+++ b/public/views/includes/output.html
@@ -1,10 +1,11 @@
 <div class="ng-animate-disabled row collapse line-b" ng-class="text-gray">
   <li ng-if="output.summary" class="line-b p10 oh" ng-click="expand(output.parent)">
     <span class="text-gray" translate>To</span>:
-    <span class="right enable_text_select">{{output.summary.length}}
+    <span class="right enable_text_select" ng-if="output.summary.length>1">{{output.summary.length}}
         <span class="enable_text_select" translate>recipients</span>
         <i class="icon-arrow-down size-24"></i>
     </span>
+    <span class="right enable_text_select" ng-if="output.summary.length==1">{{output.summary[0].toAddress}}</span>
   </li>
   <li ng-if="!output.summary" class="line-b p10 oh" ng-click="copyAddress(output.toAddress)">
     <span class="text-gray" translate>To</span>:
@@ -16,6 +17,10 @@
       <span class="label gray radius enable_text_select">{{output.alternativeAmountStr}}</span>
     </span>
   </li>
+  <li class="line-b p10 oh" ng-if="output.summary && output.summary.length==1 && output.summary[0].message" ng-click="expand(output.parent)">
+    <span class="text-gray" translate>Note</span>:
+    <span class="right enable_text_select">{{output.summary[0].message}}</span>
+  </li>
   <li class="line-b p10 oh" ng-click="expand(output.parent)">
     <span class="text-gray" translate>Note</span>:
     <span class="right enable_text_select">{{output.message}}</span>
diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html
index f6911be0c..2ad5ecab5 100644
--- a/public/views/includes/transaction.html
+++ b/public/views/includes/transaction.html
@@ -16,10 +16,14 @@
           <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
           <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
         </span>
-        <span ng-if="tx.outputs">
+        <span ng-if="tx.outputs && tx.outputs.recipientCount>1">
           <span>{{tx.outputs.recipientCount}}</span>
           <span translate>recipients</span>
         </span>
+        <span ng-if="tx.outputs && tx.outputs.recipientCount==1">
+          <contact address="{{tx.outputs[0].summary[0].toAddress}}" ng-hide="tx.merchant"> </contact>
+          {{tx.outputs[0].summary[0].toAddress}}
+        </span>
         <span ng-if="!tx.outputs">
           <contact address="{{tx.toAddress}}" ng-hide="tx.merchant"> </contact>
           {{tx.toAddress}}
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 67e8ab81c..62b8b7294 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -436,28 +436,21 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       };
 
       if (tx.outputs) {
-        if (tx.outputs.length === 1) {
-          tx.amount = tx.outputs[0].amount;
-          tx.toAddress = tx.outputs[0].toAddress;
-          tx.message += (' ' + tx.outputs[0].message);
-          delete tx.outputs;
-        } else {
-          tx.amount = lodash.reduce(tx.outputs, function(total, o) {
-            formatAmount(o, o.amount * self.satToUnit);
-            return total + o.amount;
-          }, 0);
-          var summary = tx.outputs;
-          tx.outputs = [{
-            amount: tx.amount,
-            message: tx.message,
-            summary: summary
-          }];
-          tx.outputs[0].parent = tx.outputs;
-          tx.outputs.transform = formatAmount;
-          tx.outputs.accumulator = 'amount';
-          tx.outputs.recipientCount = summary.length;
-          formatAmount(tx.outputs[0], tx.amount * self.satToUnit);
-        }
+        tx.amount = lodash.reduce(tx.outputs, function(total, o) {
+          formatAmount(o, o.amount * self.satToUnit);
+          return total + o.amount;
+        }, 0);
+        var summary = tx.outputs;
+        tx.outputs = [{
+          amount: tx.amount,
+          message: tx.message,
+          summary: summary
+        }];
+        tx.outputs[0].parent = tx.outputs;
+        tx.outputs.transform = formatAmount;
+        tx.outputs.accumulator = 'amount';
+        tx.outputs.recipientCount = summary.length;
+        formatAmount(tx.outputs[0], tx.amount * self.satToUnit);
       }
       formatAmount(tx, tx.amount * self.satToUnit);