From 8d90bee85cf4153893ffe4881633970ffb4dc9f4 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Mon, 3 Oct 2016 11:52:48 -0300
Subject: [PATCH] show loading spinner at the end of tx history list

---
 public/views/walletDetails.html     | 41 +++++++++++++----------------
 src/js/controllers/walletDetails.js |  8 +++---
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index e630506f3..f769252f0 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -9,6 +9,7 @@
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
+
   <ion-content delegate-handle="my-handle">
     <div class="oh pr" ng-show="wallet && wallet.isComplete()">
       <div ng-style="{'background-color':wallet.color}" class="amount">
@@ -88,21 +89,20 @@
       </div>
 
 
-    <div class="card list" ng-if="txps[0]">
-      <div class="item item-heading" translate>
-        <span ng-show="requiresMultipleSignatures" translate>Payment Proposals</span>
-        <span ng-show="!requiresMultipleSignatures" translate>Unsent transactions</span>
+      <div class="card list" ng-if="txps[0]">
+        <div class="item item-heading" translate>
+          <span ng-show="requiresMultipleSignatures" translate>Payment Proposals</span>
+          <span ng-show="!requiresMultipleSignatures" translate>Unsent transactions</span>
+        </div>
+        <div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
+          <span ng-include="'views/includes/txp.html'"></span>
+        </div>
+        <div class="item item-footer" ng-show="status.lockedBalanceSat">
+          <span translate>Total Locked Balance</span>:
+          <b>{{status.lockedBalanceStr}} </b>
+          <span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
+        </div>
       </div>
-      <div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
-        <span ng-include="'views/includes/txp.html'"></span>
-      </div>
-      <div class="item item-footer" ng-show="status.lockedBalanceSat">
-        <span translate>Total Locked Balance</span>:
-        <b>{{status.lockedBalanceStr}} </b>
-        <span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
-      </div>
-    </div>
-
 
       <!-- Transactions -->
 
@@ -173,15 +173,12 @@
             </div>
             <span class="label tu warning radius" ng-if="btx.action == 'invalid'" translate>Invalid</span>
           </h2>
-
         </div>
-
-        <ion-infinite-scroll
-          ng-if="txHistoryShowMore"
-          on-infinite="showMore()"
-          distance="1%">
-        </ion-infinite-scroll>
       </div>
-
+      <ion-infinite-scroll
+        ng-if="txHistoryShowMore"
+        on-infinite="showMore()"
+        distance="1%">
+      </ion-infinite-scroll>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 1282f34c3..37e7324fa 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -153,9 +153,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   };
 
   $scope.showMore = function() {
-    currentTxHistoryPage++;
-    $scope.showHistory();
-    $scope.$broadcast('scroll.infiniteScrollComplete');
+    $timeout(function() {
+      currentTxHistoryPage++;
+      $scope.showHistory();
+      $scope.$broadcast('scroll.infiniteScrollComplete');
+    }, 100);
   };
 
   $scope.updateAll = function(force, cb)  {