save merge

src/app/services/chat/room.service.ts

@@ -91,33 +91,39 @@ export class RoomService {
       this.id,
       "stream-room-messages",
       (ChatMessage) => {
-        ChatMessage = ChatMessage.fields.args[0]
 
-        ChatMessage = this.fix_updatedAt(ChatMessage)
-        // console.log('recivemessage', ChatMessage)
+        setTimeout(()=>{
+          ChatMessage = ChatMessage.fields.args[0]
 
-        const messageIsFound = this.messages.find((message) => {
-          message._id == ChatMessage._id
-        })
-
-        if(!messageIsFound) {
-          const message = this.prepareMessage(ChatMessage)
-
-          this.lastMessage = message
-          if (message.t == 'r') { this.name = message.msg }
-          this.calDateDuration(ChatMessage._updatedAt)
+          ChatMessage = this.fix_updatedAt(ChatMessage)
+          // console.log('recivemessage', ChatMessage)
   
-          setTimeout(() => {
-            this.scrollDown()
-          }, 100)
+          const messageIsFound = this.messages.find((message) => {
+            return message._id == ChatMessage._id
+          })
   
-          this.NativeNotificationService.sendNotificationChat({
-            message: message.msg,
-            title: this.name
-          });
-
-          this.addMessageDB(ChatMessage)
-        }
+          if(!messageIsFound) {
+            console.log('messageIsFound', messageIsFound)
+            const message = this.prepareMessage(ChatMessage)
+  
+            this.lastMessage = message
+            if (message.t == 'r') { this.name = message.msg }
+            this.calDateDuration(ChatMessage._updatedAt)
+    
+            setTimeout(() => {
+              this.scrollDown()
+            }, 100)
+    
+            this.NativeNotificationService.sendNotificationChat({
+              message: message.msg,
+              title: this.name
+            });
+  
+            this.addMessageDB(ChatMessage)
+          } else {
+            console.log('have')
+          }
+        }, 150)
 
       }
     )