From 0dae7b9b82f7be7b2cbb2af679de19349a153cf0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 29 Jun 2016 11:23:20 -0300
Subject: [PATCH 1/3] Fix spinner while creating wallet

---
 src/js/controllers/create.js | 5 ++++-
 src/js/controllers/index.js  | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index b2df8904e..f12a50cec 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -176,7 +176,10 @@ angular.module('copayApp.controllers').controller('createController',
             });
             return;
           }
-          go.walletHome();
+          $timeout(function() {
+            go.walletHome();
+            $rootScope.$apply();
+          });
 
         });
       }, 100);
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 7f1d3d7f7..0896bf707 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -115,7 +115,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     var fc = profileService.focusedClient;
     if (!fc) return;
 
-    ongoingProcess.clear();
     self.cleanInstance();
     self.loadingWallet = true;
     self.setSpendUnconfirmed();

From fb5aa65d15e8ca7f0c14abed828c7eeb01c8313d Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 30 Jun 2016 14:55:54 -0300
Subject: [PATCH 2/3] Fix validation wallet spinner

---
 src/js/controllers/create.js      | 5 +----
 src/js/controllers/index.js       | 5 -----
 src/js/services/profileService.js | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

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,

From 3f187c216d136e371c3830abbaa0a96e5ebdce84 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 30 Jun 2016 15:14:16 -0300
Subject: [PATCH 3/3] Fix join

---
 src/js/controllers/join.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 99df9c84a..aae3c39d8 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -129,8 +129,8 @@ angular.module('copayApp.controllers').controller('joinController',
       ongoingProcess.set('joiningWallet', true);
       $timeout(function() {
         profileService.joinWallet(opts, function(err) {
+          ongoingProcess.set('joiningWallet', false);
           if (err) {
-            ongoingProcess.set('joiningWallet', false);
             self.error = err;
             $rootScope.$apply();
             return;