diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/index.tsx b/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/index.tsx index 6028db7f5..297aa39cf 100644 --- a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/index.tsx +++ b/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/index.tsx @@ -4,7 +4,7 @@ import { useIntl } from "react-intl" import { dt } from "@/lib/dt" -import { getLang } from "@/i18n/serverContext" +import useLang from "@/hooks/useLang" import AwardPoints from "./AwardPoints" @@ -14,15 +14,14 @@ import type { RowProps } from "@/types/components/myPages/myPage/earnAndBurn" export default function Row({ transaction }: RowProps) { const intl = useIntl() + const lang = useLang() const description = transaction.hotelName && transaction.city ? `${transaction.hotelName}, ${transaction.city} ${transaction.nights} ${intl.formatMessage({ id: "nights" })}` : `${transaction.nights} ${intl.formatMessage({ id: "nights" })}` - const arrival = dt(transaction.checkinDate) - .locale(getLang()) - .format("DD MMM YYYY") + const arrival = dt(transaction.checkinDate).locale(lang).format("DD MMM YYYY") const departure = dt(transaction.checkoutDate) - .locale(getLang()) + .locale(lang) .format("DD MMM YYYY") return ( diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Mobile/index.tsx b/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Mobile/index.tsx index 639f73f9b..d4de69ac4 100644 --- a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Mobile/index.tsx +++ b/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Mobile/index.tsx @@ -4,7 +4,7 @@ import { dt } from "@/lib/dt" import AwardPoints from "@/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/AwardPoints" import Body from "@/components/TempDesignSystem/Text/Body" -import { getLang } from "@/i18n/serverContext" +import useLang from "@/hooks/useLang" import styles from "./mobile.module.css" @@ -12,7 +12,7 @@ import type { TableProps } from "@/types/components/myPages/myPage/earnAndBurn" export default function MobileTable({ transactions }: TableProps) { const intl = useIntl() - + const lang = useLang() return (
@@ -40,7 +40,7 @@ export default function MobileTable({ transactions }: TableProps) {
{dt(transaction.checkinDate) - .locale(getLang()) + .locale(lang) .format("DD MMM YYYY")} {transaction.hotelName && transaction.city ? ( diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/index.tsx b/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/index.tsx index c8f6ff6c9..71c624dd6 100644 --- a/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/index.tsx +++ b/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/index.tsx @@ -93,13 +93,11 @@ export default function TransactionTable() { limit, page, }) - // Should the active page be mirroried in the URL with params? - // That way the actual fetch could be moved up and Mobile/Desktop can be strictly server side useEffect(() => { - if (typeof data?.data.pages === "number") { - setTotalPages(data?.data.pages) + if (typeof data?.meta.totalPages === "number") { + setTotalPages(data?.meta.totalPages) } - }, [data?.data.pages]) + }, [data?.meta.totalPages]) useEffect(() => { if (data?.data.transactions) { diff --git a/server/routers/user/query.ts b/server/routers/user/query.ts index a01ee15f7..a42b8ea1f 100644 --- a/server/routers/user/query.ts +++ b/server/routers/user/query.ts @@ -509,8 +509,6 @@ export const userQueryRouter = router({ nights: attributes.nights, } }), - - pages: Math.ceil(verifiedData.data.data.length / limit), }, meta: { totalPages: Math.ceil(verifiedData.data.data.length / limit),