From 6007e2cdf8a4d97def527a8275b6efe9f165b85e Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:18:30 +0100
Subject: [PATCH 1/3] save

---
 src/app/services/chat/room.service.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 27dc6bd79..81b586f41 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -62,9 +62,8 @@ export class RoomService {
         this.ToastService.presentToast('nova mensagem')
         this.lastMessage.msg = message.msg;
         message.setData(ChatMessage)
-        this.massages.push(message)
         this.calDateDuration(ChatMessage.result._updatedAt)
-
+        this.massages.push(message)
       }
     )
   }

From 2bbe9e859c48eeba264cbc6e636e6c207a686e77 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:29:44 +0100
Subject: [PATCH 2/3] add send with wsAPI

---
 .../group-messages/group-messages.page.ts     | 14 ++---------
 .../group-messages/group-messages.page.ts     | 25 +++----------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 99df699bc..b7a9dbcaf 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -306,18 +306,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
 
 
-  sendMessage(){
-    let body = {
-      "message": { "rid": this.roomId, "msg": this.message }
-    }
-
-    this.chatService.sendMessage(body).subscribe(res=> {
-      this.getRoomInfo();
-      this.scrollingOnce = true;
-
-    },(error) => {
-
-    });
+  sendMessage() {
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index e51c0e0a1..34786d1ab 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -296,31 +296,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } */
   }
 
-  sendMessage(){
-    let body = {
-      "message":
-      {
-        "rid": this.roomId,
-        "msg": this.message,
-        /* "attachments": [{
-          "color": "#ff0000",
-          "text": "Yay for gruggy!",
-          "title": "Attachment Example",
-          "title_link": "https://youtube.com",
-          "title_link_download": false,
-          "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png",
-        }] */
-      }
-    }
-
-    this.chatService.sendMessage(body).subscribe(res=> {
-     /*  this.loadGroupMessages(); */
-     //this.getRoomInfo();
-     this.scrollingOnce = true;
-    });
+  sendMessage() {
+    this.wsChatMethodsService.getDmRoom(this.roomId).send(this.message)
     this.message = "";
   }
 
+
   deleteMessage(msgId:string){
     let body = {
       "roomId": this.roomId,

From 3bf00c889f731164ecf7024ebb6698d5755c8fbb Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Fri, 14 Jan 2022 12:38:51 +0100
Subject: [PATCH 3/3] fix name in dm

---
 src/app/shared/chat/messages/messages.page.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 053c88603..34574e784 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -2,9 +2,9 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="header-top">
-        <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{ wsChatMethodsService.getRoom(roomId).name }}</ion-label>
-          <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
+        <div class="middle">
+          <ion-label class="title">{{ wsChatMethodsService.getDmRoom(roomId).name }}</ion-label>
+          <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
         </div>
         <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">