From a8becd4ba410234bd88fbe771f972d88b8a74234 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 13 Oct 2016 16:33:25 -0300
Subject: [PATCH 1/2] fix multiple outputs

---
 src/js/controllers/modals/txDetails.js |  1 +
 www/views/includes/output.html         | 17 ++++++++------
 www/views/modals/tx-details.html       | 32 +++++++++++++-------------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index 7f3dacf10..c82343c17 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -24,6 +24,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
     updateMemo();
     initActionList();
     getAlternativeAmount();
+console.log('[txDetails.js.16:btx:]',$scope.btx, $scope.btx.addressTo); //TODO
   };
 
   function updateMemo() {
diff --git a/www/views/includes/output.html b/www/views/includes/output.html
index d085ecb4d..1decbdff0 100644
--- a/www/views/includes/output.html
+++ b/www/views/includes/output.html
@@ -1,14 +1,17 @@
-<li class="p10 oh" copy-to-clipboard="output.toAddress">
+<div class="item" copy-to-clipboard="output.toAddress">
   <span class="text-gray" translate>To</span>:
   <span class="right enable_text_select">{{output.toAddress || output.address}}</span>
-</li>
-<li class="p10" copy-to-clipboard="output.amountStr">
+</div>
+
+<div class="item" copy-to-clipboard="output.amountStr">
   <span class="text-gray" translate>Amount</span>:
   <span class="right enable_text_select">{{output.amountStr}}
-    <span ng-show="output.alternativeAmountStr" class="label gray radius">{{output.alternativeAmountStr}}</span>
+  <span ng-show="output.alternativeAmountStr">({{output.alternativeAmountStr}})</span>
   </span>
-</li>
-<li class="p10 oh" copy-to-clipboard="output.message">
+</div>
+
+
+<div class="item" copy-to-clipboard="output.message" ng-show-"output.message">
   <span class="text-gray" translate>Note</span>:
   <span class="right enable_text_select">{{output.message}}</span>
-</li>
+</div>
diff --git a/www/views/modals/tx-details.html b/www/views/modals/tx-details.html
index 2db70f5b6..a34febe9b 100644
--- a/www/views/modals/tx-details.html
+++ b/www/views/modals/tx-details.html
@@ -55,9 +55,9 @@
     </div>
 
     <div class="list">
-      <div class="item item-icon-left" ng-show="btx.action == 'sent'">
+      <div class="item item-icon-left" ng-show="btx.action == 'sent' && !btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'">
         <i class="icon icon-svg"><img src="img/icon-bitcoin-symbol.svg"></i>
-        <div ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" copy-to-clipboard="btx.addressTo">
+        <div  copy-to-clipboard="btx.addressTo">
           <span ng-if="btx.merchant">
             <span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
             <span ng-show="!btx.merchant.pr.ca"><i class="fi-unlock color-yellowi"></i> {{btx.merchant.domain}}</span>
@@ -69,6 +69,20 @@
         </div>
       </div>
 
+      <div ng-show="btx.hasMultiplesOutputs" class="item item-icon-right item-heading" ng-click="showMultiplesOutputs = !showMultiplesOutputs">
+        {{'Recipients'|translate}}
+          [ {{btx.recipientCount}} ]
+          
+        <i class="icon bp-arrow-up" ng-show="showMultiplesOutputs"></i>
+        <i class="icon bp-arrow-down" ng-show="!showMultiplesOutputs"></i>
+      </div>
+
+      <div class="item" ng-show="btx.hasMultiplesOutputs && showMultiplesOutputs"
+        ng-repeat="output in btx.outputs"
+        ng-include="'views/includes/output.html'">
+      </div>
+
+
       <div class="item item-icon-left"
         ng-click="openExternalLink('https://' + (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid, true, 'View Transaction on Insight', 'Would you like to view this transaction on the Insight blockchain explorer?
', 'Open Insight', 'Go back')">
         <i class="icon ion-ios-upload-outline"></i>
@@ -120,20 +134,6 @@
         </span>
       </div>
 
-      <div ng-show="btx.hasMultiplesOutputs" class="item" ng-click="showMultiplesOutputs = !showMultiplesOutputs">
-        {{'Recipients'|translate}}
-        <span class="item-note">
-          {{btx.recipientCount}}
-          <i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
-          <i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
-        </span>
-      </div>
-
-      <div class="item" ng-show="btx.hasMultiplesOutputs && showMultiplesOutputs"
-        ng-repeat="output in btx.outputs"
-        ng-include="'views/includes/output.html'">
-      </div>
-
       <div ng-if="btx.action == 'invalid'" class="item">
         <span class="right" translate>
           This transaction has become invalid; possibly due to a double spend attempt.

From b8a9d38fd65d234956e665387499a173ae75c354 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 13 Oct 2016 16:39:21 -0300
Subject: [PATCH 2/2] rm log

---
 src/js/controllers/modals/txDetails.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index c82343c17..7f3dacf10 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -24,7 +24,6 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
     updateMemo();
     initActionList();
     getAlternativeAmount();
-console.log('[txDetails.js.16:btx:]',$scope.btx, $scope.btx.addressTo); //TODO
   };
 
   function updateMemo() {