From 821db133c86bca3b3f9e0c04534b565068316d26 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 3 Dec 2015 17:44:02 -0300
Subject: [PATCH] Fix loading wallet-history

---
 public/views/includes/walletInfo.html |  2 +-
 public/views/walletHome.html          | 11 ++++++-----
 src/js/controllers/index.js           |  5 +++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html
index 4b9af85c5..0d42eb65a 100644
--- a/public/views/includes/walletInfo.html
+++ b/public/views/includes/walletInfo.html
@@ -12,5 +12,5 @@
 <!-- <img style="height:1em"  ng&#45;show="index.preferences.email" src="img/icon&#45;email.svg"> -->
 <img style="height:1em"  ng-show="index.usingCustomBWS" src="img/icon-bws.svg">
 
-<img style="height:1em"  class="animated flash infinite" ng-show="index.updatingTxHistory[index.walletId]" src="img/icon-sync.svg">
+<img style="height:1em"  class="animated flash infinite" ng-show="index.loadingWallet" src="img/icon-sync.svg">
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 70a6a0a8b..a60f93259 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -173,21 +173,22 @@
       <!-- Activity -->
 
       <h4 class="title m0" translate>Activity</h4>
-      <div class="row m20t" ng-show="!index.updatingTxHistory[index.walletId] && !index.txHistory[0]">
+      <div class="row" 
+        ng-show="!index.loadingWallet && !index.txHistory[0]">
         <div class="large-12 columns">
-          <div class="oh text-center">
+          <div class="oh text-gray size-12 text-center">
             <span ng-if="!index.txHistoryError" translate>
               No transactions yet
             </span>
             <span ng-show="index.txHistoryError && !index.notAuthorized" ng-click='index.updateTxHistory()'>
-              <p class="size-12 m10b db text-gray" translate>Could not fetch transaction history</p>
+              <p translate>Could not fetch transaction history</p>
               <button class="outline round light-gray tiny" translate>Tap to retry</button>
             </span>
           </div>
         </div>
       </div>
-      <div ng-show="index.updatingTxHistory[index.walletId]">
-        <div  class="row p20 text-center" ng-show="index.txProgress > 6">
+      <div ng-show="index.updatingTxHistory[index.walletId] && index.txProgress > 6">
+        <div  class="row p20 text-center">
           <div class="columns large-12 medium-12 small-12 m10b">
             <div class="spinner">
               <div class="rect1"></div>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 52bbdea25..b895712d0 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -64,6 +64,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     var fc = profileService.focusedClient;
     if (!fc) return;
 
+    // loading full wallet
+    self.loadingWallet = true;
+
     // Clean status
     self.totalBalanceSat = null;
     self.lockedBalanceSat = null;
@@ -923,6 +926,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $timeout(function() {
       self.updateLocalTxHistory(fc, function(err) {
         self.updatingTxHistory[walletId] = false;
+        self.loadingWallet = false;
+        self.txProgress = 0;
         if (err)
           self.txHistoryError = true;