From e79501e83cf56ddf6c8ee29d987c5e8948a69e0c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Jan 2022 19:49:43 +0100
Subject: [PATCH] improve message

---
 src/app/home/home.page.ts             | 5 -----
 src/app/pages/chat/chat.page.html     | 2 +-
 src/app/services/chat/room.service.ts | 6 ++++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 8b28279b0..c39f473f3 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -94,11 +94,6 @@ export class HomePage implements OnInit {
     private sqliteservice: SqliteService,
     private RouteService: RouteService,
     private RocketChatClientService: RocketChatClientService) {
-
-      this.RocketChatClientService.loadHistory('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 10).then((message)=>{
-        console.log('loadHistory', message)
-      })
-
       window['jj'] =  ()=>{
         //send message                              // roomId                // Message
         this.RocketChatClientService.send('fsMwcNdufWvdnChj7ya9nF9cX2HizxxWAM', 'Mensagem enviada programaticamente.'+ new Date().toISOString())
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 27f9acffc..09b092845 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -86,7 +86,7 @@
                   </div>
                 </div>
             </ion-item-sliding>
-            <ion-item-sliding *ngIf="ChatServiceGPR.loadingWholeList || ChatServiceGPR.individualCount < 1">
+            <ion-item-sliding *ngIf=" ChatServiceGPR.individualCount < 1">
                 <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">
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 482e33dce..d0af942f4 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -33,8 +33,10 @@ export class RoomService {
     this.RocketChatClientService.receiveLiveMessageFromRoom(
       this.id,
       this.constructor.name+this.id,
-      (Chatmessage)=>{
-        this.massages.push(Chatmessage.result)
+      (Chatmessage) => {
+        const message = new MessageService()
+        message.setData(Chatmessage.result)
+        this.massages.push(message)
       }
     )
   }