From c630e32ae3a72174c3dae03579e22207e944cac1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 29 Mar 2022 17:14:25 +0100
Subject: [PATCH] fix

---
 .../pages/chat/messages/messages.page.html    | 29 ++++++++++++++-----
 .../services/chat/ws-chat-methods.service.ts  |  9 ++++--
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index a11653d83..69d538f31 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -46,11 +46,6 @@
 
 <ion-content>
 
-  <!-- <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-    <ion-refresher-content>
-    </ion-refresher-content>
-  </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100"
       *ngFor="let msg of wsChatMethodsService.getDmRoom(this.roomId).messages; let last = last"
@@ -62,8 +57,13 @@
           <span class="time">{{msg.duration}}</span>
         </div>
         <div>
-          <ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
-          <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
+          <ion-label class="float-status-all float-status" >
+
+            <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+            <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+            <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+            <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+          </ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
@@ -80,6 +80,12 @@
             <div *ngFor="let file of msg.attachments let i = index">
               <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
+                <ion-label class="float-status-all float-status" >
+                  <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+                  <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+                  <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+                  <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+                </ion-label>
                 <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
               </div>
               <div *ngIf="msg.file.type != 'application/img'">
@@ -118,6 +124,15 @@
                       <span
                         *ngIf="msg.file.type != 'application/webtrix' && msg.file.type != 'application/audio'">{{msg.displayType}}</span>
                     </ion-label>
+
+                    <ion-label class="float-status-all float-status" >
+
+                      <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+                    </ion-label>
+                    
                   </div>
                 </div>
               </div>
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index 82dae5b98..8780bb626 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -162,9 +162,9 @@ export class WsChatMethodsService {
 
     } catch(e){}
 
-    setTimeout(()=>{
+    setTimeout(() => {
       this.sortRoomList()
-    }, 1000)
+    }, 10000)
 
   }
 
@@ -213,6 +213,11 @@ export class WsChatMethodsService {
     setTimeout(()=>{
       this.sortRoomList()
     }, 1000)
+
+
+    setTimeout(()=>{
+      this.sortRoomList()
+    }, 10000)
     
     this.loadingWholeList = false
   }