diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 6762f50a2..b901bac6f 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -24,7 +24,7 @@ import { PermissionService } from 'src/app/services/permission.service';
styleUrls: ['./publications.page.scss'],
})
export class PublicationsPage implements OnInit {
- showLoader: boolean;
+ showLoader: boolean = false
publicationFolder: PublicationFolder;
publication: Publication;
@@ -57,7 +57,6 @@ export class PublicationsPage implements OnInit {
hideRefreshBtn = true;
showSlidingOptions = true;
idSelected: string;
- skeletonLoader: boolean;
constructor(
private router: Router,
@@ -138,13 +137,10 @@ export class PublicationsPage implements OnInit {
return this.theDate.getDate() + " de " + (this.months[this.theDate.getMonth()]) + " de " + this.theDate.getFullYear()
}
- loadList = false
getActions() {
- if(this.loadList == false) {
- this.loadList = true
+ if(this.showLoader == false) {
this.showLoader = true;
- this.skeletonLoader = true;
this.publications.GetPublicationFolderList().subscribe(async res => {
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
@@ -162,13 +158,9 @@ export class PublicationsPage implements OnInit {
}
this.showLoader = false;
- this.skeletonLoader = false;
- this.loadList = false
}, (error) => {
this.showLoader = false;
- this.skeletonLoader = false;
- this.loadList = false
});
}
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 311c3a700..b1184a9a1 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -80,6 +80,8 @@ export class AuthService {
}
+ // async UpdateLogin() {}
+
SetSession(response: LoginUserRespose, user:UserForm) {
const session: UserSession = Object.assign(SessionStore.user, response)
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 5fdb97dc1..0cbe52090 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -96,7 +96,7 @@ export class ChatSystemService {
}
loadChat() {
- if(SessionStore.user.ChatData) {
+ if(SessionStore.user?.ChatData?.data) {
this.ReLoadChat()
}
}
@@ -184,14 +184,18 @@ export class ChatSystemService {
async getAllRooms () {
this.loadingWholeList = true
var rooms;
- try {
- rooms = await this.RochetChatConnectorService.getRooms();
- } catch (error) {
- console.error('chatgetrooms',error)
- }
+
+ if(this.RochetChatConnectorService.isLogin) {
try {
- await this.storage.remove('Rooms');
- } catch(e) {}
+ rooms = await this.RochetChatConnectorService.getRooms();
+ } catch (error) {
+ this.loadingWholeList = false
+ console.error('chatgetrooms',error)
+ }
+ try {
+ await this.storage.remove('Rooms');
+ } catch(e) {}
+ }
let index = 0
diff --git a/src/app/services/first-enter.service.ts b/src/app/services/first-enter.service.ts
index 8560d8bf4..55acf2dca 100644
--- a/src/app/services/first-enter.service.ts
+++ b/src/app/services/first-enter.service.ts
@@ -11,7 +11,6 @@ import { SessionStore } from '../store/session.service';
export class FirstEnterService {
constructor(private router:Router,
- private platform: Platform,
public p: PermissionService,
private alertController: AlertController) { }
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 880e4506b..ea866e684 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -1,22 +1,17 @@
/* eslint-disable */
/* tslint:disable */
import { Injectable, NgZone } from '@angular/core';
-import { ActivatedRoute } from '@angular/router'
import { HttpClient } from '@angular/common/http';
import { environment } from 'src/environments/environment';
import { StorageService } from 'src/app/services/storage.service';
import { AuthConnstants } from 'src/app/config/auth-constants';
import { Tokenn } from '../models/token.model';
-import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
-import { NavigationExtras, Router } from '@angular/router';
-import { ToastService } from '../services/toast.service';
-import { BackgroundService } from './background.service';
-import { v4 as uuidv4 } from 'uuid';
+import { AlertController, Platform } from '@ionic/angular';
+import { Router } from '@angular/router';
import { EventTrigger } from '../services/eventTrigger.service';
import { SessionStore } from '../store/session.service';
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
import { notificationObject } from '../models/notifications';
-/* import { Events } from 'ionic-angular' */
@Injectable({
providedIn: 'root'
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index d7dea0438..36dbc6172 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -59,12 +59,12 @@
- Enviado
+ Enviado
- Lido
+ Lido
Tentar
{{last ? scrollToBottom() : ''}}
@@ -108,13 +108,13 @@
- Enviado
+ Enviado
Lido
- Tentar
+ Tentar
-