Skip to content
Snippets Groups Projects
Commit 93056131 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Hide loading indicator, when logout of a secondary wallet

parent da4cbc5f
No related branches found
No related tags found
No related merge requests found
...@@ -48,8 +48,6 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services']) ...@@ -48,8 +48,6 @@ angular.module('cesium.app.controllers', ['cesium.platform', 'cesium.services'])
.controller('PluginExtensionPointCtrl', PluginExtensionPointController) .controller('PluginExtensionPointCtrl', PluginExtensionPointController)
; ;
/** /**
...@@ -127,14 +125,14 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ ...@@ -127,14 +125,14 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
// Login using keypair // Login using keypair
return wallet.login({ return wallet.login({
silent: true, silent: true,
forceAuth: true, forceAuth: true,
minData: false, minData: false,
authData: { authData: {
pubkey: pubkey, pubkey: pubkey,
keypair: keypair keypair: keypair
} }
}) })
.then(function () { .then(function () {
// Open transfer all wallet // Open transfer all wallet
...@@ -344,7 +342,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ ...@@ -344,7 +342,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
}); });
} }
else { else {
UIUtils.loading.hide();
} }
}) })
.catch(UIUtils.onError()); .catch(UIUtils.onError());
...@@ -427,6 +425,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ ...@@ -427,6 +425,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
$timeout(function(){$scope.profilePopover.hide();}); $timeout(function(){$scope.profilePopover.hide();});
} }
}; };
// Change peer info // Change peer info
$scope.showPeerInfoPopover = function(event) { $scope.showPeerInfoPopover = function(event) {
return UIUtils.popover.show(event, { return UIUtils.popover.show(event, {
...@@ -437,7 +436,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ ...@@ -437,7 +436,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
}; };
//////////////////////////////////////// ////////////////////////////////////////
// Link management (fix issue #) // Link management
//////////////////////////////////////// ////////////////////////////////////////
$scope.openLink = function($event, uri, options) { $scope.openLink = function($event, uri, options) {
...@@ -486,7 +485,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $ ...@@ -486,7 +485,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
okText: 'COMMON.BTN_YES' okText: 'COMMON.BTN_YES'
}) })
.then(function(confirm) { .then(function(confirm) {
if (!confirm) return; if (!confirm) return;
$scope.toggleFullscreen(); $scope.toggleFullscreen();
}); });
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment