diff --git a/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx index e2e90be05..f4e67656d 100644 --- a/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx +++ b/apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx @@ -11,6 +11,7 @@ import { useEffect, useState } from "react"; import { CheckCircle, Clock, Copy, Train, FileText } from "lucide-react"; import { format } from "date-fns"; import { isChild, isFirstChild } from "@/utils/fare-utils"; +import { toZonedDate } from "@/utils/format"; type BookingWithTicket = { id: string; @@ -383,7 +384,7 @@ export default function ConfirmationPage() {
{schedule.departureTime && - format(new Date(schedule.departureTime), "PPp")} + format(toZonedDate(new Date(schedule.departureTime)), "PPp")}
{schedule.arrivalTime && - format(new Date(schedule.arrivalTime), "PPp")} + format(toZonedDate(new Date(schedule.arrivalTime)), "PPp")}
{inboundSchedule.departureTime && format( - new Date(inboundSchedule.departureTime), + toZonedDate(new Date(inboundSchedule.departureTime)), "PPp", )}
@@ -468,7 +469,7 @@ export default function ConfirmationPage() {{inboundSchedule.arrivalTime && format( - new Date(inboundSchedule.arrivalTime), + toZonedDate(new Date(inboundSchedule.arrivalTime)), "PPp", )}
diff --git a/apps/edr-passenger-web/portal/src/app/booking/detail/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/detail/page.tsx index 6442fd0d6..addaf685d 100644 --- a/apps/edr-passenger-web/portal/src/app/booking/detail/page.tsx +++ b/apps/edr-passenger-web/portal/src/app/booking/detail/page.tsx @@ -21,7 +21,7 @@ import { X, } from "lucide-react"; import { format } from "date-fns"; -import { formatTime, getTimePeriod } from "@/utils/format"; +import { formatTime, getTimePeriod, toZonedDate } from "@/utils/format"; import { formatFare } from "@/utils/fare-utils"; import { markManageBookingPaymentReturn, @@ -606,7 +606,7 @@ function BookingDetailContent() {- {format(new Date(b.schedule.departureAt), "dd MMM yyyy, HH:mm")} + {format(toZonedDate(new Date(b.schedule.departureAt)), "dd MMM yyyy, HH:mm")} {" · "} {b.adultCount} adult{b.adultCount !== 1 ? "s" : ""} {b.childCount > 0 && `, ${b.childCount} child${b.childCount !== 1 ? "ren" : ""}`} diff --git a/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx index 3992e140f..237f8086e 100644 --- a/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx +++ b/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx @@ -8,7 +8,7 @@ import { apiClient } from "@/lib/api-client"; import { useState, useEffect } from "react"; import { PaymentMethod } from "@/types"; import { format } from "date-fns"; -import { formatTime, getTimePeriod } from '@/utils/format'; +import { formatTime, getTimePeriod, toZonedDate } from '@/utils/format'; import { isChild, isFirstChild, formatFare } from '@/utils/fare-utils'; import { CreditCard, @@ -289,7 +289,7 @@ export default function PaymentPage() {