diff --git a/src/renderer/src/hooks/use-date.ts b/src/renderer/src/hooks/use-date.ts index a0cfdb9f..21ed1b34 100644 --- a/src/renderer/src/hooks/use-date.ts +++ b/src/renderer/src/hooks/use-date.ts @@ -68,12 +68,17 @@ export function useDate() { } }, - format: (timestamp: number): string => { + formatDateTime: (date: number | Date | string): string => { const locale = getDateLocale(); return format( - timestamp, + date, locale == enUS ? "MM/dd/yyyy - HH:mm" : "dd/MM/yyyy - HH:mm" ); }, + + formatDate: (date: number | Date | string): string => { + const locale = getDateLocale(); + return format(date, locale == enUS ? "MM/dd/yyyy" : "dd/MM/yyyy"); + }, }; } diff --git a/src/renderer/src/pages/achievement/achievements.tsx b/src/renderer/src/pages/achievement/achievements.tsx index 457cf938..fdffddd8 100644 --- a/src/renderer/src/pages/achievement/achievements.tsx +++ b/src/renderer/src/pages/achievement/achievements.tsx @@ -27,7 +27,7 @@ export function Achievement() { const { t } = useTranslation("achievement"); - const { format } = useDate(); + const { formatDateTime } = useDate(); const dispatch = useAppDispatch(); @@ -163,7 +163,8 @@ export function Achievement() {

{achievement.displayName}

{achievement.description}

- {achievement.unlockTime && format(achievement.unlockTime)} + {achievement.unlockTime && + formatDateTime(achievement.unlockTime)} diff --git a/src/renderer/src/pages/game-details/modals/repacks-modal.tsx b/src/renderer/src/pages/game-details/modals/repacks-modal.tsx index de94bcff..635c7f99 100644 --- a/src/renderer/src/pages/game-details/modals/repacks-modal.tsx +++ b/src/renderer/src/pages/game-details/modals/repacks-modal.tsx @@ -7,11 +7,11 @@ import type { GameRepack } from "@types"; import * as styles from "./repacks-modal.css"; import { SPACING_UNIT } from "@renderer/theme.css"; -import { format } from "date-fns"; import { DownloadSettingsModal } from "./download-settings-modal"; import { gameDetailsContext } from "@renderer/context"; import { Downloader } from "@shared"; import { orderBy } from "lodash-es"; +import { useDate } from "@renderer/hooks"; export interface RepacksModalProps { visible: boolean; @@ -36,6 +36,8 @@ export function RepacksModal({ const { t } = useTranslation("game_details"); + const { formatDate } = useDate(); + const sortedRepacks = useMemo(() => { return orderBy(repacks, (repack) => repack.uploadDate, "desc"); }, [repacks]); @@ -109,9 +111,7 @@ export function RepacksModal({

{repack.fileSize} - {repack.repacker} -{" "} - {repack.uploadDate - ? format(repack.uploadDate, "dd/MM/yyyy") - : ""} + {repack.uploadDate ? formatDate(repack.uploadDate!) : ""}

); diff --git a/src/renderer/src/pages/game-details/sidebar/sidebar.tsx b/src/renderer/src/pages/game-details/sidebar/sidebar.tsx index f72fcadc..66874aff 100644 --- a/src/renderer/src/pages/game-details/sidebar/sidebar.tsx +++ b/src/renderer/src/pages/game-details/sidebar/sidebar.tsx @@ -60,7 +60,7 @@ export function Sidebar() { useContext(gameDetailsContext); const { t } = useTranslation("game_details"); - const { format } = useDate(); + const { formatDateTime } = useDate(); const { numberFormatter } = useFormat(); @@ -138,7 +138,8 @@ export function Sidebar() {

{achievement.displayName}

- {achievement.unlockTime && format(achievement.unlockTime)} + {achievement.unlockTime && + formatDateTime(achievement.unlockTime)}
@@ -176,7 +177,8 @@ export function Sidebar() {

{achievement.displayName}

- {achievement.unlockTime && format(achievement.unlockTime)} + {achievement.unlockTime && + formatDateTime(achievement.unlockTime)}