From 76a1d36d046e4a6789179b20646ee814e3608dab Mon Sep 17 00:00:00 2001
From: puri-ph4tt <puriphat001@gmail.com>
Date: Mon, 19 Feb 2024 11:46:22 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=20"=E0=B8=AD?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=99=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7?=
 =?UTF-8?q?"=20(support)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/00_support/components/ChatMessage.vue | 8 +++++---
 src/modules/00_support/store/Main.ts              | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/modules/00_support/components/ChatMessage.vue b/src/modules/00_support/components/ChatMessage.vue
index 6697a63..8398673 100644
--- a/src/modules/00_support/components/ChatMessage.vue
+++ b/src/modules/00_support/components/ChatMessage.vue
@@ -66,12 +66,14 @@ function dateChat(timestamp: string) {
         <q-space />
         <div
           v-if="
-            store.messageStatus?.result.some(
-              (v) =>
+            store.messageStatus?.result.some((v) => {
+              return (
                 new Date(v.lastAccessDate).getTime() >=
                   new Date(item.createdAt).getTime() &&
+                v.fromUserId !== store.userId &&
                 index + 1 === store.message?.result.message.length
-            )
+              );
+            })
           "
           class="q-mr-xl"
         >
diff --git a/src/modules/00_support/store/Main.ts b/src/modules/00_support/store/Main.ts
index 01febba..72bb088 100644
--- a/src/modules/00_support/store/Main.ts
+++ b/src/modules/00_support/store/Main.ts
@@ -88,14 +88,14 @@ export const useSupportStore = defineStore("supportServiceStore", () => {
     // console.log(message.value?.result.message);
   });
 
-  socket.on("read", (r: SupportMessageStatus) => {
+  socket.on("read", (r) => {
     if (messageStatus.value) {
       messageStatus.value.result = messageStatus.value.result.map((v) => {
-        if (v.fromUserId !== r.fromUserId) return r;
+        if (v.fromUserId === r.fromUserId) return r;
         return v;
       });
+      // console.log("event(read):", messageStatus.value);
     }
-    // console.log("event(read):", messageStatus.value);
   });
 
   function scrollToEnd(position: Number = 1) {
@@ -227,7 +227,7 @@ export const useSupportStore = defineStore("supportServiceStore", () => {
     messageStatus,
     userStatus,
     currentIssue,
-	currentIssueDate,
+    currentIssueDate,
     currentTitle,
     fetchIssue,
     fetchIssueCategory,