diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index f12a50cec..b2df8904e 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -176,10 +176,7 @@ angular.module('copayApp.controllers').controller('createController', }); return; } - $timeout(function() { - go.walletHome(); - $rootScope.$apply(); - }); + go.walletHome(); }); }, 100); diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 0896bf707..8e84d190a 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1410,12 +1410,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.tab = 'walletHome'; }); - $rootScope.$on('Local/ValidatingWallet', function(ev, walletId) { - ongoingProcess.set('validatingWallet', true); - }); - $rootScope.$on('Local/ValidatingWalletEnded', function(ev, walletId, isOK) { - ongoingProcess.set('validatingWallet', false); if (self.isInFocus(walletId)) { // NOTE: If the user changed the wallet, the flag is already turn off. diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 4372fd48b..2e4a8dc7d 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -139,7 +139,6 @@ angular.module('copayApp.services') var walletId = client.credentials.walletId; $log.debug('ValidatingWallet: ' + walletId + ' skip Device:' + skipDeviceValidation); - $rootScope.$emit('Local/ValidatingWallet', walletId); $timeout(function() { client.validateKeyDerivation({ skipDeviceValidation: skipDeviceValidation,