From a0db8a0ee2e22d8d3b0ce49c22f2488aeca49eed Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Sun, 17 Nov 2024 09:10:25 +0100
Subject: [PATCH] fix(frontend): date normalization

---
 frontend/src/components/inbox/components/Chat.tsx           | 4 +++-
 .../src/components/inbox/components/ConversationsList.tsx   | 3 ++-
 frontend/src/utils/date.ts                                  | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/inbox/components/Chat.tsx b/frontend/src/components/inbox/components/Chat.tsx
index 5e5ff1d67..414f11647 100644
--- a/frontend/src/components/inbox/components/Chat.tsx
+++ b/frontend/src/components/inbox/components/Chat.tsx
@@ -22,6 +22,7 @@ import { useAuth } from "@/hooks/useAuth";
 import { useConfig } from "@/hooks/useConfig";
 import { useTranslate } from "@/hooks/useTranslate";
 import { EntityType } from "@/services/types";
+import { normalizeDate } from "@/utils/date";
 
 import {
   getAvatarSrc,
@@ -119,8 +120,9 @@ export function Chat() {
                           key={message.id}
                           title={`${subscriber.first_name} ${
                             subscriber.last_name
-                          } : ${message.createdAt.toLocaleString(
+                          } : ${normalizeDate(
                             i18n.language,
+                            message.createdAt,
                           )}`}
                           src={getAvatarSrc(
                             apiUrl,
diff --git a/frontend/src/components/inbox/components/ConversationsList.tsx b/frontend/src/components/inbox/components/ConversationsList.tsx
index b0c25d0ab..4484929c9 100644
--- a/frontend/src/components/inbox/components/ConversationsList.tsx
+++ b/frontend/src/components/inbox/components/ConversationsList.tsx
@@ -18,6 +18,7 @@ import { useConfig } from "@/hooks/useConfig";
 import { useTranslate } from "@/hooks/useTranslate";
 import { Title } from "@/layout/content/Title";
 import { EntityType } from "@/services/types";
+import { normalizeDate } from "@/utils/date";
 
 import { getAvatarSrc } from "../helpers/mapMessages";
 import { useChat } from "../hooks/ChatContext";
@@ -69,7 +70,7 @@ export const SubscribersList = (props: {
                   {conversation.first_name} {conversation.last_name}
                 </div>
                 <div className="cs-conversation__info">
-                  {conversation.lastvisit?.toLocaleString(i18n.language)}
+                  {normalizeDate(i18n.language, conversation.lastvisit)}
                 </div>
               </Conversation.Content>
               <Conversation.Operations visible>
diff --git a/frontend/src/utils/date.ts b/frontend/src/utils/date.ts
index 395ef513c..80f877a3d 100644
--- a/frontend/src/utils/date.ts
+++ b/frontend/src/utils/date.ts
@@ -14,3 +14,9 @@ export const getDateTimeFormatter = (date: Date) => ({
     val: DATE_TIME_FORMAT,
   },
 });
+
+export const normalizeDate = (locale: string, dateField?: Date | string) =>
+  (typeof dateField === "string"
+    ? new Date(dateField)
+    : dateField
+  )?.toLocaleString(locale);