diff --git a/frontend/src/helpers/datetime.ts b/frontend/src/helpers/datetime.ts index b0b174166..6e0fb8e48 100644 --- a/frontend/src/helpers/datetime.ts +++ b/frontend/src/helpers/datetime.ts @@ -18,7 +18,7 @@ export const formatDateTime = ({ if (timezone === Timezone.UTC) { const utcDate = new Date(date.getTime() + date.getTimezoneOffset() * 60000); - return `${format(utcDate, dateFormat)} UTC`; + return `${format(utcDate, dateFormat)}`; } return format(date, dateFormat); }; diff --git a/frontend/src/pages/organization/AuditLogsPage/components/LogsDateFilter.tsx b/frontend/src/pages/organization/AuditLogsPage/components/LogsDateFilter.tsx index 1249b6b8b..ca31a17cd 100644 --- a/frontend/src/pages/organization/AuditLogsPage/components/LogsDateFilter.tsx +++ b/frontend/src/pages/organization/AuditLogsPage/components/LogsDateFilter.tsx @@ -3,7 +3,6 @@ import { Controller, useForm } from "react-hook-form"; import { faCalendar, faChevronRight } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { zodResolver } from "@hookform/resolvers/zod"; -import { format } from "date-fns"; import ms from "ms"; import { twMerge } from "tailwind-merge"; @@ -18,7 +17,7 @@ import { Select, SelectItem } from "@app/components/v2"; -import { Timezone } from "@app/helpers/datetime"; +import { formatDateTime, Timezone } from "@app/helpers/datetime"; import { auditLogDateFilterFormSchema, @@ -100,11 +99,23 @@ export const LogsDateFilter = ({ setFilter, filter, timezone, setTimezone }: Pro ) : (
-
{format(filter.startDate, "yyyy-MM-dd HH:mm")}
+
+ {formatDateTime({ + timezone, + timestamp: filter.startDate, + dateFormat: "yyyy/MM/dd HH:mm" + })} +
-
{format(filter.endDate, "yyyy-MM-dd HH:mm")}
+
+ {formatDateTime({ + timezone, + timestamp: filter.startDate, + dateFormat: "yyyy/MM/dd HH:mm" + })} +
)}