anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

how comment on tx list

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-06-03 15:36:45 -03:00
commit 28eb3ee989
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/modals/tx-details.html
View file

@ -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>

7
public/views/walletHome.html
View file

@ -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>

2
src/js/controllers/index.js
View file

@ -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

19
src/js/controllers/preferencesHistory.js
View file

@ -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',