refactor(datepicker): only show 12h not 24h and add a AM/PM as suffix

hudy9x · Mar 14, 2024 · 049f1ac · 049f1ac
1 parent 301d34c
commit 049f1ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/shared-ui/src/components/DatePicker/index.tsx b/packages/shared-ui/src/components/DatePicker/index.tsx
@@ -102,7 +102,7 @@ export default function DatePicker({
   const showTimer = () => {
     if (!enableTimer) return null
     const { hour, min } = extractHourNMin(time)
-    const suffix = +hour > 12 ? 'PM' : 'AM'
+    const suffix = +hour >= 12 ? 'PM' : 'AM'
     return (
       <span className="pl-1">
         at {+hour > 12 ? +hour - 12 : hour}:{min} {suffix}

diff --git a/packages/ui-app/app/[orgID]/project/[projectId]/calendar/CalMonthTaskList.tsx b/packages/ui-app/app/[orgID]/project/[projectId]/calendar/CalMonthTaskList.tsx
@@ -34,7 +34,9 @@ export default function CalMonthTaskList({ day }: { day: Date }) {
 
         const h = dueDate.getHours()
         const m = dueDate.getMinutes()
-        const time = `${h > 9 ? h : '0' + h}:${m > 9 ? m : '0' + m}`
+        const time = `${h > 9 ? (h > 12 ? h - 12 : h) : '0' + h}:${
+          m > 9 ? m : '0' + m
+        } ${h >= 12 ? 'PM' : 'AM'}`
 
         return (
           <CalMonthTask