Merge pull request #4514 from cmgustavo/bug/creating-wallet-01

Fix spinner while create/import/join a wallet (iOS)
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-30 16:29:12 -03:00 committed by GitHub
commit 3ff3543171
3 changed files with 1 additions and 8 deletions

View file

@ -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();
@ -1411,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.

View file

@ -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;

View file

@ -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,