From f3c97288900ab474f1524fb0289f09f6239097d4 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 9 Feb 2016 15:10:25 -0300
Subject: [PATCH 1/2] rename variables/event

---
 src/js/controllers/index.js  | 12 +++++++++++-
 src/js/controllers/topbar.js |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 928c830e9..fe11cace7 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -926,7 +926,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         if (walletId == profileService.focusedClient.credentials.walletId) {
           self.completeHistory = newHistory;
           self.txHistory = newHistory.slice(0, self.historyShowLimit);
-          self.historyShowShowAll = newHistory.length >= self.historyShowLimit;
+          self.historyShowShowAll = newHistory.length > self.historyShowLimit;
         }
 
         return storageService.setTxHistory(JSON.stringify(newHistory), walletId, function() {
@@ -935,6 +935,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       });
     });
   }
+
   self.showAllHistory = function() {
     self.historyShowShowAll = false;
     self.historyRendering = true;
@@ -1177,6 +1178,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
+  $rootScope.$on('Local/UpdateTxHistory', function(event) {
+    $timeout(function () {
+      self.txHistory = self.completeHistory.slice(0, self.historyShowLimit);
+      if (self.completeHistory.length > self.historyShowLimit)
+        self.historyShowShowAll = true;
+    }, 10);
+  });
+
+
   $rootScope.$on('$stateChangeSuccess', function(ev, to, toParams, from, fromParams) {
     self.prevState = from.name || 'walletHome';
     self.tab = 'walletHome';
diff --git a/src/js/controllers/topbar.js b/src/js/controllers/topbar.js
index b3f58ad0e..c25102f46 100644
--- a/src/js/controllers/topbar.js
+++ b/src/js/controllers/topbar.js
@@ -1,12 +1,14 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('topbarController', function(go) { 
+angular.module('copayApp.controllers').controller('topbarController', function(go, $rootScope) {
 
   this.goHome = function() {
+    $rootScope.$emit('Local/UpdateTxHistory');
     go.walletHome();
   };
 
   this.goPreferences = function() {
+    $rootScope.$emit('Local/UpdateTxHistory');
     go.preferences();
   };
 

From eb3680ba6d2d28a11a891887bc3e0c928bf610a9 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 9 Feb 2016 17:09:23 -0300
Subject: [PATCH 2/2] convert update tx history event into a function

---
 public/views/includes/topbar.html |  8 ++++----
 src/js/controllers/index.js       | 15 ++++++---------
 src/js/controllers/topbar.js      |  4 +---
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index bbda0916c..1a7f28d40 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -1,5 +1,5 @@
-<nav ng-controller="topbarController as topbar" 
-  class="tab-bar" 
+<nav ng-controller="topbarController as topbar"
+  class="tab-bar"
   ng-style="{'background-color': noColor ? '#4B6178' : index.backgroundColor}">
   <section class="left-small">
     <a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet"
@@ -11,13 +11,13 @@
     </a>
 
     <a ng-show="closeToHome" class="p10 "
-      ng-click="topbar.goHome(); closeToHome = null">
+      ng-click="topbar.goHome(); index.setCompactTxHistory(); closeToHome = null">
       <span class="text-close">{{'Close'|translate}}</span>
     </a>
   </section>
 
   <section class="right-small" ng-show="showPreferences && !index.noFocusedWallet">
-    <a class="p10" ng-click="topbar.goPreferences()">
+    <a class="p10" ng-click="topbar.goPreferences(); index.setCompactTxHistory()">
       <i class="fi-widget size-24"></i>
     </a>
   </section>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index fe11cace7..87a564471 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -996,6 +996,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
+  self.setCompactTxHistory = function() {
+    self.txHistory = self.completeHistory.slice(0, self.historyShowLimit);
+    if (self.completeHistory.length > self.historyShowLimit)
+      self.historyShowShowAll = true;
+  };
+
   self.debounceUpdateHistory = lodash.debounce(function() {
     self.updateHistory();
   }, 1000);
@@ -1178,15 +1184,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-  $rootScope.$on('Local/UpdateTxHistory', function(event) {
-    $timeout(function () {
-      self.txHistory = self.completeHistory.slice(0, self.historyShowLimit);
-      if (self.completeHistory.length > self.historyShowLimit)
-        self.historyShowShowAll = true;
-    }, 10);
-  });
-
-
   $rootScope.$on('$stateChangeSuccess', function(ev, to, toParams, from, fromParams) {
     self.prevState = from.name || 'walletHome';
     self.tab = 'walletHome';
diff --git a/src/js/controllers/topbar.js b/src/js/controllers/topbar.js
index c25102f46..b3f58ad0e 100644
--- a/src/js/controllers/topbar.js
+++ b/src/js/controllers/topbar.js
@@ -1,14 +1,12 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('topbarController', function(go, $rootScope) {
+angular.module('copayApp.controllers').controller('topbarController', function(go) { 
 
   this.goHome = function() {
-    $rootScope.$emit('Local/UpdateTxHistory');
     go.walletHome();
   };
 
   this.goPreferences = function() {
-    $rootScope.$emit('Local/UpdateTxHistory');
     go.preferences();
   };