From 062c0ba9946bd42c2909a68ffe3f9023bf0bdc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 23 Feb 2016 10:52:20 -0300
Subject: [PATCH] conflicts solved

---
 src/js/controllers/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 9c473edc7..4fe06a985 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -15,6 +15,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   ret.onGoingProcess = {};
   ret.historyShowLimit = 10;
   ret.historyShowMoreLimit = 100;
+  ret.isSearching = false;
   ret.prevState = 'walletHome';
 
   ret.menu = [{
@@ -895,9 +896,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         if (walletId == profileService.focusedClient.credentials.walletId) {
           self.completeHistory = newHistory;
           self.setCompactTxHistory();
-          self.txHistory = newHistory.slice(0, self.historyShowLimit);
-          self.txHistoryToList = self.txHistory;
-          self.historyShowMore = newHistory.length > self.historyShowLimit;
         }
 
         return storageService.setTxHistory(JSON.stringify(newHistory), walletId, function() {