From 361c76143518523a43eddcdf8c0646aaa7bb013d Mon Sep 17 00:00:00 2001 From: hamid zarghami Date: Sun, 12 Oct 2025 17:05:46 +0330 Subject: [PATCH] Fix sender detection logic to use senderRef field - Change IMessage interface to use senderRef instead of sender - Update message rendering logic to check if senderRef === 'Admin' for admin messages - All other messages are treated as seller messages --- src/pages/ticket/TicketMessages.tsx | 73 +++++++++++++++-------------- src/pages/ticket/types/Types.ts | 2 +- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/src/pages/ticket/TicketMessages.tsx b/src/pages/ticket/TicketMessages.tsx index 725f31d..a7066f6 100644 --- a/src/pages/ticket/TicketMessages.tsx +++ b/src/pages/ticket/TicketMessages.tsx @@ -146,46 +146,49 @@ const TicketMessages: FC = () => { هیچ پیامی یافت نشد ) : ( - messages.map((message: IMessage) => ( -
+ messages.map((message: IMessage) => { + const isAdmin = message.senderRef === 'Admin' + return (
-
- {message.sender === 'admin' ? 'ادمین' : 'فروشنده'} -
-
- {message.content} -
- {message.attachments && message.attachments.length > 0 && ( -
- {message.attachments.map((attachment, index) => ( -
- فایل ضمیمه: {attachment} -
- ))} +
+
+ {isAdmin ? 'ادمین' : 'فروشنده'} +
+
+ {message.content} +
+ {message.attachments && message.attachments.length > 0 && ( +
+ {message.attachments.map((attachment, index) => ( +
+ فایل ضمیمه: {attachment} +
+ ))} +
+ )} +
+ {message.createdAt && formatDate(message.createdAt)}
- )} -
- {message.createdAt && formatDate(message.createdAt)}
-
- )) + ) + }) )}
diff --git a/src/pages/ticket/types/Types.ts b/src/pages/ticket/types/Types.ts index 644637e..514bb6a 100644 --- a/src/pages/ticket/types/Types.ts +++ b/src/pages/ticket/types/Types.ts @@ -65,7 +65,7 @@ export interface IMessage { attachments?: string[]; createdAt?: string; updatedAt?: string; - sender?: "admin" | "seller"; + senderRef?: string; } export interface ITicketResponse extends IBaseResponse {