From ceca507fa596f97987e38f4fab086e1002ce6f72 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 24 Apr 2015 03:01:26 -0300
Subject: [PATCH] better loading

---
 public/views/walletHome.html | 11 +++++++++--
 src/js/controllers/index.js  |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index e6cb5122d..bde94b2bd 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -408,9 +408,16 @@ history
     </div>
     <div class="m20t row">
       <div class="columns">
+
         <button class="outline light-gray small expand" 
-          ng-click="index.updateTxHistory(index.skipHistory)" ng-show="index.txHistoryPaging && !index.updatingTxHistory">
-          <span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
+          ng-disabled="index.updatingTxHistory"
+          ng-click="index.updateTxHistory(index.skipHistory)" 
+          ng-show="index.txHistoryPaging || index.updatingTxHistory"
+        >
+          <span  ng-show="!index.updatingTxHistory">
+            <span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i> 
+          </span>
+          <span translate ng-show="index.updatingTxHistory">Loading...</span>
         </button>
       </div>
     </div>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 273e2d2a1..f812d9603 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -220,6 +220,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $log.debug('Updating Transaction History');
     self.txHistoryError = false;
     self.updatingTxHistory = true;
+    self.txHistoryPaging = false;
     $timeout(function() {
       $rootScope.$apply();
       fc.getTxHistory({