From 147de5e6971b6c1e21316fd5942a47a2d63c2f4b Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Mon, 22 Feb 2016 17:33:41 -0300
Subject: [PATCH 1/2] show more

---
 public/views/walletHome.html | 15 ++++++++-------
 src/js/controllers/index.js  | 18 +++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 7dd1ed9d6..c0c5ea510 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -179,7 +179,7 @@
               <div translate>Updating transaction history. Please stand by.</div>
             </div>
           </div>
-        </div> 
+        </div>
 
         <div ng-if="index.txHistory[0] &&  index.updatingTxHistory && index.newTx" class="row collapse last-transactions-content animated fadeInDown">
           <div class="large-6 medium-6 small-6 columns size-14">
@@ -258,9 +258,10 @@
 
         <div class="m20t text-center">
           <a class="text-gray size-12"
-             ng-show="index.historyShowShowAll"
-             ng-click="index.showAllHistory()">
-            <span translate>Show all</span>
+            ng-show="index.historyShowMore"
+            ng-click="index.showMore()">
+            {{index.completeHistory.length - index.txHistory.length}} <span translate>more</span>
+            <i class="icon-arrow-down4"></i>
           </a>
         </div>
       </div>
@@ -358,12 +359,12 @@
       <div class="pr p25b">
         <h4 class="title m0">
           <available-balance></available-balance>
-          <span 
-            ng-show="home.lockedCurrentFeePerKb || home.blockUx || home.lockAmount" 
+          <span
+            ng-show="home.lockedCurrentFeePerKb || home.blockUx || home.lockAmount"
             class="text-gray" translate>Send All</span>
           <a
             ng-show="index.availableBalanceSat > 0 && !home.lockedCurrentFeePerKb && !home.blockUx && !home.lockAmount"
-            ng-click="home.sendAll(index.totalBytesToSendMax, index.availableBalanceSat)" 
+            ng-click="home.sendAll(index.totalBytesToSendMax, index.availableBalanceSat)"
              translate> Send All
           </a>
           <div ng-show="!home.paymentExpired && home._paypro">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index ba3bbd100..875c1b8f2 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -14,6 +14,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   ret.usePushNotifications = ret.isCordova && !isMobile.Windows();
   ret.onGoingProcess = {};
   ret.historyShowLimit = 10;
+  ret.historyShowMoreLimit = 100;
   ret.prevState = 'walletHome';
 
   ret.menu = [{
@@ -892,15 +893,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   }
 
-  self.showAllHistory = function() {
-    self.historyShowShowAll = false;
-    self.historyRendering = true;
+  self.showMore = function() {
     $timeout(function() {
-      $rootScope.$apply();
-      $timeout(function() {
-        self.historyRendering = false;
-        self.txHistory = self.completeHistory;
-      }, 100);
+      self.txHistory = self.completeHistory.slice(0, self.nextTxHistory);
+      $log.debug('Total txs: ', self.txHistory.length + '/' + self.completeHistory.length);
+      self.nextTxHistory += self.historyShowMoreLimit;
+      if (self.txHistory.length >= self.completeHistory.length)
+        self.historyShowMore = false;
     }, 100);
   };
 
@@ -956,8 +955,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   };
 
   self.setCompactTxHistory = function() {
+    self.nextTxHistory = self.historyShowMoreLimit;
     self.txHistory = self.completeHistory.slice(0, self.historyShowLimit);
-    self.historyShowShowAll = self.completeHistory.length > self.historyShowLimit;
+    self.historyShowMore = self.completeHistory.length > self.historyShowLimit;
   };
 
   self.debounceUpdateHistory = lodash.debounce(function() {

From e6dd97adbb31ff71cb6dedc9e57cd63b6b5043ea Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 23 Feb 2016 10:43:58 -0300
Subject: [PATCH 2/2] fix wording

---
 public/views/walletHome.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index c0c5ea510..dd46d60be 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -260,7 +260,7 @@
           <a class="text-gray size-12"
             ng-show="index.historyShowMore"
             ng-click="index.showMore()">
-            {{index.completeHistory.length - index.txHistory.length}} <span translate>more</span>
+            <span translate>Show more</span> ({{index.completeHistory.length - index.txHistory.length}})
             <i class="icon-arrow-down4"></i>
           </a>
         </div>