Merged in fix/LOY-138-remove-membership-id-surprises (pull request #1337)

fix(LOY-138): remove membership id from showing in surprises

Approved-by: Chuma Mcphoy (We Ahead)

components/MyPages/Surprises/Client.tsx

@@ -27,10 +27,7 @@ import type { SurprisesProps } from "@/types/components/blocks/surprises"
 
 const MotionModal = motion(Modal)
 
-export default function SurprisesNotification({
+export default function SurprisesNotification({ surprises }: SurprisesProps) {
-  surprises,
-  membershipNumber,
-}: SurprisesProps) {
   const lang = useLang()
   const intl = useIntl()
   const pathname = usePathname()
@@ -185,10 +182,7 @@ export default function SurprisesNotification({
                             }}
                             layout
                           >
-                            <Slide
+                            <Slide surprise={surprise} />
-                              surprise={surprise}
-                              membershipNumber={membershipNumber}
-                            />
                           </motion.div>
                         </AnimatePresence>
 

components/MyPages/Surprises/Slide.tsx

@@ -12,7 +12,7 @@ import styles from "./surprises.module.css"
 
 import type { SlideProps } from "@/types/components/blocks/surprises"
 
-export default function Slide({ surprise, membershipNumber }: SlideProps) {
+export default function Slide({ surprise }: SlideProps) {
   const lang = useLang()
   const intl = useIntl()
 
@@ -38,16 +38,6 @@ export default function Slide({ surprise, membershipNumber }: SlideProps) {
             }
           )}
         </Caption>
-        <Caption>
-          {intl.formatMessage(
-            {
-              id: "Membership ID {id}",
-            },
-            {
-              id: membershipNumber,
-            }
-          )}
-        </Caption>
       </div>
     </Card>
   )

components/MyPages/Surprises/index.tsx

@@ -1,5 +1,4 @@
 import { env } from "@/env/server"
-import { getProfile } from "@/lib/trpc/memoizedRequests"
 import { serverClient } from "@/lib/trpc/server"
 
 import SurprisesClient from "./Client"
@@ -9,22 +8,11 @@ export default async function Surprises() {
     return null
   }
 
-  const user = await getProfile()
-
-  if (!user || "error" in user) {
-    return null
-  }
-
   const surprises = await serverClient().contentstack.rewards.surprises()
 
   if (!surprises) {
     return null
   }
 
-  return (
+  return <SurprisesClient surprises={surprises} />
-    <SurprisesClient
-      surprises={surprises}
-      membershipNumber={user.membership?.membershipNumber}
-    />
-  )
 }

i18n/dictionaries/da.json

@@ -64,9 +64,9 @@
   "Bed type": "Seng type",
   "Bike friendly": "Cykelvenlig",
   "Birth date": "Fødselsdato",
-  "Boardroom": "Boardroom",
   "Birth date is missing": "Birth date is missing",
   "Birth date: {dateOfBirth, date, ::MMMM d yyyy}": "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
+  "Boardroom": "Boardroom",
   "Book": "Book",
   "Book Reward Night": "Book bonusnat",
   "Book a table online": "Book et bord online",
@@ -332,7 +332,6 @@
   "Members": "Members",
   "Members {price}/night": "Medlemmer {price}/nat",
   "Membership ID copied to clipboard": "Medlems-ID kopieret til udklipsholder",
-  "Membership ID {id}": "Medlems-id {id}",
   "Membership ID: {id}": "Medlems-id: {id}",
   "Membership benefits applied": "Membership benefits applied",
   "Membership cards": "Medlemskort",

i18n/dictionaries/de.json

@@ -65,9 +65,9 @@
   "Bed type": "Bettentyp",
   "Bike friendly": "Fahrradfreundlich",
   "Birth date": "Geburtsdatum",
-  "Boardroom": "Boardroom",
   "Birth date is missing": "Birth date is missing",
   "Birth date: {dateOfBirth, date, ::MMMM d yyyy}": "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
+  "Boardroom": "Boardroom",
   "Book": "Buchen",
   "Book Reward Night": "Bonusnacht buchen",
   "Book a table online": "Tisch online buchen",
@@ -333,7 +333,6 @@
   "Members": "Members",
   "Members {price}/night": "Mitglieder {price}/nacht",
   "Membership ID copied to clipboard": "Mitglieds-ID in die Zwischenablage kopiert",
-  "Membership ID {id}": "Mitglieds-ID {id}",
   "Membership ID: {id}": "Mitglieds-ID: {id}",
   "Membership benefits applied": "Membership benefits applied",
   "Membership cards": "Mitgliedskarten",

i18n/dictionaries/en.json

@@ -65,9 +65,9 @@
   "Bed type": "Bed type",
   "Bike friendly": "Bike friendly",
   "Birth date": "Birth date",
-  "Boardroom": "Boardroom",
   "Birth date is missing": "Birth date is missing",
   "Birth date: {dateOfBirth, date, ::MMMM d yyyy}": "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
+  "Boardroom": "Boardroom",
   "Book": "Book",
   "Book Reward Night": "Book Reward Night",
   "Book a table online": "Book a table online",
@@ -336,7 +336,6 @@
   "Members": "Members",
   "Members {price}/night": "Members {price}/night",
   "Membership ID copied to clipboard": "Membership ID copied to clipboard",
-  "Membership ID {id}": "Membership ID {id}",
   "Membership ID: {id}": "Membership ID: {id}",
   "Membership benefits applied": "Membership benefits applied",
   "Membership cards": "Membership cards",

i18n/dictionaries/fi.json

@@ -63,9 +63,9 @@
   "Bed type": "Vuodetyyppi",
   "Bike friendly": "Pyöräystävällinen",
   "Birth date": "Syntymäaika",
-  "Boardroom": "Boardroom",
   "Birth date is missing": "Birth date is missing",
   "Birth date: {dateOfBirth, date, ::MMMM d yyyy}": "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
+  "Boardroom": "Boardroom",
   "Book": "Varaa",
   "Book Reward Night": "Kirjapalkinto-ilta",
   "Book a table online": "Varaa pöytä verkossa",
@@ -332,7 +332,6 @@
   "Members": "Members",
   "Members {price}/night": "Jäsenet {price}/yö",
   "Membership ID copied to clipboard": "Jäsenyystunnus kopioitu leikepöydälle",
-  "Membership ID {id}": "Jäsentunnus {id}",
   "Membership ID: {id}": "Jäsentunnus: {id}",
   "Membership benefits applied": "Membership benefits applied",
   "Membership cards": "Jäsenkortit",

i18n/dictionaries/no.json

@@ -63,9 +63,9 @@
   "Bed type": "Seng type",
   "Bike friendly": "Sykkelvennlig",
   "Birth date": "Fødselsdato",
-  "Boardroom": "Boardroom",
   "Birth date is missing": "Birth date is missing",
   "Birth date: {dateOfBirth, date, ::MMMM d yyyy}": "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
+  "Boardroom": "Boardroom",
   "Book": "Bestill",
   "Book Reward Night": "Bestill belønningskveld",
   "Book a table online": "Bestill bord online",
@@ -331,7 +331,6 @@
   "Members": "Members",
   "Members {price}/night": "Medlemmer {price}/natt",
   "Membership ID copied to clipboard": "Medlems-ID kopiert til utklippstavlen",
-  "Membership ID {id}": "Medlems-ID {id}",
   "Membership ID: {id}": "Medlems-ID: {id}",
   "Membership benefits applied": "Membership benefits applied",
   "Membership cards": "Medlemskort",

i18n/dictionaries/sv.json

@@ -63,9 +63,9 @@
   "Bed type": "Sängtyp",
   "Bike friendly": "Cykelvänligt",
   "Birth date": "Födelsedatum",
-  "Boardroom": "Boardroom",
   "Birth date is missing": "Birth date is missing",
   "Birth date: {dateOfBirth, date, ::MMMM d yyyy}": "Birth date: {dateOfBirth, date, ::MMMM d yyyy}",
+  "Boardroom": "Boardroom",
   "Book": "Boka",
   "Book Reward Night": "Boka frinatt",
   "Book a table online": "Boka ett bord online",
@@ -331,7 +331,6 @@
   "Members": "Members",
   "Members {price}/night": "Medlemmar {price}/natt",
   "Membership ID copied to clipboard": "Medlems-ID kopierat till urklipp",
-  "Membership ID {id}": "Medlems-ID {id}",
   "Membership ID: {id}": "Medlems-ID: {id}",
   "Membership benefits applied": "Membership benefits applied",
   "Membership cards": "Medlemskort",

types/components/blocks/surprises.ts

@@ -26,7 +26,6 @@ export interface InitialProps {
 
 export interface SlideProps {
   surprise: Surprise
-  membershipNumber?: string
 }
 
 export interface HeaderProps extends React.PropsWithChildren {