From 5ec82cd8efb1d2a9afc65754eb90b0e62888c047 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 30 Sep 2016 15:58:56 -0300
Subject: [PATCH] Fix walletDetails getHistory

---
 public/views/walletDetails.html     | 2 +-
 src/js/controllers/walletDetails.js | 7 +++++--
 src/js/services/walletService.js    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

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
       </div>
 
-      <div ng-show="updatingTxHistory" class="updatingHistory">
+      <div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="updatingHistory">
         <div  class="row" >
             <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
         </div>
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;