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

conflicts solved

Browse source
This commit is contained in:
Gabriel Bazán 2016-02-23 10:52:20 -03:00
commit 062c0ba994
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
ret.onGoingProcess = {}; ret.onGoingProcess = {};
ret.historyShowLimit = 10; ret.historyShowLimit = 10;
ret.historyShowMoreLimit = 100; ret.historyShowMoreLimit = 100;
ret.isSearching = false;
ret.prevState = 'walletHome'; ret.prevState = 'walletHome';
ret.menu = [{ ret.menu = [{
@ -895,9 +896,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (walletId == profileService.focusedClient.credentials.walletId) { if (walletId == profileService.focusedClient.credentials.walletId) {
self.completeHistory = newHistory; self.completeHistory = newHistory;
self.setCompactTxHistory(); self.setCompactTxHistory();
self.txHistory = newHistory.slice(0, self.historyShowLimit);
self.txHistoryToList = self.txHistory;
self.historyShowMore = newHistory.length > self.historyShowLimit;
} }
return storageService.setTxHistory(JSON.stringify(newHistory), walletId, function() { return storageService.setTxHistory(JSON.stringify(newHistory), walletId, function() {