From e2721f10919da8d76e7eccdcda7923fb3d2b3b1a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 25 Mar 2022 17:39:51 +0100
Subject: [PATCH] fix

---
 src/app/services/chat/message.service.ts | 12 +++++++-----
 src/app/services/chat/room.service.ts    | 11 ++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 908bfd4cf..838c0ea51 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -77,17 +77,21 @@ export class MessageService {
     this._id = _id
     this._updatedAt = _updatedAt || new Date().getTime()
     this.file = file
-    this.attachments = attachments
     this.temporaryData = temporaryData
     this.localReference = localReference || null
     this.id = id
     this.delate = delate
     this.delateRequest = delateRequest
 
+    if(this.attachments?.length >= 1 && attachments?.length >= 1) {
+      this.attachments[0] = Object.assign(this.attachments[0], attachments[0])
+    } else {
+      this.attachments = attachments
+    }
+    
     this.viewed =  [...new Set([...viewed,...this.viewed])];
     this.received =   [...new Set([...received,...this.received])];
-
-
+    
     if(!this.ts) {
       this.offline = true
       this.messageSend = false
@@ -105,11 +109,9 @@ export class MessageService {
     }
 
     if(this.hasFile) {
-      
       if(this.file.type != 'application/webtrix') {
         this.displayType = this.file.type.replace('application/','').toUpperCase()
       }
-
     }
 
     this.calDateDuration()
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 138093304..5dd8c4a0c 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -238,7 +238,6 @@ export class RoomService {
 
         const args = message.fields.args
 
-        // alert(JSON.stringify(args))
 
            
         if (typeof args[1] != 'object') {
@@ -367,8 +366,7 @@ export class RoomService {
 
       if(this.messages[i]?._id == id ) {
 
-        console.log(_id,'==',this.messages[i]?._id, true)
-        this.messages.splice(i, 1)
+        
 
         //Get previous last message from room
         const previousLastMessage = this.messages.slice(-1)[0];
@@ -377,7 +375,7 @@ export class RoomService {
         this.calDateDuration(previousLastMessage._updatedAt)
         this.sortRoomList()
         
-        if (SessionStore.user.RochetChatUser == this.messages[i].u.username) {
+        if (SessionStore.user.RochetChatUser == this.messages[i]?.u?.username) {
           const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
           
           DeleteMessageModel.create({
@@ -389,7 +387,10 @@ export class RoomService {
           })
         }
         
-        this.messages[i].delateDB()
+        this.messages[i]?.delateDB()
+
+        console.log(_id,'==',this.messages[i]?._id, true)
+        this.messages.splice(i, 1)
 
         return true