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

Merge pull request #3321 from matiu/bug/csv

Browse source 
Bug/csv
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-21 11:01:43 -03:00
commit 49b60758d0
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.currentFeeLevel = null; self.currentFeeLevel = null;
self.notAuthorized = false; self.notAuthorized = false;
self.txHistory = []; self.txHistory = [];
self.txHistoryUnique = {};
self.balanceByAddress = null; self.balanceByAddress = null;
self.txHistoryPaging = false; self.txHistoryPaging = false;
self.pendingTxProposalsCountForUs = null; self.pendingTxProposalsCountForUs = null;
@ -408,6 +409,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (!fc || !fc.isComplete()) return; if (!fc || !fc.isComplete()) return;
if (!skip) { if (!skip) {
self.txHistory = []; self.txHistory = [];
self.txHistoryUnique = {};
} }
self.skipHistory = skip || 0; self.skipHistory = skip || 0;
$log.debug('Updating Transaction History'); $log.debug('Updating Transaction History');
@ -544,8 +546,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} }
if (c < self.limitHistory) { if (c < self.limitHistory) {
self.txHistory.push(tx); if (!self.txHistoryUnique[tx.txid]) {
c++; self.txHistory.push(tx);
self.txHistoryUnique[tx.txid] = true;
c++;
} else {
$log.debug('Ignoring duplicate TX in history: '+ tx.txid)
}
} }
}); });
}; };
@ -685,6 +692,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var step = 6; var step = 6;
var unique = {};
function getHistory(skip, cb) { function getHistory(skip, cb) {
skip = skip || 0; skip = skip || 0;
fc.getTxHistory({ fc.getTxHistory({
@ -693,7 +701,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}, function(err, txs) { }, function(err, txs) {
if (err) return cb(err); if (err) return cb(err);
if (txs && txs.length > 0) { if (txs && txs.length > 0) {
allTxs.push(txs); lodash.each(txs, function(tx) {
if (!unique[tx.txid]){
allTxs.push(tx);
unique[tx.txid] = 1;
console.log("Got:" + lodash.keys(unique).length + " txs");
} else {
console.log("Ignoring duplicate TX in CSV: "+ tx.txid);
}
});
return getHistory(skip + step, cb); return getHistory(skip + step, cb);
} else { } else {
return cb(null, lodash.flatten(allTxs)); return cb(null, lodash.flatten(allTxs));