diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestone/MilestoneNextStartTime.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestone/MilestoneNextStartTime.tsx index a708e17915..f724daeadf 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestone/MilestoneNextStartTime.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestone/MilestoneNextStartTime.tsx @@ -1,23 +1,25 @@ import { styled } from '@mui/material'; import HourglassEmptyOutlinedIcon from '@mui/icons-material/HourglassEmptyOutlined'; import type { IReleasePlanMilestone } from 'interfaces/releasePlans'; -import { formatDateYMDHM } from 'utils/formatDate'; -import { isToday, isTomorrow, format } from 'date-fns'; +import { isToday, isTomorrow, format, addMinutes } from 'date-fns'; import { calculateMilestoneStartTime } from '../utils/calculateMilestoneStartTime.ts'; import { useUiFlag } from 'hooks/useUiFlag'; export const formatSmartDate = (date: Date): string => { - const timeString = format(date, 'HH:mm'); + const startTime = format(date, 'HH:mm'); + const endTime = format(addMinutes(date, 2), 'HH:mm'); + const timeRange = `between ${startTime} - ${endTime}`; if (isToday(date)) { - return `today after ${timeString}`; + return `today ${timeRange}`; } if (isTomorrow(date)) { - return `tomorrow after ${timeString}`; + return `tomorrow ${timeRange}`; } - // For other dates, show full date with time - return formatDateYMDHM(date); + // For other dates, show full date with time range + const dateString = format(date, 'yyyy-MM-dd'); + return `${dateString} ${timeRange}`; }; const StyledTimeContainer = styled('span')(({ theme }) => ({