From 7b57011fd2a551511dff2e88ddaa75ad17fed5db Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 16 Feb 2016 14:13:50 -0500
Subject: [PATCH] Enables copy-to-clipboard more strings

---
 public/views/includes/confirm-tx.html |  2 +-
 public/views/includes/output.html     | 10 +++++-----
 public/views/modals/tx-details.html   | 21 ++++++++-------------
 public/views/modals/txp-details.html  |  2 +-
 public/views/walletHome.html          |  2 +-
 src/js/controllers/walletHome.js      | 10 +++++-----
 6 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/public/views/includes/confirm-tx.html b/public/views/includes/confirm-tx.html
index 98b507b19..3cadb0ca0 100644
--- a/public/views/includes/confirm-tx.html
+++ b/public/views/includes/confirm-tx.html
@@ -9,7 +9,7 @@
     <div class="size-36">{{tx.amountStr}}</div>
     <div class="size-14 text-light" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
     <i class="db fi-arrow-down size-24 m10v"></i>
-    <div class="payment-proposal-to" ng-click="copyAddress(tx.toAddress)">
+    <div class="payment-proposal-to" ng-click="copyToClipboard(tx.toAddress)">
       <i class="fi-bitcoin left m10l"></i>
       <contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b m15l size-14" address="{{tx.toAddress}}"></contact>
       <span ng-if="tx.hasMultiplesOutputs" translate>
diff --git a/public/views/includes/output.html b/public/views/includes/output.html
index e22e4b8c2..82b886a29 100644
--- a/public/views/includes/output.html
+++ b/public/views/includes/output.html
@@ -1,14 +1,14 @@
-<li class="p10 oh" ng-click="copyAddress(output.toAddress)">
+<li class="p10 oh" ng-click="copyToClipboard(output.toAddress)">
   <span class="text-gray" translate>To</span>:
   <span class="right enable_text_select">{{output.toAddress || output.address}}</span>
 </li>
-<li class="p10">
+<li class="p10" ng-click="copyToClipboard(output.amountStr)">
   <span class="text-gray" translate>Amount</span>:
-  <span class="right">{{output.amountStr}}
+  <span class="right enable_text_select">{{output.amountStr}}
     <span ng-show="output.alternativeAmountStr" class="label gray radius">{{output.alternativeAmountStr}}</span>
   </span>
 </li>
-<li class="p10 oh">
+<li class="p10 oh" ng-click="copyToClipboard(output.message)">
   <span class="text-gray" translate>Note</span>:
-  <span class="right">{{output.message}}</span>
+  <span class="right enable_text_select">{{output.message}}</span>
 </li>
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index e54ce322e..235835e67 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -51,7 +51,7 @@
 
   <ul class="no-bullet size-14 m0"> 
 
-    <li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
+    <li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyToClipboard(btx.addressTo)">
     <span class="text-gray" translate>To</span>
     <span class="right">
       <span ng-if="btx.merchant">
@@ -78,11 +78,6 @@
       ng-repeat="output in btx.outputs"
       ng-include="'views/includes/output.html'">
     </div>
-
-    <li ng-show="btc.message" class="line-b p10 oh">
-      <span class="text-gray" translate>Note</span>
-      <span class="right">{{btx.message}}</span>
-    </li>
     
     <li ng-if="btx.action == 'invalid'" class="line-b p10 oh">
     <span class="right" translate>
@@ -90,22 +85,22 @@
     </span>
     <li ng-if="btx.time" class="line-b p10 oh">
     <span class="text-gray" translate>Date</span>
-    <span class="right">
+    <span class="right enable_text_select">
       <time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
       <time>({{ btx.time * 1000 | amTimeAgo}})</time>
     </span>
     </li>
-    <li class="line-b p10" ng-show="btx.action != 'received'">
+    <li class="line-b p10" ng-show="btx.action != 'received'" ng-click="copyToClipboard(btx.feeStr)">
       <span class="text-gray" translate>Fee</span>
-      <span class="right">{{btx.feeStr}}</span>
+      <span class="right enable_text_select">{{btx.feeStr}}</span>
     </li>
-    <li class="line-b p10 oh" ng-if="btx.message && btx.action != 'received'">
+    <li class="line-b p10 oh" ng-show="btx.message && btx.action != 'received'" ng-click="copyToClipboard(btx.message)">
       <span class="text-gray" translate>Note</span>
-      <span class="right">{{btx.message}}</span>
+      <span class="right enable_text_select">{{btx.message}}</span>
     </li>
-    <li ng-if="btx.merchant" class="line-b p10 oh">
+    <li ng-if="btx.merchant" class="line-b p10 oh" ng-click="copyToClipboard(btx.merchant.pr.pd.memo)">
     <span class="text-gray" translate>Merchant message</span>
-    <span class="right">
+    <span class="right enable_text_select">
       {{btx.merchant.pr.pd.memo}}
     </span>
     </li>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 013ebd88e..2b8160b00 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -21,7 +21,7 @@
     <div class="size-14 text-light" ng-show="tx.alternativeAmountStr">{{tx.alternativeAmountStr}}</div>
     <i class="db fi-arrow-down size-24 m10v"></i>
     <span class="payment-proposal-to"
-      ng-click="copyAddress(tx.toAddress)">
+      ng-click="copyToClipboard(tx.toAddress)">
       <i class="fi-bitcoin left"></i>
       <contact ng-if="!tx.hasMultiplesOutputs" class="dib enable_text_select ellipsis m5t m5b size-14" address="{{tx.toAddress}}"></contact>
       <span ng-if="tx.hasMultiplesOutputs" translate>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index c75a3e09e..0b608ba5b 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -302,7 +302,7 @@
           <!-- Address-->
           <div class="large-12 columns">
             <h2 class="text-center m10t" translate>My Bitcoin address</h2>
-            <div class="text-center" ng-click="home.copyAddress(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress">
+            <div class="text-center" ng-click="home.copyToClipboard(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress">
               <qrcode size="220" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode>
               <div ng-show="home.generatingAddress" style="position:relative; top:-226px; height:0px">
                 <div style="height:220px; width:220px; margin:auto; background: white">
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index dcc9373f6..7eff987b6 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -427,9 +427,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         }, 100);
       };
 
-      $scope.copyAddress = function(addr) {
+      $scope.copyToClipboard = function(addr) {
         if (!addr) return;
-        self.copyAddress(addr);
+        self.copyToClipboard(addr);
       };
 
       $scope.cancel = lodash.debounce(function() {
@@ -497,7 +497,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     });
   };
 
-  this.copyAddress = function(addr) {
+  this.copyToClipboard = function(addr) {
     if (isCordova) {
       window.cordova.plugins.clipboard.copy(addr);
       window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard'));
@@ -1193,9 +1193,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         return n.substring(0, 4);
       };
 
-      $scope.copyAddress = function(addr) {
+      $scope.copyToClipboard = function(addr) {
         if (!addr) return;
-        self.copyAddress(addr);
+        self.copyToClipboard(addr);
       };
 
       $scope.cancel = lodash.debounce(function() {