Merge pull request #196 from gsainfoteam/reflect-change-of-deadline-d…

…ate-to-time
gsainfoteam · Nov 26, 2023 · 202ae47 · 202ae47
2 parents 3da7341 + e6021db
commit 202ae47
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/app/components/molecules/DDay/DDay.tsx b/src/app/components/molecules/DDay/DDay.tsx
@@ -22,14 +22,11 @@ const DDay = ({ deadline, t, className }: PropsWithT<DDayProps>) => (
 );
 
 const ddayFormatted = (deadline: dayjs.Dayjs, t: T) => {
-  const daysLeft = deadline
-    .tz()
-    .startOf('d')
-    .diff(dayjs.tz().startOf('d'), 'd');
+  const daysLeft = deadline.diff(dayjs(), 'day', true);
 
   if (daysLeft < 0) return t('ddayPlus');
-  if (daysLeft === 0) return 'D - Day';
-  return `D - ${daysLeft}`;
+  if (daysLeft < 1) return 'D - Day';
+  return `D - ${Math.floor(daysLeft)}`;
 };
 
 export default DDay;