diff --git a/apps/frontend/src/components/layout/set.timezone.tsx b/apps/frontend/src/components/layout/set.timezone.tsx index f37b4f0f..ac5b74a5 100644 --- a/apps/frontend/src/components/layout/set.timezone.tsx +++ b/apps/frontend/src/components/layout/set.timezone.tsx @@ -3,8 +3,10 @@ import dayjs, { ConfigType } from 'dayjs'; import { FC, useEffect } from 'react'; import timezone from 'dayjs/plugin/timezone'; import utc from 'dayjs/plugin/utc'; +import relativeTime from 'dayjs/plugin/relativeTime'; dayjs.extend(timezone); dayjs.extend(utc); +dayjs.extend(relativeTime); const { utc: originalUtc } = dayjs; diff --git a/apps/frontend/src/components/notifications/notification.component.tsx b/apps/frontend/src/components/notifications/notification.component.tsx index 4b890706..731b80f9 100644 --- a/apps/frontend/src/components/notifications/notification.component.tsx +++ b/apps/frontend/src/components/notifications/notification.component.tsx @@ -4,6 +4,7 @@ import { useFetch } from '@gitroom/helpers/utils/custom.fetch'; import useSWR from 'swr'; import { FC, useCallback, useState } from 'react'; import clsx from 'clsx'; +import dayjs from 'dayjs'; import { useClickAway } from '@uidotdev/usehooks'; import ReactLoading from '@gitroom/frontend/components/layout/loading'; import { useT } from '@gitroom/react/translation/get.transation.service.client'; @@ -26,16 +27,29 @@ export const ShowNotification: FC<{ const [newNotification] = useState( new Date(notification.createdAt) > new Date(props.lastReadNotification) ); + const createdAt = dayjs(notification.createdAt); + const isWithin24h = dayjs().diff(createdAt, 'hour') < 24; + const fullDate = createdAt.format('MMM D, YYYY h:mm A'); return (
+ > + +