diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index cbb759b6a..e630506f3 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -111,7 +111,7 @@ No transactions yet -
+
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 83cf90735..1282f34c3 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -118,10 +118,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.updateTxHistoryError = false; $scope.updatingTxHistoryProgress = 0; - var progressFn = function(txs) { - $scope.updatingTxHistoryProgress = txs ? txs.length : 0; + var progressFn = function(txs, newTxs) { + $scope.updatingTxHistoryProgress = newTxs; $scope.completeTxHistory = txs; $scope.showHistory(); + $timeout(function() { + $scope.$apply(); + }); }; $timeout(function() { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index f2f8d9a13..84bfea06a 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -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;