From 28eb3ee989f62aa5ead5e047e5c52ce0b8f72c28 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 3 Jun 2016 15:36:45 -0300
Subject: [PATCH] how comment on tx list

---
 public/views/modals/tx-details.html      |  2 +-
 public/views/walletHome.html             |  7 ++++++-
 src/js/controllers/index.js              |  2 ++
 src/js/controllers/preferencesHistory.js | 19 +------------------
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 3c8e6711f..8df8ce51f 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -128,7 +128,7 @@
         <li class="p10 oh" ng-show="btx.note">
           <span class="text-gray" translate>Comment</span>
           <span class="right enable_text_select">{{btx.note.body}}</span><br>
-          <span class="right text-italic text-gray size-12 m10t">
+          <span class="right text-italic text-gray size-12">
             <span>{{btx.note.editedByName}}</span>
             <time>{{btx.note.editedOn * 1000 | amTimeAgo}}</time></span>
           </span>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 8d55095c7..6282c236d 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -202,7 +202,12 @@
                   <img src="img/icon-moved.svg" alt="sync" width="40" ng-show="btx.action == 'moved'">
                 </div>
                 <div class="m10t">
-                  <span ng-show="btx.action == 'received'" translate>Received</span>
+                  <span ng-show="btx.action == 'received'">
+                    <span class="ellipsis">
+                      <span ng-if="btx.note.body">{{btx.note.body}}</span>
+                      <span ng-if="!btx.note.body" translate> Received</span>
+                    </span>
+                  </span>
                   <span ng-show="btx.action == 'sent'">
                     <span class="ellipsis">
                       <span ng-if="btx.message">{{btx.message}}</span>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 88d68f819..fd920173d 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -757,6 +757,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
       var confirmedTxs = self.removeAndMarkSoftConfirmedTx(txsFromLocal);
       var endingTxid = confirmedTxs[0] ? confirmedTxs[0].txid : null;
+      var endingTs = confirmedTxs[0] ? confirmedTxs[0].ts : null;
+console.log('[index.js.760:endingTs:]',endingTs); //TODO
 
 
       // First update
diff --git a/src/js/controllers/preferencesHistory.js b/src/js/controllers/preferencesHistory.js
index 7480c5d2a..20ca932fa 100644
--- a/src/js/controllers/preferencesHistory.js
+++ b/src/js/controllers/preferencesHistory.js
@@ -22,24 +22,8 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
         return dateObj.toJSON();
       }
 
-      function formatString(str) {
-        if (!str) return '';
-
-        if (str.indexOf('"') !== -1) {
-          //replace all
-          str = str.replace(new RegExp('"', 'g'), '\'');
-        }
-
-        //escaping commas
-        str = '\"' + str + '\"';
-        console.log('[index.js.720:str:]', str); //TODO
-
-        return str;
-      }
-
       var step = 6;
       var unique = {};
-
       function getHistory(cb) {
         storageService.getTxHistory(c.walletId, function(err, txs) {
           if (err) return cb(err);
@@ -52,7 +36,6 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
           }
 
           allTxs.push(txsFromLocal);
-console.log('[preferencesHistory.js.56:allTxs:]',allTxs); //TODO
           return cb(null, lodash.flatten(allTxs));
         });
       }
@@ -111,7 +94,7 @@ console.log('[preferencesHistory.js.77]', txs); //TODO
 
           self.csvContent.push({
             'Date': formatDate(it.time * 1000),
-            'Destination': formatString(it.addressTo),
+            'Destination': it.addressTo || '',
             'Description': _note,
             'Amount': _amount,
             'Currency': 'BTC',