Merged in chore(LOY-531)-cleanup-old-stays (pull request #3498)

chore(LOY-531): cleanup old stays

* chore(LOY-531): cleanup old stays


Approved-by: Emma Zettervall
Approved-by: Anton Gunnarsson

apps/scandic-web/components/Blocks/DynamicContent/Stays/Upcoming/index.tsx

@@ -1,4 +1,3 @@
-import { env } from "@/env/server"
 import { serverClient } from "@/lib/trpc/server"
 
 import { Section } from "@/components/Section"
@@ -6,8 +5,6 @@ import { SectionHeader } from "@/components/Section/Header"
 import SectionLink from "@/components/Section/Link"
 
 import UpcomingStaysCarousel from "./Carousel"
-import EmptyUpcomingStays from "./EmptyUpcomingStays"
-import ClientUpcomingStays from "./OldClient"
 
 import styles from "./upcoming.module.css"
 
@@ -25,26 +22,12 @@ export default async function UpcomingStays({
   const hasStays =
     initialUpcomingStays?.data && initialUpcomingStays.data.length > 0
 
-  if (env.NEW_STAYS_ON_MY_PAGES) {
-    if (!hasStays) return null
-
-    return (
-      <Section className={styles.container}>
-        {title && <SectionHeader heading={title} link={link} />}
-        <UpcomingStaysCarousel initialUpcomingStays={initialUpcomingStays} />
-        <SectionLink link={link} variant="mobile" />
-      </Section>
-    )
-  }
+  if (!hasStays) return null
 
   return (
     <Section className={styles.container}>
       {title && <SectionHeader heading={title} link={link} />}
-      {hasStays ? (
-        <ClientUpcomingStays initialUpcomingStays={initialUpcomingStays} />
-      ) : (
-        <EmptyUpcomingStays />
-      )}
+      <UpcomingStaysCarousel initialUpcomingStays={initialUpcomingStays} />
       <SectionLink link={link} variant="mobile" />
     </Section>
   )