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

add unique to txhistory

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-10-21 10:47:15 -03:00
commit 444b620499
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
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)
}
} }
}); });
}; };
@ -700,7 +707,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
unique[tx.txid] = 1; unique[tx.txid] = 1;
console.log("Got:" + lodash.keys(unique).length + " txs"); console.log("Got:" + lodash.keys(unique).length + " txs");
} else { } else {
console.log("Ignoring Duplicate TX:", tx.txid); console.log("Ignoring duplicate TX in CSV: "+ tx.txid);
} }
}); });
return getHistory(skip + step, cb); return getHistory(skip + step, cb);