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 @@
Comment
{{btx.note.body}}
-
+
{{btx.note.editedByName}}
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 @@
- Received
+
+
+ {{btx.note.body}}
+ Received
+
+
{{btx.message}}
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',