From 486c09ac9b3ef4b55bfa649f7dfdcae7f3ba638e Mon Sep 17 00:00:00 2001
From: Faisal Amir <urmauur@gmail.com>
Date: Thu, 22 Aug 2024 12:49:35 +0700
Subject: [PATCH] fix: date format for chat item (#3436)

---
 web/utils/datetime.ts | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/web/utils/datetime.ts b/web/utils/datetime.ts
index d139c95c2..e596f0841 100644
--- a/web/utils/datetime.ts
+++ b/web/utils/datetime.ts
@@ -1,17 +1,32 @@
 export const isToday = (timestamp: number) => {
   const today = new Date()
-  return today.setHours(0, 0, 0, 0) == new Date(timestamp).setHours(0, 0, 0, 0)
+  return today.setHours(0, 0, 0, 0) === new Date(timestamp).setHours(0, 0, 0, 0)
 }
 
 export const displayDate = (timestamp?: string | number | Date) => {
   if (!timestamp) return 'N/A'
 
-  let displayDate = new Date(timestamp).toLocaleString()
+  const date = new Date(timestamp)
+
+  let displayDate = `${date.toLocaleDateString(undefined, {
+    day: '2-digit',
+    month: 'short',
+    year: 'numeric',
+  })}, ${date.toLocaleTimeString(undefined, {
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: true,
+  })}`
+
   if (typeof timestamp === 'number' && isToday(timestamp)) {
-    displayDate = new Date(timestamp).toLocaleTimeString(undefined, {
+    displayDate = date.toLocaleTimeString(undefined, {
       hour: '2-digit',
       minute: '2-digit',
+      second: '2-digit',
+      hour12: true,
     })
   }
+
   return displayDate
 }