Merged in feature/refactor-lang (pull request #387)

feat: SW-238 Avoid prop drilling of lang

Approved-by: Michael Zetterberg
This commit is contained in:
Niclas Edenvin
2024-08-14 11:00:20 +00:00
parent 35128dbf44
commit e67212bd94
94 changed files with 378 additions and 322 deletions

View File

@@ -1,6 +1,7 @@
import { dt } from "@/lib/dt"
import { getIntl } from "@/i18n"
import { getLang } from "@/i18n/serverContext"
import AwardPoints from "./AwardPoints"
@@ -8,15 +9,17 @@ import styles from "./row.module.css"
import type { RowProps } from "@/types/components/myPages/myPage/earnAndBurn"
export default async function Row({ transaction, lang }: RowProps) {
export default async function Row({ transaction }: RowProps) {
const { formatMessage } = await getIntl()
const description =
transaction.hotelName && transaction.city
? `${transaction.hotelName}, ${transaction.city} ${transaction.nights} ${formatMessage({ id: "nights" })}`
: `${transaction.nights} ${formatMessage({ id: "nights" })}`
const arrival = dt(transaction.checkinDate).locale(lang).format("DD MMM YYYY")
const arrival = dt(transaction.checkinDate)
.locale(getLang())
.format("DD MMM YYYY")
const departure = dt(transaction.checkoutDate)
.locale(lang)
.locale(getLang())
.format("DD MMM YYYY")
return (
<tr className={styles.tr}>

View File

@@ -15,7 +15,7 @@ const tableHeadings = [
"Points",
]
export default async function DesktopTable({ lang, transactions }: TableProps) {
export default async function DesktopTable({ transactions }: TableProps) {
const { formatMessage } = await getIntl()
return (
<div className={styles.container}>
@@ -35,7 +35,6 @@ export default async function DesktopTable({ lang, transactions }: TableProps) {
<tbody>
{transactions.map((transaction) => (
<Row
lang={lang}
key={transaction.confirmationNumber}
transaction={transaction}
/>