chore: replace function expression with inline statement

replace destructuring for better static analysis remove unused variables
2024-11-05 10:14:52 +01:00
parent 28c30b2416
commit f6b3cf8b92
25 changed files with 75 additions and 78 deletions
--- a/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx
@@ -13,13 +13,13 @@ export default async function MembershipNumber({
  color,
  membership,
 }: MembershipNumberProps) {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
  const classNames = membershipNumberVariants({ className, color })

  return (
    <div className={classNames}>
      <Caption color="pale">
-        {formatMessage({ id: "Membership ID" })}
+        {intl.formatMessage({ id: "Membership ID" })}
        {": "}
      </Caption>
      <span className={styles.icon}>
--- a/components/Blocks/DynamicContent/Overview/Friend/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Friend/index.tsx
@@ -18,7 +18,7 @@ export default async function Friend({
  membership,
  name,
 }: FriendProps) {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
  if (!membership?.membershipLevel) {
    return null
  }
@@ -28,7 +28,7 @@ export default async function Friend({
    <section className={styles.friend}>
      <header className={styles.header}>
        <Body color="white" textTransform="bold" textAlign="center">
-          {formatMessage(
+          {intl.formatMessage(
            isHighestLevel
              ? { id: "Highest level" }
              : { id: `Level ${membershipLevels[membership.membershipLevel]}` }
--- a/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx
@@ -44,15 +44,13 @@ async function PointsColumn({
  title,
  subtitle,
 }: PointsColumnProps) {
-  const { formatMessage, formatNumber } = await getIntl()
+  const intl = await getIntl()

-  function number() {
-    if (typeof points === "number") {
-      return formatNumber(points)
-    } else if (typeof nights === "number") {
-      return formatNumber(nights)
-    }
-    return "N/A"
+  let number = "N/A"
+  if (typeof points === "number") {
+    number = intl.formatNumber(points)
+  } else if (typeof nights === "number") {
+    number = intl.formatNumber(nights)
  }

  return (
@@ -63,16 +61,16 @@ async function PointsColumn({
        textAlign="center"
        className={styles.firstRow}
      >
-        {formatMessage({
+        {intl.formatMessage({
          id: title,
        })}
      </Body>
      <Title color="white" level="h2" textAlign="center">
-        {number()}
+        {number}
      </Title>
      {subtitle ? (
        <Body color="white" textAlign="center">
-          {formatMessage({ id: subtitle })}
+          {intl.formatMessage({ id: subtitle })}
        </Body>
      ) : null}
    </article>
--- a/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx
@@ -10,7 +10,7 @@ import { NextLevelPointsColumn, YourPointsColumn } from "./PointsColumn"
 import { UserProps } from "@/types/components/myPages/user"

 export default async function Points({ user }: UserProps) {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()

  const membership = getMembership(user.memberships)

@@ -27,7 +27,7 @@ export default async function Points({ user }: UserProps) {
      {nextLevel && (
        <NextLevelPointsColumn
          points={membership?.pointsRequiredToNextlevel}
-          subtitle={`${formatMessage({ id: "next level:" })} ${nextLevel.name}`}
+          subtitle={`${intl.formatMessage({ id: "next level:" })} ${nextLevel.name}`}
        />
      )}
      {/* TODO: Show NextLevelNightsColumn when nightsToTopTier data is correct from Antavo */}
--- a/components/Blocks/DynamicContent/Points/Overview/Points/index.tsx
+++ b/components/Blocks/DynamicContent/Points/Overview/Points/index.tsx
@@ -17,7 +17,7 @@ import { LangParams } from "@/types/params"

 /* TODO */
 export default async function Points({ user, lang }: UserProps & LangParams) {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()

  const membership = getMembership(user.memberships)
  if (!membership?.nextLevel || !MembershipLevelEnum[membership.nextLevel]) {
@@ -34,13 +34,13 @@ export default async function Points({ user, lang }: UserProps & LangParams) {
          {membership?.currentPoints ? (
            <StayOnLevelColumn
              points={membership?.currentPoints} //TODO
-              subtitle={`${formatMessage({ id: "by" })} ${membership?.expirationDate}`}
+              subtitle={`${intl.formatMessage({ id: "by" })} ${membership?.expirationDate}`}
            />
          ) : (
            <>
              <NextLevelPointsColumn
                points={membership?.pointsRequiredToNextlevel}
-                subtitle={`${formatMessage({ id: "next level:" })} ${nextLevel.name}`}
+                subtitle={`${intl.formatMessage({ id: "next level:" })} ${nextLevel.name}`}
              />
              {membership?.nightsToTopTier && (
                <NextLevelNightsColumn
--- a/components/Blocks/DynamicContent/Stays/Previous/EmptyPreviousStays/index.tsx
+++ b/components/Blocks/DynamicContent/Stays/Previous/EmptyPreviousStays/index.tsx
@@ -4,11 +4,11 @@ import { getIntl } from "@/i18n"
 import styles from "./emptyPreviousStays.module.css"

 export default async function EmptyPreviousStaysBlock() {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
  return (
    <section className={styles.container}>
      <Title as="h4" level="h3" color="red" textAlign="center">
-        {formatMessage({
+        {intl.formatMessage({
          id: "You have no previous stays.",
        })}
      </Title>
--- a/components/Blocks/DynamicContent/Stays/ShowMoreButton/index.tsx
+++ b/components/Blocks/DynamicContent/Stays/ShowMoreButton/index.tsx
@@ -13,7 +13,7 @@ export default function ShowMoreButton({
  disabled,
  loadMoreData,
 }: ShowMoreButtonParams) {
-  const { formatMessage } = useIntl()
+  const intl = useIntl()
  return (
    <div className={styles.container}>
      <Button
@@ -25,7 +25,7 @@ export default function ShowMoreButton({
        intent="text"
      >
        <ChevronDownIcon />
-        {formatMessage({ id: "Show more" })}
+        {intl.formatMessage({ id: "Show more" })}
      </Button>
    </div>
  )
--- a/components/Blocks/DynamicContent/Stays/Soonest/EmptyUpcomingStays/index.tsx
+++ b/components/Blocks/DynamicContent/Stays/Soonest/EmptyUpcomingStays/index.tsx
@@ -10,14 +10,14 @@ import { getLang } from "@/i18n/serverContext"
 import styles from "./emptyUpcomingStays.module.css"

 export default async function EmptyUpcomingStaysBlock() {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
  return (
    <section className={styles.container}>
      <div className={styles.titleContainer}>
        <Title as="h4" level="h3" color="red" className={styles.title}>
-          {formatMessage({ id: "You have no upcoming stays." })}
+          {intl.formatMessage({ id: "You have no upcoming stays." })}
          <span className={styles.burgundyTitle}>
-            {formatMessage({ id: "Where should you go next?" })}
+            {intl.formatMessage({ id: "Where should you go next?" })}
          </span>
        </Title>
      </div>
@@ -26,7 +26,7 @@ export default async function EmptyUpcomingStaysBlock() {
        className={styles.link}
        color="peach80"
      >
-        {formatMessage({ id: "Get inspired" })}
+        {intl.formatMessage({ id: "Get inspired" })}
        <ArrowRightIcon color="peach80" />
      </Link>
    </section>
--- a/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/index.tsx
+++ b/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/index.tsx
@@ -10,14 +10,14 @@ import { getLang } from "@/i18n/serverContext"
 import styles from "./emptyUpcomingStays.module.css"

 export default async function EmptyUpcomingStaysBlock() {
-  const { formatMessage } = await getIntl()
+  const intl = await getIntl()
  return (
    <section className={styles.container}>
      <div className={styles.titleContainer}>
        <Title as="h4" level="h3" color="red" className={styles.title}>
-          {formatMessage({ id: "You have no upcoming stays." })}
+          {intl.formatMessage({ id: "You have no upcoming stays." })}
          <span className={styles.burgundyTitle}>
-            {formatMessage({ id: "Where should you go next?" })}
+            {intl.formatMessage({ id: "Where should you go next?" })}
          </span>
        </Title>
      </div>
@@ -26,7 +26,7 @@ export default async function EmptyUpcomingStaysBlock() {
        className={styles.link}
        color="peach80"
      >
-        {formatMessage({ id: "Get inspired" })}
+        {intl.formatMessage({ id: "Get inspired" })}
        <ArrowRightIcon color="peach80" />
      </Link>
    </section>