diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 0be944473..496a88e4d 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -846,9 +846,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setCompactTxHistory(); } - if (historyUpdateInProgress[walletId]) + if (historyUpdateInProgress[walletId]) return; - + historyUpdateInProgress[walletId] = true; function getNewTxs(newTxs, skip, i_cb) { @@ -1237,10 +1237,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setAddressbook(ab); }); - $rootScope.$on('Local/Searching', function(event, val) { - self.isSearching = val; - }); - // UX event handlers $rootScope.$on('Local/ColorUpdated', function(event) { self.updateColor(); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c7e0b9ba2..be8dcab34 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -24,7 +24,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi ret.isMobile = isMobile.any(); ret.isWindowsPhoneApp = isMobile.Windows() && isCordova; var vanillaScope = ret; - this.isSearching = false; + + $rootScope.$emit('Local/Searching', false); var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) { self.setForm(data); @@ -52,7 +53,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.addr = null; self.resetForm(); $scope.search = ''; - $rootScope.$emit('Local/Searching', false); if (profileService.focusedClient) { self.setAddress();