diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index d5726117e..4bcdbebbd 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -171,7 +171,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }); }; - $scope.$on("$ionicView.beforeEnter", function(event, data){ + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.wallet = profileService.getWallet(data.stateParams.walletId); $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index a34b210d3..f2f8d9a13 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -421,8 +421,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var endingTxid = confirmedTxs[0] ? confirmedTxs[0].txid : null; var endingTs = confirmedTxs[0] ? confirmedTxs[0].time : null; - // First update + progressFn(txsFromLocal); 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); + progressFn(newTxs.concat(txsFromLocal)); skip = skip + requestLimit;