From 2705150d656e4c3c039d2aec74cf7680baa54824 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 13 Jul 2022 16:44:23 +0100
Subject: [PATCH] dont show skeleton when there is chat

---
 src/app/pages/chat/chat.page.html                | 4 ++--
 src/app/services/chat/ws-chat-methods.service.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 6202db01f..27c49e4f1 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -94,7 +94,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList == true">
+            <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList == true && wsChatMethodsService._dm.length == 0">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
@@ -150,7 +150,7 @@
                     </div>
                   </div>
               </ion-item-sliding>
-              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList == true">
+              <ion-item-sliding *ngIf="wsChatMethodsService.loadingWholeList == true && wsChatMethodsService._group.length == 0">
                 <div *ngFor="let n of numSequence(8); let i = index;" class="item item-hover width-100 d-flex ion-no-padding ion-no-margin">
                   <div class="item-icon"><ion-icon class="icon" slot="start" src="assets/icon/icons-group-chat-grey.svg"></ion-icon></div>
                   <div class="item-content flex-grow-1 cursor-pointer">
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 48614ec51..87976f395 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -215,12 +215,12 @@ export class WsChatMethodsService {
     await this.storage.set('Rooms', rooms);
 
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.sortRoomList()
     }, 1000)
 
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.sortRoomList()
     }, 10000)