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

rm dups

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-02-25 16:03:03 -03:00
commit af581286cd
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -892,7 +892,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
getNewTxs([], 0, function(err, txs) { getNewTxs([], 0, function(err, txs) {
if (err) return cb(err); if (err) return cb(err);
var newHistory = lodash.compact(txs.concat(confirmedTxs)); var newHistory = lodash.uniq(lodash.compact(txs.concat(confirmedTxs)), function(x) {
return x.txid;
});
var historyToSave = JSON.stringify(newHistory); var historyToSave = JSON.stringify(newHistory);
lodash.each(txs, function(tx) { lodash.each(txs, function(tx) {
@ -919,22 +921,22 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.showMore = function() { self.showMore = function() {
$timeout(function() { $timeout(function() {
if (self.isSearching) { if (self.isSearching) {
self.txHistorySearchResults = self.result.slice(0, self.nextTxHistory); self.txHistorySearchResults = self.result.slice(0, self.nextTxHistory);
$log.debug('Total txs: ', self.txHistorySearchResults.length + '/' + self.result.length); $log.debug('Total txs: ', self.txHistorySearchResults.length + '/' + self.result.length);
if (self.txHistorySearchResults.length >= self.result.length) if (self.txHistorySearchResults.length >= self.result.length)
self.historyShowMore = false; self.historyShowMore = false;
} else { } else {
self.txHistory = self.completeHistory.slice(0, self.nextTxHistory); self.txHistory = self.completeHistory.slice(0, self.nextTxHistory);
self.txHistorySearchResults = self.txHistory; self.txHistorySearchResults = self.txHistory;
$log.debug('Total txs: ', self.txHistorySearchResults.length + '/' + self.completeHistory.length); $log.debug('Total txs: ', self.txHistorySearchResults.length + '/' + self.completeHistory.length);
if (self.txHistorySearchResults.length >= self.completeHistory.length) if (self.txHistorySearchResults.length >= self.completeHistory.length)
self.historyShowMore = false; self.historyShowMore = false;
} }
self.nextTxHistory += self.historyShowMoreLimit; self.nextTxHistory += self.historyShowMoreLimit;
}, 100); }, 100);
}; };
self.startSearch = function(){ self.startSearch = function() {
self.isSearching = true; self.isSearching = true;
self.txHistorySearchResults = []; self.txHistorySearchResults = [];
self.result = []; self.result = [];
@ -942,13 +944,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.nextTxHistory = self.historyShowMoreLimit; self.nextTxHistory = self.historyShowMoreLimit;
} }
self.cancelSearch = function(){ self.cancelSearch = function() {
self.isSearching = false; self.isSearching = false;
self.result = []; self.result = [];
self.setCompactTxHistory(); self.setCompactTxHistory();
} }
self.updateSearchInput = function(search){ self.updateSearchInput = function(search) {
self.search = search; self.search = search;
if (isCordova) if (isCordova)
window.plugins.toast.hide(); window.plugins.toast.hide();
@ -960,13 +962,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
function filter(search) { function filter(search) {
self.result = []; self.result = [];
function computeSearchableString(tx){ function computeSearchableString(tx) {
var addrbook = ''; var addrbook = '';
if(tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || ''; if (tx.addressTo && self.addressbook && self.addressbook[tx.addressTo]) addrbook = self.addressbook[tx.addressTo] || '';
var searchableDate = computeSearchableDate(new Date(tx.time * 1000)); var searchableDate = computeSearchableDate(new Date(tx.time * 1000));
var message = tx.message ? tx.message : ''; var message = tx.message ? tx.message : '';
var addressTo = tx.addressTo ? tx.addressTo : ''; var addressTo = tx.addressTo ? tx.addressTo : '';
return ((tx.amountStr+message+addressTo+addrbook+searchableDate).toString()).toLowerCase(); return ((tx.amountStr + message + addressTo + addrbook + searchableDate).toString()).toLowerCase();
} }
function computeSearchableDate(date) { function computeSearchableDate(date) {
@ -982,13 +984,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} }
self.result = lodash.filter(self.completeHistory, function(tx) { self.result = lodash.filter(self.completeHistory, function(tx) {
if (!tx.searcheableString) tx.searcheableString = computeSearchableString(tx); if (!tx.searcheableString) tx.searcheableString = computeSearchableString(tx);
return lodash.includes(tx.searcheableString, search.toLowerCase()); return lodash.includes(tx.searcheableString, search.toLowerCase());
}); });
if (self.result.length > self.historyShowLimit) self.historyShowMore = true; if (self.result.length > self.historyShowLimit) self.historyShowMore = true;
else self.historyShowMore = false; else self.historyShowMore = false;
return self.result; return self.result;
}; };
self.txHistorySearchResults = filter(self.search).slice(0, self.historyShowLimit); self.txHistorySearchResults = filter(self.search).slice(0, self.historyShowLimit);
@ -999,7 +1001,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$apply(); $rootScope.$apply();
}); });
},1000); }, 1000);
self.getTxsFromServer = function(client, skip, endingTxid, limit, cb) { self.getTxsFromServer = function(client, skip, endingTxid, limit, cb) {
var res = []; var res = [];