chore: move totalPages to meta

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)
+  const arrival = dt(transaction.checkinDate).locale(lang).format("DD MMM YYYY")
-    .locale(getLang())
-    .format("DD MMM YYYY")
   const departure = dt(transaction.checkoutDate)
-    .locale(getLang())
+    .locale(lang)
     .format("DD MMM YYYY")
   return (
     <tr className={styles.tr}>

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 (
     <div className={styles.container}>
       <table className={styles.table}>
@@ -40,7 +40,7 @@ export default function MobileTable({ transactions }: TableProps) {
                 <td className={`${styles.td} ${styles.transactionDetails}`}>
                   <span className={styles.transactionDate}>
                     {dt(transaction.checkinDate)
-                      .locale(getLang())
+                      .locale(lang)
                       .format("DD MMM YYYY")}
                   </span>
                   {transaction.hotelName && transaction.city ? (

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") {
+    if (typeof data?.meta.totalPages === "number") {
-      setTotalPages(data?.data.pages)
+      setTotalPages(data?.meta.totalPages)
     }
-  }, [data?.data.pages])
+  }, [data?.meta.totalPages])
 
   useEffect(() => {
     if (data?.data.transactions) {

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),