diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index c2ddd9b0a..03098dbbb 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -131,8 +131,6 @@ export class ChatPage implements OnInit { ngOnInit() { - // this.chatService.refreshtoken(); - this.segment = "Contactos"; this.authService.userData$.subscribe((res: any) => { @@ -281,7 +279,6 @@ export class ChatPage implements OnInit { } openGroupMessagesPage(rid) { - // this.chatService.refreshtoken(); this.roomId = rid; if (window.innerWidth < 701) { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 44fdd7363..26a799fe8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -537,7 +537,9 @@ export class GabineteDigitalPage implements OnInit { try { expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); this.loadCount = true; + this.showLoader = false; } catch(error) { + this.showLoader = false this.loadCount = true; } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 787d027a4..f41170d55 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -162,7 +162,12 @@ export class LoginPage implements OnInit { this.getToken(); if(!this.platform.is('desktop') && !this.platform.is('mobileweb')) { - this.router.navigateByUrl('/pin', { replaceUrl: true }); + if(this.sessionStore.hasPin) { + this.router.navigateByUrl('/home/events'); + } else { + this.router.navigateByUrl('/pin', { replaceUrl: true }); + } + } else { this.router.navigateByUrl('/home/events'); }