Merge pull request #230 from cmgustavo/ref/design-64

Fix walletDetails getHistory
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-30 17:14:03 -03:00 committed by GitHub
commit 7fb2113c86
3 changed files with 8 additions and 5 deletions

View file

@ -422,7 +422,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
var endingTs = confirmedTxs[0] ? confirmedTxs[0].time : null;
// First update
progressFn(txsFromLocal);
progressFn(txsFromLocal, 0);
wallet.completeHistory = txsFromLocal;
function getNewTxs(newTxs, skip, cb) {
@ -431,7 +431,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
newTxs = newTxs.concat(processNewTxs(wallet, lodash.compact(res)));
progressFn(newTxs.concat(txsFromLocal));
progressFn(newTxs.concat(txsFromLocal), newTxs.length);
skip = skip + requestLimit;