diff --git a/app/[locale]/[slug]/page.tsx b/app/[locale]/[slug]/page.tsx
index 9e50527da..215014a35 100644
--- a/app/[locale]/[slug]/page.tsx
+++ b/app/[locale]/[slug]/page.tsx
@@ -2,6 +2,7 @@ import StoryblokPage, { StoryblokPageProps } from '@/components/storyblok/Storyb
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
 
 import { routing } from '@/i18n/routing';
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
 import { notFound } from 'next/navigation';
@@ -34,7 +35,7 @@ export async function generateStaticParams() {
   const storyblokApi = getStoryblokApi();
 
   let sbParams: ISbStoriesParams = {
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
   };
 
   const { data } = await storyblokApi.get('cdn/links/', sbParams);
diff --git a/app/[locale]/conversations/[slug]/page.tsx b/app/[locale]/conversations/[slug]/page.tsx
index b6832441b..0ae3e229a 100644
--- a/app/[locale]/conversations/[slug]/page.tsx
+++ b/app/[locale]/conversations/[slug]/page.tsx
@@ -2,6 +2,7 @@ import StoryblokResourceConversationPage, {
   StoryblokResourceConversationPageProps,
 } from '@/components/storyblok/StoryblokResourceConversationPage';
 import { routing } from '@/i18n/routing';
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
@@ -40,7 +41,7 @@ export async function generateStaticParams() {
   const storyblokApi = getStoryblokApi();
 
   let sbParams: ISbStoriesParams = {
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     starts_with: 'conversations/',
     filter_query: {
       component: {
diff --git a/app/[locale]/courses/[slug]/[sessionSlug]/page.tsx b/app/[locale]/courses/[slug]/[sessionSlug]/page.tsx
index dd2f6d607..502995a1e 100644
--- a/app/[locale]/courses/[slug]/[sessionSlug]/page.tsx
+++ b/app/[locale]/courses/[slug]/[sessionSlug]/page.tsx
@@ -2,6 +2,7 @@ import StoryblokSessionPage, {
   StoryblokSessionPageProps,
 } from '@/components/storyblok/StoryblokSessionPage';
 import { routing } from '@/i18n/routing';
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
@@ -43,7 +44,7 @@ export async function generateStaticParams() {
   const storyblokApi = getStoryblokApi();
 
   let sbParams: ISbStoriesParams = {
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     starts_with: 'courses/',
   };
 
diff --git a/app/[locale]/courses/[slug]/page.tsx b/app/[locale]/courses/[slug]/page.tsx
index af0bf0940..2d1b76831 100644
--- a/app/[locale]/courses/[slug]/page.tsx
+++ b/app/[locale]/courses/[slug]/page.tsx
@@ -2,6 +2,7 @@ import StoryblokCoursePage, {
   StoryblokCoursePageProps,
 } from '@/components/storyblok/StoryblokCoursePage';
 import { routing } from '@/i18n/routing';
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
 import { getStoryblokApi, ISbStoriesParams } from '@storyblok/react/rsc';
@@ -40,7 +41,7 @@ export async function generateStaticParams() {
   const storyblokApi = getStoryblokApi();
 
   let sbParams: ISbStoriesParams = {
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     starts_with: 'courses/',
     filter_query: {
       component: {
diff --git a/app/[locale]/courses/page.tsx b/app/[locale]/courses/page.tsx
index 604d85391..588767c2e 100644
--- a/app/[locale]/courses/page.tsx
+++ b/app/[locale]/courses/page.tsx
@@ -1,3 +1,4 @@
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { FeatureFlag } from '@/lib/featureFlag';
 import { getStoryblokStories } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
@@ -21,7 +22,7 @@ export default async function Page({ params }: { params: Params }) {
 
   const baseProps: Partial<ISbStoriesParams> = {
     language: locale,
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     sort_by: 'position:description',
   };
 
diff --git a/app/[locale]/shorts/[slug]/page.tsx b/app/[locale]/shorts/[slug]/page.tsx
index ed1c7c6b4..ae0cf9ff5 100644
--- a/app/[locale]/shorts/[slug]/page.tsx
+++ b/app/[locale]/shorts/[slug]/page.tsx
@@ -2,6 +2,7 @@ import StoryblokResourceShortPage, {
   StoryblokResourceShortPageProps,
 } from '@/components/storyblok/StoryblokResourceShortPage';
 import { routing } from '@/i18n/routing';
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { COURSE_CATEGORIES } from '@/lib/constants/enums';
 import { getStoryblokStories, getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
@@ -45,7 +46,7 @@ export async function generateStaticParams() {
   const storyblokApi = getStoryblokApi();
 
   let sbParams: ISbStoriesParams = {
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     starts_with: 'shorts/',
     filter_query: {
       component: {
diff --git a/app/[locale]/therapy/book-session/BookTherapyPage.tsx b/app/[locale]/therapy/book-session/BookTherapyPage.tsx
index 3c8138095..cc7cb80bf 100644
--- a/app/[locale]/therapy/book-session/BookTherapyPage.tsx
+++ b/app/[locale]/therapy/book-session/BookTherapyPage.tsx
@@ -1,10 +1,11 @@
 'use client';
 
-import Faqs from '@/components/common/Faqs';
-import ImageTextGrid, { ImageTextItem } from '@/components/common/ImageTextGrid';
-import Header from '@/components/layout/Header';
+import ImageTextRow, { ImageTextItem } from '@/components/common/ImageTextRow';
+import NoDataAvailable from '@/components/common/NoDataAvailable';
+import Header, { HeaderProps } from '@/components/layout/Header';
+import StoryblokPageSection from '@/components/storyblok/StoryblokPageSection';
+import TherapyBookings from '@/components/therapy/TherapyBookings';
 import { THERAPY_BOOKING_OPENED, THERAPY_BOOKING_VIEWED } from '@/lib/constants/events';
-import { therapyFaqs } from '@/lib/constants/faqs';
 import { useTypedSelector } from '@/lib/hooks/store';
 import { getSimplybookWidgetConfig } from '@/lib/simplybook';
 import { PartnerAccess } from '@/lib/store/partnerAccessSlice';
@@ -13,35 +14,86 @@ import illustrationChange from '@/public/illustration_change.svg';
 import illustrationChooseTherapist from '@/public/illustration_choose_therapist.svg';
 import illustrationConfidential from '@/public/illustration_confidential.svg';
 import illustrationDateSelector from '@/public/illustration_date_selector.svg';
-import illustrationLeafMix from '@/public/illustration_leaf_mix.svg';
-import illustrationPerson4Peach from '@/public/illustration_person4_peach.svg';
-import { rowStyle } from '@/styles/common';
-import { Box, Button, Container, Typography } from '@mui/material';
+import CloseIcon from '@mui/icons-material/Close';
+import { Box, Button, Container, IconButton, Modal, Typography } from '@mui/material';
+import { ISbStoryData } from '@storyblok/react/rsc';
 import { useTranslations } from 'next-intl';
-import Image from 'next/image';
 import Script from 'next/script';
 import { useEffect, useState } from 'react';
 
 const containerStyle = {
+  pt: '0 !important',
   backgroundColor: 'secondary.light',
+} as const;
+
+const bookingButtonStyle = {
+  minWidth: 200,
+  marginY: 4,
+} as const;
+
+const bookingSectionStyle = {
+  backgroundColor: 'background.default',
   textAlign: 'center',
-  ...rowStyle,
+  paddingTop: 4,
+  paddingBottom: 4,
 } as const;
 
-const ctaContent = {
-  flex: 1,
-  textAlign: 'left',
-  marginTop: 4,
+const modalStyle = {
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
 } as const;
 
-const faqsContainerStyle = {
-  maxWidth: '680px !important',
-  margin: 'auto',
+const modalContentBoxStyle = {
+  position: 'relative',
+  width: '95%',
+  height: '90vh',
+  maxWidth: '1000px',
+  maxHeight: '800px',
+  bgcolor: 'background.default',
+  boxShadow: 24,
+  borderRadius: 2,
+  p: 0,
+  overflow: 'hidden',
+  border: 'none',
+  outline: 'none',
+  display: 'flex',
+  flexDirection: 'column',
 } as const;
 
-const bookingButtonStyle = {
-  minWidth: 200,
-  marginY: 4,
+const widgetContainerStyle = {
+  flexGrow: 1,
+  width: '100%',
+  height: '100%',
+  overflowY: 'auto',
+  overflowX: 'hidden',
+  mt: 8,
+  '& iframe': {
+    width: '100%',
+    border: 'none',
+    display: 'block',
+  },
+} as const;
+
+const modalTitleStyle = {
+  position: 'absolute',
+  top: 10,
+  right: 0,
+  left: 0,
+  marginInline: 'auto',
+  width: 'fit-content',
+} as const;
+
+const closeButtonStyle = {
+  position: 'absolute',
+  top: 20,
+  right: 20,
+  zIndex: 1301,
+  color: 'grey.700',
+  backgroundColor: 'rgba(255, 255, 255, 0.7)',
+  '&:hover': {
+    backgroundColor: 'rgba(255, 255, 255, 0.9)',
+  },
 } as const;
 
 const steps: Array<ImageTextItem> = [
@@ -67,34 +119,64 @@ const steps: Array<ImageTextItem> = [
   },
 ];
 
-export default function BookTherapyPage() {
+interface Props {
+  story: ISbStoryData | undefined;
+}
+
+export default function BookTherapyPage({ story }: Props) {
   const t = useTranslations('Therapy');
-  const tS = useTranslations('Shared');
   const [partnerAccess, setPartnerAccess] = useState<PartnerAccess | null>(null);
   const [hasTherapyRemaining, setHasTherapyRemaining] = useState<boolean>(false);
-  const [widgetOpen, setWidgetOpen] = useState(false);
+  const [isWidgetModalOpen, setIsWidgetModalOpen] = useState(false);
+  const [isScriptLoaded, setIsScriptLoaded] = useState(false);
+  const [widgetError, setWidgetError] = useState<string | null>(null);
 
   const user = useTypedSelector((state) => state.user);
   const partnerAccesses = useTypedSelector((state) => state.partnerAccesses);
 
+  function replacePartnerName(partnerName: string) {
+    const accordionDetailsElements = document.querySelectorAll('.MuiAccordionDetails-root');
+    const introductionElement: HTMLParagraphElement | null = document.querySelector('h1 + p');
+
+    accordionDetailsElements.forEach((detailsElement) => {
+      const paragraphElements = detailsElement.querySelectorAll('p');
+
+      const allElementsToProcess = [...paragraphElements];
+      if (introductionElement) {
+        allElementsToProcess.push(introductionElement);
+      }
+
+      allElementsToProcess.forEach((element) => {
+        if (!element) return;
+
+        // Use innerHTML to preserve embedded HTML elements
+        const currentHtml = element.innerHTML;
+
+        // Replace all instances of '{partnerName}' with the provided partnerName
+        const escapedPartnerName = partnerName.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        const newHtml = currentHtml.replace(/\{partnerName\}/g, escapedPartnerName);
+
+        element.innerHTML = newHtml;
+      });
+    });
+  }
+
   useEffect(() => {
-    let partnerAccess = partnerAccesses.find(
-      (partnerAccess) =>
-        partnerAccess.featureTherapy === true && partnerAccess.therapySessionsRemaining > 0,
+    let currentPartnerAccess = partnerAccesses.find(
+      (pa) => pa.featureTherapy === true && pa.therapySessionsRemaining > 0,
     );
-    if (partnerAccess) {
+    if (currentPartnerAccess) {
       setHasTherapyRemaining(true);
     } else {
-      // existing therapy access has no remaining sessions, return access that was last redeemed
       const redeemedAccesses = partnerAccesses.filter(
-        (partnerAccess) =>
-          !!partnerAccess.featureTherapy && partnerAccess.therapySessionsRedeemed > 0,
+        (pa) => !!pa.featureTherapy && pa.therapySessionsRedeemed > 0,
       );
-      partnerAccess = redeemedAccesses[redeemedAccesses.length - 1];
+      currentPartnerAccess = redeemedAccesses[redeemedAccesses.length - 1];
     }
 
-    if (partnerAccess?.partner.name) {
-      setPartnerAccess(partnerAccess);
+    if (currentPartnerAccess?.partner.name) {
+      setPartnerAccess(currentPartnerAccess);
+      replacePartnerName(currentPartnerAccess?.partner.name);
     }
   }, [setPartnerAccess, partnerAccesses]);
 
@@ -102,93 +184,173 @@ export default function BookTherapyPage() {
     logEvent(THERAPY_BOOKING_VIEWED);
   }, []);
 
-  const headerProps = {
-    title: t('title'),
-    introduction: `${t.rich('introduction', { partnerName: partnerAccess?.partner?.name as string })}`,
-    imageSrc: illustrationPerson4Peach,
-    imageAlt: 'alt.personTea',
+  const handleOpenWidgetModal = () => {
+    logEvent(THERAPY_BOOKING_OPENED);
+    setWidgetError(null);
+    setIsWidgetModalOpen(true);
   };
 
-  const openWidget = () => {
-    logEvent(THERAPY_BOOKING_OPENED);
+  const handleCloseWidgetModal = () => {
+    setIsWidgetModalOpen(false);
+    setWidgetError(null);
+  };
+
+  useEffect(() => {
+    let timeoutId: NodeJS.Timeout | null = null;
+
+    const initializeWidget = () => {
+      if (typeof (window as any).SimplybookWidget === 'function') {
+        const container = document.getElementById('simplybook-widget-container');
+        if (container) {
+          container.innerHTML = '';
+          setWidgetError(null);
+          try {
+            new (window as any).SimplybookWidget(getSimplybookWidgetConfig(user));
+          } catch (error) {
+            setWidgetError(t('error.initializingWidget'));
+          }
+        } else {
+          timeoutId = setTimeout(() => {
+            const containerRetry = document.getElementById('simplybook-widget-container');
+            if (containerRetry) {
+              containerRetry.innerHTML = '';
+              setWidgetError(null);
+              try {
+                new (window as any).SimplybookWidget(getSimplybookWidgetConfig(user));
+              } catch (error) {
+                setWidgetError(t('error.initializingWidgetRetry'));
+              }
+            } else {
+              console.error('Simplybook widget container not found after retry.');
+              setWidgetError(t('error.containerNotFoundRetry'));
+            }
+          }, 1000);
+        }
+      } else {
+        setWidgetError(t('error.scriptNotLoaded'));
+      }
+    };
+
+    if (isWidgetModalOpen && isScriptLoaded) {
+      initializeWidget();
+    } else if (!isWidgetModalOpen) {
+      setWidgetError(null);
+    }
+
+    return () => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  }, [isWidgetModalOpen, isScriptLoaded, user, t]); // Added t to dependencies
+
+  if (!story) {
+    return <NoDataAvailable />;
+  }
 
-    setWidgetOpen(true);
+  const headerProps: HeaderProps = {
+    title: story.content.title,
+    introduction: story.content.description,
+    imageSrc: story.content.header_image.filename,
+    translatedImageAlt: story.content.header_image.alt,
   };
 
   return (
     <Box>
       <Header
-        title={headerProps.title}
-        introduction={headerProps.introduction}
-        imageSrc={headerProps.imageSrc}
-        imageAlt={headerProps.imageAlt}
+        {...headerProps}
+        cta={
+          <Button
+            sx={{ mt: -2 }}
+            variant="contained"
+            color="secondary"
+            size="large"
+            onClick={handleOpenWidgetModal}
+            disabled={!hasTherapyRemaining}
+          >
+            {t('bookingButton')}
+          </Button>
+        }
       />
       <Container sx={containerStyle}>
-        <Box sx={ctaContent}>
-          <Typography>
-            {hasTherapyRemaining
-              ? t.rich('therapySessionsRemaining', {
-                  strongText: () => (
-                    <strong id="therapy-sessions-remaining">
-                      {partnerAccess?.therapySessionsRemaining}
-                    </strong>
-                  ),
-                })
-              : t('noTherapySessionsRemaining')}
-          </Typography>
-          {hasTherapyRemaining && (
-            <Button
-              sx={bookingButtonStyle}
-              variant="contained"
-              color="secondary"
-              size="large"
-              onClick={openWidget}
-            >
-              {t('bookingButton')}
-            </Button>
-          )}
-        </Box>
-        <ImageTextGrid items={steps} translations="Therapy.steps" />
+        {partnerAccess && <TherapyBookings partnerAccess={partnerAccess} />}
       </Container>
 
-      <Container>
-        <Typography variant="h2" component="h2" mb={2} textAlign="center">
-          {t('faqHeader')}
+      <Container id="booking-steps-section" sx={bookingSectionStyle} maxWidth="md">
+        <Typography variant="h2" component="h2" gutterBottom>
+          {t('bookingSectionTitle')}
         </Typography>
-        <Box textAlign="center">
-          <Image alt={tS('alt.leafMix')} src={illustrationLeafMix} width={125} height={100} />
+        <Box my={3}>
+          <ImageTextRow items={steps} translations="Therapy.steps" />
         </Box>
+        {hasTherapyRemaining && (
+          <Button
+            sx={bookingButtonStyle}
+            variant="contained"
+            color="secondary"
+            size="large"
+            onClick={handleOpenWidgetModal}
+          >
+            {t('bookingButton')}
+          </Button>
+        )}{' '}
+      </Container>
+
+      {story.content.page_sections?.length > 0 &&
+        story.content.page_sections.map((section: any, index: number) => (
+          <StoryblokPageSection key={`page_section_${index}`} {...section} />
+        ))}
+
+      <Modal
+        open={isWidgetModalOpen}
+        onClose={handleCloseWidgetModal}
+        aria-labelledby="simplybook-widget-modal-title"
+        aria-describedby="simplybook-widget-modal-description"
+        sx={modalStyle}
+      >
+        <Box sx={modalContentBoxStyle}>
+          <IconButton
+            aria-label={t('closeBookingWidget')}
+            onClick={handleCloseWidgetModal}
+            sx={closeButtonStyle}
+          >
+            <CloseIcon />
+          </IconButton>
+          <Typography id="simplybook-widget-modal-title" variant="h3" sx={modalTitleStyle} mt={2}>
+            {t('modalTitle')}
+          </Typography>
+          <Typography
+            id="simplybook-widget-modal-description"
+            sx={{ position: 'absolute', left: '-9999px' }}
+          >
+            {t('modalDescription')}
+          </Typography>
 
-        <Box sx={faqsContainerStyle}>
-          <Faqs
-            faqList={therapyFaqs(tS('feedbackTypeform'))}
-            translations="Therapy.faqs"
-            partner={partnerAccess?.partner}
-          />
-          {hasTherapyRemaining && (
-            <Button
-              sx={bookingButtonStyle}
-              variant="contained"
-              color="secondary"
-              size="large"
-              onClick={openWidget}
-            >
-              {t('bookingButton')}
-            </Button>
+          {widgetError && (
+            <Box sx={{ p: 2, textAlign: 'center' }}>
+              <Typography id="simplybook-widget-error" color="error">
+                {widgetError}
+              </Typography>
+            </Box>
           )}
+
+          <Box id="simplybook-widget-container" sx={widgetContainerStyle}></Box>
         </Box>
-      </Container>
+      </Modal>
 
-      {widgetOpen && (
-        <Script
-          id="widget-js"
-          src="//widget.simplybook.it/v2/widget/widget.js"
-          onLoad={() => {
-            new (window as any).SimplybookWidget(getSimplybookWidgetConfig(user));
-            document.title = t('title');
-          }}
-        />
-      )}
+      <Script
+        id="widget-js"
+        src="//widget.simplybook.it/v2/widget/widget.js"
+        strategy="lazyOnload"
+        onLoad={() => {
+          setIsScriptLoaded(true);
+        }}
+        onError={(e) => {
+          console.error('Failed to load Simplybook widget script:', e);
+          setIsScriptLoaded(false);
+          setWidgetError(t('error.scriptLoadFailed'));
+        }}
+      />
     </Box>
   );
 }
diff --git a/app/[locale]/therapy/book-session/page.tsx b/app/[locale]/therapy/book-session/page.tsx
index c6b72aea3..d163a1c0e 100644
--- a/app/[locale]/therapy/book-session/page.tsx
+++ b/app/[locale]/therapy/book-session/page.tsx
@@ -1,16 +1,34 @@
+import NoDataAvailable from '@/components/common/NoDataAvailable';
+import { getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
-import { getTranslations } from 'next-intl/server';
 import BookTherapyPage from './BookTherapyPage';
 
 type Params = Promise<{ locale: string }>;
 
+async function getStory(locale: string) {
+  return await getStoryblokStory('therapy/book-session', locale);
+}
+
 export async function generateMetadata({ params }: { params: Params }) {
   const { locale } = await params;
-  const t = await getTranslations({ locale, namespace: 'Therapy' });
+  const story = await getStory(locale);
+  if (!story) return;
 
-  return generateMetadataBasic({ title: t('title') });
+  return generateMetadataBasic({
+    title: story.content.title,
+    description: story.content.seo_description,
+  });
 }
 
-export default function Page() {
-  return <BookTherapyPage />;
+export default async function Page({ params }: { params: Promise<{ locale: string }> }) {
+  const { locale } = await params;
+  const story = await getStory(locale);
+
+  if (!story) {
+    return <NoDataAvailable />;
+  }
+
+  return <BookTherapyPage story={story} />;
 }
+
+export const revalidate = 14400; // invalidate every 4 hours
diff --git a/app/[locale]/therapy/confirmed-session/ConfirmedTherapyPage.tsx b/app/[locale]/therapy/confirmed-session/ConfirmedTherapyPage.tsx
deleted file mode 100644
index 01e052707..000000000
--- a/app/[locale]/therapy/confirmed-session/ConfirmedTherapyPage.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-'use client';
-
-import Faqs from '@/components/common/Faqs';
-import Header from '@/components/layout/Header';
-import { Link as i18nLink } from '@/i18n/routing';
-import { THERAPY_CONFIRMATION_VIEWED } from '@/lib/constants/events';
-import { therapyFaqs } from '@/lib/constants/faqs';
-import { useTypedSelector } from '@/lib/hooks/store';
-import { PartnerAccess } from '@/lib/store/partnerAccessSlice';
-import logEvent from '@/lib/utils/logEvent';
-import illustrationLeafMix from '@/public/illustration_leaf_mix.svg';
-import illustrationPerson4Peach from '@/public/illustration_person4_peach.svg';
-import { Box, Container, Link, Typography } from '@mui/material';
-import { useTranslations } from 'next-intl';
-import Image from 'next/image';
-import { useEffect, useState } from 'react';
-
-export default function ConfirmedTherapyPage() {
-  const t = useTranslations('Therapy');
-  const tS = useTranslations('Shared');
-
-  const partnerAccesses = useTypedSelector((state) => state.partnerAccesses);
-  const [partnerAccess, setPartnerAccess] = useState<PartnerAccess | null>(null);
-
-  useEffect(() => {
-    let accesses = partnerAccesses.filter(
-      (partnerAccess) =>
-        !!partnerAccess.featureTherapy && partnerAccess.therapySessionsRedeemed > 0,
-    );
-    let partnerAccess = null;
-
-    if (accesses.length === 1) {
-      partnerAccess = accesses[0];
-    } else {
-      // several partner accesses with redeemed therapy, get last one
-      partnerAccess = accesses[accesses.length - 1];
-    }
-    setPartnerAccess(partnerAccess);
-  }, [partnerAccesses]);
-
-  useEffect(() => {
-    logEvent(THERAPY_CONFIRMATION_VIEWED);
-  }, []);
-
-  const headerProps = {
-    title: t('confirmation.title'),
-    introduction: t('confirmation.introduction'),
-    imageSrc: illustrationPerson4Peach,
-    imageAlt: 'alt.personTea',
-  };
-
-  const containerStyle = {
-    backgroundColor: 'secondary.light',
-  } as const;
-
-  const faqsContainerStyle = {
-    maxWidth: '680px !important',
-    margin: 'auto',
-  } as const;
-
-  return (
-    <Box>
-      <Header
-        title={headerProps.title}
-        introduction={headerProps.introduction}
-        imageSrc={headerProps.imageSrc}
-        imageAlt={headerProps.imageAlt}
-      />
-      <Container sx={containerStyle}>
-        <Typography>{t('confirmation.returnDescription')}</Typography>
-        <Typography>
-          {t.rich('confirmation.bookmarkDescription', {
-            bookingLink: (children) => (
-              <Link component={i18nLink} href={`/`}>
-                {children}
-              </Link>
-            ),
-          })}
-        </Typography>
-      </Container>
-      <Container>
-        <Typography variant="h2" component="h2" mb={2} textAlign="center">
-          {t('faqHeader')}
-        </Typography>
-        <Box textAlign="center">
-          <Image alt={tS('alt.leafMix')} src={illustrationLeafMix} width={100} height={100} />
-        </Box>
-        <Box sx={faqsContainerStyle}>
-          <Faqs
-            faqList={therapyFaqs(tS('feedbackTypeform'))}
-            translations="Therapy.faqs"
-            partner={partnerAccess?.partner}
-          />
-        </Box>
-      </Container>
-    </Box>
-  );
-}
diff --git a/app/[locale]/therapy/confirmed-session/page.tsx b/app/[locale]/therapy/confirmed-session/page.tsx
deleted file mode 100644
index 16fe57053..000000000
--- a/app/[locale]/therapy/confirmed-session/page.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
-import { getTranslations } from 'next-intl/server';
-import ConfirmedTherapyPage from './ConfirmedTherapyPage';
-
-type Params = Promise<{ locale: string }>;
-
-export async function generateMetadata({ params }: { params: Params }) {
-  const { locale } = await params;
-  const t = await getTranslations({ locale, namespace: 'Therapy' });
-
-  return generateMetadataBasic({ title: t('title') });
-}
-
-export default function Page() {
-  return <ConfirmedTherapyPage />;
-}
diff --git a/app/[locale]/welcome/[partnerName]/page.tsx b/app/[locale]/welcome/[partnerName]/page.tsx
index 46d2b5072..27d64bc25 100644
--- a/app/[locale]/welcome/[partnerName]/page.tsx
+++ b/app/[locale]/welcome/[partnerName]/page.tsx
@@ -2,6 +2,7 @@ import StoryblokWelcomePage, {
   StoryblokWelcomePageProps,
 } from '@/components/storyblok/StoryblokWelcomePage';
 import { routing } from '@/i18n/routing';
+import { STORYBLOK_ENVIRONMENT } from '@/lib/constants/common';
 import { getStoryblokStory } from '@/lib/storyblok';
 import { generateMetadataBasic } from '@/lib/utils/generateMetadataBase';
 import { ISbResult, ISbStoriesParams, getStoryblokApi } from '@storyblok/react/rsc';
@@ -36,7 +37,7 @@ export async function generateStaticParams() {
   const locales = routing.locales;
 
   let sbParams: ISbStoriesParams = {
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     starts_with: 'welcome/',
   };
 
diff --git a/app/layout.tsx b/app/layout.tsx
index b95de85eb..934856f33 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,4 +1,9 @@
-import { ReactNode } from 'react';
+'use client';
+
+import { PWA_LOADED, WEB_APP_LOADED } from '@/lib/constants/events';
+import logEvent from '@/lib/utils/logEvent';
+import { storePWAStatus, usePWAStatus } from '@/lib/utils/pwaDetection';
+import { ReactNode, useEffect } from 'react';
 
 type Props = {
   children: ReactNode;
@@ -6,5 +11,14 @@ type Props = {
 
 // Since we have a `not-found.tsx` page on the root, a layout file is required to pass children
 export default function RootLayout({ children }: Props) {
+  const pwaStatus = usePWAStatus();
+
+  useEffect(() => {
+    if (pwaStatus) {
+      // Store status for future reference
+      storePWAStatus(pwaStatus);
+      pwaStatus.isInstalled ? logEvent(PWA_LOADED) : logEvent(WEB_APP_LOADED);
+    }
+  }, [pwaStatus]);
   return children;
 }
diff --git a/bloom-frontend b/bloom-frontend
new file mode 160000
index 000000000..b1ac9cfb8
--- /dev/null
+++ b/bloom-frontend
@@ -0,0 +1 @@
+Subproject commit b1ac9cfb844154f6f448243eb8d1d18b75ee9496
diff --git a/components/banner/DesktopPwaBanner.tsx b/components/banner/DesktopPwaBanner.tsx
new file mode 100644
index 000000000..8417e25a9
--- /dev/null
+++ b/components/banner/DesktopPwaBanner.tsx
@@ -0,0 +1,70 @@
+'use client';
+
+import usePWA from '@/lib/hooks/usePwa';
+import AddBoxOutlinedIcon from '@mui/icons-material/AddBoxOutlined';
+import IosShareIcon from '@mui/icons-material/IosShare';
+import { Button, Paper, Stack, Typography, useMediaQuery, useTheme } from '@mui/material';
+import { useTranslations } from 'next-intl';
+
+export const DesktopPwaBanner = () => {
+  const { bannerState, declineInstallation, install } = usePWA();
+  const t = useTranslations('Shared.pwaBanner');
+  const theme = useTheme();
+  const isSmallScreen = useMediaQuery(theme.breakpoints.down('md'));
+
+  if (isSmallScreen || bannerState === 'Hidden') return null;
+
+  return (
+    <Paper
+      elevation={1}
+      sx={{
+        px: 2,
+        py: 1.5,
+        display: 'flex',
+        alignItems: 'center',
+        gap: bannerState === 'Generic' ? 0 : '1rem',
+        justifyContent: bannerState === 'Generic' ? 'space-between' : 'flex-start',
+        backgroundColor: 'common.white',
+        width: '100%',
+      }}
+    >
+      <Typography variant="body2" sx={{ fontWeight: 500, whiteSpace: 'nowrap' }}>
+        {t(bannerState === 'Generic' ? 'mobileDescription' : 'iosDescription')}
+      </Typography>
+
+      {bannerState === 'Generic' ? (
+        <Stack direction="row" spacing={2}>
+          <Button
+            onClick={declineInstallation}
+            variant="outlined"
+            color="secondary"
+            size="small"
+            sx={{ px: 2, minWidth: 'auto', whiteSpace: 'nowrap' }}
+          >
+            {t('button-decline-label')}
+          </Button>
+          <Button
+            onClick={install}
+            variant="contained"
+            color="secondary"
+            size="small"
+            sx={{ px: 2, minWidth: 'auto', whiteSpace: 'nowrap' }}
+          >
+            {t('button-install-label')}
+          </Button>
+        </Stack>
+      ) : (
+        <Stack direction="row" gap={2}>
+          <Stack alignItems="center" direction="row" gap={1}>
+            <Typography variant="body1">{t('iosStep1')}</Typography>
+            <IosShareIcon />
+          </Stack>
+          <Stack alignItems="center" direction="row" gap={1}>
+            <Typography variant="body1">{t('iosStep2')}</Typography>
+            <AddBoxOutlinedIcon />
+          </Stack>
+        </Stack>
+      )}
+    </Paper>
+  );
+};
diff --git a/components/common/Faqs.tsx b/components/common/Faqs.tsx
index e696642d8..33c742f82 100644
--- a/components/common/Faqs.tsx
+++ b/components/common/Faqs.tsx
@@ -39,7 +39,11 @@ const Faqs = (props: FaqsProps) => {
   return (
     <Box>
       {faqList.map((faq, i) => (
-        <Accordion key={`panel${i}`} onChange={handleChange(faq.title)}>
+        <Accordion
+          key={`panel${i}`}
+          onChange={handleChange(faq.title)}
+          sx={{ backgroundColor: 'secondary.light' }}
+        >
           <AccordionSummary
             expandIcon={<ExpandMoreIcon />}
             aria-controls={`panel${i}-content`}
diff --git a/components/common/ImageTextGrid.tsx b/components/common/ImageTextRow.tsx
similarity index 82%
rename from components/common/ImageTextGrid.tsx
rename to components/common/ImageTextRow.tsx
index 188c3d2f2..621ec3d70 100644
--- a/components/common/ImageTextGrid.tsx
+++ b/components/common/ImageTextRow.tsx
@@ -12,19 +12,20 @@ export interface ImageTextItem {
   illustrationAlt: string;
 }
 
-interface ImageTextGridProps {
+interface ImageTextRowProps {
   items: Array<ImageTextItem>;
   translations: string;
 }
 
 const containerStyle = {
   ...rowStyle,
-  width: { xs: '100%', md: '60%' },
+  width: 'calc(100% + 2rem)',
+  mx: '-1rem',
 } as const;
 
 const itemContainerStyle = {
   position: 'relative',
-  width: { xs: '100%', sm: '50%' },
+  width: { xs: '100%', sm: '50%', md: '25%' },
   paddingX: 2,
   paddingY: 1,
   alignText: 'center',
@@ -34,13 +35,13 @@ const imageContainerStyle = {
   position: 'relative',
   width: 100,
   height: 100,
-  marginY: 3,
+  marginY: '1rem !important',
   marginX: 'auto',
 
   ...richtextContentStyle,
 } as const;
 
-const ImageTextGrid = (props: ImageTextGridProps) => {
+const ImageTextRow = (props: ImageTextRowProps) => {
   const { items, translations } = props;
 
   const t = useTranslations(translations);
@@ -61,11 +62,11 @@ const ImageTextGrid = (props: ImageTextGridProps) => {
               }}
             />
           </Box>
-          <Typography>{t(item.text)}</Typography>
+          <Typography variant="body2">{t(item.text)}</Typography>
         </Box>
       ))}
     </Box>
   );
 };
 
-export default ImageTextGrid;
+export default ImageTextRow;
diff --git a/components/layout/BaseLayout.tsx b/components/layout/BaseLayout.tsx
index 5da798c6e..c7e47ce48 100644
--- a/components/layout/BaseLayout.tsx
+++ b/components/layout/BaseLayout.tsx
@@ -100,7 +100,10 @@ export default async function BaseLayout({ children, locale }: BaseLayoutProps)
                     )}
                     <Analytics />
                   </body>
-                  <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID || ''} />
+                  <GoogleAnalytics
+                    debugMode={true}
+                    gaId={process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID || ''}
+                  />
                 </StoryblokProvider>
               </ThemeProvider>
             </AppRouterCacheProvider>
diff --git a/components/layout/Header.tsx b/components/layout/Header.tsx
index dc9eb57f8..cc959d018 100644
--- a/components/layout/Header.tsx
+++ b/components/layout/Header.tsx
@@ -13,6 +13,7 @@ import { ISbRichtext } from '@storyblok/react/rsc';
 import { useTranslations } from 'next-intl';
 import Image, { StaticImageData } from 'next/image';
 import { render } from 'storyblok-rich-text-react-renderer';
+import { DesktopPwaBanner } from '../banner/DesktopPwaBanner';
 
 export interface HeaderProps {
   title: string;
@@ -106,6 +107,7 @@ const Header = (props: HeaderProps) => {
 
   return (
     <Container sx={headerContainerStyle}>
+      <DesktopPwaBanner />
       <Box sx={textContainerStyle}>
         <IconButton
           sx={backButtonStyle}
diff --git a/components/layout/HomeHeader.tsx b/components/layout/HomeHeader.tsx
index b64816bdf..53aa4d0b6 100644
--- a/components/layout/HomeHeader.tsx
+++ b/components/layout/HomeHeader.tsx
@@ -11,6 +11,7 @@ import { useTranslations } from 'next-intl';
 import Image, { StaticImageData } from 'next/image';
 import * as React from 'react';
 import { render } from 'storyblok-rich-text-react-renderer';
+import { DesktopPwaBanner } from '../banner/DesktopPwaBanner';
 
 interface HeaderProps {
   title:
@@ -74,6 +75,7 @@ const Header = (props: HeaderProps) => {
 
   return (
     <Container sx={headerContainerStyles}>
+      <DesktopPwaBanner />
       <Box sx={textContainerStyle}>
         <Box sx={textContentStyle}>
           <Typography variant="h1" component="h1" mb={3}>
diff --git a/components/pages/CoursesPage.tsx b/components/pages/CoursesPage.tsx
index 7e8f6abd2..29e16c188 100644
--- a/components/pages/CoursesPage.tsx
+++ b/components/pages/CoursesPage.tsx
@@ -18,7 +18,7 @@ import theme from '@/styles/theme';
 import { Box, Container, Grid, Typography, useMediaQuery } from '@mui/material';
 import { ISbStoryData } from '@storyblok/react/rsc';
 import Cookies from 'js-cookie';
-import { useLocale, useTranslations } from 'next-intl';
+import { useTranslations } from 'next-intl';
 import { useSearchParams } from 'next/navigation';
 import { useCallback, useEffect, useState } from 'react';
 import ResourceCarousel from '../common/ResourceCarousel';
@@ -35,8 +35,6 @@ interface Props {
   shorts: ISbStoryData[];
 }
 export default function CoursesPage({ courseStories, conversations, shorts }: Props) {
-  const locale = useLocale();
-
   const [loadedCourses, setLoadedCourses] = useState<ISbStoryData[] | null>(null);
   const [loadedShorts, setLoadedShorts] = useState<ISbStoryData[] | null>(null);
   const [coursesStarted, setCoursesStarted] = useState<Array<string>>([]);
@@ -60,14 +58,6 @@ export default function CoursesPage({ courseStories, conversations, shorts }: Pr
 
   const t = useTranslations('Courses');
 
-  const slidesPerView = {
-    xs: 1,
-    sm: 2,
-    md: 3,
-    lg: 3,
-    xl: 3,
-  };
-
   const headerProps = {
     title: t('title'),
     introduction: t('introduction'),
diff --git a/components/pages/NotesPage.tsx b/components/pages/NotesPage.tsx
index 010a2a362..c0ff5e9e0 100644
--- a/components/pages/NotesPage.tsx
+++ b/components/pages/NotesPage.tsx
@@ -2,11 +2,12 @@
 
 import { SignUpBanner } from '@/components/banner/SignUpBanner';
 import ImageTextColumn from '@/components/common/ImageTextColumn';
-import { ImageTextItem } from '@/components/common/ImageTextGrid';
+import { ImageTextItem } from '@/components/common/ImageTextRow';
 import WhatsappSubscribeForm from '@/components/forms/WhatsappSubscribeForm';
 import WhatsappUnsubscribeForm from '@/components/forms/WhatsappUnsubscribeForm';
 import Header, { HeaderProps } from '@/components/layout/Header';
 import StoryblokPageSection from '@/components/storyblok/StoryblokPageSection';
+import { useGetSubscriptionsUserQuery } from '@/lib/api';
 import { useTypedSelector } from '@/lib/hooks/store';
 import illustrationChange from '@/public/illustration_change.svg';
 import illustrationChooseTherapist from '@/public/illustration_choose_therapist.svg';
@@ -61,6 +62,10 @@ export default function NotesPage({ story }: Props) {
   const userActiveSubscriptions = useTypedSelector((state) => state.user.activeSubscriptions);
   const userId = useTypedSelector((state) => state.user.id);
 
+  const { data: subscriptions } = useGetSubscriptionsUserQuery(undefined, {
+    skip: !userId,
+  });
+
   useEffect(() => {
     setHasActiveWhatsappSub(hasWhatsappSubscription(userActiveSubscriptions));
   }, [userActiveSubscriptions]);
diff --git a/components/session/SessionHeader.tsx b/components/session/SessionHeader.tsx
index b929874ef..4062fbac0 100644
--- a/components/session/SessionHeader.tsx
+++ b/components/session/SessionHeader.tsx
@@ -8,7 +8,7 @@ import illustrationPerson4Peach from '@/public/illustration_person4_peach.svg';
 import { breadcrumbButtonStyle } from '@/styles/common';
 import theme from '@/styles/theme';
 import CircleIcon from '@mui/icons-material/Circle';
-import { Button, Typography, useMediaQuery } from '@mui/material';
+import { Box, Button, Typography, useMediaQuery } from '@mui/material';
 import { ISbRichtext, ISbStoryData } from '@storyblok/react/rsc';
 import { useLocale, useTranslations } from 'next-intl';
 import { useEffect, useState } from 'react';
@@ -36,6 +36,7 @@ export const SessionHeader = (props: SessionHeaderProps) => {
 
   const t = useTranslations('Courses');
   const locale = useLocale();
+
   const isSmallScreen = useMediaQuery(theme.breakpoints.down('sm'));
 
   const [weekString, setWeekString] = useState<string>('');
@@ -69,21 +70,47 @@ export const SessionHeader = (props: SessionHeaderProps) => {
       imageAlt={headerProps.imageAlt}
       progressStatus={sessionProgress}
     >
-      <Button variant="contained" href="/courses" sx={breadcrumbButtonStyle} size="small">
-        {t('courses')}
-      </Button>
+      <Box
+        component="nav"
+        sx={{
+          display: 'flex',
+          alignItems: 'center',
+          flexWrap: isSmallScreen ? 'wrap' : 'nowrap',
+          overflowX: isSmallScreen ? 'visible' : 'auto',
+          gap: 1,
+        }}
+      >
+        <Button
+          size="small"
+          variant="contained"
+          href="/courses"
+          sx={{
+            ...breadcrumbButtonStyle,
+            whiteSpace: 'nowrap',
+          }}
+        >
+          {t('courses')}
+        </Button>
 
-      <CircleIcon color="error" sx={{ ...dotStyle, marginX: 1 }} />
+        <CircleIcon color="error" sx={dotStyle} />
+
+        <Button
+          size="small"
+          variant="contained"
+          component={i18nLink}
+          href={getDefaultFullSlug(course.full_slug, locale)}
+          sx={{
+            ...breadcrumbButtonStyle,
+            flexShrink: 1,
+            minWidth: 0,
+            whiteSpace: isSmallScreen ? 'normal' : 'nowrap',
+            wordBreak: 'break-word',
+          }}
+        >
+          {courseNameEllipses}
+        </Button>
+      </Box>
 
-      <Button
-        variant="contained"
-        sx={breadcrumbButtonStyle}
-        href={getDefaultFullSlug(course.full_slug, locale)}
-        component={i18nLink}
-        size="small"
-      >
-        {courseNameEllipses}
-      </Button>
       <Typography sx={sessionSubtitleStyle} variant="body2">
         {weekString} -{' '}
         {storyPosition !== undefined ? `${t('session')} ${storyPosition / 10 - 1}` : subtitle}
diff --git a/components/storyblok/StoryblokAccordion.tsx b/components/storyblok/StoryblokAccordion.tsx
index f7cc96393..7c62d5da0 100644
--- a/components/storyblok/StoryblokAccordion.tsx
+++ b/components/storyblok/StoryblokAccordion.tsx
@@ -31,7 +31,6 @@ const containerStyle = {
 
 const accordionDetail = {
   textAlign: 'left',
-  backgroundColor: 'rgba(0, 0, 0, 0.09)',
 } as const;
 
 const themes = {
@@ -42,27 +41,10 @@ const themes = {
         display: 'none',
       },
     },
-    '&.Mui-expanded': {
-      '& .MuiAccordionDetails-root': {
-        borderTop: '1px solid rgba(0, 0, 0, 0.08)',
-      },
-    },
   }, // uses default styling
   secondary: {
     '& .MuiAccordionSummary-expandIconWrapper': { color: 'primary.dark' },
     backgroundColor: 'paleSecondaryLight',
-    '&.MuiAccordion-root': {
-      margin: 0,
-      '&:before': {
-        display: 'none',
-      },
-    },
-    '&.Mui-expanded': {
-      '& .MuiAccordionDetails-root': {
-        backgroundColor: 'rgba(0, 0, 0, 0.09)',
-        borderTop: '1px solid rgba(0, 0, 0, 0.08)',
-      },
-    },
   },
 };
 
@@ -113,6 +95,7 @@ const StoryblokAccordion = (props: StoryblokAccordionProps) => {
     <Box sx={containerStyle} {...storyblokEditable({ _uid, _editable, accordion_items, theme })}>
       {accordion_items.map((ai, i) => (
         <Accordion
+          data-testid="accordion-item"
           id={ai.accordion_id ?? undefined}
           ref={ai.accordion_id === accordionInUrl ? scrollRef : undefined}
           key={`panel${i}`}
diff --git a/components/storyblok/StoryblokTeamMemberCard.tsx b/components/storyblok/StoryblokTeamMemberCard.tsx
index 18f42f8b5..12a74989c 100644
--- a/components/storyblok/StoryblokTeamMemberCard.tsx
+++ b/components/storyblok/StoryblokTeamMemberCard.tsx
@@ -13,6 +13,7 @@ import { useState } from 'react';
 import { render } from 'storyblok-rich-text-react-renderer';
 
 const cardStyle = {
+  textAlign: 'left',
   alignSelf: 'flex-start',
   width: '100%',
   backgroundColor: 'background.default',
@@ -78,7 +79,7 @@ const StoryblokTeamMemberCard = (props: StoryblokTeamMemberCardProps) => {
 
   return (
     <Card
-      data-testid="TeamMemberCard"
+      data-testid="team-member-card"
       sx={cardStyle}
       {...storyblokEditable({
         _uid,
diff --git a/components/storyblok/StoryblokTeamMembersCards.tsx b/components/storyblok/StoryblokTeamMembersCards.tsx
index 36086614d..81be0b235 100644
--- a/components/storyblok/StoryblokTeamMembersCards.tsx
+++ b/components/storyblok/StoryblokTeamMembersCards.tsx
@@ -14,6 +14,7 @@ const cardColumnStyle = {
 
 const cardColumnRowStyle = {
   ...rowStyle,
+  width: '100%',
   marginTop: { xs: 2, md: 5 },
 } as const;
 
@@ -38,7 +39,7 @@ const StoryblokTeamMembersCards = (props: StoryblokTeamMembersCardsProps) => {
       <Box sx={cardColumnStyle}>
         {leftTeamMemberCards.map((teamMemberCard) => (
           <StoryblokTeamMemberCard
-            key={`${teamMemberCard.name}_team_member`}
+            key={`${teamMemberCard._uid}_team_member`}
             {...teamMemberCard}
             cardExpandable={cards_expandable}
           />
@@ -47,7 +48,7 @@ const StoryblokTeamMembersCards = (props: StoryblokTeamMembersCardsProps) => {
       <Box sx={cardColumnStyle}>
         {rightTeamMemberCards.map((teamMemberCard) => (
           <StoryblokTeamMemberCard
-            key={`${teamMemberCard.name}_team_member`}
+            key={`${teamMemberCard._uid}_team_member`}
             {...teamMemberCard}
             cardExpandable={cards_expandable}
           />
diff --git a/components/therapy/TherapyBookingItem.tsx b/components/therapy/TherapyBookingItem.tsx
new file mode 100644
index 000000000..3b8bb44d1
--- /dev/null
+++ b/components/therapy/TherapyBookingItem.tsx
@@ -0,0 +1,420 @@
+'use client';
+
+import { useCancelTherapySessionMutation } from '@/lib/api';
+import {
+  THERAPY_BOOKING_CANCEL_CONFIRMED,
+  THERAPY_BOOKING_CANCEL_DIALOG_CLOSED,
+  THERAPY_BOOKING_CANCEL_DIALOG_OPENED,
+  THERAPY_BOOKING_CANCELLED,
+  THERAPY_BOOKING_CANCELLED_ERROR,
+  THERAPY_BOOKING_COLLAPSED,
+  THERAPY_BOOKING_EXPANDED,
+} from '@/lib/constants/events';
+import { TherapySession } from '@/lib/store/therapySessionsSlice';
+import { getDateLocale } from '@/lib/utils/dates';
+import {
+  formatDateDetails,
+  formatDialogDateTime,
+  formatHeaderDateTime,
+  formatTimeRange,
+} from '@/lib/utils/formatTherapyDates';
+import { getTherapySessionStatus } from '@/lib/utils/getTherapySessions';
+import logEvent from '@/lib/utils/logEvent';
+import {
+  CalendarMonthOutlined,
+  Cancel,
+  CheckCircleOutline,
+  ErrorOutline,
+  ExpandMore,
+} from '@mui/icons-material';
+import {
+  Alert,
+  Box,
+  Button,
+  CircularProgress,
+  Collapse,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  Divider,
+  IconButton,
+  Paper,
+  Stack,
+  Typography,
+} from '@mui/material';
+import { useRollbar } from '@rollbar/react';
+import { isValid } from 'date-fns';
+import { useLocale, useTranslations } from 'next-intl';
+import React, { useEffect, useMemo, useState } from 'react';
+
+interface TherapyBookingItemProps {
+  session: TherapySession;
+}
+
+const paperStyle = {
+  mb: 1.5,
+  borderRadius: '12px',
+  overflow: 'hidden',
+  transition: 'background-color 0.3s, opacity 0.3s, border-left-color 0.3s',
+} as const;
+
+const headerBoxStyle = {
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+  p: '12px 16px',
+  cursor: 'pointer',
+} as const;
+
+const headerIconBoxStyle = {
+  display: 'flex',
+  alignItems: 'center',
+  gap: 1.5,
+} as const;
+
+const expandIconStyle = {
+  transform: 'rotate(0deg)',
+  transition: 'transform 0.3s',
+  color: 'action.active',
+} as const;
+
+const expandedBoxStyle = {
+  p: '16px 20px',
+  pt: 2,
+  textAlign: 'left',
+} as const;
+
+const videoLinkStyle = {
+  display: 'flex',
+  alignItems: 'center',
+  gap: 0.5,
+} as const;
+
+const cancelButtonContainerStyle = {
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'flex-end',
+  pt: 1,
+} as const;
+
+const dialogActionsStyle = {
+  padding: '16px 24px',
+  paddingTop: 0,
+  gap: '8px',
+  button: {
+    padding: '4px 16px',
+    fontSize: '14px !important',
+  },
+} as const;
+
+export default function TherapyBookingItem({ session }: TherapyBookingItemProps) {
+  const t = useTranslations('Therapy.bookingItem');
+  const currentLocaleString = useLocale();
+  const dateLocale = getDateLocale(currentLocaleString);
+  const rollbar = useRollbar();
+
+  const [isExpanded, setIsExpanded] = useState(false);
+  const [isCancelling, setIsCancelling] = useState(false);
+  const [showConfirmDialog, setShowConfirmDialog] = useState(false);
+  const [cancelError, setCancelError] = useState<string | null>(null);
+
+  const [cancelTherapySession] = useCancelTherapySessionMutation();
+
+  const now = new Date();
+  const status = getTherapySessionStatus(session, now);
+
+  const { startDateTime, endDateTime, isValidStartDate, isValidEndDate } = useMemo(() => {
+    const start = new Date(session.startDateTime || 0);
+    const end = new Date(session.endDateTime || 0);
+    return {
+      startDateTime: start,
+      endDateTime: end,
+      isValidStartDate: isValid(start),
+      isValidEndDate: isValid(end),
+    };
+  }, [session.startDateTime, session.endDateTime]);
+
+  useEffect(() => {
+    if (!isValidStartDate) {
+      rollbar.warning('Invalid startDateTime encountered for session rendering', {
+        sessionId: session.id,
+        startDateTime: session.startDateTime,
+      });
+    }
+    if (!isValidEndDate) {
+      rollbar.warning('Invalid endDateTime encountered for session rendering', {
+        sessionId: session.id,
+        endDateTime: session.endDateTime,
+      });
+    }
+  }, [
+    isValidStartDate,
+    isValidEndDate,
+    session.id,
+    session.startDateTime,
+    session.endDateTime,
+    rollbar,
+  ]);
+
+  const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+  const formattedDateDetails = useMemo(
+    () => formatDateDetails(startDateTime, isValidStartDate, dateLocale),
+    [isValidStartDate, startDateTime, dateLocale],
+  );
+
+  const formattedTimeRange = useMemo(
+    () =>
+      formatTimeRange(
+        startDateTime,
+        endDateTime,
+        isValidStartDate,
+        isValidEndDate,
+        dateLocale,
+        userTimezone,
+      ),
+    [isValidStartDate, isValidEndDate, startDateTime, endDateTime, dateLocale, userTimezone],
+  );
+
+  const formattedHeaderDateTime = useMemo(
+    () => formatHeaderDateTime(startDateTime, now, isValidStartDate, dateLocale, status),
+    [isValidStartDate, startDateTime, now, dateLocale, status],
+  );
+
+  const handleToggleExpand = () => {
+    const newState = !isExpanded;
+    setIsExpanded(newState);
+    const eventData = { sessionId: session.id, status: status };
+    logEvent(newState ? THERAPY_BOOKING_EXPANDED : THERAPY_BOOKING_COLLAPSED, eventData);
+  };
+
+  const handleCancelClick = (event: React.MouseEvent) => {
+    event.stopPropagation();
+    if (status !== 'upcoming' || isCancelling) return;
+    setCancelError(null);
+    setShowConfirmDialog(true);
+    logEvent(THERAPY_BOOKING_CANCEL_DIALOG_OPENED, { sessionId: session.id });
+  };
+
+  const handleCloseConfirmDialog = () => {
+    setShowConfirmDialog(false);
+    logEvent(THERAPY_BOOKING_CANCEL_DIALOG_CLOSED, { sessionId: session.id });
+  };
+
+  const handleConfirmCancel = async () => {
+    setShowConfirmDialog(false);
+    if (status !== 'upcoming' || !session.id) return;
+
+    setIsCancelling(true);
+    setCancelError(null);
+    logEvent(THERAPY_BOOKING_CANCEL_CONFIRMED, { sessionId: session.id });
+
+    try {
+      await cancelTherapySession({ id: session.id }).unwrap();
+      logEvent(THERAPY_BOOKING_CANCELLED, { sessionId: session.id });
+      window.scrollTo(0, 0);
+    } catch (err: any) {
+      const errorMessage = err?.data?.message || t('cancelErrorGeneric');
+      logEvent(THERAPY_BOOKING_CANCELLED_ERROR, { sessionId: session.id, error: err });
+      rollbar.error('Therapy session cancellation error', err, { sessionId: session.id });
+      setCancelError(errorMessage);
+    } finally {
+      setIsCancelling(false);
+    }
+  };
+
+  let IconComponent = CalendarMonthOutlined;
+  let statusStyles = {};
+  let headerTitle = '';
+
+  switch (status) {
+    case 'upcoming':
+      IconComponent = CalendarMonthOutlined;
+      headerTitle = t('upcomingSessionTitle');
+      statusStyles = {
+        borderLeft: '4px solid',
+        borderLeftColor: 'secondary.dark',
+        backgroundColor: 'background.default',
+      };
+      break;
+    case 'cancelled':
+      IconComponent = ErrorOutline;
+      headerTitle = t('cancelledSessionTitle');
+      statusStyles = { opacity: 0.7, backgroundColor: 'action.disabledBackground' };
+      break;
+    case 'past':
+    default:
+      IconComponent = CheckCircleOutline;
+      headerTitle = t('pastSessionTitle');
+      statusStyles = { backgroundColor: 'background.default' };
+      break;
+  }
+
+  return (
+    <>
+      <Paper
+        elevation={0}
+        sx={{
+          ...paperStyle,
+          ...statusStyles,
+        }}
+        data-testid="therapy-booking-item"
+      >
+        <Box
+          sx={headerBoxStyle}
+          onClick={handleToggleExpand}
+          aria-expanded={isExpanded}
+          aria-controls={`booking-details-${session.id}`}
+        >
+          <Box sx={headerIconBoxStyle}>
+            <IconComponent
+              sx={{ color: status === 'cancelled' ? 'action.disabled' : 'secondary.dark' }}
+            />
+            <Box>
+              <Typography component="div" fontWeight="medium">
+                {headerTitle}
+              </Typography>
+              <Typography
+                variant="body2"
+                color={!isValidStartDate ? 'error.main' : 'text.secondary'}
+              >
+                {formattedHeaderDateTime ? (
+                  formattedHeaderDateTime
+                ) : (
+                  <>
+                    {t('invalidDate')}{' '}
+                    <ErrorOutline
+                      fontSize="inherit"
+                      sx={{ verticalAlign: 'text-bottom', ml: 0.5 }}
+                    />
+                  </>
+                )}{' '}
+                {!isValidStartDate && !formattedHeaderDateTime && (
+                  <ErrorOutline fontSize="inherit" sx={{ verticalAlign: 'text-bottom', ml: 0.5 }} />
+                )}
+              </Typography>
+            </Box>
+          </Box>
+          <IconButton
+            size="small"
+            aria-label={isExpanded ? t('collapse') : t('expand')}
+            sx={{ pointerEvents: 'none' }}
+          >
+            <ExpandMore
+              sx={{
+                ...expandIconStyle,
+                transform: isExpanded ? 'rotate(180deg)' : 'rotate(0deg)',
+              }}
+            />
+          </IconButton>
+        </Box>
+
+        <Collapse in={isExpanded} timeout="auto" unmountOnExit>
+          <Divider />
+          <Box sx={expandedBoxStyle}>
+            <Stack spacing={1.5}>
+              <Typography variant="body2" color={!isValidStartDate ? 'error.main' : 'inherit'}>
+                <strong>{t('dateLabel')}:</strong>{' '}
+                {formattedDateDetails ? (
+                  formattedDateDetails
+                ) : (
+                  <>
+                    {t('invalidDate')}{' '}
+                    <ErrorOutline
+                      fontSize="inherit"
+                      sx={{ verticalAlign: 'text-bottom', ml: 0.5 }}
+                    />
+                  </>
+                )}{' '}
+                {!isValidStartDate && !formattedDateDetails && (
+                  <ErrorOutline fontSize="inherit" sx={{ verticalAlign: 'text-bottom', ml: 0.5 }} />
+                )}
+              </Typography>
+              <Typography
+                variant="body2"
+                color={!isValidStartDate || !isValidEndDate ? 'error.main' : 'inherit'}
+              >
+                <strong>{t('timeLabel')}:</strong>{' '}
+                {formattedTimeRange ? (
+                  formattedTimeRange
+                ) : (
+                  <>
+                    {t('invalidDate')}{' '}
+                    <ErrorOutline
+                      fontSize="inherit"
+                      sx={{ verticalAlign: 'text-bottom', ml: 0.5 }}
+                    />
+                  </>
+                )}{' '}
+                {(!isValidStartDate || !isValidEndDate) && !formattedTimeRange && (
+                  <ErrorOutline fontSize="inherit" sx={{ verticalAlign: 'text-bottom', ml: 0.5 }} />
+                )}
+              </Typography>
+              <Typography variant="body2">
+                <strong>{t('therapistLabel')}:</strong>{' '}
+                {session.serviceProviderName || t('notAssigned')}
+              </Typography>
+              <Typography variant="body2" sx={videoLinkStyle}>
+                <strong>{t('videoLinkLabel')}:</strong> {t('videoLink')}
+              </Typography>
+              {status === 'upcoming' && (
+                <Box sx={cancelButtonContainerStyle}>
+                  {cancelError && (
+                    <Alert severity="error" sx={{ mb: 1.5, width: '100%' }}>
+                      {cancelError}
+                    </Alert>
+                  )}
+                  <Button
+                    variant="outlined"
+                    color="secondary"
+                    size="small"
+                    sx={{ fontWeight: 500 }}
+                    onClick={handleCancelClick}
+                    disabled={!session.id || isCancelling || status !== 'upcoming'}
+                    startIcon={
+                      isCancelling ? (
+                        <CircularProgress size={16} color="secondary" />
+                      ) : (
+                        <Cancel color="secondary" />
+                      )
+                    }
+                  >
+                    {t('cancelButton')}
+                  </Button>
+                </Box>
+              )}
+            </Stack>
+          </Box>
+        </Collapse>
+      </Paper>
+
+      <Dialog
+        open={showConfirmDialog}
+        onClose={handleCloseConfirmDialog}
+        aria-labelledby="cancel-dialog-title"
+        aria-describedby="cancel-dialog-description"
+      >
+        <DialogTitle id="cancel-dialog-title">{t('cancelDialog.title')}</DialogTitle>
+        <DialogContent>
+          <DialogContentText id="cancel-dialog-description">
+            {t('cancelDialog.description', {
+              dateTime:
+                formatDialogDateTime(startDateTime, isValidStartDate, dateLocale) ||
+                t('invalidDate'),
+            })}
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions sx={dialogActionsStyle}>
+          <Button variant="outlined" color="secondary" onClick={handleCloseConfirmDialog}>
+            {t('cancelDialog.keepButton')}
+          </Button>
+          <Button variant="contained" color="secondary" onClick={handleConfirmCancel} autoFocus>
+            {t('cancelDialog.confirmButton')}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </>
+  );
+}
diff --git a/components/therapy/TherapyBookings.tsx b/components/therapy/TherapyBookings.tsx
new file mode 100644
index 000000000..26ec2af0c
--- /dev/null
+++ b/components/therapy/TherapyBookings.tsx
@@ -0,0 +1,116 @@
+'use client';
+
+import { useGetTherapySessionsQuery } from '@/lib/api';
+import { THERAPY_BOOKINGS_LOAD_ERROR, THERAPY_BOOKINGS_VIEWED } from '@/lib/constants/events';
+import { useTypedSelector } from '@/lib/hooks/store';
+import { PartnerAccess } from '@/lib/store/partnerAccessSlice';
+import { sortTherapyBookings } from '@/lib/utils/getTherapySessions';
+import logEvent from '@/lib/utils/logEvent';
+import { Alert, Box, CircularProgress, Paper, Stack, Typography } from '@mui/material';
+import { useRollbar } from '@rollbar/react';
+import { useTranslations } from 'next-intl';
+import { useEffect, useMemo } from 'react';
+import TherapyBookingItem from './TherapyBookingItem';
+
+interface TherapyBookingsProps {
+  partnerAccess: PartnerAccess;
+}
+
+const containerStyle = {
+  maxWidth: '660px',
+  width: '100%',
+} as const;
+
+const loadingContainerStyle = {
+  display: 'flex',
+  justifyContent: 'center',
+  alignItems: 'center',
+  p: 4,
+} as const;
+
+const noBookingsPaperStyle = {
+  p: 3,
+  textAlign: 'center',
+  backgroundColor: 'background.default',
+  borderRadius: '12px',
+} as const;
+
+export default function TherapyBookings({ partnerAccess }: TherapyBookingsProps) {
+  const t = useTranslations('Therapy.therapyBookings');
+  const rollbar = useRollbar();
+
+  const { isLoading, isError, error: loadError } = useGetTherapySessionsQuery();
+
+  const userId = useTypedSelector((state) => state.user.id);
+  const sessions = useTypedSelector((state) => state.therapySessions);
+
+  const isLoggedIn = Boolean(userId);
+
+  useEffect(() => {
+    if (isLoggedIn && !isLoading && !isError && sessions) {
+      logEvent(THERAPY_BOOKINGS_VIEWED, { count: sessions.length });
+    }
+  }, [isLoggedIn, isLoading, isError, sessions]);
+
+  useEffect(() => {
+    if (isError && loadError) {
+      logEvent(THERAPY_BOOKINGS_LOAD_ERROR, { error: loadError });
+      rollbar.error('Error loading therapy sessions', loadError);
+    }
+  }, [isError, loadError, rollbar]);
+
+  const { sortedBookings, totalUpcomingSessions } = useMemo(() => {
+    if (!sessions) return { sortedBookings: [], totalUpcomingSessions: 0 };
+
+    const now = new Date();
+    const { sorted, upcomingCount } = sortTherapyBookings(sessions, now);
+    return { sortedBookings: sorted, totalUpcomingSessions: upcomingCount };
+  }, [sessions]);
+
+  return (
+    <Box sx={containerStyle}>
+      <Typography variant="h2" component="h2" gutterBottom>
+        {t('header')}
+      </Typography>
+      <Typography mb={'2rem !important'}>
+        {partnerAccess.therapySessionsRemaining > 0
+          ? t.rich('bookingSummary', {
+              remainingTotal: () => (
+                <strong id="therapy-sessions-remaining">
+                  {partnerAccess.therapySessionsRemaining}
+                </strong>
+              ),
+              upcomingTotal: () => (
+                <strong id="therapy-sessions-upcoming">{totalUpcomingSessions}</strong>
+              ),
+            })
+          : t('noBookingSummary')}
+      </Typography>
+      {isLoading && (
+        <Box sx={loadingContainerStyle}>
+          <CircularProgress />
+        </Box>
+      )}
+
+      {isError && !isLoading && (
+        <Alert severity="error" sx={{ mt: 2 }}>
+          {t('loadError')}
+        </Alert>
+      )}
+
+      {!isLoading && !isError && sortedBookings.length === 0 && (
+        <Paper elevation={0} sx={noBookingsPaperStyle}>
+          <Typography>{t('noBookings')}</Typography>
+        </Paper>
+      )}
+
+      {!isLoading && !isError && sortedBookings.length > 0 && (
+        <Stack spacing={0}>
+          {sortedBookings.map((session) => (
+            <TherapyBookingItem key={session.id} session={session} />
+          ))}
+        </Stack>
+      )}
+    </Box>
+  );
+}
diff --git a/cypress/integration/tests/conversations.cy.tsx b/cypress/integration/tests/conversations.cy.tsx
new file mode 100644
index 000000000..889580848
--- /dev/null
+++ b/cypress/integration/tests/conversations.cy.tsx
@@ -0,0 +1,48 @@
+describe('Conversations Flow', () => {
+  const email = `cypresstestemail+${Date.now()}@chayn.co`;
+  const password = 'testtesttest';
+
+  before(() => {
+    cy.cleanUpTestState();
+    cy.createUser({ emailInput: email, passwordInput: password });
+  });
+
+  it('Should allow a user to navigate to Courses, select a conversation, log in, play audio, and submit feedback.', () => {
+    // User visits the home page
+    cy.visit('/');
+
+    // User clicks on Courses
+    cy.get(`[qa-id=secondary-nav-courses-button]`, { timeout: 10000 }).should('exist').click();
+
+    // User clicks on a conversation
+    cy.contains('Stolen faces: How fake images leave real scars', {
+      timeout: 10000,
+    })
+      .should('exist')
+      .click();
+
+    // User is prompted to login
+    cy.get('a[qa-id="dialogLoginButton"]').click();
+
+    // User logs in
+    cy.get('#email').type(email);
+    cy.get('#password').type(password);
+    cy.get('button[type=submit]').click();
+    cy.wait(2000); // wait to ensure user is redirected to the session
+
+    // User plays the conversation
+    cy.get('audio')
+      .should('exist')
+      .invoke('attr', 'src')
+      .then((audiofile) => {
+        const audio = new Audio(audiofile);
+        audio.playbackRate = 6;
+        audio.play();
+      });
+    cy.wait(2000); // wait to ensure user plays the session
+  });
+
+  after(() => {
+    cy.logout();
+  });
+});
diff --git a/cypress/integration/tests/meet-the-team.cy.tsx b/cypress/integration/tests/meet-the-team.cy.tsx
index 566172d13..8750bdfce 100644
--- a/cypress/integration/tests/meet-the-team.cy.tsx
+++ b/cypress/integration/tests/meet-the-team.cy.tsx
@@ -23,7 +23,7 @@ describe('Meet the team page should', () => {
     const checkCard = ({ name, title, languages, image, description, closed }: CheckCardProps) => {
       const expandIconTag = 'svg[data-testid="KeyboardArrowDownIcon"]';
       const cardContainer = cy
-        .get(`div[data-testid="TeamMemberCard"]:has(img[alt="${image.alt}"])`)
+        .get(`div[data-testid="team-member-card"]:has(img[alt="${image.alt}"])`)
         .first();
       cardContainer.within(() => {
         cy.get('h3').should('contain', name);
@@ -77,7 +77,7 @@ describe('Meet the team page should', () => {
       cy.get('h2').should('contain', 'Supporting team');
       cy.get('p').should(
         'contain',
-        'Our wider team has helped us edit, write, and record our course videos, and some of them also provide support over 1-1 chat. They bring with them a wealth of knowledge and life experience, and have been trained by Chayn. You may even come across someone who is based in the same place as you!',
+        'Our wider team has helped us edit, write, and record our course videos, and some of them also provide support over our messaging service. They bring with them a wealth of knowledge and life experience, and have been trained by Chayn. You may even come across someone who is based in the same place as you!',
       );
       cy.fixture('meet-the-team').then((data: { supporting: CheckCardProps[] }) => {
         data.supporting.forEach((supportingMember) => {
diff --git a/cypress/integration/tests/partner-content-access.cy.tsx b/cypress/integration/tests/partner-content-access.cy.tsx
new file mode 100644
index 000000000..491c6d1bc
--- /dev/null
+++ b/cypress/integration/tests/partner-content-access.cy.tsx
@@ -0,0 +1,41 @@
+describe('users signing up through partner channels can properly access partner-specific course content', () => {
+  let username_partner = `cypresstestemailpartner+${Date.now()}@chayn.co`;
+  let username_regular = `cypresstestemailRegular+${Date.now()}@chayn.co`;
+  const password = 'testtesttest';
+
+  const bumbleSpecificCourseName = /Dating, boundaries, and Relationships/i;
+
+  beforeEach(() => {
+    cy.cleanUpTestState();
+  });
+
+  it('Bumble-specific courses and resources exclusively exist on the /courses page for Bumble users.', () => {
+    //log in as a Bumble user and see if the course appears
+    cy.visit('/welcome/bumble');
+    cy.get('a', { timeout: 8000 }).contains('Get started').click();
+    cy.wait(2000); // waiting for dom to rerender
+    cy.get('h2', { timeout: 8000 }).should('contain', 'Create account');
+    cy.get('#name').type('Cypress test');
+    cy.get('#email').type(username_partner);
+    cy.get('#password').type('testpassword');
+    cy.get('button[type="submit"]').contains('Create account').click();
+    cy.wait(4000); // Waiting for dom to rerender
+
+    cy.visit('/courses');
+
+    cy.wait(4000); // Waiting for dom to rerender
+    cy.get('h3').contains(bumbleSpecificCourseName).should('exist');
+  });
+
+  it('Non-parter users should not see Partner-specific courses and resources', () => {
+    cy.createUser({ emailInput: username_regular, passwordInput: password });
+    cy.logInWithEmailAndPassword(username_regular, password);
+    cy.visit('/courses');
+    cy.wait(4000); // Waiting for dom to rerender
+    cy.get('h3').contains(bumbleSpecificCourseName).should('not.exist');
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+});
diff --git a/cypress/integration/tests/therapy-usage.cy.tsx b/cypress/integration/tests/therapy-usage.cy.tsx
index 2915be09d..b78981d03 100644
--- a/cypress/integration/tests/therapy-usage.cy.tsx
+++ b/cypress/integration/tests/therapy-usage.cy.tsx
@@ -1,47 +1,292 @@
 describe('Therapy Usage', () => {
   let accessCode = ''; //intialise access code variable
-  const newUserEmail = `cypresstestemail+${Date.now()}@chayn.co`;
+  const newUserEmail = `cypresstestuser+${Date.now()}@chayn.co`;
   const password = 'testpassword';
 
-  describe('A new partner user should be able to apply the access code', () => {
-    before(() => {
-      // create a partner access code with therapy
-      cy.logInWithEmailAndPassword(
-        Cypress.env('CYPRESS_BUMBLE_PARTNER_ADMIN_EMAIL'),
-        Cypress.env('CYPRESS_BUMBLE_PARTNER_ADMIN_PASSWORD'),
-      );
-      cy.visit('/partner-admin/create-access-code');
-      cy.get('input[type="radio"]').should('exist').check('therapy'); //select radio button on form
-      cy.get('button[type="submit"]').contains('Create access code').click(); // submit form to create access code
-      cy.get('#access-code')
-        .should('exist') //wait for result to exist in dom then get the access code
-        .then((elem) => {
-          //get the access code
-          accessCode = elem.text();
-        });
-      cy.logout();
-    });
-
-    it('Log in as a user and apply code', () => {
-      cy.cleanUpTestState();
-      cy.createUser({
-        emailInput: newUserEmail,
-        passwordInput: password,
+  before(() => {
+    // create a partner access code with therapy
+    cy.logInWithEmailAndPassword(
+      Cypress.env('CYPRESS_BUMBLE_PARTNER_ADMIN_EMAIL'),
+      Cypress.env('CYPRESS_BUMBLE_PARTNER_ADMIN_PASSWORD'),
+    );
+    cy.visit('/partner-admin/create-access-code');
+    cy.get('input[type="radio"]').should('exist').check('therapy'); //select radio button on form
+    cy.get('button[type="submit"]').contains('Create access code').click(); // submit form to create access code
+    cy.get('#access-code')
+      .should('exist') //wait for result to exist in dom then get the access code
+      .then((elem) => {
+        //get the access code
+        accessCode = elem.text();
       });
-      cy.logInWithEmailAndPassword(newUserEmail, password); //log in to test user
-      cy.visit('/welcome/bumble');
-      cy.get('button#user-menu-button').should('exist').click(); //check user menu exists and access it
-      cy.get('a').contains('Apply a code').should('exist').click(); //go to the apply code page
-      cy.get('input#accessCode').should('exist').click().type(accessCode); // populate the access code field
-      cy.get('button[type="submit"]').contains('Apply code').click(); // submit form to add access code
-      cy.get('p').contains('A Bumble code was applied to your account!').should('exist'); //check form submitted successfully
+    cy.logout();
+  });
+
+  after(() => {
+    cy.logout();
+  });
+
+  it('Log in as a user and apply code', () => {
+    cy.cleanUpTestState();
+    cy.createUser({
+      emailInput: newUserEmail,
+      passwordInput: password,
     });
-    it('Check therapy is available and start to book a session', () => {
-      cy.visit('/welcome/bumble');
-      cy.get(`[qa-id=secondary-nav-therapy-button]`).should('exist').click(); //Find therapy button and click
-      cy.get('#therapy-sessions-remaining').should('have.text', '6'); //check number of therapy sessions is 6
-      cy.get('button').contains('Begin booking').should('exist').click(); //begin booking
-      cy.get('iframe[title="Booking widget"]').should('exist'); //check it worked
+    cy.logInWithEmailAndPassword(newUserEmail, password); //log in to test user
+    cy.visit('/welcome/bumble');
+    cy.get('button#user-menu-button').should('exist').click(); //check user menu exists and access it
+    cy.get('a').contains('Apply a code').should('exist').click(); //go to the apply code page
+    cy.get('input#accessCode').should('exist').click().type(accessCode); // populate the access code field
+    cy.get('button[type="submit"]').contains('Apply code').click(); // submit form to add access code
+    cy.get('p').contains('A Bumble code was applied to your account!').should('exist'); //check form submitted successfully
+  });
+
+  it('Should load the therapy page and display main content sections', () => {
+    cy.visit('/therapy/book-session');
+    // Check Header elements
+    cy.get('h1').should('be.visible').and('have.text', 'Book therapy'); // Assuming H1 is the main title
+
+    // Check Booking Button state (should be enabled if sessions > 0)
+    cy.get('button').contains('Begin booking').should('be.visible').and('be.enabled');
+
+    // Check Sessions Remaining
+    cy.get('#therapy-sessions-remaining').should('be.visible').and('contain.text', '6'); // Check for '6' sessions
+
+    // Check Booking Steps Section Title
+    cy.get('#booking-steps-section').within(() => {
+      cy.get('h2').should('be.visible').and('have.text', 'How booking works');
     });
+
+    // Check Therapist Section
+    cy.get('h2').contains('Meet our therapists').should('be.visible');
+    cy.get('[data-testid="team-member-card"]').should('exist');
+
+    // Check FAQs Section
+    cy.get('main').contains('h2', 'More about the therapy').should('be.visible');
+    cy.get('[data-testid="accordion-item"]').should('exist');
+
+    // Check initial state - modal should be closed
+    cy.get('.MuiModal-root').should('not.exist');
+  });
+
+  it('Should open the booking modal and display the Simplybook widget iframe', () => {
+    cy.visit('/therapy/book-session');
+
+    cy.get('button').contains('Begin booking').click();
+
+    // Check modal is open and visible
+    cy.get('.MuiModal-root').should('be.visible');
+    cy.get('button[aria-label="Close booking widget"]').should('be.visible');
+    cy.get('.MuiModal-root').find('#simplybook-widget-container').should('be.visible');
+
+    // Check iframe exists within the container (indicates widget loaded successfully)
+    cy.get('#simplybook-widget-container')
+      .find('iframe.sb-widget-iframe', { timeout: 10000 })
+      .should('be.visible');
+  });
+
+  it('Should display a therapy booking item with all relevant data', () => {
+    cy.visit('/therapy/book-session');
+
+    cy.intercept('GET', '/api/v1/therapy-session', [
+      {
+        id: 'test-session-1',
+        action: 'NEW_BOOKING',
+        clientTimezone: 'Europe/London',
+        serviceName: 'Individual Therapy Session',
+        serviceProviderName: 'Test Therapist',
+        startDateTime: new Date(Date.now() + 86400000).toISOString(), // Tomorrow
+        endDateTime: new Date(Date.now() + 90000000).toISOString(),
+        cancelledAt: null,
+        rescheduledFrom: null,
+        completedAt: null,
+        partnerAccessId: 'test-access-id',
+      },
+    ]).as('getTherapySessions');
+    cy.reload();
+    cy.wait('@getTherapySessions');
+
+    cy.get('[data-testid="therapy-booking-item"]').should('exist');
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Upcoming therapy session')
+      .should('be.visible');
+    cy.get('[data-testid="therapy-booking-item"]').click();
+    cy.get('[data-testid="therapy-booking-item"]').contains('Test Therapist').should('be.visible');
+  });
+
+  it('Should allow expanding and collapsing a therapy booking item and display details', () => {
+    cy.visit('/therapy/book-session');
+
+    cy.intercept('GET', '/api/v1/therapy-session', [
+      {
+        id: 'test-session-1',
+        action: 'NEW_BOOKING',
+        clientTimezone: 'Europe/London',
+        serviceName: 'Individual Therapy Session',
+        serviceProviderName: 'Test Therapist',
+        startDateTime: new Date(Date.now() + 86400000).toISOString(), // Tomorrow
+        endDateTime: new Date(Date.now() + 90000000).toISOString(),
+        cancelledAt: null,
+        rescheduledFrom: null,
+        completedAt: null,
+        partnerAccessId: 'test-access-id',
+      },
+    ]).as('getTherapySessions');
+    cy.reload();
+    cy.wait('@getTherapySessions');
+
+    cy.get('[data-testid="therapy-booking-item"]').should('exist').click();
+    cy.get('[data-testid="therapy-booking-item"]').contains('Date:').should('be.visible');
+    cy.get('[data-testid="therapy-booking-item"]').contains('Time:').should('be.visible');
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Therapist: Test Therapist')
+      .should('be.visible');
+    cy.get('[data-testid="therapy-booking-item"] > div[aria-expanded="true"]').click();
+    cy.get('[data-testid="therapy-booking-item"]').contains('Date:').should('not.be.visible');
+  });
+
+  it('Should open and close the cancel confirmation dialog for an Upcoming therapy session', () => {
+    cy.visit('/therapy/book-session');
+
+    cy.intercept('GET', '/api/v1/therapy-session', [
+      {
+        id: 'upcoming-session',
+        action: 'NEW_BOOKING',
+        clientTimezone: 'Europe/London',
+        serviceName: 'Individual Therapy Session',
+        serviceProviderName: 'Test Therapist',
+        startDateTime: new Date(Date.now() + 86400000).toISOString(), // Tomorrow
+        endDateTime: new Date(Date.now() + 90000000).toISOString(),
+        cancelledAt: null,
+        rescheduledFrom: null,
+        completedAt: null,
+        partnerAccessId: 'test-access-id',
+      },
+    ]).as('getTherapySessions');
+
+    cy.intercept('PATCH', '/api/v1/therapy-session/upcoming-session/cancel', {
+      id: 'upcoming-session',
+      action: 'CANCELLED_BOOKING',
+      clientTimezone: 'Europe/London',
+      serviceName: 'Individual Therapy Session',
+      serviceProviderName: 'Test Therapist',
+      startDateTime: new Date(Date.now() + 86400000).toISOString(), // Tomorrow
+      endDateTime: new Date(Date.now() + 90000000).toISOString(),
+      cancelledAt: new Date(Date.now()).toISOString(),
+      rescheduledFrom: null,
+      completedAt: null,
+      partnerAccessId: 'test-access-id',
+    }).as('cancelTherapySession');
+
+    cy.reload();
+    cy.wait('@getTherapySessions');
+
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Upcoming therapy session')
+      .should('exist')
+      .click();
+    cy.get('[data-testid="therapy-booking-item"]').find('button').contains('Cancel').click();
+    cy.get('[role="dialog"]').should('be.visible').and('contain', 'Confirm Cancellation');
+    cy.get('[role="dialog"]').find('button').contains('Keep Session').click();
+    cy.get('[role="dialog"]').should('not.exist');
+
+    cy.get('[data-testid="therapy-booking-item"]').contains('Upcoming therapy session').click();
+    cy.get('[data-testid="therapy-booking-item"]').find('button').contains('Cancel').click();
+    cy.get('[role="dialog"]').should('be.visible').and('contain', 'Confirm Cancellation');
+    cy.get('[role="dialog"]').find('button').contains('Cancel Session').click();
+
+    cy.wait('@cancelTherapySession').its('response.statusCode').should('eq', 200);
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Cancelled session')
+      .should('be.visible');
+  });
+
+  it('Should not show cancel button for past or cancelled sessions', () => {
+    cy.visit('/therapy/book-session');
+
+    cy.intercept('GET', '/api/v1/therapy-session', [
+      {
+        id: 'past-session',
+        action: 'COMPLETED_BOOKING',
+        clientTimezone: 'Europe/London',
+        serviceName: 'Individual Therapy Session',
+        serviceProviderName: 'Past Therapist',
+        startDateTime: new Date(Date.now() - 86400000).toISOString(), // Yesterday
+        endDateTime: new Date(Date.now() - 82800000).toISOString(),
+        cancelledAt: null,
+        rescheduledFrom: null,
+        completedAt: new Date(Date.now() - 43200000).toISOString(),
+        partnerAccessId: 'past-access-id',
+      },
+      {
+        id: 'cancelled-session',
+        action: 'CANCELLED_BOOKING',
+        clientTimezone: 'Europe/London',
+        serviceName: 'Individual Therapy Session',
+        serviceProviderName: 'Cancelled Therapist',
+        startDateTime: new Date(Date.now() + 172800000).toISOString(), // In two days
+        endDateTime: new Date(Date.now() + 176400000).toISOString(),
+        cancelledAt: new Date(Date.now() + 86400000).toISOString(),
+        rescheduledFrom: null,
+        completedAt: null,
+        partnerAccessId: 'cancelled-access-id',
+      },
+    ]).as('getTherapySessions');
+
+    cy.reload();
+    cy.wait('@getTherapySessions');
+
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Past therapy session')
+      .should('exist')
+      .click();
+    cy.get('[data-testid="therapy-booking-item"]')
+      .find('button')
+      .contains('Cancel')
+      .should('not.exist');
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Cancelled session')
+      .should('exist')
+      .click();
+    cy.get('[data-testid="therapy-booking-item"]')
+      .find('button')
+      .contains('Cancel')
+      .should('not.exist');
+  });
+
+  it('Should display an error message if cancelling a session fails', () => {
+    cy.visit('/therapy/book-session');
+
+    cy.intercept('GET', '/api/v1/therapy-session', [
+      {
+        id: 'upcoming-session-with-error',
+        action: 'NEW_BOOKING',
+        clientTimezone: 'Europe/London',
+        serviceName: 'Individual Therapy Session',
+        serviceProviderName: 'Error Therapist',
+        startDateTime: new Date(Date.now() + 86400000).toISOString(), // Tomorrow
+        endDateTime: new Date(Date.now() + 90000000).toISOString(),
+        cancelledAt: null,
+        rescheduledFrom: null,
+        completedAt: null,
+        partnerAccessId: 'error-access-id',
+      },
+    ]).as('getTherapySessionsWithError');
+    cy.reload();
+    cy.wait('@getTherapySessionsWithError');
+
+    cy.intercept('PATCH', '/api/v1/therapy-session/upcoming-session-with-error/cancel', {
+      statusCode: 500,
+      body: { message: 'Failed to cancel session' },
+    }).as('cancelTherapySessionError');
+
+    cy.get('[data-testid="therapy-booking-item"]').contains('Upcoming therapy session').click();
+    cy.get('[data-testid="therapy-booking-item"]').find('button').contains('Cancel').click();
+    cy.get('[role="dialog"]').should('be.visible').and('contain', 'Confirm Cancellation');
+    cy.get('[role="dialog"]').find('button').contains('Cancel Session').click();
+
+    cy.wait('@cancelTherapySessionError');
+    cy.get('[data-testid="therapy-booking-item"]')
+      .contains('Failed to cancel session')
+      .should('be.visible');
   });
 });
diff --git a/i18n/messages/account/pt.json b/i18n/messages/account/pt.json
index 0c522e21d..0261c9905 100644
--- a/i18n/messages/account/pt.json
+++ b/i18n/messages/account/pt.json
@@ -11,7 +11,7 @@
       "formSuccess": {
         "success": "Um código Bumble foi aplicado à sua conta!",
         "successLine2": "Seu acesso com o Bumble permite:",
-        "liveChat": "Mensageria com a equipe Bloom",
+        "liveChat": "Bate-papo com a equipe Bloom",
         "therapy": "{therapySessionsRemaining} sessões de terapia",
         "courses": "Cursos autodirigidos"
       },
diff --git a/i18n/messages/auth/de.json b/i18n/messages/auth/de.json
index 05bd1c86d..c6ff829da 100644
--- a/i18n/messages/auth/de.json
+++ b/i18n/messages/auth/de.json
@@ -48,7 +48,8 @@
         "weakPassword": "Dein Passwort muss etwas länger sein, damit es sicherer ist.",
         "emailAlreadyInUse": "Diese Email ist bereits bei Bloom registriert, bitte geh zum <loginLink>Login-Bereich</loginLink> um fortzufahren.",
         "invalidCode": "Dieser Link zum Zurücksetzen des Passworts ist ungültig. Bitte <resetLink>starte den Prozess neu</resetLink> und versuche es noch einmal. ",
-        "expiredCode": "Dieser Link zum Zurücksetzen des Passworts ist abgelaufen. Bitte <resetLink>starte den Vorgang neu</resetLink> und versuche es noch einmal. "
+        "expiredCode": "Dieser Link zum Zurücksetzen des Passworts ist abgelaufen. Bitte <resetLink>starte den Vorgang neu</resetLink> und versuche es noch einmal. ",
+        "getUserError": "Beim Abrufen deines Kontos ist ein Fehler aufgetreten. Versuche es später nochmal und <contactLink>kontaktiere das Bloom-Team</contactLink>, falls dieser Fehler weiterhin auftritt."
       },
       "phoneNumberLabel": "Telefonnummer",
       "verificationCodeLabel": "Verifizierungscode",
diff --git a/i18n/messages/auth/en.json b/i18n/messages/auth/en.json
index 93925a9cd..ac0535b8d 100644
--- a/i18n/messages/auth/en.json
+++ b/i18n/messages/auth/en.json
@@ -48,7 +48,8 @@
         "weakPassword": "Your password needs to be a little longer, so it's more secure.",
         "emailAlreadyInUse": "This email is already registered with Bloom, go to <loginLink>login</loginLink> to continue.",
         "invalidCode": "This reset password link is invalid, please <resetLink>restart the process</resetLink> and try again.",
-        "expiredCode": "This reset password link is now expired, please <resetLink>restart the process</resetLink> and try again."
+        "expiredCode": "This reset password link is now expired, please <resetLink>restart the process</resetLink> and try again.",
+        "getUserError": "There was an error retrieving your account. Try again later and <contactLink>message the Bloom team</contactLink> if you're still getting this error."
       },
       "phoneNumberLabel": "Phone Number",
       "verificationCodeLabel": "Verification Code",
diff --git a/i18n/messages/auth/es.json b/i18n/messages/auth/es.json
index 1d807009a..f4278239b 100644
--- a/i18n/messages/auth/es.json
+++ b/i18n/messages/auth/es.json
@@ -48,7 +48,8 @@
         "weakPassword": "Tu contraseña necesita ser un poquito más larga, así será más segura.",
         "emailAlreadyInUse": "Este email ya está registrado en Bloom. Ve al <loginLink>inicio de sesión</loginLink> para continuar.",
         "invalidCode": "Este link de recuperación de contraseña no es válido. Por favor <resetLink>comienza de nuevo el proceso</resetLink> e inténtalo otra vez.",
-        "expiredCode": "Este link de recuperación de contraseña ha expirado. Por favor <resetLink>comienza de nuevo el proceso</resetLink> e inténtalo otra vez."
+        "expiredCode": "Este link de recuperación de contraseña ha expirado. Por favor <resetLink>comienza de nuevo el proceso</resetLink> e inténtalo otra vez.",
+        "getUserError": "Hubo un error recuperando tu cuenta. Inténtalo de nuevo luego y <contactLink>envíale un mensaje al equipo de Bloom</contactLink> si sigues obteniendo este error."
       },
       "phoneNumberLabel": "Número de teléfono",
       "verificationCodeLabel": "Código de verificación",
diff --git a/i18n/messages/auth/fr.json b/i18n/messages/auth/fr.json
index 570826e44..634f40349 100644
--- a/i18n/messages/auth/fr.json
+++ b/i18n/messages/auth/fr.json
@@ -48,7 +48,8 @@
         "weakPassword": "Votre mot de passe doit être un peu plus long pour plus de sécurité.",
         "emailAlreadyInUse": "Cet email est déjà enregistré chez Bloom, cliquez sur <loginLink>Connexion</loginLink> pour continuer.",
         "invalidCode": "Ce lien de réinitialisation du mot de passe n'est pas valide, veuillez <resetLink>recommencer le processus</resetLink> et réessayer.",
-        "expiredCode": "Ce lien de réinitialisation du mot de passe a expiré, veuillez <resetLink>recommencer le processus</resetLink> et réessayer."
+        "expiredCode": "Ce lien de réinitialisation du mot de passe a expiré, veuillez <resetLink>recommencer le processus</resetLink> et réessayer.",
+        "getUserError": "Une erreur s'est produite lors de la récupération de votre compte. Veuillez réessayer plus tard et <contactLink>contactez l'équipe Bloom</contactLink> si le problème persiste."
       },
       "phoneNumberLabel": "Numéro de téléphone",
       "verificationCodeLabel": "Code de vérification",
diff --git a/i18n/messages/auth/hi.json b/i18n/messages/auth/hi.json
index 7c7f9e313..5606f7b9a 100644
--- a/i18n/messages/auth/hi.json
+++ b/i18n/messages/auth/hi.json
@@ -48,7 +48,8 @@
         "weakPassword": "Aapke password ko thoda aur lamba hone ki zaroorat hai taki vo aur surakshit ho.",
         "emailAlreadyInUse": "Yeh email Bloom ke saath pehle se he registered hai, <loginLink>login</loginLink> par jaiye jaari rakhne ke liye.",
         "invalidCode": "Yeh reset password link ab samaapt hogaya hai, kripya <resetLink>prakriya restart kariya</resetLink> aur fir prayas kariya. ",
-        "expiredCode": "This reset password link is now expired, please <resetLink>restart the process</resetLink> and try again."
+        "expiredCode": "This reset password link is now expired, please <resetLink>restart the process</resetLink> and try again.",
+        "getUserError": "Aapka account retrieve karne mein error aa raha hai. Baad mein dubara prayas kariye aur <contactLink>Bloom team ko message kariye</contactLink> agar aapko fir bhi error aa raha hai. "
       },
       "phoneNumberLabel": "Phone Number",
       "verificationCodeLabel": "Verification Code",
diff --git a/i18n/messages/auth/pt.json b/i18n/messages/auth/pt.json
index 950ca191c..92dc62dfc 100644
--- a/i18n/messages/auth/pt.json
+++ b/i18n/messages/auth/pt.json
@@ -48,7 +48,8 @@
         "weakPassword": "Sua senha precisa ser um pouco mais longa para ser mais segura.",
         "emailAlreadyInUse": "Este e-mail já está cadastrado no Bloom, acesse <loginLink>login</loginLink> para continuar.",
         "invalidCode": "Este link de redefinição de senha é inválido. Por favor, <resetLink>reinicie o processo</resetLink> e tente novamente.",
-        "expiredCode": "Este link de redefinição de senha expirou. Por favor, <resetLink>reinicie o processo</resetLink> e tente novamente."
+        "expiredCode": "Este link de redefinição de senha expirou. Por favor, <resetLink>reinicie o processo</resetLink> e tente novamente.",
+        "getUserError": "Ocorreu um erro ao tentar recuperar sua conta. Por favor, tente novamente mais tarde e <contactLink>envie uma mensagem para a equipe do Bloom</contactLink> se o erro persistir."
       },
       "phoneNumberLabel": "Número de telefone",
       "verificationCodeLabel": "Código de verificação",
diff --git a/i18n/messages/navigation/pt.json b/i18n/messages/navigation/pt.json
index 710aa877c..5ccd0daab 100644
--- a/i18n/messages/navigation/pt.json
+++ b/i18n/messages/navigation/pt.json
@@ -28,7 +28,7 @@
       "activitiesIcon": "A book with a small yellow fire on its cover.",
       "groundingIcon": "A twig with small pink flowers."
     },
-    "messaging": "Mensageria",
+    "messaging": "Bate-papo",
     "grounding": "Aterramento",
     "activities": "Atividades"
   }
diff --git a/i18n/messages/resources/de.json b/i18n/messages/resources/de.json
index 5e624aa6f..38ac5acdd 100644
--- a/i18n/messages/resources/de.json
+++ b/i18n/messages/resources/de.json
@@ -5,7 +5,7 @@
     "conversations": "Gespräche",
     "shorts": "Kurzfilme",
     "completed": "Abgeschlossen",
-    "sessionDetail": "Dieser Clip stammt aus Sitzung {sessionNumber}, {sessionName}, aus unserem Kurs {courseName}.",
+    "sessionDetail": "Dieser Clip ist aus der Session: {sessionName}, aus unserem Kurs: {courseName}",
     "sessionButtonLabel": "Ganze Sitzung ansehen",
     "videoTranscriptLink": "Sehen Sie sich das Video an oder lesen Sie die <link>Transkription</link>.",
     "conversationTranscriptLink": "Hören Sie sich das Gespräch an oder lesen Sie die <link>Transkription</link>.",
diff --git a/i18n/messages/resources/en.json b/i18n/messages/resources/en.json
index 86fc2190e..dbf58693d 100644
--- a/i18n/messages/resources/en.json
+++ b/i18n/messages/resources/en.json
@@ -5,7 +5,7 @@
     "conversations": "Conversations",
     "shorts": "Shorts",
     "completed": "Completed",
-    "sessionDetail": "This clip is from Session {sessionNumber}, {sessionName}, from our {courseName} course.",
+    "sessionDetail": "This clip is from Session: {sessionName}, from our Course: {courseName}",
     "sessionButtonLabel": "Watch full session",
     "videoTranscriptLink": "Watch the video or read the <link>transcript</link>.",
     "conversationTranscriptLink": "Listen to the conversation or read the <link>transcript</link>.",
diff --git a/i18n/messages/resources/es.json b/i18n/messages/resources/es.json
index 382bedd79..bbcbd2537 100644
--- a/i18n/messages/resources/es.json
+++ b/i18n/messages/resources/es.json
@@ -5,7 +5,7 @@
     "conversations": "Conversaciones",
     "shorts": "Cortos",
     "completed": "Completado",
-    "sessionDetail": "Este clip es de la Sesión {sessionNumber}, {sessionName}, de nuestro curso {courseName}.",
+    "sessionDetail": "Este clip es de la Sesión: {sessionName}, de nuestro Curso: {courseName}",
     "sessionButtonLabel": "Ver sesión completa",
     "videoTranscriptLink": "Mira el video o lee la <link>transcripción</link>.",
     "conversationTranscriptLink": "Escucha la conversación o lee la <link>transcripción</link>.",
diff --git a/i18n/messages/resources/fr.json b/i18n/messages/resources/fr.json
index 00bbfaa28..d013c4edc 100644
--- a/i18n/messages/resources/fr.json
+++ b/i18n/messages/resources/fr.json
@@ -5,7 +5,7 @@
     "conversations": "Conversations",
     "shorts": "Courte",
     "completed": "Terminé",
-    "sessionDetail": "Ce clip est un extrait de la session {sessionNumber}, {sessionName}, diffusée dans le cours {courseName}.",
+    "sessionDetail": "Cet extrait est de la Session : {sessionName}, de notre Cours : {courseName}",
     "sessionButtonLabel": "Regarder la session complète",
     "videoTranscriptLink": "Regardez la vidéo ou lisez la <link>transcription</link>.",
     "conversationTranscriptLink": "Écoutez la conversation ou lisez la <link>transcription</link>.",
diff --git a/i18n/messages/resources/hi.json b/i18n/messages/resources/hi.json
index 592df044b..31475520d 100644
--- a/i18n/messages/resources/hi.json
+++ b/i18n/messages/resources/hi.json
@@ -5,7 +5,7 @@
     "conversations": "Bātcīt",
     "shorts": "Clips",
     "completed": "Pūra",
-    "sessionDetail": "Yah clip Session {sessionNumber}, {sessionName}, hamāre {courseName} course se hai.",
+    "sessionDetail": "Yah clip Session: {sessionName}, hamāre Course: {courseName} se hai",
     "sessionButtonLabel": "Pūrī session dekhen",
     "videoTranscriptLink": "Video dekhen yā <link>transcript</link> paṛhen.",
     "conversationTranscriptLink": "Bātchīt sune yā <link>transcript</link> paṛhen.",
diff --git a/i18n/messages/resources/pt.json b/i18n/messages/resources/pt.json
index 3ad7f0679..4d48ec3a1 100644
--- a/i18n/messages/resources/pt.json
+++ b/i18n/messages/resources/pt.json
@@ -5,7 +5,7 @@
     "conversations": "Conversas",
     "shorts": "Curtas",
     "completed": "Concluído",
-    "sessionDetail": "Este clipe é da Sessão {sessionNumber}, {sessionName}, do nosso curso {courseName}.",
+    "sessionDetail": "Este clipe é da Sessão: {sessionName}, do nosso Curso: {courseName}",
     "sessionButtonLabel": "Assistir à sessão completa",
     "videoTranscriptLink": "Assista ao vídeo ou leia a <link>transcrição</link>.",
     "conversationTranscriptLink": "Ouça a conversa ou leia a <link>transcrição</link>.",
diff --git a/i18n/messages/therapy/de.json b/i18n/messages/therapy/de.json
index 50ed304ff..6643e33b3 100644
--- a/i18n/messages/therapy/de.json
+++ b/i18n/messages/therapy/de.json
@@ -1,60 +1,51 @@
 {
   "Therapy": {
     "title": "Therapie buchen",
-    "introduction": "{partnerName} kooperiert mit Bloom, um Dir kostenfrei vertrauliche Unterstützung anzubieten. Bloom vermittelt Dir Therapeut:innen, die auf Dich angepasste Unterstützung bieten können. Du hast Zugang zu sechs einstündigen Sitzungen mit einer Therapeutin oder einem Therapeuten Deiner Wahl. ",
-    "bookingButton": "Begin booking",
-    "therapySessionsRemaining": "Du hast <strongText>4</strongText> Therapiesitzungen zum Buchen zur Verfügung.",
-    "noTherapySessionsRemaining": "Du hast zur Zeit keine verfügbaren Sitzungen mehr zu buchen. ",
+    "bookingButton": "Eine Sitzung buchen",
+    "bookingSectionTitle": "So funktioniert die Buchung",
     "steps": {
       "step1": "Du wählst aus unseren sorgfältig ausgewählten, mehrsprachigen Therapeut:innen aus.",
       "step2": "Wähle ein Datum und eine Uhrzeit, die für Dich passen. Alle Sitzungen finden online statt. ",
       "step3": "Wenn Du Deine Meinung änderst, kannst Du die Sitzung jederzeit abbrechen oder die Therapeutin oder den Therapeuten wechseln. ",
       "step4": "Alles, was Du teilst, bleibt streng vertraulich zwischen Dir und den Therapeut:innen."
     },
-    "faqHeader": "Mehr zur Therapie",
-    "faqs": {
-      "faqTitle0": "Für wen ist dieses Programm gedacht?",
-      "faqBody0": "Das Programm steht allen Nutzer:innen von {partnerName}, die dort sexualisierte Gewalt melden, zur Verfügung, unabhängig von ethnischer Zugehörigkeit, Alter, Behinderung, Religion oder Glauben, sexueller Orientierung, Geschlechteridentität oder Lebensumständen - wir sind für Dich da. ",
-      "faqTitle1": "Muss ich für die Therapie bezahlen?",
-      "faqBody1": "Im Rahmen dieses Programms bietet Bloom eine Reihe von Angeboten für Nutzer:innen von {partnerName}, die von einer Erfahrung sexualisierter Gewalt heilen. Dies beinhaltet einen kostenlosen Zugang zu die Bibliothek mit Ressourcen, die von Überlebenden und Traumatherapeut:innen erstellt wurden, sowie die Möglichkeit für Messaging mit dem Bloom-Team. Für {partnerName}-Nutzer:innen, die schwere Traumatisierungen erlebt haben, werden sechs 50-minütige Therapiesitzungen kostenfrei zur Verfügung gestellt. ",
-      "faqTitle2": "Wie viele Therapiesitzungen kann ich in Anspruch nehmen?",
-      "faqBody2": "Für {partnerName}-Nutzer:innen, die schwer traumatische Erfahrungen gemacht haben, werden sechs 50-minütige Therapiesitzungen kostenfrei angeboten. ",
-      "faqTitle3": "Wie viel Zeit habe ich, um meine Therapiesitzungen zu buchen?",
-      "faqBody3": "Du kannst wählen, wie oft Du Deine Sitzungen haben möchtest, ob einmal pro Woche oder einmal im Monat. Es ist empfehlenswert, dass Du mit deiner Therapeutin oder deinem Therapeuten besprichst, was für Dich am besten ist. Bitte buche Deine erste Sitzung innerhalb von drei Monaten nach Erhalt des Zugangscodes. ",
-      "faqTitle4": "Kann ich die Sitzungen in Präsenz machen?",
-      "faqBody4": "Alle Sitzungen werden online per Videoanruf stattfinden. Bloom ist auf digitale Unterstützung spezialisiert. Die Therapeut:innen werden aufgrund ihrer Erfahrung und Fähigkeiten ausgewählt, um das Beste aus einer Online-Sitzung herauszuholen. ",
-      "faqTitle5": "Was passiert, wenn ich nicht zu meiner Therapiesitzung kommen kann?",
-      "faqBody5": "Verwende den Link aus Deiner Bestätigungsemail, um eine Therapiesitzung zu verschieben, und zwar so frühzeitig wie möglich. Eine Absage weniger als 48 Stunden vorher kann auf eine Deiner Therapiesitzungen angerechnet werden, also versuch bitte, den Termin rechtzeitig zu verschieben. ",
-      "faqTitle6": "Was mache ich, wenn ich keinen Termin für die Therapie finde, der für mich passt?",
-      "faqBody6": "Die Bloom-Kooperation mit {partnerName} und das Unterstützungsprogramm befinden sich noch in der Anfangsphase. Das bedeutet, dass wir möglicherweise noch kein komplettes Team von Therapeut:innen zur Verfügung haben. Wir sollten in den meisten Zeitzonen verfügbar sein, um Deinen Bedürfnissen gerecht zu werden. Wenn Du keine Therapeut:innen oder keine passende Uhrzeit finden kannst, lass es uns bitte über unser <faqLink>Kontaktformular</faqLink> wissen. So können wir Lücken oder Hürden bei unserem Angebot entsprechend bearbeiten. ",
-      "faqTitle7": "Was ist, wenn ich mit der Therapeutin oder dem Therapeuten nicht zurecht komme?",
-      "faqBody7": "Wir sind alle nur Menschen, also mach Dir keine Sorgen, wenn du mit der Therapeutin oder dem Therapeuten keine Verbindung gespürt hast. Du kannst Deine verbleibende(n) Sitzungen(en) bei anderen Therapeut:innen buchen. ",
-      "faqTitle8": "Was passiert, wenn meine sechs Sitzungen aufgebraucht sind?",
-      "faqBody8": "Sprich mit Deiner Therapeutin oder Deinem Therapeuten über Deine Bedürfnisse und ob sie meinen, dass Dir weitere Sitzungen helfen könnten. Bloom-Therapeut:innen können ihre Honorare mitteilen, und Du kannst entscheiden, ob Du weiter mit Ihnen arbeiten willst. ",
-      "faqTitle9": "Ich bin nicht zur Therapie gegangen, aber die Plattform zeigt eine Sitzung weniger an?",
-      "faqBody9": "Unsere Therapeut:innen halten Zeitfenster für Dich frei, also möchten wir ihre Zeit respektieren. Wenn Du nicht zu Deiner Therapiesitzung gekommen bist oder sie weniger als 48 Stunden vorher abgesagt oder verschoben hast, kann das leider auf eine Deiner Sitzungen angerechnet werden. Wenn Du glaubst, dass ein Fehler vorliegt, bitte schick uns eine Nachricht über unser <faqLink>Kontaktformular</faqLink>.",
-      "faqTitle10": "Ist das, was ich in den Therapiesitzungen bespreche, vertraulich?",
-      "faqBody10": "Ja. Alles, was du mit Therapeut:innen besprichst, wird streng vertraulich behandelt und bleibt zwischen dir und der Therapeutin oder dem Therapeuten. Zu keinem Zeitpunkt hat {partnerName} Zugang zu diesen Informationen. ",
-      "faqTitle11": "Ist die Unterstützung, die ich erhalte, vertraulich?",
-      "faqBody11": "Ja. Bloom ist ein Programm, das von der global tätigen Wohltätigkeitsorganisation Chayn angeboten wird. Alle Informationen darüber, wie viele Therapiesitzungen Du in Anspruch nimmst, werden streng vertraulich behandelt. Chayn gibt diese oder andere persönliche Informationen weder an {partnerName}, noch an Dritte weiter.",
-      "faqTitle12": "Haftungsbeschränkung",
-      "faqBody12": "Mit der Teilnahme an den Therapiesitzungen gehst Du eine Vereinbarung mit der Therapeutin oder dem Therapeuten über die von ihnen erbrachte Dienstleistung als freie Praktizierende ein. Dieser Haftungsverzicht schließt jedes Risiko ein, das mit der Teilnahme an der Therapie und den Therapiesitzungen verbunden ist. Bitte beachte die nachfolgenden Einzelheiten: ",
-      "faqList12Item1": "Nutzer:innen, die an Online-Therapiesitzungen teilnehmen, werden verstehen, dass diese kein Ersatz für klinische psychologische oder medizinische Betreuung sind, und nicht dazu gedacht sind, psychische Störungen oder medizinische Erkrankungen zu diagnostizieren, behandeln oder zu heilen. Du solltest auch verstehen, dass die Therapeut:innen, mit denen du arbeitest, nicht in der Rolle von medizinischem Fachpersonal sind. ",
-      "faqList12Item2": "Du verstehst und erklärst Dich damit einverstanden, dass Du während der Therapiesitzungen für Dein eigenes Wohlbefinden und dementsprechend auch für Deine Entscheidungen verantwortlich bist. ",
-      "faqList12Item3": "Du wirst verstehen, dass die Therapeut:innen sich bei ihrer Arbeit Notizen für die eigenen Unterlagen machen können. Nur die Therapeut:innen, die mit dir arbeiten, werden diese Notizen sehen. Das geschieht stets auf vertrauliche Weise, wobei deine Privatsphäre und deine Integrität gewahrt werden. ",
-      "faqList12Item4": "Du wirst auch verstehen, dass alle Kommentare und Ideen, die von Therapeut:innen angeboten werden, ausschließlich den Zweck haben, Dich bei Deinem Heilungsprozess zu unterstützen. Vor Beginn der Therapie wirst Du von Deiner Therapeutin oder Deinem Therapeuten über etwaige Schutzrichtlinien aufgeklärt, die dazu führen könnten, dass sie Informationen über Dich weitergeben, um Deine Sicherheit zu gewährleisten. ",
-      "faqList12Item5": "Du hast unsere Datenschutzrichtlinie gelesen und verstanden (https://www.notion.so/Privacy-policy-ad4a447bc1aa4d7294d9af5f8be7ae43).",
-      "faqList12Item6": "Du hast verstanden, dass der Einsatz von Technologie nicht immer sicher ist und akzeptierst die Vertraulichkeits-Risiken, die die Nutzung von Email, SMS, Telefon- und Videoanrufen und anderen Technologien haben. ",
-      "faqList12Item7": "Du entbindest hiermit Deine Therapeut:innen, Bumble, Chayn von allen Ansprüchen, Klagen, Forderungen oder Schadensersatzsprüchen, die sich aus Deinen eigenen Handlungen und Unterlassungen oder aus Handlungen und Unterlassungen Deiner Therapeut:innen als Folge von Ratschlägen ergeben, die anderweitig aus der therapeutischen Beziehung gemäß dieser Vereinbarung resultieren. Weiterhin versicherst Du, dass keine Versprechen, Anreize oder Vereinbarungen gemacht wurden, die nicht in dieser Vereinbarung zum Ausdruck kommen. ",
-      "faqList12Item8": "Deine Therapeut:innen halten sich das Recht vor, den Zugang zu ihren Dienstleistungen zu verweigern. Für alle internationalen Klient:innen werden alle Therapie- und Beratungsleistungen in Übereinstimmung mit den Gesetzen des Landes der jeweiligen Therapeutin oder des Therapeuten erbracht, und alle Streitigkeiten unterliegen dem Recht dieses Landes. ",
-      "faqTitle13": "Ich möchte Feedback geben",
-      "faqBody13": "Bloom möchte ein Unterstützungsprogramm für Traumata anbieten, das den Bedürfnissen von {partnerName}-Nutzer:innen entspricht. Wenn Du Feedback, Ideen oder Vorschläge hast, die uns helfen, uns zu verbessern, lass es uns bitte über dieses <faqLink>Kontaktformular</faqLink> wissen. Danke!"
+    "closeBookingWidget": "Buchungs-Widget schließen",
+    "modalTitle": "Therapie buchen",
+    "modalDescription": "SimplyBook.me Widget zur Terminplanung Ihrer Therapiesitzung.",
+    "error": {
+      "initializingWidget": "Fehler beim Initialisieren des Buchungs-Widgets.",
+      "initializingWidgetRetry": "Fehler beim Initialisieren des Buchungs-Widgets beim erneuten Versuch.",
+      "containerNotFoundRetry": "Das Buchungs-Widget konnte nicht geladen werden.",
+      "scriptNotLoaded": "Das Skript für das Buchungs-Widget wurde nicht vollständig geladen.",
+      "scriptLoadFailed": "Fehler beim Laden des Buchungsskripts."
     },
-    "confirmation": {
-      "title": "Buchung erfolgreich!",
-      "introduction": "Deine Therapiesitzung ist gebucht. Wir wissen wie schwer es sein kann, diesen Schritt zu gehen, also Gratulation, dass Du es getan hast. Halte Ausschau nach einer Email von \"Bloom\", in der Du Datum, Uhrzeit und einen Link für den Video-Call zugeschickt bekommst. Solltest du den Termin nicht wahrnehmen können, enthält die Email auch einen Link zum Umbuchen. ",
-      "returnDescription": "Komm nach deiner Therapiesitzung wieder zu Bloom zurück, um die nächste zu buchen.",
-      "bookmarkDescription": "URLs zu vergessen ist einfach! Setz Dir ein Lesezeichen für diese Seite, um sie schnell aufrufen zu können: <bookingLink>bloom.chayn.co</bookingLink>"
+    "therapyBookings": {
+      "header": "Deine Therapiebuchungen",
+      "bookingSummary": "Du hast noch <remainingTotal>{remainingTotal}</remainingTotal> Therapiesitzungen übrig, <upcomingTotal>{upcomingTotal}</upcomingTotal> sind geplant.",
+      "noBookingSummary": "Sie haben alle Ihre verfügbaren Therapiesitzungen gebucht.",
+      "noBookings": "Du hast im Moment keine Therapiebuchungen.",
+      "cancelAlert": "Stornierung für Buchungs-ID angefordert: {id}. Implementieren Sie die tatsächliche Stornierungslogik."
+    },
+    "bookingItem": {
+      "upcomingSessionTitle": "Bevorstehende Therapiesitzung",
+      "pastSessionTitle": "Vergangene Therapiesitzung",
+      "cancelledSessionTitle": "Abgesagte Sitzung",
+      "dateLabel": "Datum",
+      "timeLabel": "Uhrzeit",
+      "therapistLabel": "Therapeut/in",
+      "videoLinkLabel": "Video-Link",
+      "videoLink": "Nehmen Sie am Anruf über die Google Meet-Kalendereinladung teil, die per E-Mail gesendet wurde.",
+      "cancelError": "Fehler beim Stornieren der Buchung – bitte versuchen Sie es erneut oder wenden Sie sich an das Team.",
+      "noVideoLink": "Kein Link angegeben",
+      "cancelButton": "Stornieren",
+      "expand": "Erweitern",
+      "collapse": "Einklappen",
+      "cancelDialog": {
+        "title": "Stornierung bestätigen",
+        "description": "Sind Sie sicher, dass Sie Ihre für {dateTime} geplante Therapiesitzung absagen möchten? Sie können einen neuen Termin zu einem Zeitpunkt buchen, der sich für Sie richtig anfühlt.",
+        "keepButton": "Sitzung beibehalten",
+        "confirmButton": "Sitzung stornieren"
+      }
     },
     "accessGuard": {
       "title": "Therapie nicht verfügbar",
diff --git a/i18n/messages/therapy/en.json b/i18n/messages/therapy/en.json
index ffd95391d..d517c85ea 100644
--- a/i18n/messages/therapy/en.json
+++ b/i18n/messages/therapy/en.json
@@ -1,60 +1,51 @@
 {
   "Therapy": {
     "title": "Book therapy",
-    "introduction": "{partnerName} has partnered with Bloom to offer you free, confidential support. Bloom connects you to a therapist who can offer tailored support. You'll have access to six, hour-long sessions with a therapist of your choice.",
     "bookingButton": "Begin booking",
-    "therapySessionsRemaining": "You have <strongText>4</strongText> therapy sessions available to book.",
-    "noTherapySessionsRemaining": "You don't currently have any available sessions left to book.",
+    "bookingSectionTitle": "How booking works",
     "steps": {
       "step1": "You choose from our carefully selected, multilingual therapists.",
       "step2": "Pick a date and time that works for you. All sessions are online.",
       "step3": "If you change your mind, you can stop the sessions or change therapist at any point.",
       "step4": "Everything you share remains strictly confidential, between you and the therapist."
     },
-    "faqHeader": "More about the therapy",
-    "faqs": {
-      "faqTitle0": "Who is this programme for?",
-      "faqBody0": "The programme is available to any {partnerName} user who reports sexual abuse or assault to {partnerName}, regardless of your background, race, age, disability, religion or belief, sexuality, gender identity or expression, or life circumstances – we are here for you.",
-      "faqTitle1": "Do I have to pay for therapy?",
-      "faqBody1": "Through this programme, Bloom is offering a range of services for {partnerName} users healing from their experience of sexual abuse or assault. This includes free access to Bloom’s self-guided library of resources created by survivors and trauma-informed therapists, and opportunities for interactive messaging with course facilitators. For {partnerName} users who have had deeply traumatic experiences, six 50-minute therapy sessions will be provided at no cost to the individual.",
-      "faqTitle2": "How many therapy sessions do I get?",
-      "faqBody2": "For {partnerName} users who have had deeply traumatic experiences, six 50-minute therapy sessions will be provided at no cost to the individual.",
-      "faqTitle3": "How much time do I have to book my therapy sessions?",
-      "faqBody3": "You can choose how often you want to have your sessions, whether it's once a week or once a month. It is recommended you chat with your therapist to decide what works best for you. Please book your first session within three months of receiving your access code.",
-      "faqTitle4": "Can I do the sessions in-person?",
-      "faqBody4": "All sessions will be held online through video calls. Bloom specialises in digital, remote support. These therapists are chosen given their experience and skill for getting the best out of an online session.",
-      "faqTitle5": "What happens if I can't make it to my therapy session?",
-      "faqBody5": "Use the link in your confirmation email to reschedule your therapy session, with as much notice as possible. Cancelling with less than 48 hours notice may count towards one of your therapy sessions, so please try to make sure you reschedule in advance.",
-      "faqTitle6": "What if I can’t find a therapy slot that suits me?",
-      "faqBody6": "The Bloom partnership with {partnerName} and programme of support is in the early stages of getting started and that means we may not readily have a full team of therapists available yet. We should have availability across most time zones to meet your needs. If you  cannot find a therapist or a time that works, please let us know via our <faqLink>contact form</faqLink>. This will allow us to address any gaps or barriers to access, accordingly.",
-      "faqTitle7": "What if I don't get along with the therapist?",
-      "faqBody7": "We're all human, so don't worry if you didn't click with the therapist you spoke to. You can book your remaining session(s) with a different therapist.",
-      "faqTitle8": "What happens when my six sessions are up?",
-      "faqBody8": "Have a discussion with your therapist about what your needs are and whether they think you could benefit from more sessions. Bloom therapists can share their price listing with you, and you can decide whether to continue on with them.",
-      "faqTitle9": "I didn't go to therapy, but the platform shows I have one less session?",
-      "faqBody9": "Our therapists hold slots for you, so we want to respect their time. If you didn't attend your therapy session or cancelled/rescheduled with less than 48 hours notice, then unfortunately, that may count towards one of your sessions. If you think there’s a mistake, please send a message via our <faqLink>contact form</faqLink>.",
-      "faqTitle10": "Is what I discuss during the therapy sessions private?",
-      "faqBody10": "Yes. Whatever you discuss with any therapist will remain strictly private between you and the therapist. At no time will {partnerName} have access to this information.",
-      "faqTitle11": "Is the support I access confidential?",
-      "faqBody11": "Yes. Bloom is a programme run by the global charity Chayn. Any information on how many therapy sessions you access will remain strictly private. Chayn does not share this or any personal information with {partnerName} or any other third party.",
-      "faqTitle12": "Limitation of Liability",
-      "faqBody12": "By taking part in therapy sessions you are entering into agreement with the therapist for the services they will provide as an independent practitioner. This waiver of liability includes any risk of attending therapist sessions and engaging in therapy.  Please see the detail below:",
-      "faqList12Item1": "Users attending online therapy sessions will understand that these services are not offered as a substitute for clinical mental health care or medical care and are not intended to diagnose, treat or cure any mental health or medical conditions. You should also understand that the therapist you have chosen to work with is not acting as a medical professional.",
-      "faqList12Item2": "You will understand and agree that you are fully responsible for your own well-being during your therapy sessions, and subsequently, your choices and decisions.",
-      "faqList12Item3": "You will understand that as a practice therapists may take notes for their own records. Only the practitioners working with you will see your notes. This will always be done in a confidential way respecting your privacy and integrity.",
-      "faqList12Item4": "You will also understand that all comments and ideas offered by a therapist are solely for the purpose of aiding you in your recovery journey. Your therapist will inform you before you begin therapy of any safeguarding policies they have in place that could result in the sharing of information about you in order to ensure your safety.",
-      "faqList12Item5": "You will have read and understood our Privacy Policy (https://www.notion.so/Privacy-policy-ad4a447bc1aa4d7294d9af5f8be7ae43).",
-      "faqList12Item6": "You will have understood that the use of technology is not always secure and accept the risks of confidentiality in the use of email, text, phone, video call and other technology.",
-      "faqList12Item7": "You hereby release, waive, acquit and forever discharge your therapist, Bumble, Chayn from every claim, suit action, demand or right to compensation for damages claimed or that you may have arising out of your own acts or omissions or acts and omissions of your Therapist as a result of any advice given otherwise resulting from the therapeutic relationship contemplated by this agreement. You further declare and represent that no promise, inducement or agreement not expressed in this agreement has been made.",
-      "faqList12Item8": "Your therapist reserves the right to refuse access to their services. For all international clients all therapy and counselling services are undertaken in accordance with the laws of the practitioner’s own country and any disputes will be subject to that country’s law.",
-      "faqTitle13": "I want to give feedback",
-      "faqBody13": "Bloom wants to offer a trauma support programme that meets {partnerName} users’ needs. If you have any feedback, ideas, or suggestions to help us improve, please let us know via this <faqLink>contact form</faqLink>. Thank you!"
+    "closeBookingWidget": "Close booking widget",
+    "modalTitle": "Book therapy",
+    "modalDescription": "SimplyBook.me widget for scheduling your therapy session.",
+    "error": {
+      "initializingWidget": "Error initializing booking widget.",
+      "initializingWidgetRetry": "Error initializing booking widget on retry.",
+      "containerNotFoundRetry": "Could not load the booking widget.",
+      "scriptNotLoaded": "Booking widget script not fully loaded.",
+      "scriptLoadFailed": "Failed to load booking script."
     },
-    "confirmation": {
-      "title": "You're booked in!",
-      "introduction": "Your therapy session is booked in. We know it can be hard to take this step, so well done for doing it. Look out for an email from 'Bloom', which will send you the time, date and video call link. If you can't make the session, the same email includes a link to reschedule the session.",
-      "returnDescription": "After your therapy session, come back to Bloom to book your next one.",
-      "bookmarkDescription": "Forgetting URLs is easy! Bookmark this page to keep us close: <bookingLink>bloom.chayn.co</bookingLink>"
+    "therapyBookings": {
+      "header": "Your therapy bookings",
+      "bookingSummary": "You have <remainingTotal>{remainingTotal}</remainingTotal> therapy sessions remaining, <upcomingTotal>{upcomingTotal}</upcomingTotal> scheduled.",
+      "noBookingSummary": "You have booked all of your available therapy sessions.",
+      "noBookings": "You have no therapy bookings at the moment.",
+      "cancelAlert": "Cancellation requested for booking ID: {id}. Implement actual cancellation logic."
+    },
+    "bookingItem": {
+      "upcomingSessionTitle": "Upcoming therapy session ",
+      "pastSessionTitle": "Past therapy session ",
+      "cancelledSessionTitle": "Cancelled session",
+      "dateLabel": "Date",
+      "timeLabel": "Time",
+      "therapistLabel": "Therapist",
+      "videoLinkLabel": "Video link",
+      "videoLink": "Join the call from the Google Meet calendar invite sent by email",
+      "noVideoLink": "No link provided",
+      "cancelButton": "Cancel",
+      "cancelError": "Error cancelling booking - please try again or get in touch with the team.",
+      "expand": "Expand",
+      "collapse": "Collapse",
+      "cancelDialog": {
+        "title": "Confirm Cancellation",
+        "description": "Are you sure you want to cancel your therapy session scheduled for {dateTime}? You can book a new appointment at a time that feels right for you.",
+        "keepButton": "Keep Session",
+        "confirmButton": "Cancel Session"
+      }
     },
     "accessGuard": {
       "title": "Therapy not available",
diff --git a/i18n/messages/therapy/es.json b/i18n/messages/therapy/es.json
index 5d1226919..9b99f1b4d 100644
--- a/i18n/messages/therapy/es.json
+++ b/i18n/messages/therapy/es.json
@@ -1,60 +1,51 @@
 {
   "Therapy": {
     "title": "Reserva una cita de terapia",
-    "introduction": "{partnerName} se ha asociado con Bloom para ofrecerte apoyo gratuito y confidencial. Bloom te conecta con un terapeuta que puede ofrecer apoyo a tu medida. Tendrás acceso a 6 sesiones de terapia, de una hora cada una, con el terapeuta que tu escojas.",
     "bookingButton": "Empezar a reservar",
-    "therapySessionsRemaining": "Tienes <strongText>4</strongText> sesiones de terapia disponibles para reservar.",
-    "noTherapySessionsRemaining": "Actualmente no tienes más sesiones de terapia disponibles para reservar.",
+    "bookingSectionTitle": "Cómo funciona la reserva",
     "steps": {
-      "step1": "Escoge entre nuestros terapeutas multilingües, que fueron cuidadosamente seleccionados.",
-      "step2": "Escoge una fecha y hora que funcione para ti. Todas las sesiones son en línea.",
-      "step3": "Si cambias de parecer, puedes suspender las sesiones o cambiar de terapeuta en cualquier momento.",
-      "step4": "Todo lo que compartas, permanecerá estrictamente confidencial entre el terapeuta y tú."
+      "step1": "Eliges entre nuestros terapeutas multilingües cuidadosamente seleccionados.",
+      "step2": "Elige una fecha y hora que te funcione. Todas las sesiones son en línea.",
+      "step3": "Si cambias de opinión, puedes detener las sesiones o cambiar de terapeuta en cualquier momento.",
+      "step4": "Todo lo que compartas permanece estrictamente confidencial, entre tú y el terapeuta."
     },
-    "faqHeader": "Más acerca de la terapia",
-    "faqs": {
-      "faqTitle0": "¿Para quién es este programa?",
-      "faqBody0": "El programa está disponible para cualquier usuario de {partnerName} que reporte abuso o agresión sexual a {partnerName}, independientemente de su orígen, raza, edad, discapacidad, religión o creencias, sexualidad, identidad o expresión de género, o situaciones de vida; estamos aquí para ti.",
-      "faqTitle1": "¿Tengo que pagar por la terapia?",
-      "faqBody1": "A través de este programa, Bloom está ofreciendo un rango de servicios para los usuarios de {partnerName} que estén sanando de su experiencia de abuso o agresión sexual. Esto incluye acceso gratuito a la biblioteca de recursos autoguiados de Bloom, creados por sobrevivientes y por terapeutas informados en el trauma, y la oportunidad de participar en conversaciones interactivas por mensaje con facilitadores de cursos. Para los usuarios de {partnerName} que hayan tenido experiencias intensamente traumáticas, se proveerán seis sesiones de terapia, de 50 minutos, sin costo alguno para el individuo.",
-      "faqTitle2": "¿A cuántas sesiones de terapia tengo derecho?",
-      "faqBody2": "Para los usuarios de {partnerName} que hayan tenido experiencias intensamente traumáticas, se proveerán seis sesiones de terapia, de 50 minutos, sin costo alguno para el individuo.",
-      "faqTitle3": "¿Cuánto tiempo tengo para reservar mis sesiones de terapia?",
-      "faqBody3": "Puedes escoger que tan seguido quieres tener tus sesiones, ya sea una vez a la semana, o una vez al mes. Se recomienda que hables con tu terapeuta para decidir qué funciona mejor para ti. Por favor, agenda tu primera sesión dentro de los tres meses de haber recibido tu código.",
-      "faqTitle4": "¿Puedo asistir a sesiones en persona?",
-      "faqBody4": "Todas las sesiones serán en línea a través de videollamadas. Bloom se especializa en apoyo digital y remoto. Estos terapeutas fueron escogidos por su experiencia y habilidad para obtener los mejores resultados de una sesión en línea.",
-      "faqTitle5": "¿Qué pasa si no puedo llegar a mi sesión de terapia?",
-      "faqBody5": "Usa el link en tu email de confirmación para reprogramar tu sesión de terapia, con el mayor tiempo de antelación posible. Si no cancelas con 48 horas de antelación, puede que se te descuente una sesión de terapia, así que, por favor, asegúrate de reprogramarla con tiempo.",
-      "faqTitle6": "¿Qué pasa si no puedo encontrar una hora que me sirva?",
-      "faqBody6": "La sociedad de Bloom con {partnerName} y el programa de apoyo están apenas en las primeras etapas y esto significa que puede que aún no tengamos un equipo completo de terapeutas disponibles. Deberíamos tener disponibilidad a través de la mayoría de zonas horarias para satisfacer tus necesidades. Si no puedes conseguir un terapeuta o una hora que te sirva, por favor háznoslo saber a través de nuestro <faqLink>formulario de contacto</faqLink>. Esto nos permitirá hacer frente a cualquier brecha u obstáculo al acceso.",
-      "faqTitle7": "¿Qué pasa si no me llevo bien con el terapeuta?",
-      "faqBody7": "Todos somos humanos, así que no te preocupes si no congeniaste con el terapeuta con el que hablaste. Puedes reservar las sesiones que te quedan con otro terapeuta.",
-      "faqTitle8": "¿Qué pasa cuando se acaban mis seis sesiones?",
-      "faqBody8": "Habla con tu terapeuta acerca de tus necesidades y si piensa que te beneficiarías de más sesiones. Los terapeutas de Bloom pueden compartir su lista de precios contigo y tú puedes decidir si continuar con ellos.",
-      "faqTitle9": "No asistí a terapia, pero la plataforma me muestra que tengo una sesión menos.",
-      "faqBody9": "Nuestros terapeutas reservan cupos para ti, por lo tanto queremos respetar su tiempo. Si no asististe a tu sesión de terapia, o cancelaste/reprogramaste con menos de 48 horas de antelación, entonces desafortunadamente esto cuenta como una sesión menos. Si crees que fue un error, por favor, envíanos un mensaje por nuestro <faqLink>formulario de contacto</faqLink>.",
-      "faqTitle10": "¿Lo que hablo durante las sesiones de terapia es privado?",
-      "faqBody10": "Sí. Lo que converses con tu terapeuta es estrictamente entre tu terapeuta y tú. En ningún momento {partnerName} tendrá acceso a esta información.",
-      "faqTitle11": "¿El apoyo al que yo accedo es privado?",
-      "faqBody11": "Sí. Bloom es un programa dirigido por la organización de caridad mundial Chayn. La cantidad de sesiones de terapia a las que accedas será información estrictamente confidencial. Chayn no comparte esta ni ninguna información personal con {partnerName} ni con ningún tercero.",
-      "faqTitle12": "Limitación de la responsabilidad",
-      "faqBody12": "Al participar en las sesiones de terapia, estás aceptando los servicios que el terapeuta te brindará como profesional independiente. Esta exención de responsabilidad también incluye cualquier riesgo por atender a las sesiones de terapia y por participar en ésta terapia. Por favor, lee los siguientes detalles:",
-      "faqList12Item1": "Los usuarios que participen en las sesiones de terapia en línea deben tener presente  que estos servicios no se ofrecen como sustituto a la atención médica o clínica de salud mental y su intención no es diagnosticar, tratar o curar condiciones de salud mental o médicas. También deben entender que el terapeuta que han elegido no actúa como un profesional médico.",
-      "faqList12Item2": "Entenderás y estarás de acuerdo de que eres completamente responsable por tu propio bienestar durante las sesiones de terapia y posteriormente, por tus elecciones y decisiones.",
-      "faqList12Item3": "Entenderás que los terapeutas tomarán notas y mantendrán un registro como parte de su práctica. Solo los terapeutas que has escogido verán tus notas. Esto siempre se hará de manera confidencial, respetando tu privacidad e integridad.",
-      "faqList12Item4": "También entenderás que todos los comentarios e ideas ofrecidas por el terapeuta, tienen el solo propósito de ayudarte en tu viaje de recuperación. Antes de empezar la terapia, tu terapeuta te informará acerca de cualquier política de salvaguarda que tenga, que podría resultar en compartir tu información personal para garantizar tu seguridad.",
-      "faqList12Item5": "Habrás leído y entendido nuestra Política de Privacidad (https://www.notion.so/Privacy-policy-ad4a447bc1aa4d7294d9af5f8be7ae43).",
-      "faqList12Item6": "Habrás entendido que el uso de la tecnología no es siempre seguro y aceptas los riesgos de confidencialidad al usar correo electrónico, texto, teléfono, videollamada y otras tecnologías.",
-      "faqList12Item7": "Por medio de la presente liberas, absuelves, y por siempre exoneras a tu terapeuta, a Bumble y a Chayn de todo reclamo, acción judicial o derecho a indemnización, por daños o perjuicios que puedas tener como consecuencia de tus propios actos u omisiones o de los mismos, y de los actos u omisiones de tu terapeuta como resultado de cualquier consejo que surja de la relación terapéutica contemplada en este acuerdo. Además declaras que no se estableció  ninguna promesa, insinuación o acuerdo no expresado en este acuerdo.",
-      "faqList12Item8": "Tu terapeuta se reserva el derecho a negarte acceso a los servicios. Para todos los clientes internacionales, todos los servicios de terapia y consejería serán tomados de acuerdo con las leyes de práctica en el país del profesional, y cualquier disputa será sujeta por la ley de su país.",
-      "faqTitle13": "Quiero dar mi opinión",
-      "faqBody13": "Bloom te quiere ofrecer un programa de apoyo para el trauma, para cubrir las necesidades de los usuarios de {partnerName}. Si tienes algún comentario, idea o sugerencia para ayudarnos a mejorar, por favor, envíalo a través de este <faqLink>formulario de contacto</faqLink>. ¡Muchas gracias!"
+    "closeBookingWidget": "Cerrar widget",
+    "modalTitle": "Reservar terapia",
+    "modalDescription": "Widget de SimplyBook.me para programar tu sesión de terapia.",
+    "error": {
+      "initializingWidget": "Error al inicializar el widget de reserva.",
+      "initializingWidgetRetry": "Error al inicializar el widget de reserva en el reintento.",
+      "containerNotFoundRetry": "No se pudo cargar el widget de reserva.",
+      "scriptNotLoaded": "El script del widget de reserva no se cargó completamente.",
+      "scriptLoadFailed": "Error al cargar el script de reserva."
     },
-    "confirmation": {
-      "title": "¡Tu reserva está hecha!",
-      "introduction": "Tu sesión de terapia ha sido reservada. Sabemos que puede ser un poco difícil tomar este paso, así que bien hecho por hacerlo. Te llegará un email de “Bloom”, con la hora, fecha y el link de la videollamada. Si no puedes asistir a la sesión, el mismo email incluye un link para reprogramarla.",
-      "returnDescription": "Después de tu sesión de terapia, vuelve a Bloom para reservar la siguiente.",
-      "bookmarkDescription": "¡Es fácil olvidarse de los url! Agrega esta página a tus favoritos para mantenernos cerca: <bookingLink>bloom.chayn.co</bookingLink>"
+    "therapyBookings": {
+      "header": "Tus reservas de terapia",
+      "bookingSummary": "Te quedan <remainingTotal>{remainingTotal}</remainingTotal> sesiones de terapia, <upcomingTotal>{upcomingTotal}</upcomingTotal> programadas.",
+      "noBookingSummary": "Ha reservado todas sus sesiones de terapia disponibles.",
+      "noBookings": "No tienes reservas de terapia en este momento.",
+      "cancelAlert": "Cancelación solicitada para la reserva ID: {id}. Implementa la lógica de cancelación real."
+    },
+    "bookingItem": {
+      "upcomingSessionTitle": "Próxima sesión de terapia",
+      "pastSessionTitle": "Sesión de terapia pasada",
+      "cancelledSessionTitle": "Sesión cancelada",
+      "dateLabel": "Fecha",
+      "timeLabel": "Hora",
+      "therapistLabel": "Terapeuta",
+      "videoLinkLabel": "Enlace del vídeo",
+      "videoLink": "Únete a la llamada desde la invitación del calendario de Google Meet enviada por correo electrónico.",
+      "cancelError": "Error al cancelar la reserva. Inténtalo de nuevo o ponte en contacto con el equipo.",
+      "noVideoLink": "No se proporcionó ningún enlace",
+      "cancelButton": "Cancelar",
+      "expand": "Expandir",
+      "collapse": "Contraer",
+      "cancelDialog": {
+        "title": "Confirmar Cancelación",
+        "description": "¿Seguro que quieres cancelar tu sesión de terapia programada para el {dateTime}? Puedes reservar una nueva cita a una hora que te resulte adecuada.",
+        "keepButton": "Mantener Sesión",
+        "confirmButton": "Cancelar Sesión"
+      }
     },
     "accessGuard": {
       "title": "Terapia no disponible",
diff --git a/i18n/messages/therapy/fr.json b/i18n/messages/therapy/fr.json
index a4d5de691..6d19d0ef0 100644
--- a/i18n/messages/therapy/fr.json
+++ b/i18n/messages/therapy/fr.json
@@ -1,60 +1,51 @@
 {
   "Therapy": {
     "title": "Thérapie par la lecture",
-    "introduction": "{partnerName} s'est associé à Bloom pour vous offrir un soutien gratuit et confidentiel. Bloom vous met en relation avec un·e thérapeute qui peut vous offrir un soutien personnalisé. Vous aurez accès à six sessions d'une heure avec le·a thérapeute de votre choix.",
     "bookingButton": "Commencer la réservation",
-    "therapySessionsRemaining": "Vous avez <strongText>4</strongText> sessions de thérapie disponibles à réserver.",
-    "noTherapySessionsRemaining": "Actuellement il ne vous reste aucune session disponible à réserver.",
+    "bookingSectionTitle": "Comment fonctionne la réservation",
     "steps": {
       "step1": "Vous avez le choix parmi des thérapeutes multilingues soigneusement sélectionné·es.",
       "step2": "Choisissez la date et l'heure qui vous conviennent. Toutes les sessions sont en ligne.",
       "step3": "Si vous changez d'avis, vous pouvez à tout moment arrêter les sessions ou changer de thérapeute.",
       "step4": "Tout ce que vous partagez reste strictement confidentiel, entre vous et le·a thérapeute."
     },
-    "faqHeader": "A propos de la thérapie",
-    "faqs": {
-      "faqTitle0": "À qui s'adresse ce programme ?",
-      "faqBody0": "Le programme est accessible à tout utilisateur·rice de {partnerName} qui signale une agression sexuelle à {partnerName}, quels que soient son origine, sa race, son âge, son handicap, sa religion ou ses convictions, sa sexualité, son identité ou son expression de genre, ou ses conditions de vie ; nous sommes là pour vous.",
-      "faqTitle1": "Dois-je payer pour la thérapie ?",
-      "faqBody1": "Dans le cadre de ce programme, Bloom offre une gamme de services aux utilisateur·rices de {partnerName} qui se remettent d'une expérience d'agression sexuelle. Ces services comprennent l'accès gratuit à la bibliothèque autoguidée de Bloom, composée de ressources créées par des personnes survivantes et des thérapeutes spécialisé·es dans les traumatismes, ainsi que des possibilités de messagerie interactive avec les animateur rices du cours. Pour les utilisateur·rices de {partnerName} qui ont vécu des expériences profondément traumatisantes, six sessions de thérapie de 50 minutes seront offertes gratuitement.",
-      "faqTitle2": "De combien de sessions de thérapie ai-je droit ?",
-      "faqBody2": "Six sessions de thérapie de 50 minutes seront offertes gratuitement à tous les utilisateur·rices de {partnerName} ayant vécu des expériences profondément traumatisantes.",
-      "faqTitle3": "De combien de temps est-ce que je dispose pour réserver mes sessions de thérapie ?",
-      "faqBody3": "Vous pouvez choisir la fréquence de vos sessions, soit une fois par semaine, soit une fois par mois. Il est recommandé de discuter avec votre thérapeute pour décider de ce qui vous convient le mieux. Veuillez réserver votre première séance dans les trois mois suivant la réception de votre code d'accès.",
-      "faqTitle4": "Puis-je participer physiquement aux sessions ?",
-      "faqBody4": "Toutes les sessions se dérouleront en ligne par appels vidéo. Bloom est spécialisé dans l'assistance numérique à distance. Ces thérapeutes sont choisi·es en fonction de leur expérience et de leurs compétences afin que vous puissiez tirer le meilleur parti d'une session en ligne.",
-      "faqTitle5": "Que se passe-t-il si je ne peux pas participer à ma session de thérapie ?",
-      "faqBody5": "Utilisez le lien figurant dans votre e-mail de confirmation pour reprogrammer votre session de thérapie, avec un préavis aussi long que possible. Si vous annulez moins de 48 heures à l'avance, vous risquez de perdre une de vos sessions de thérapie, alors essayez de prendre rendez-vous à l'avance.",
-      "faqTitle6": "Que faire si je ne trouve pas de créneau de thérapie qui me convienne ?",
-      "faqBody6": "Le partenariat de Bloom avec {partnerName} et le programme de soutien n'en sont qu'à leurs débuts, ce qui signifie que nous ne disposons peut-être pas encore d'une équipe complète de thérapeutes. Nous sommes disponibles dans la plupart des fuseaux horaires pour répondre à vos besoins. Si vous ne parvenez pas à trouver un·e thérapeute ou un horaire qui vous convienne, veuillez nous le faire savoir via notre <faqLink>formulaire de contact</faqLink>. Cela nous permettra de combler les lacunes ou les problèmes d'accès.",
-      "faqTitle7": "Et si je ne m'entends pas avec le·a thérapeute ?",
-      "faqBody7": "Nous sommes tous humains, ne vous inquiétez donc pas si vous n'avez pas eu de déclic avec le·a thérapeute avec lequel/laquelle vous avez discuté. Vous pouvez réserver la ou les sessions restantes avec un·e autre thérapeute.",
-      "faqTitle8": "Que se passe-t-il lorsque mes six sessions sont terminées ?",
-      "faqBody8": "Discutez avec votre thérapeute pour savoir quels sont vos besoins et si vous nécessitez de suivre des sessions supplémentaires. Les thérapeutes de Bloom peuvent vous communiquer leurs tarifs, et vous pouvez décider de poursuivre ou non avec eux/elles.",
-      "faqTitle9": "Je n'ai pas suivi de thérapie, mais la plateforme indique que j'ai une session en moins.",
-      "faqBody9": "Nos thérapeutes vous proposent des créneaux, il est important de les respecter. Une session de thérapie manquée ou annulée/reportée à moins de 48 heures sera considérée comme faite. Pour toute réclamation, veuillez nous contacter via notre <faqLink>formulaire de contact</faqLink>.",
-      "faqTitle10": "Les informations partagées pendant les sessions de thérapie sont-elles confidentielles ?",
-      "faqBody10": "Les échanges avec votre thérapeute resteront confidentiels. À aucun moment, {PartnerName} n'aura accès à ces informations.",
-      "faqTitle11": "Le soutien auquel j'ai accès est-il confidentiel ?",
-      "faqBody11": "Bloom est un programme géré par l'organisation caritative internationale Chayn. Toute information sur le nombre de sessions de thérapie auxquelles vous avez accès restera strictement confidentielle. Chayn ne partage pas ces informations ni aucune autre information personnelle avec {PartnerName} ou tout autre tiers.",
-      "faqTitle12": "Limitation de la responsabilité",
-      "faqBody12": "En prenant part aux sessions de thérapie, vous concluez un accord avec le·a thérapeute pour les services qu'il fournira en tant que praticien·ne indépendant·e. Cette clause de non responsabilité inclut tout risque lié à la participation à ces sessions et à l'engagement dans la thérapie. Veuillez consulter le détail ci-dessous :",
-      "faqList12Item1": "Les utilisateur·rices qui participent à des sessions de thérapie en ligne doivent comprendre que ces services ne remplacent pas des soins cliniques de santé mentale ou de soins médicaux et qu'ils ne sont pas destinés à diagnostiquer, traiter ou guérir des problèmes de santé mentale ou des problèmes médicaux. Vous devez également comprendre que le thérapeute avec lequel vous avez choisi de travailler n'agit pas en tant que professionnel de la santé.",
-      "faqList12Item2": "Sachez que vous êtes entièrement responsable de votre propre bien-être pendant vos sessions de thérapie, et par conséquent, de vos choix et décisions.",
-      "faqList12Item3": "Vous comprenez que comme dans leur cabinet, les thérapeutes peuvent prendre des notes pour leurs propres dossiers. Seuls les praticien·nes qui travaillent avec vous verront vos notes. Cela se fera toujours de manière confidentielle, en respectant votre vie privée et votre intégrité.",
-      "faqList12Item4": "Vous comprenez également que tous les commentaires et idées proposés par un·e thérapeute ont pour seul but de vous aider dans votre démarche de rétablissement. Votre thérapeute vous informera, avant le début de la thérapie, de toute politique de sauvegarde qu'il a mise en place et qui pourrait entraîner le partage d'informations vous concernant afin d'assurer votre sécurité.",
-      "faqList12Item5": "Vous avez lu et compris notre politique de confidentialité (https://www.notion.so/Privacy-policy-ad4a447bc1aa4d7294d9af5f8be7ae43).",
-      "faqList12Item6": "Vous comprenez que l'utilisation de la technologie n'est pas toujours sûre et acceptez les risques de confidentialité dans l'utilisation de la messagerie électronique, du texte, du téléphone, de l'appel vidéo et d'autres technologies.",
-      "faqList12Item7": "Par la présente, vous libérez, renoncez, acquittez et déchargez à jamais votre thérapeute, Bumble, Chayn de toute réclamation, action en justice, demande ou droit à une compensation pour des dommages réclamés ou que vous pourriez avoir découlant de vos propres actes ou omissions ou des actes et omissions de votre thérapeute à la suite de tout conseil donné  résultant de la relation thérapeutique envisagée par cet accord. De plus, vous déclarez et affirmez qu'aucune promesse, incitation ou accord non exprimé dans cet accord n'a été fait.",
-      "faqList12Item8": "Votre thérapeute se réserve le droit de refuser l'accès à ses services. Pour tous les clients internationaux, tous les services de thérapie et de conseil sont entrepris conformément aux lois du pays du praticien et tout litige sera soumis à la loi de ce pays.",
-      "faqTitle13": "Je veux donner mon avis",
-      "faqBody13": "Bloom propose un programme de soutien après les traumatismes qui répond aux besoins des utilisateurs de {partnerName}. Si vous avez des commentaires, des idées ou des suggestions pour nous aider à nous améliorer, veuillez nous en faire part via ce <faqLink>formulaire de contact</faqLink>. Merci !"
+    "closeBookingWidget": "Fermer le widget de réservation",
+    "modalTitle": "Réserver une thérapie",
+    "modalDescription": "Widget SimplyBook.me pour planifier votre séance de thérapie.",
+    "error": {
+      "initializingWidget": "Erreur lors de l'initialisation du widget de réservation.",
+      "initializingWidgetRetry": "Erreur lors de l'initialisation du widget de réservation lors de la nouvelle tentative.",
+      "containerNotFoundRetry": "Impossible de charger le widget de réservation.",
+      "scriptNotLoaded": "Le script du widget de réservation n'est pas complètement chargé.",
+      "scriptLoadFailed": "Échec du chargement du script de réservation."
     },
-    "confirmation": {
-      "title": "Réservation effectuée",
-      "introduction": "Votre session de thérapie est réservée. Nous savons qu'il est difficile de franchir cette étape, pour cela, nous vous félicitons. Surveillez vos e-mail ; \"Bloom\" vous enverra un courriel avec l'heure, la date et le lien de l'appel vidéo. Ce courriel contient également un lien permettant de reprogrammer la session si vous ne pouvez pas y assister.",
-      "returnDescription": "Après votre session de thérapie, revenez sur Bloom pour réserver votre prochaine session.",
-      "bookmarkDescription": "Les URL sont difficile à retenir ! Epinglez cette page pour un accès facile : <bookingLink>bloom.chayn.co</bookingLink>"
+    "therapyBookings": {
+      "header": "Vos réservations de thérapie",
+      "bookingSummary": "Il vous reste <remainingTotal>{remainingTotal}</remainingTotal> séances de thérapie, <upcomingTotal>{upcomingTotal}</upcomingTotal> sont programmées.",
+      "noBookingSummary": "Vous avez réservé toutes vos séances de thérapie disponibles.",
+      "noBookings": "Vous n'avez aucune réservation de thérapie pour le moment.",
+      "cancelAlert": "Annulation demandée pour la réservation ID : {id}. Implémentez la logique d'annulation réelle."
+    },
+    "bookingItem": {
+      "upcomingSessionTitle": "Prochaine séance de thérapie",
+      "pastSessionTitle": "Séance de thérapie passée",
+      "cancelledSessionTitle": "Séance annulée",
+      "dateLabel": "Date",
+      "timeLabel": "Heure",
+      "therapistLabel": "Thérapeute",
+      "videoLinkLabel": "Lien vidéo",
+      "videoLink": "Rejoignez l'appel à partir de l'invitation de l'agenda Google Meet envoyée par e-mail.",
+      "cancelError": "Erreur lors de l'annulation de la réservation. Veuillez réessayer ou contacter l'équipe.",
+      "noVideoLink": "Aucun lien fourni",
+      "cancelButton": "Annuler",
+      "expand": "Développer",
+      "collapse": "Réduire",
+      "cancelDialog": {
+        "title": "Confirmer l'annulation",
+        "description": "Êtes-vous sûr de vouloir annuler votre séance de thérapie prévue pour le {dateTime} ? Vous pouvez prendre un nouveau rendez-vous à un moment qui vous convient.",
+        "keepButton": "Garder la séance",
+        "confirmButton": "Annuler la séance"
+      }
     },
     "accessGuard": {
       "title": "Thérapie indisponible",
diff --git a/i18n/messages/therapy/hi.json b/i18n/messages/therapy/hi.json
index 9a1f4d204..15e4d6144 100644
--- a/i18n/messages/therapy/hi.json
+++ b/i18n/messages/therapy/hi.json
@@ -1,60 +1,51 @@
 {
   "Therapy": {
     "title": "Therapy book kariye",
-    "introduction": "{partnerName} ne Bloom ke saath bhagidari kari hai taki aapko muft aur gupniye sahayata mil sake. Bloom apko ek therapist se jodta hai vo anuroop sahayata pradaan kar sakta hai. Apke pas apni pasand ke therapist ke saath  che, ek ghante se sessions hain. ",
     "bookingButton": "Booking shuru kariye",
-    "therapySessionsRemaining": "Aapke paas <strongText>4</strongText> therapy sessions hain book karne ke liye.",
-    "noTherapySessionsRemaining": "Abhi aapke paas book karne ke liye koi uplabdh session nahi hain. ",
+    "bookingSectionTitle": "Booking kaise kaam kartī hai",
     "steps": {
       "step1": "Ap hamare dhaayn se chune hue, bahubhashi therapists se chun sakte hain. ",
       "step2": "Vo din aur samay chuniye jo apke liye sabse acha kaam karta hain. Saare sessions online hain. ",
       "step3": "Agar aap apka mann badal jata hain, toh kisi bhi samay aap apne sessions rok sakte hain ya therapist badal sakte hain. ",
       "step4": "Aap jo kuch bhi sajha karte hain vo apke aur therapist ke beech poori tarha gopniye rehta hai."
     },
-    "faqHeader": "Therapy ke bare mein adhik jaankari",
-    "faqs": {
-      "faqTitle0": "Yeh programme kiske liye hai?",
-      "faqBody0": "Yeh programme kisi bhi {partnerName} user ke liye uplabhd hai jo yaun shoshan ya hinsa ke bare mein {partnerName} ko report karta hai. Chahe aapka background, race, jati, umar, viklangata, dharm ya vishvas, sexuality, ling pehchan ya zindegi ki paristhitiyan kuch bhi ho - hum aapke liye yahan hain. ",
-      "faqTitle1": "Kya mujhe therapy ke liye paise dene honge?",
-      "faqBody1": "Iss programme ke madhyam se Bloom {partnerName} ke users ko kai tareeke ki sevaein de raha hai taki vo apne yaun shoshan ya hinsa ke anubhav se heal ho sakein. Ismein free access shamil hai Bloom ki swa-nirdeshit library jismein survivors, aur trauma-informed therapists ke banaye gaye sansadhan hain aur course suvidhadataon ke saath sandesh vinimya ka avsar hai. {partnerName} users jinhone gehra trauma anubhav kiya hai unhe che 50-minute ke therapy sessions diye jaenge jiske liye unhe koi paise dene ki zaroorat nahi hai.",
-      "faqTitle2": "Mujhe kitne therapy sessions milte hain?",
-      "faqBody2": "{partnerName} users jinhone gehra trauma anubhav kiya hai unhe che 50-minute ke therapy sessions diye jaenge jiske liye unhe koi paise dene ki zaroorat nahi hai.",
-      "faqTitle3": "Mere paas kitna time hai apne therapy sessions book karne ka?",
-      "faqBody3": "Aap chun sakte hain ko aap kitni baar apne sessions chahte hain, chahe vo ek session har hafte ho ya har mahine. Hum anushansa karte hain ki aap apne therapist se iss bare mein baat karein and fir decide karein ki aapke liye sabse acha kya kaam karega. Kripya apne access code ke milne ke teen mahine ke andar apna pehla session book karein.",
-      "faqTitle4": "Kya mein in-person sessions kar sakti/sakta hoon?",
-      "faqBody4": "Sabhi sessions video call ke madhyam se online liye jaenge. Bloom digital, remote sahayata mein mahir hai. Inn therapists ko unke anbhav aur kaushal ko dekhte hue chuna gaya hai taki vo online sessions bahut ache se le sakein. ",
-      "faqTitle5": "Yadi mein apne therapy session mein nahi aa pati/pata toh kya hoga?",
-      "faqBody5": "Apke confirmation mail mein jo link hai usko therapy reschedule karne ke liye istemaal kariye, jitna dhyaan se ho sakta hai utne dhyaan se. Yadi session ko cancel karne ka notice 48 ghanton ke andar nahi ata toh usse apke therapy session ke roop mein gina jaega, toh kripya session rescheduling pehle se karne ki koshish karein. ",
-      "faqTitle6": "Kya hoga agar mujhe mere mutabik koi therapy slot nahi mil raha?",
-      "faqBody6": "{partnerName} ke saath Bloom ki sajhedari (partnership) aur sahayata ke programme shuru hone ke shuruati charan mein hai. Iska matlab hai ki hamare paas abhi therapists ki poori team uplabdh nahi ho sakti hai. Aapki avashyaktaon ko poora karne ke liye hamari uplabdhi zadatar timezones mein hain. Yadi aap ko therapist ya sahi samay ka slot nahi mil raha hai toh kripya hamein <faqLink>contact form</faqLink> ke dwara jaankari deejiye. Yeh hamein kisi bhi badhaon ko suljhane aur door karne mein madad karega.",
-      "faqTitle7": "Kya hoga agar meri therapist ke sath \nbani nahi?",
-      "faqBody7": "Hum sabhi insaan hain, isliye chinta na karein agar jis therapist se apne baat kari usse aapki baat nahi bani. Aap apne bache hue session(s) kisi doosre therapist ke saath book kar sakte hain. ",
-      "faqTitle8": "Kya hota jab mere saare che sessions ho jate hain?",
-      "faqBody8": "Apne therapist ke saath apni zarooraton ke bare mein baat kariye aur sochiye agar apko aur sessions se faeda hoga. Bloom ke therapist aapke saath apni price ki listing share kar sakte hain and fir aap tay kar sakte hain ki aapko unke saath therapy jaari rakhni hai ya nahi. ",
-      "faqTitle9": "Mein therapy nahi gai, par platform par dikha raha hai ki mere pass ek kam session hai? ",
-      "faqBody9": "Humara therapists aapke liye slot rakhte hain, isliye hum unke samay ka samman karna chahte hain. Yadi aap apne therapy session mein shaamil nahi hue ya 48 ghante se kam samay ke notice ke saath session cancel ya reschedule kiya gaya, toh durbhagya se, yeh apke therapy session ke roop mein gina jaega. Yadi aapko lagta hai ki koi galti hai, toh kripya hamare <faqLink>contact form</faqLink> ke dwara message karein.",
-      "faqTitle10": "Mein jo therapy session mein baat karti hu, kya vo niji/private hai?",
-      "faqBody10": "Haan. Aap kisi bhi therapist ke saath jo bhi baat karte karenge, vo aapke aur therapist ke beech poori tarha se private hoga. Kisi bhi samay {partnerName} ki iss jaankari par pahuch nahi hogi.",
-      "faqTitle11": "Kya mere dwara acess ki jaane wali sahayata gopniye hai?",
-      "faqBody11": "Haan. Bloom is program hai jisse global charity Chayn chalati hai. Apne kitne sessions istemaal kiye, iss bare mein jaankari poori tarha se private rahegi. Chayn iss ya koi bhi vyaktigat jankari ko {partnerName} ya kisi third-party ko nahi deta.  ",
-      "faqTitle12": "Liability ki Limitation",
-      "faqBody12": "Therapy session mein bhag lekar aap therapist ke saaath samjhaota kar rahe hain ki vo apko apni sevaiye swatantra practitioner ke taur par denge. Iss waiver of liability mein koi bhi vo risk shamil hain jo therapy session mein bhaag lene se aate hain. Kripya neeche likhi jankari dekhein:  ",
-      "faqList12Item1": "Online therapy mein bhaag lene wale users samjhein ki yeh sevaye clinical mansik swasth dekhbhal ya chikitsak dekhbhal ko substitute nahi karti aur iska udheshye kisi mansik swasth ya chikitsak bimari ka nidaan (diagnosis),  upchaar (treatment) ya ilaaj (cure) nahi hai. Aapko yeh bhi samjhna hoga ki jis therapist ko aapne kaam karne ke liye chuna hai vo medical professional nahi hain.",
-      "faqList12Item2": "Aap samjhenge aur sehmat honge ki apne therapy sessions ke dauraan aap apni bhalai ke liye poori tarha se zimmedar hain, aur baad mein apni choices aur nirnay ke liye bhi.",
-      "faqList12Item3": "Aap samjhenge ki records ke liye therapists aapke sessions se notes banate hain. Jo therapist aapke saath kaam kar rahe hain sirf wahi yeh notes dekh sakte hain. Yeh aapki gupniyeta aur akhandta ka samman karte hue hamesha gopniye tareeke se kiya jaega. ",
-      "faqList12Item4": "Aap yeh bhi samjhenge ki therapist ke di gai tippniya aur vichar poori tarha se aapki recovery ke safar ko sahayata dene ke liye hain. Aapke therapist therapy shuru karne se pehle aapko kisi bhi suraksha neeti ya safeguarding policies ke bare mein bateinge jinka vo palan karte hain, jiski vajah se vo apke bare mein jaankari sajha kar sakte hain apki suraksha sunuchit karne ke liye.",
-      "faqList12Item5": "Apne hamari Privacy Policy ko pad aur samjh liya hoga: (https://www.notion.so/Privacy-policy-ad4a447bc1aa4d7294d9af5f8be7ae43).",
-      "faqList12Item6": "Aap samjh gaye honge ki technology ka upyog hamesha surakshit nahi hota aur email, text, phone, video call aur anya technology ke upyog mein guptnyeta ke jhokhim ko sweekar karte hain.",
-      "faqList12Item7": "Aap etadwara apne therapist, Bumble, Chayn ko mukt (waive) karte hain, maaf karte hain, bari (acquit) karte hain, aur hamesha ke liye chutti (discharge) dete hain, vo har daavey, karvai, maang ya muaavajon (right to compensation) se jismein nuksaan ka dava ho ya fir vo dava ho apke khud ke kare actions ya chook se ya fir aapke therapist ke actions aur chook se jo hui ho therapist ki di hui koi bhi salah se apke therapeutic relationship ke dauran jo iss agreement pe based hai. Aap aage ghoshit karte hain aur pratinidhtav (represent) karte hain ki iss samjhaute mein koi vada, praloban (inducement) ya samjhauta jo iss agreement ke bahar ho - nahi kiya gaya hai.",
-      "faqList12Item8": "Apke therapist ke paas haq hai ki vo apni sevanein dene se mana kar dein. Your therapist reserves the right to refuse access to their services. Saare international clients ke liye saari therapy aur counselling ki sevayein therapist ke desh ke kanoon ke hisaab se hongi aur koi bhi vivaad uss dekh ke kanoon de adhaar pe hoga.",
-      "faqTitle13": "Mujhe feedback deni hai",
-      "faqBody13": "Bloom ek trauma support (sahayata) programme pesh karna chahta hai jo {partnerName} ke users ki zarooratein poori kare. Yadi hamare support (sahayata) programme ke bare mein aapke paas koi feedback, vichar ya sujhaav hain, toh kripya humein iske madhyam se bataiye <faqLink>contact form</faqLink>. Shukriya!"
+    "closeBookingWidget": "Booking widget band karein",
+    "modalTitle": "Therapī book karein",
+    "modalDescription": "Āpkī therapy session schedule karne ke liye SimplyBook.me widget.",
+    "error": {
+      "initializingWidget": "Booking widget initialize karne mein error.",
+      "initializingWidgetRetry": "Retry par booking widget initialize karne mein error.",
+      "containerNotFoundRetry": "Booking widget load nahīn ho sakā.",
+      "scriptNotLoaded": "Booking widget script pūrī tarah se load nahīn huā.",
+      "scriptLoadFailed": "Booking script load karne mein asafaltā."
     },
-    "confirmation": {
-      "title": "Aapne book karliya hai!",
-      "introduction": "Aapka therapy session book ho gaya hai. Hum jaante hain ki yeh kadam uthana mushkil ho sakta hai, toh apne aapko shabashi dijiye. 'Bloom' ka mail apne email par check kariyega. Usmein aapko samay, date aur video call ka link bheja jaega. Agar aap session mein shamil nahi ho sakte toh iss same email mein session ko reschedule karne ka bhi link hoga. ",
-      "returnDescription": "Apne therapy session ke baad, doosra session book karne ke liye vapis Bloom par aiye.",
-      "bookmarkDescription": "URLs bhoolna asaan hai! Iss page ko bookmark karein taki aap humein bhoole nahi: <bookingLink>bloom.chayn.co</bookingLink>"
+    "therapyBookings": {
+      "header": "Aapki therapy bookings",
+      "bookingSummary": "Aapke paas <remainingTotal>{remainingTotal}</remainingTotal> therapy sessions baaki hain, <upcomingTotal>{upcomingTotal}</upcomingTotal> scheduled hain.",
+      "noBookingSummary": "Aapke paas koi therapy sessions baaki nahi hain.",
+      "noBookings": "Aapne apni sabhi uplabdh therapy sessions book kar li hain.",
+      "cancelAlert": "Booking ID ke liye cancellation request ki gayi hai: {id}. Vastavik cancellation logic implement karein."
+    },
+    "bookingItem": {
+      "upcomingSessionTitle": "Aane wala therapy session",
+      "pastSessionTitle": "Pichhla therapy session",
+      "cancelledSessionTitle": "Radd satra",
+      "dateLabel": "Tareekh",
+      "timeLabel": "Samay",
+      "therapistLabel": "Therapist",
+      "videoLinkLabel": "Video link",
+      "videoLink": "Email dwara bheje gaye Google Meet calendar aamantran se call mein shaamil hon.",
+      "cancelError": "Booking radd karne mein truti - kripya punah prayaas karein ya team se sampark karein.",
+      "noVideoLink": "Koi link nahi diya gaya hai",
+      "cancelButton": "Cancel karein",
+      "expand": "Expand karein",
+      "collapse": "Collapse karein",
+      "cancelDialog": {
+        "title": "Cancel karna confirm karein",
+        "description": "Kya aap vaakai apni {dateTime} ke lie nirdhaarit therapy satr radd karna chahte hain? Aap apni suvidhaanusaar ek naya appointment book kar sakte hain.",
+        "keepButton": "Session rakhein",
+        "confirmButton": "Session cancel karein"
+      }
     },
     "accessGuard": {
       "title": "Therapy uplabdh nahi hai",
diff --git a/i18n/messages/therapy/pt.json b/i18n/messages/therapy/pt.json
index 3dbe9a954..35939a50f 100644
--- a/i18n/messages/therapy/pt.json
+++ b/i18n/messages/therapy/pt.json
@@ -1,60 +1,52 @@
 {
   "Therapy": {
     "title": "Agende uma sessão de terapia",
-    "introduction": "{partnerName} fez uma parceria com a Bloom para oferecer suporte gratuito e confidencial. Bloom conecta você a uma pessoa terapeuta da sua escolha que pode oferecer suporte personalizado. Você terá acesso a seis sessões de uma hora.",
     "bookingButton": "Comece a agendar",
-    "therapySessionsRemaining": "Você tem <strongText>4</strongText> sessões de terapia disponíveis para serem agendadas.",
-    "noTherapySessionsRemaining": "No momento, você não tem mais sessões para agendar. ",
+    "bookingSectionTitle": "Como funciona o agendamento",
     "steps": {
       "step1": "Escolha entre as opções disponíveis de terapeutas multilíngues, que passaram por uma cuidadosa seleção.",
       "step2": "Escolha a data e hora que melhor funcionar para você. Todas as sessões são virtuais.",
       "step3": "Se você mudar de ideia, poderá suspender as sessões ou trocar de profissional a qualquer momento. ",
       "step4": "Tudo o que você compartilhar, permanecerá estritamente confidencial entre você a pessoa que te acompanha como terapeuta."
     },
-    "faqHeader": "Mais sobre a terapia",
-    "faqs": {
-      "faqTitle0": "Para quem é este programa?",
-      "faqBody0": "O programa está disponível para qualquer pessoa que utilize {partnerName} que denuncie abuso ou agressão sexual a {partnerName}, independentemente de sua origem, raça, idade, deficiência, religião ou crença, sexualidade, identidade ou expressão de gênero ou circunstâncias de vida - estamos aqui para você.",
-      "faqTitle1": "Tenho que pagar pela terapia?",
-      "faqBody1": "Por meio desse programa, o Bloom oferece uma variedade de serviços para quem utiliza {partnerName} que estão no processo de recuperação de suas experiências de abuso ou agressão sexual. Isso inclui acesso gratuito à biblioteca autoguiada de recursos do Bloom, criada por pessoas sobreviventes e terapeutas informadas sobre traumas, e oportunidades para mensagens interativas com facilitadores do curso. Para aquelas pessoas que utilizam {partnerName} e que tiveram experiências profundamente traumáticas, seis sessões de terapia de 50 minutos serão fornecidas gratuitamente.",
-      "faqTitle2": "Quantas sessões de terapia tenho direito?",
-      "faqBody2": "Para as pessoas que utilizam {partnerName} e que tiveram experiências profundamente traumáticas, seis sessões de terapia de 50 minutos serão fornecidas gratuitamente.",
-      "faqTitle3": "Quanto tempo tenho para agendar minhas sessões de terapia?",
-      "faqBody3": "Você pode escolher com que frequência deseja fazer suas sessões, seja uma vez por semana ou uma vez por mês. É recomendável que você converse com a pessoa que te acompanha como terapeuta para decidir o que funciona melhor para você. Por favor, reserve sua primeira sessão dentro de três meses após o recebimento do seu código de acesso.",
-      "faqTitle4": "Posso fazer as sessões presencialmente?",
-      "faqBody4": "Todas as sessões serão realizadas online através de videochamadas. O Bloom é especializado em suporte digital e remoto. As pessoas terapeutas são escolhidas pela experiência e habilidade para tirar o melhor proveito de uma sessão online.",
-      "faqTitle5": "O que acontece se não posso participar da minha sessão de terapia?",
-      "faqBody5": "Use o link em seu e-mail de confirmação para reagendar sua sessão de terapia com o máximo de antecedência possível. Cancelar com menos de 48 horas antes da sessão pode contar como sessão de terapia realizada, portanto, tente reagendá-las com antecedência.",
-      "faqTitle6": "O que fazer se eu não encontrar um horário disponível para agendar a sessão de terapia?",
-      "faqBody6": "A parceria Bloom com {partnerName} e o programa de suporte está nos estágios iniciais e isso significa que talvez ainda não tenhamos uma equipe completa de terapeutas disponível. Deveríamos ter disponibilidade na maioria dos fusos horários para atender às suas necessidades. Se você não conseguir encontrar terapeuta disponível ou um horário que funcione, informe-nos através do nosso <faqLink>formulário de contato</faqLink>. Isso nos ajudará a resolver quaisquer lacunas ou dificuldades no acesso.",
-      "faqTitle7": "E se eu não criar uma boa conexão com a pessoa terapeuta?",
-      "faqBody7": "Somos seres humanos, então não se preocupe se você não sentir que criou uma conexão com a pessoa terapeuta com quem falou. Você pode reservar sua(s) sessão(ões) restante(s) com outra pessoa diferente.",
-      "faqTitle8": "O que acontece quando as minhas seis sessões terminam?",
-      "faqBody8": "Converse com a pessoa terapeuta sobre quais são suas necessidades e se ela acha que você poderia se beneficiar de mais sessões. Quem é  terapeuta no Bloom pode compartilhar sua lista de preços com você, e você pode decidir se quer continuar a terapia com essa pessoa.",
-      "faqTitle9": "Eu não fui à sessão, mas a plataforma me mostra que tenho uma sessão a menos.",
-      "faqBody9": "As pessoas terapeutas reservam vagas para você, por isso queremos respeitar o tempo delas. Se você não compareceu à sua sessão de terapia ou cancelou/remarcou com menos de 48 horas de antecedência, infelizmente, isso pode contar como uma de suas sessões. Se você acha que há qualquer erro, envie uma mensagem através do nosso <faqLink>formulário de contato</faqLink>.",
-      "faqTitle10": "O que falo durante as sessões de terapia é privado?",
-      "faqBody10": "Sim. Tudo o que você discutir com qualquer terapeuta permanecerá estritamente confidencial entre vocês. Em nenhum momento {partnerName} terá acesso a essas informações.",
-      "faqTitle11": "O apoio que tenho acesso é confidencial?",
-      "faqBody11": "Sim. Bloom é um programa administrado pela organização de caridade global Chayn. Qualquer informação sobre quantas sessões de terapia você acessa permanecerá estritamente privada. Chayn não compartilha esta ou qualquer informação pessoal com {partnerName} ou terceiros.",
-      "faqTitle12": "Limitação de Responsabilidade",
-      "faqBody12": "Ao participar das sessões de terapia, você concorda os serviços que a pessoa terapeuta fornecerá como profissional independente. Esta isenção de responsabilidade inclui qualquer risco de participar das sessões de terapia. Por favor, leia os detalhes abaixo:",
-      "faqList12Item1": "Quem participa das sessões de terapia on-line compreende que esses serviços não são oferecidos como substitutos de cuidados clínicos de saúde mental ou cuidados médicos e não se destinam a diagnosticar, tratar ou curar quaisquer condições médicas ou de saúde mental. Você também deve entender que a pessoa terapeuta com quem você escolheu trabalhar não está atuando como um profissional da medicina.",
-      "faqList12Item2": "Você entenderá e concordará que é totalmente responsável por seu próprio bem-estar durante suas sessões de terapia e, posteriormente, por suas escolhas e decisões.",
-      "faqList12Item3": "Você entenderá que, como profissional, as pessoas terapeutas podem tomar notas para seus próprios registros. Apenas quem trabalha com você terá acesso às anotações. Isso sempre será feito de forma confidencial, respeitando sua privacidade e integridade.",
-      "faqList12Item4": "Você também entenderá que todos os comentários e ideias oferecidos pela pessoa terapeuta são apenas para lhe ajudar em sua jornada de recuperação. A pessoa que irá lhe acompanhar como terapeuta vai lhe informar antes de iniciar a terapia sobre quaisquer políticas de proteção que possam resultar na quebra de sigilo para garantir sua segurança.",
-      "faqList12Item5": "Você deverá ler e entender nossa Política de Privacidade (https://www.notion.so/Privacy-policy-ad4a447bc1aa4d7294d9af5f8be7ae43).",
-      "faqList12Item6": "Você entende que o uso da tecnologia nem sempre é seguro e aceita os riscos de confidencialidade no uso de e-mail, texto, telefone, videochamada e outras tecnologias.",
-      "faqList12Item7": "Pela presente, você libera, renuncia, absolve e isenta para sempre seu terapeuta, Bumble, Chayn de qualquer reclamação, ação judicial, demanda ou direito a indenização por danos ou prejuízos que você possa ter decorrentes de seus próprios atos ou omissões, ou atos e omissões do terapeuta como resultado de qualquer conselho que surja da relação terapêutica contemplada por este acordo. Ainda, você também declara que nenhuma promessa, incentivo ou acordo não expresso neste acordo foi feito.",
-      "faqList12Item8": "As pessoas terapeutas parceiras reservam-se o direito de recusar o acesso aos seus serviços. Para todos os clientes internacionais, todos os serviços de terapia e aconselhamento são realizados de acordo com as leis do país da pessoa profissional e quaisquer disputas estarão sujeitas à lei desse país.",
-      "faqTitle13": "Quero deixar minha opinião",
-      "faqBody13": "Bloom quer oferecer um programa de apoio ao trauma que atenda às necessidades de quem utiliza  {partnerName}. Se você tiver comentários, ideias ou sugestões para nos ajudar a melhorar, informe-nos por meio deste <faqLink>formulário de contato</faqLink>. Nosso sincero agradecimento!"
+    "closeBookingWidget": "Fechar widget de agendamento",
+    "modalTitle": "Agendar terapia",
+    "modalDescription": "Widget SimplyBook.me para agendar sua sessão de terapia.",
+    "error": {
+      "initializingWidget": "Erro ao inicializar o widget de agendamento.",
+      "initializingWidgetRetry": "Erro ao inicializar o widget de agendamento na nova tentativa.",
+      "containerNotFoundRetry": "Não foi possível carregar o widget de agendamento.",
+      "scriptNotLoaded": "O script do widget de agendamento não foi totalmente carregado.",
+      "scriptLoadFailed": "Falha ao carregar o script de agendamento."
     },
-    "confirmation": {
-      "title": "Agendamento confirmado!",
-      "introduction": "Sua sessão de terapia está agendada. Sabemos que pode ser difícil dar esse passo, então, lhe parabenizamos por essa decisão. Aguarde um e-mail do 'Bloom'. Enviaremos a hora, data e link da videochamada. Se você não puder fazer a sessão, o mesmo e-mail inclui um link para reagendá-la.",
-      "returnDescription": "Após sua sessão de terapia, retorne à página do Bloom para agendar a próxima.",
-      "bookmarkDescription": "Forgetting URLs is easy! Bookmark this page to keep us close: <bookingLink>bloom.chayn.co</bookingLink>"
+
+    "therapyBookings": {
+      "header": "Suas reservas de terapia",
+      "bookingSummary": "Você tem <remainingTotal>{remainingTotal}</remainingTotal> sessões de terapia restantes, <upcomingTotal>{upcomingTotal}</upcomingTotal> agendadas.",
+      "noBookingSummary": "Você não tem mais sessões de terapia restantes.",
+      "noBookings": "Você reservou todas as suas sessões de terapia disponíveis.",
+      "cancelAlert": "Cancelamento solicitado para o ID da reserva: {id}. Implemente a lógica de cancelamento real."
+    },
+    "bookingItem": {
+      "upcomingSessionTitle": "Próxima sessão de terapia",
+      "pastSessionTitle": "Sessão de terapia anterior",
+      "cancelledSessionTitle": "Sessão cancelada",
+      "dateLabel": "Data",
+      "timeLabel": "Hora",
+      "therapistLabel": "Terapeuta",
+      "videoLinkLabel": "Link do vídeo",
+      "videoLink": "Participe na chamada a partir do convite do calendário do Google Meet enviado por e-mail.",
+      "cancelError": "Erro ao cancelar a reserva. Tente novamente ou entre em contacto com a equipa.",
+      "noVideoLink": "Nenhum link fornecido",
+      "cancelButton": "Cancelar",
+      "expand": "Expandir",
+      "collapse": "Recolher",
+      "cancelDialog": {
+        "title": "Confirmar Cancelamento",
+        "description": "Tem certeza de que deseja cancelar sua sessão de terapia agendada para {dateTime}? Você pode agendar uma nova consulta em um horário que lhe seja conveniente.",
+        "keepButton": "Manter Sessão",
+        "confirmButton": "Cancelar Sessão"
+      }
     },
     "accessGuard": {
       "title": "Terapia não disponível",
diff --git a/lib/api.ts b/lib/api.ts
index 183a2c4d2..1c187f2ed 100644
--- a/lib/api.ts
+++ b/lib/api.ts
@@ -14,6 +14,7 @@ import { PartnerAccess, PartnerAccesses } from './store/partnerAccessSlice';
 import { PartnerAdmin } from './store/partnerAdminSlice';
 import { Partner, PartnerFeature } from './store/partnersSlice';
 import { Resource, ResourceFeedback, Resources } from './store/resourcesSlice';
+import { TherapySession, TherapySessions } from './store/therapySessionsSlice';
 import { setUserToken, Subscription, Subscriptions, User } from './store/userSlice';
 
 export interface GetUserResponse {
@@ -275,6 +276,31 @@ export const api = createApi({
       },
       providesTags: [{ type: 'UserCourses' }],
     }),
+    getTherapySessions: builder.query<TherapySessions, void>({
+      query() {
+        return {
+          url: 'therapy-session',
+          method: 'GET',
+        };
+      },
+    }),
+    getSubscriptionsUser: builder.query<Subscriptions, void>({
+      query() {
+        return {
+          url: 'subscription-user',
+          method: 'GET',
+        };
+      },
+    }),
+    cancelTherapySession: builder.mutation<TherapySession, TherapySession>({
+      query({ id }) {
+        return {
+          url: `therapy-session/${id}/cancel`,
+          method: 'PATCH',
+          body: '',
+        };
+      },
+    }),
   }),
 });
 
@@ -302,4 +328,7 @@ export const {
   useStartResourceMutation,
   useCompleteResourceMutation,
   useGetUserCoursesQuery,
+  useGetTherapySessionsQuery,
+  useCancelTherapySessionMutation,
+  useGetSubscriptionsUserQuery,
 } = api;
diff --git a/lib/constants/common.ts b/lib/constants/common.ts
index a83136371..99f9c9973 100644
--- a/lib/constants/common.ts
+++ b/lib/constants/common.ts
@@ -9,6 +9,7 @@ export const ENVIRONMENT =
 export const BASE_URL =
   ENVIRONMENT === 'staging' ? VERCEL_PREVIEW_URL : process.env.NEXT_PUBLIC_BASE_URL;
 export const FEEDBACK_FORM_URL = process.env.NEXT_PUBLIC_FEEDBACK_FORM_URL || '#';
+export const STORYBLOK_ENVIRONMENT = ENVIRONMENT === 'production' ? 'published' : 'draft';
 
 export type ErrorDisplay =
   | string
diff --git a/lib/constants/enums.ts b/lib/constants/enums.ts
index b1be4bf0f..f91dc71c9 100644
--- a/lib/constants/enums.ts
+++ b/lib/constants/enums.ts
@@ -50,6 +50,13 @@ export enum STORYBLOK_STORY_STATUS {
   DELETED = 'deleted',
 }
 
+export enum SIMPLYBOOK_ACTION_ENUM {
+  NEW_BOOKING = 'NEW_BOOKING',
+  CANCELLED_BOOKING = 'CANCELLED_BOOKING',
+  UPDATED_BOOKING = 'UPDATED_BOOKING',
+  COMPLETED_BOOKING = 'COMPLETED_BOOKING', // currently not in use as no webhook available - could be updated in cron job
+}
+
 export enum PARTNER_ACCESS_CODE_STATUS {
   VALID = 'VALID',
   INVALID_CODE = 'INVALID_CODE',
diff --git a/lib/constants/events.ts b/lib/constants/events.ts
index ebdcdbb4d..ba564da00 100644
--- a/lib/constants/events.ts
+++ b/lib/constants/events.ts
@@ -56,8 +56,17 @@ export const ASSIGN_NEW_PARTNER_ACCESS_INVALID = 'ASSIGN_NEW_PARTNER_ACCESS_INVA
 export const THERAPY_BOOKING_VIEWED = 'THERAPY_BOOKING_VIEWED';
 export const THERAPY_BOOKING_OPENED = 'THERAPY_BOOKING_OPENED';
 export const THERAPY_CONFIRMATION_VIEWED = 'THERAPY_CONFIRMATION_VIEWED';
+export const THERAPY_BOOKING_CANCELLED = 'THERAPY_BOOKING_CANCELLED';
+export const THERAPY_BOOKING_CANCELLED_ERROR = 'THERAPY_BOOKING_CANCELLED_ERROR';
 export const THERAPY_FAQ_OPENED = 'THERAPY_FAQ_OPENED';
-
+export const THERAPY_BOOKING_CANCEL_CONFIRMED = 'THERAPY_BOOKING_CANCEL_CONFIRMED';
+export const THERAPY_BOOKING_CANCEL_DIALOG_CLOSED = 'THERAPY_BOOKING_CANCEL_DIALOG_CLOSED';
+export const THERAPY_BOOKING_CANCEL_DIALOG_OPENED = 'THERAPY_BOOKING_CANCEL_DIALOG_OPENED';
+export const THERAPY_BOOKING_COLLAPSED = 'THERAPY_BOOKING_COLLAPSED';
+export const THERAPY_BOOKING_EXPANDED = 'THERAPY_BOOKING_EXPANDED';
+export const THERAPY_BOOKINGS_LOAD_ERROR = 'THERAPY_BOOKINGS_LOAD_ERROR';
+export const THERAPY_BOOKINGS_VIEWED = 'THERAPY_BOOKINGS_VIEWED';
+export const THERAPY_VIDEO_LINK_CLICKED = 'THERAPY_VIDEO_LINK_CLICKED';
 export const COURSE_LIST_VIEWED = 'COURSE_LIST_VIEWED';
 export const COURSE_OVERVIEW_VIEWED = 'COURSE_OVERVIEW_VIEWED';
 
@@ -249,3 +258,7 @@ export const SIGN_UP_TODAY_BANNER_BUTTON_CLICKED = 'SIGN_UP_TODAY_BANNER_BUTTON_
 // PWA EVENTS
 export const PWA_INSTALLED = 'PWA_INSTALLED';
 export const PWA_DISMISSED = 'PWA_DISMISSED';
+
+// TYPE OF APP LOADED
+export const PWA_LOADED = 'PWA_LOADED';
+export const WEB_APP_LOADED = 'WEB_APP_LOADED';
diff --git a/lib/hooks/usePWA.test.ts b/lib/hooks/usePWA.test.ts
index 6c1ed02d5..4af57a0c3 100644
--- a/lib/hooks/usePWA.test.ts
+++ b/lib/hooks/usePWA.test.ts
@@ -5,6 +5,14 @@ import { setPwaDismissed } from '../store/userSlice';
 import { useAppDispatch, useTypedSelector } from './store';
 import usePWA from './usePwa';
 
+// Mocking track functions for vercel and GA4
+jest.mock('@vercel/analytics/react', () => ({
+  track: jest.fn(),
+}));
+jest.mock('@next/third-parties/google', () => ({
+  sendGAEvent: jest.fn(),
+}));
+
 jest.mock('js-cookie');
 jest.mock('./store', () => ({
   useTypedSelector: jest.fn(),
@@ -38,11 +46,6 @@ describe('usePWA hook', () => {
       })),
     });
 
-    Object.defineProperty(window, 'navigator', {
-      value: { userAgent: 'iphone' },
-      writable: true,
-    });
-
     Cookies.get = jest.fn();
     Cookies.set = jest.fn();
 
@@ -63,6 +66,7 @@ describe('usePWA hook', () => {
   });
 
   it('should show Generic banner initially', () => {
+    (window as any).beforeinstallpromptEvent = {};
     Cookies.get = jest.fn().mockReturnValue(undefined);
 
     const { result } = renderHook(() => usePWA());
@@ -143,8 +147,10 @@ describe('usePWA hook', () => {
     const addEventListenerSpy = jest.spyOn(window, 'addEventListener');
     const { result } = renderHook(() => usePWA());
 
-    // Simulate install event
     act(() => {
+      // Simulate user click on pwa banner (custom banner ui) install button - this will open the native browser install modal
+      result.current.install();
+      // Simulate user clicked on install on native pwa modal - this will fire an appinstalled event.
       const handler = addEventListenerSpy.mock.calls.find(
         ([event]) => event === 'appinstalled',
       )?.[1] as EventListener;
diff --git a/lib/hooks/usePwa.ts b/lib/hooks/usePwa.ts
index 6739d07d3..48705e2e2 100644
--- a/lib/hooks/usePwa.ts
+++ b/lib/hooks/usePwa.ts
@@ -1,9 +1,11 @@
 'use client';
 
+import { useAppDispatch, useTypedSelector } from '@/lib/hooks/store';
+import { setPwaDismissed } from '@/lib/store/userSlice';
+import logEvent from '@/lib/utils/logEvent';
 import Cookies from 'js-cookie';
 import { useEffect, useMemo, useState } from 'react';
-import { setPwaDismissed } from '@/lib/store/userSlice';
-import { useAppDispatch, useTypedSelector } from '@/lib/hooks/store';
+import { PWA_DISMISSED, PWA_INSTALLED } from '../constants/events';
 
 type UserChoice = Promise<{
   outcome: 'accepted' | 'dismissed';
@@ -17,23 +19,44 @@ interface BeforeInstallPromptEvent extends Event {
   prompt(): Promise<void>;
 }
 
-const PWA_DISMISSED = 'pwaBannerDismissed';
+const PWA_BANNER_DISMISSED = 'pwaBannerDismissed';
 
 export default function usePWA() {
-  const [bannerState, setBannerState] = useState<PwaBannerState>('Generic');
+  const [bannerState, setBannerState] = useState<PwaBannerState>('Hidden');
   const [installAttempted, setInstallAttempted] = useState(false);
   const dispatch = useAppDispatch();
-
   const user = useTypedSelector((state) => state.user);
   const userCookiesAccepted = user.cookiesAccepted || Cookies.get('analyticsConsent') === 'true';
-  const isIos = useMemo(
-    () => /iphone|ipad|ipod/.test(window.navigator.userAgent.toLowerCase()),
-    [],
-  );
+
+  const getPwaMetaData = useMemo(() => {
+    const userAgent = window.navigator.userAgent;
+    const platform = userAgent.includes('Win')
+      ? 'Windows'
+      : userAgent.includes('Mac')
+        ? 'MacOS'
+        : userAgent.includes('Linux')
+          ? 'Linux'
+          : 'Unknown OS';
+
+    const browser = userAgent.includes('Chrome')
+      ? 'Chrome'
+      : userAgent.includes('Firefox')
+        ? 'Firefox'
+        : userAgent.includes('Safari')
+          ? 'Safari'
+          : userAgent.includes('Edge')
+            ? 'Edge'
+            : userAgent.includes('Edge')
+              ? 'Opera'
+              : 'Unknown Browser';
+
+    return { browser, platform };
+  }, []);
 
   const declineInstallation = async () => {
     if (userCookiesAccepted) {
-      Cookies.set(PWA_DISMISSED, 'true');
+      Cookies.set(PWA_BANNER_DISMISSED, 'true');
+      logEvent(PWA_DISMISSED, getPwaMetaData);
     }
     setBannerState('Hidden');
     await dispatch(setPwaDismissed(true));
@@ -50,14 +73,20 @@ export default function usePWA() {
      * immediately after installation. In some cases, isStandalone might
      * still return false momentarily, causing the banner to reappear.
      */
+    if (userCookiesAccepted) {
+      logEvent(PWA_INSTALLED, getPwaMetaData);
+    }
     window.beforeinstallpromptEvent = undefined;
     setBannerState('Hidden');
   };
 
   useEffect(() => {
-    const pwaBannerDismissedCookie = Boolean(Cookies.get(PWA_DISMISSED));
+    const pwaBannerDismissedCookie = Boolean(Cookies.get(PWA_BANNER_DISMISSED));
     const isStandalone =
       typeof window !== 'undefined' && window.matchMedia('(display-mode: standalone)').matches;
+    const isIos =
+      typeof window !== 'undefined' && /iphone|ipad|ipod/.test(window?.navigator.userAgent.toLowerCase());
+
     const isHidden =
       pwaBannerDismissedCookie ||
       user.pwaDismissed ||
@@ -66,13 +95,14 @@ export default function usePWA() {
 
     if (isHidden && bannerState !== 'Hidden') setBannerState('Hidden');
     if (installAttempted && isIos && bannerState !== 'Ios') setBannerState('Ios');
+    if (!isHidden && !installAttempted && bannerState !== 'Generic') setBannerState('Generic');
 
     window.addEventListener('appinstalled', appInstalledCb);
 
     return () => {
       window.removeEventListener('appinstalled', appInstalledCb);
     };
-  }, [isIos, user.pwaDismissed, installAttempted, bannerState]);
+  }, [user.pwaDismissed, installAttempted, bannerState]);
 
   return {
     declineInstallation,
diff --git a/lib/simplybook.ts b/lib/simplybook.ts
index 0268bce21..5b143baec 100644
--- a/lib/simplybook.ts
+++ b/lib/simplybook.ts
@@ -10,6 +10,7 @@ const userIdFieldId =
 
 export const getSimplybookWidgetConfig = (user?: User) => {
   return {
+    container_id: 'simplybook-widget-container',
     widget_type: 'iframe',
     url: process.env.NEXT_PUBLIC_SIMPLYBOOK_WIDGET_URL,
     theme: 'dainty',
@@ -17,17 +18,6 @@ export const getSimplybookWidgetConfig = (user?: User) => {
       timeline_show_end_time: '1',
       timeline_hide_unavailable: '1',
       hide_past_days: '0',
-      sb_base_color: '#F3D6D8',
-      secondary_color: '#FFBFA4',
-      sb_text_color: '#757575',
-      display_item_mode: 'block',
-      body_bg_color: '#FFF8F4',
-      sb_background_image: '',
-      sb_review_image: '',
-      dark_font_color: '#424242',
-      light_font_color: '#ffffff',
-      sb_company_label_color: '#ffffff',
-      sb_cancellation_color: '#EA0050',
       hide_img_mode: '0',
     },
     timeline: 'modern',
diff --git a/lib/store.ts b/lib/store.ts
index eac79e30b..128f04c49 100644
--- a/lib/store.ts
+++ b/lib/store.ts
@@ -5,6 +5,7 @@ import partnerAccessesReducer from './store/partnerAccessSlice';
 import partnerAdminReducer from './store/partnerAdminSlice';
 import partnersReducer from './store/partnersSlice';
 import resourceReducer from './store/resourcesSlice';
+import therapySessionsReducer from './store/therapySessionsSlice';
 import userReducer from './store/userSlice';
 
 export const makeStore = () => {
@@ -17,6 +18,7 @@ export const makeStore = () => {
       partnerAdmin: partnerAdminReducer,
       partners: partnersReducer,
       resources: resourceReducer,
+      therapySessions: therapySessionsReducer,
     },
     middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(api.middleware),
   });
diff --git a/lib/store/therapySessionsSlice.tsx b/lib/store/therapySessionsSlice.tsx
new file mode 100644
index 000000000..526700878
--- /dev/null
+++ b/lib/store/therapySessionsSlice.tsx
@@ -0,0 +1,58 @@
+import { api } from '@/lib/api';
+import { SIMPLYBOOK_ACTION_ENUM } from '@/lib/constants/enums';
+import { createSlice } from '@reduxjs/toolkit';
+
+export interface TherapySession {
+  id?: string;
+  action?: SIMPLYBOOK_ACTION_ENUM;
+  clientTimezone?: string;
+  serviceName?: string;
+  serviceProviderName?: string;
+  startDateTime?: Date;
+  endDateTime?: Date;
+  cancelledAt?: Date;
+  rescheduledFrom?: Date;
+  completedAt?: Date;
+  partnerAccessId?: string;
+}
+
+export interface TherapySessions extends Array<TherapySession> {}
+
+const initialState: TherapySessions = [];
+
+const mergeUpdatedTherapySessions = (state: TherapySessions, payload: TherapySession) => {
+  const therapySession = state.filter((session) => session.id === payload.id);
+
+  if (therapySession) {
+    return state.map((session) =>
+      session.id === payload.id ? { ...session, ...payload } : session,
+    );
+  }
+
+  return [...state, payload];
+};
+
+const slice = createSlice({
+  name: 'therapySessions',
+  initialState: initialState,
+  reducers: {
+    clearTherapySessionsSlice: (state) => {
+      return initialState;
+    },
+  },
+
+  extraReducers: (builder) => {
+    builder.addMatcher(api.endpoints.getTherapySessions.matchFulfilled, (state, { payload }) => {
+      return payload;
+    });
+    builder.addMatcher(api.endpoints.cancelTherapySession.matchFulfilled, (state, { payload }) => {
+      return mergeUpdatedTherapySessions(state, payload);
+    });
+  },
+});
+
+const { actions, reducer } = slice;
+
+export const { clearTherapySessionsSlice } = actions;
+
+export default reducer;
diff --git a/lib/store/userSlice.tsx b/lib/store/userSlice.tsx
index 482b347a1..4fe5b83d2 100644
--- a/lib/store/userSlice.tsx
+++ b/lib/store/userSlice.tsx
@@ -1,4 +1,4 @@
-import { api, GetUserResponse } from '@/lib/api';
+import { api } from '@/lib/api';
 import { EMAIL_REMINDERS_FREQUENCY, LANGUAGES } from '@/lib/constants/enums';
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { PartnerAccesses } from './partnerAccessSlice';
@@ -135,23 +135,18 @@ const slice = createSlice({
 
   extraReducers: (builder) => {
     builder.addMatcher(api.endpoints.addUser.matchFulfilled, (state, { payload }) => {
-      const activeSubscriptions = getActiveSubscriptions(payload);
-
-      return Object.assign({}, state, payload.user, { activeSubscriptions });
+      return Object.assign({}, state, payload.user);
     });
     builder.addMatcher(api.endpoints.updateUser.matchFulfilled, (state, { payload }) => {
       return Object.assign({}, state, payload);
     });
     builder.addMatcher(api.endpoints.getUser.matchFulfilled, (state, { payload }) => {
-      const activeSubscriptions = getActiveSubscriptions(payload);
-
-      return Object.assign({}, state, payload.user, { activeSubscriptions });
+      return Object.assign({}, state, payload.user);
     });
     builder.addMatcher(api.endpoints.subscribeToWhatsapp.matchFulfilled, (state, { payload }) => {
       if (isSubscriptionActive(payload)) {
         state.activeSubscriptions.push(payload);
       }
-
       return state;
     });
     builder.addMatcher(
@@ -163,12 +158,16 @@ const slice = createSlice({
         return state;
       },
     );
+    builder.addMatcher(api.endpoints.getSubscriptionsUser.matchFulfilled, (state, { payload }) => {
+      state.activeSubscriptions = getActiveSubscriptions(payload);
+      return state;
+    });
   },
 });
 
-const getActiveSubscriptions = (payload: GetUserResponse): ActiveSubscription[] => {
-  if (payload.subscriptions && payload.subscriptions.length > 0) {
-    return payload.subscriptions.filter(isSubscriptionActive);
+const getActiveSubscriptions = (subscriptions: Subscriptions): ActiveSubscription[] => {
+  if (subscriptions && subscriptions.length > 0) {
+    return subscriptions.filter(isSubscriptionActive);
   }
   return [];
 };
diff --git a/lib/storyblok.ts b/lib/storyblok.ts
index d3f0929a8..bebf77b0d 100644
--- a/lib/storyblok.ts
+++ b/lib/storyblok.ts
@@ -27,6 +27,7 @@ import {
   StoryblokClient,
   storyblokInit,
 } from '@storyblok/react/rsc';
+import { STORYBLOK_ENVIRONMENT } from './constants/common';
 
 export const getStoryblokApi = storyblokInit({
   accessToken: process.env.NEXT_PUBLIC_STORYBLOK_TOKEN,
@@ -68,9 +69,7 @@ export const getStoryblokStory = async (
   }
 
   const sbParams: ISbStoriesParams = {
-    // TODO: fix draft
-    // version: ENVIRONMENT === ENVIRONMENTS.PRODUCTION ? 'published' : 'draft',
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     language: locale || 'en',
     ...(params && params),
   };
@@ -93,9 +92,7 @@ export const getStoryblokStories = async (
   uuids?: string,
 ) => {
   const sbParams: ISbStoriesParams = {
-    // TODO: fix draft
-    // version: ENVIRONMENT === ENVIRONMENTS.PRODUCTION ? 'published' : 'draft',
-    version: 'published',
+    version: STORYBLOK_ENVIRONMENT,
     language: locale || 'en',
     ...(params && params),
     ...(uuids && { by_uuids: uuids }),
diff --git a/lib/utils/dates.ts b/lib/utils/dates.ts
new file mode 100644
index 000000000..865fe7d09
--- /dev/null
+++ b/lib/utils/dates.ts
@@ -0,0 +1,17 @@
+import { type Locale } from 'date-fns';
+import { de, enGB, es, fr, hi, pt } from 'date-fns/locale';
+
+// Map next-intl locale identifiers to date-fns locale objects
+const dateFnsLocales: Record<string, Locale> = {
+  en: enGB,
+  fr: fr,
+  es: es,
+  pt: pt,
+  hi: hi,
+  de: de,
+};
+
+// Helper to get the date-fns locale object based on the current app locale
+export const getDateLocale = (currentLang: string): Locale => {
+  return dateFnsLocales[currentLang] || enGB; // Fallback to English GB
+};
diff --git a/lib/utils/formatTherapyDates.ts b/lib/utils/formatTherapyDates.ts
new file mode 100644
index 000000000..aea8b953d
--- /dev/null
+++ b/lib/utils/formatTherapyDates.ts
@@ -0,0 +1,80 @@
+import { format, formatRelative, Locale } from 'date-fns';
+
+export const formatDateDetails = (
+  date: Date | null,
+  isValidDate: boolean,
+  locale: Locale,
+): string | null => {
+  if (!isValidDate || !date) {
+    return null;
+  }
+  return format(date, 'EEEE do MMMM yyyy', { locale });
+};
+
+export const formatTimeRange = (
+  startDate: Date | null,
+  endDate: Date | null,
+  isValidStart: boolean,
+  isValidEnd: boolean,
+  locale: Locale,
+  timezone: string,
+): string | null => {
+  if (!isValidStart || !isValidEnd || !startDate || !endDate) {
+    return null;
+  }
+  const startTime = format(startDate, 'p', { locale });
+  const endTime = format(endDate, 'p', { locale });
+  return `${startTime} - ${endTime} (${timezone})`;
+};
+
+export const formatHeaderDateTime = (
+  date: Date | null,
+  now: Date,
+  isValidDate: boolean,
+  locale: Locale,
+  status: string,
+): string | null => {
+  if (!isValidDate || !date) {
+    return null;
+  }
+
+  const daysDifference = differenceInDays(date, now);
+
+  if (status === 'upcoming') {
+    if (daysDifference <= 1) {
+      return formatRelative(date, now, { locale });
+    } else if (daysDifference <= 6) {
+      const relativeDay = formatRelative(date, now, { locale }).split(' at ')[0];
+      const specificTime = format(date, 'p', { locale });
+      const specificDate = format(date, 'do MMM', { locale });
+      return `${relativeDay} (${specificDate}) at ${specificTime}`;
+    } else {
+      return format(date, `EEEE do MMMM 'at' p`, { locale });
+    }
+  } else {
+    return format(date, 'do MMMM yyyy', { locale });
+  }
+};
+
+export const formatDialogDateTime = (
+  date: Date | null,
+  isValidDate: boolean,
+  locale: Locale,
+): string | null => {
+  if (!isValidDate || !date) {
+    return null;
+  }
+  return format(date, 'EEEE do MMMM yyyy, p', { locale });
+};
+
+function differenceInDays(dateLeft: Date, dateRight: Date): number {
+  const startOfDayLeft = new Date(dateLeft.getFullYear(), dateLeft.getMonth(), dateLeft.getDate());
+  const startOfDayRight = new Date(
+    dateRight.getFullYear(),
+    dateRight.getMonth(),
+    dateRight.getDate(),
+  );
+
+  const diff = startOfDayLeft.getTime() - startOfDayRight.getTime();
+  return Math.round(diff / (1000 * 60 * 60 * 24));
+}
diff --git a/lib/utils/getTherapySessions.ts b/lib/utils/getTherapySessions.ts
new file mode 100644
index 000000000..2af1d90ad
--- /dev/null
+++ b/lib/utils/getTherapySessions.ts
@@ -0,0 +1,45 @@
+import { isValid } from 'date-fns';
+import { TherapySession } from '../store/therapySessionsSlice';
+
+type SessionStatus = 'upcoming' | 'past' | 'cancelled';
+
+export function getTherapySessionStatus(session: TherapySession, now: Date): SessionStatus {
+  if (session.cancelledAt) {
+    return 'cancelled';
+  }
+  const startDate = new Date(session.startDateTime || 0);
+  if (isValid(startDate) && startDate > now) {
+    return 'upcoming';
+  }
+  return 'past';
+}
+
+export const sortTherapyBookings = (
+  sessions: TherapySession[],
+  now: Date,
+): { sorted: TherapySession[]; upcomingCount: number } => {
+  const enrichedSessions = sessions.map((session) => ({
+    ...session,
+    status: getTherapySessionStatus(session, now),
+    sortTimestamp: isValid(new Date(session.startDateTime || 0))
+      ? new Date(session.startDateTime || 0).getTime()
+      : 0,
+  }));
+
+  const sorted = [...enrichedSessions].sort((a, b) => {
+    const statusOrder = { upcoming: 1, past: 2, cancelled: 3 };
+    const statusComparison = statusOrder[a.status] - statusOrder[b.status];
+    if (statusComparison !== 0) return statusComparison;
+
+    if (a.sortTimestamp === 0 && b.sortTimestamp === 0) return 0;
+    if (a.sortTimestamp === 0) return 1;
+    if (b.sortTimestamp === 0) return -1;
+
+    return a.status === 'upcoming'
+      ? a.sortTimestamp - b.sortTimestamp
+      : b.sortTimestamp - a.sortTimestamp;
+  });
+
+  const upcomingCount = sorted.filter((s) => s.status === 'upcoming').length;
+  return { sorted, upcomingCount };
+};
diff --git a/lib/utils/pwaDetection.ts b/lib/utils/pwaDetection.ts
new file mode 100644
index 000000000..2d037a3bb
--- /dev/null
+++ b/lib/utils/pwaDetection.ts
@@ -0,0 +1,147 @@
+import { useEffect, useState } from 'react';
+
+export interface PWAStatus {
+  isInstalled: boolean;
+  installSource: string;
+  displayMode: string;
+  detectionMethods: Record<string, boolean>;
+}
+
+/**
+ * Detects if the app is running as an installed PWA
+ * @returns PWA status information or null if running on server
+ */
+export const detectPWA = (): PWAStatus | null => {
+  // Early return if running on server
+  if (typeof window === 'undefined') {
+    return null;
+  }
+
+  // Basic display mode checks
+  const isStandalone = window.matchMedia('(display-mode: standalone)').matches;
+  const isFullScreen = window.matchMedia('(display-mode: fullscreen)').matches;
+  const isMinimalUi = window.matchMedia('(display-mode: minimal-ui)').matches;
+  const isWindowControls = window.matchMedia('(display-mode: window-controls-overlay)').matches;
+
+  // Platform-specific checks
+  const iosPWA = Boolean((window.navigator as any).standalone);
+  const isWindowsApp = navigator.userAgent.includes('MSAppHost');
+  const isAndroidPWA = document.referrer.includes('android-app://');
+
+  // Technical checks
+  const hasServiceWorker = 'serviceWorker' in navigator;
+  const hasManifest = !!Array.from(document.querySelectorAll('link')).find(
+    (link) => link.rel === 'manifest',
+  );
+  const isHttps = window.location.protocol === 'https:';
+
+  // Combined determination
+  const detectionMethods = {
+    isStandalone,
+    isFullScreen,
+    isMinimalUi,
+    isWindowControls,
+    iosPWA,
+    isWindowsApp,
+    isAndroidPWA,
+    hasServiceWorker,
+    hasManifest,
+    isHttps,
+  };
+
+  const isInstalled =
+    isStandalone ||
+    isFullScreen ||
+    isMinimalUi ||
+    isWindowControls ||
+    iosPWA ||
+    isWindowsApp ||
+    isAndroidPWA;
+
+  // Determine display mode
+  let displayMode = 'browser';
+  if (isStandalone) displayMode = 'standalone';
+  if (isFullScreen) displayMode = 'fullscreen';
+  if (isMinimalUi) displayMode = 'minimal-ui';
+  if (isWindowControls) displayMode = 'window-controls-overlay';
+
+  // Determine install source
+  let installSource = 'browser';
+  if (isAndroidPWA) {
+    installSource = 'Android';
+  } else if (iosPWA) {
+    installSource = 'iOS';
+  } else if (isWindowsApp) {
+    installSource = 'Windows Store';
+  } else if (isWindowControls) {
+    installSource = 'Chrome Desktop';
+  } else if (isStandalone || isFullScreen || isMinimalUi) {
+    installSource = 'Home Screen';
+  }
+
+  return {
+    isInstalled,
+    installSource,
+    displayMode,
+    detectionMethods,
+  };
+};
+
+/**
+ * Hook to monitor PWA installation status
+ */
+export const usePWAStatus = () => {
+  const [pwaStatus, setPwaStatus] = useState<PWAStatus | null>(null);
+
+  useEffect(() => {
+    // Initial check
+    setPwaStatus(detectPWA());
+
+    // Set up listeners for display mode changes
+    const modeQueries = [
+      window.matchMedia('(display-mode: standalone)'),
+      window.matchMedia('(display-mode: fullscreen)'),
+      window.matchMedia('(display-mode: minimal-ui)'),
+      window.matchMedia('(display-mode: window-controls-overlay)'),
+    ];
+
+    const handleDisplayModeChange = () => {
+      setPwaStatus(detectPWA());
+    };
+
+    modeQueries.forEach((query) => {
+      query.addEventListener('change', handleDisplayModeChange);
+    });
+
+    return () => {
+      modeQueries.forEach((query) => {
+        query.removeEventListener('change', handleDisplayModeChange);
+      });
+    };
+  }, []);
+
+  return pwaStatus;
+};
+
+/**
+ * Store PWA status in local storage
+ */
+export const storePWAStatus = (status: PWAStatus | null): void => {
+  if (typeof localStorage === 'undefined' || !status) return;
+
+  localStorage.setItem('pwaInstalled', String(status.isInstalled));
+  localStorage.setItem('pwaInstallSource', status.installSource);
+  localStorage.setItem('pwaDisplayMode', status.displayMode);
+};
+
+/**
+ * Get previously stored PWA status
+ */
+export const getStoredPWAStatus = (): { isInstalled: boolean; source: string } | null => {
+  if (typeof localStorage === 'undefined') return null;
+
+  const isInstalled = localStorage.getItem('pwaInstalled') === 'true';
+  const source = localStorage.getItem('pwaInstallSource') || '';
+
+  return { isInstalled, source };
+};
diff --git a/lib/utils/richText.tsx b/lib/utils/richText.tsx
index 283a0ac54..8c02b8e51 100644
--- a/lib/utils/richText.tsx
+++ b/lib/utils/richText.tsx
@@ -76,9 +76,9 @@ export const RichTextOptions: RenderOptions = {
       if (href)
         return (
           <Link
-            component={href.includes(BASE_URL) ? i18nLink : 'a'}
+            component={href.includes(BASE_URL) || href.startsWith('/') ? i18nLink : 'a'}
             href={href}
-            target={href?.match(/^(https?:)?\/\//) && '_blank'}
+            target={target || '_blank'}
           >
             {children}
           </Link>
diff --git a/next.config.js b/next.config.js
index 233dc9be9..772e782ed 100644
--- a/next.config.js
+++ b/next.config.js
@@ -45,7 +45,7 @@ module.exports = withBundleAnalyzer(
         emotion: true,
       },
       images: {
-        domains: ['a.storyblok.com'],
+        remotePatterns: [{ protocol: 'https', hostname: 'a.storyblok.com' }],
       },
       serverExternalPackages: ['newrelic'],
       async redirects() {
@@ -90,6 +90,11 @@ module.exports = withBundleAnalyzer(
             destination: '/:locale/messaging',
             permanent: true,
           },
+          {
+            source: '/about-our-courses',
+            destination: '/courses',
+            permanent: false,
+          },
         ];
       },
       async rewrites() {
diff --git a/package.json b/package.json
index 4b88c5029..a049f41c2 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "resolutions": {
-    "@types/react": "19.1.2",
+    "@types/react": "19.1.4",
     "redux": "^5.0.1",
     "cross-spawn": "^7.0.5"
   },
@@ -24,6 +24,7 @@
     "test:watch": "jest --watch",
     "cypress": "cypress open",
     "cypress:headless": "cypress run --headless true --browser chrome",
+    "cypress:headless-spec": "cypress run --headless true --browser chrome --spec $SPEC",
     "cypress:coverage": "npx nyc report",
     "cypress:auth": "cypress run --spec \"cypress/integration/tests/auth-redirect.cy.tsx,cypress/integration/tests/create-user*.cy.tsx,cypress/integration/tests/reset-password.cy.tsx\"",
     "cypress:user-accounts": "cypress run --spec \"cypress/integration/tests/delete-user.cy.tsx,cypress/integration/tests/user-account-settings.cy.tsx,cypress/integration/tests/user-disable-service-emails.cy.tsx,cypress/integration/tests/user-about-you.cy.tsx,cypress/integration/tests/user-update-email.cy.tsx,cypress/integration/tests/user-apply-a-code.cy.tsx\"",
@@ -46,20 +47,21 @@
     "@mui/icons-material": "^5.17.1",
     "@mui/lab": "^5.0.0-alpha.176",
     "@mui/material": "^5.17.1",
-    "@mui/material-nextjs": "^7.0.2",
-    "@next/third-parties": "^15.3.1",
-    "@reduxjs/toolkit": "^2.7.0",
+    "@mui/material-nextjs": "^7.1.0",
+    "@next/third-parties": "^15.3.2",
+    "@reduxjs/toolkit": "^2.8.1",
     "@rollbar/react": "^0.12.1",
-    "@storyblok/react": "^4.6.0",
+    "@storyblok/react": "^4.6.1",
     "@vercel/analytics": "^1.5.0",
-    "axios": "^1.8.4",
+    "axios": "^1.9.0",
     "cross-spawn": "^7.0.0",
-    "firebase": "^11.6.0",
+    "date-fns": "^4.1.0",
+    "firebase": "^11.7.1",
     "gemoji": "^8.1.0",
     "js-cookie": "^3.0.1",
-    "newrelic": "^12.18.0",
-    "next": "^15.3.1",
-    "next-intl": "^4.0.2",
+    "newrelic": "^12.18.2",
+    "next": "^15.3.2",
+    "next-intl": "^4.1.0",
     "next-pwa": "^5.6.0",
     "nextjs-hotjar": "^1.2.0",
     "nuka-carousel": "^8.2.0",
@@ -74,30 +76,30 @@
     "storyblok-rich-text-react-renderer": "^2.9.0"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "^3.14.0",
+    "@cypress/code-coverage": "^3.14.2",
     "@istanbuljs/nyc-config-babel": "^3.0.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@next/bundle-analyzer": "15.3.1",
+    "@next/bundle-analyzer": "15.3.2",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.3.0",
     "@types/jest": "^29.5.12",
     "@types/js-cookie": "^3.0.2",
-    "@types/newrelic": "^9.14.3",
-    "@types/node": "^22.14.1",
-    "@types/react": "19.1.2",
+    "@types/newrelic": "^9.14.8",
+    "@types/node": "^22.15.19",
+    "@types/react": "19.1.4",
     "babel-plugin-istanbul": "^7.0.0",
-    "cypress": "^14.3.1",
+    "cypress": "^14.3.3",
     "dotenv": "^16.5.0",
-    "eslint": "9.25.0",
-    "eslint-config-next": "15.3.1",
-    "eslint-config-prettier": "^10.1.2",
+    "eslint": "9.27.0",
+    "eslint-config-next": "15.3.2",
+    "eslint-config-prettier": "^10.1.5",
     "husky": "^9.0.11",
     "identity-obj-proxy": "^3.0.0",
     "istanbul-lib-coverage": "^3.2.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "knip": "^5.50.5",
-    "mailslurp-client": "^15.21.0",
+    "knip": "^5.56.0",
+    "mailslurp-client": "^15.22.1",
     "nyc": "^17.0.0",
     "pre-commit": "^1.2.2",
     "prettier": "^3.5.3",
diff --git a/tsconfig.json b/tsconfig.json
index 2af513246..f1c7f9f2b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2022",
     "lib": ["dom", "dom.iterable", "esnext"],
     "baseUrl": ".",
     "paths": {
diff --git a/yarn.lock b/yarn.lock
index afae185b3..669404eed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -874,19 +874,10 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.10.tgz#a07b4d8fa27af131a633d7b3524db803eb4764c2"
-  integrity sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
-"@babel/runtime@^7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.0.tgz#fbee7cf97c709518ecc1f590984481d5460d4762"
-  integrity sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==
-  dependencies:
-    regenerator-runtime "^0.14.0"
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.27.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.1.tgz#9fce313d12c9a77507f264de74626e87fd0dc541"
+  integrity sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==
 
 "@babel/template@^7.25.9", "@babel/template@^7.3.3":
   version "7.25.9"
@@ -940,11 +931,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@colors/colors@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
-  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
-
 "@colors/colors@1.6.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
@@ -958,10 +944,10 @@
     nan "^2.19.0"
     node-gyp-build "^4.8.1"
 
-"@cypress/code-coverage@^3.14.0":
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.14.0.tgz#3608cc0a509eb5fbe89308ffe9693678500f94b7"
-  integrity sha512-Bk3V9xEUrNF+3QaDzKiiyO+gpW+tlOQt57pJYo51FXwXIQGF8thghcv80Fvc1BZjNWds3G71kDB7s10YlHxy1Q==
+"@cypress/code-coverage@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.14.2.tgz#d2c82b77e1acadcd279fa2e58381797612db3b4d"
+  integrity sha512-HhdjQvUn/oIl9HCoJW1uoTgcDzipdCB6yPpWU2HNemCmMh6Ws6oQxfifue7BNlCXPX28jsnEzYzix9/eHYQ/Hw==
   dependencies:
     "@cypress/webpack-preprocessor" "^6.0.0"
     chalk "4.1.2"
@@ -1019,6 +1005,14 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@emnapi/core@^1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.4.3.tgz#9ac52d2d5aea958f67e52c40a065f51de59b77d6"
+  integrity sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==
+  dependencies:
+    "@emnapi/wasi-threads" "1.0.2"
+    tslib "^2.4.0"
+
 "@emnapi/runtime@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.4.0.tgz#8f509bf1059a5551c8fe829a1c4e91db35fdfbee"
@@ -1026,6 +1020,20 @@
   dependencies:
     tslib "^2.4.0"
 
+"@emnapi/runtime@^1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.4.3.tgz#c0564665c80dc81c448adac23f9dfbed6c838f7d"
+  integrity sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz#977f44f844eac7d6c138a415a123818c655f874c"
+  integrity sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==
+  dependencies:
+    tslib "^2.4.0"
+
 "@emotion/babel-plugin@^11.13.5":
   version "11.13.5"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0"
@@ -1180,10 +1188,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.2.1.tgz#26042c028d1beee5ce2235a7929b91c52651646d"
   integrity sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==
 
-"@eslint/core@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.13.0.tgz#bf02f209846d3bf996f9e8009db62df2739b458c"
-  integrity sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==
+"@eslint/core@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.14.0.tgz#326289380968eaf7e96f364e1e4cf8f3adf2d003"
+  integrity sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==
   dependencies:
     "@types/json-schema" "^7.0.15"
 
@@ -1202,33 +1210,33 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.25.0":
-  version "9.25.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.0.tgz#4656b39de7cbf12fd66e7d54d9a26d05855b2a5a"
-  integrity sha512-iWhsUS8Wgxz9AXNfvfOPFSW4VfMXdVhp1hjkZVhXCrpgh/aLcc45rX6MPu+tIVUWDw0HfNwth7O28M1xDxNf9w==
+"@eslint/js@9.27.0":
+  version "9.27.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.27.0.tgz#181a23460877c484f6dd03890f4e3fa2fdeb8ff0"
+  integrity sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==
 
 "@eslint/object-schema@^2.1.6":
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.6.tgz#58369ab5b5b3ca117880c0f6c0b0f32f6950f24f"
   integrity sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==
 
-"@eslint/plugin-kit@^0.2.8":
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz#47488d8f8171b5d4613e833313f3ce708e3525f8"
-  integrity sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==
+"@eslint/plugin-kit@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz#b71b037b2d4d68396df04a8c35a49481e5593067"
+  integrity sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==
   dependencies:
-    "@eslint/core" "^0.13.0"
+    "@eslint/core" "^0.14.0"
     levn "^0.4.1"
 
-"@firebase/analytics-compat@0.2.18":
-  version "0.2.18"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.18.tgz#5ea9bdea188d4c91938f539af4c4414813ddc5c9"
-  integrity sha512-Hw9mzsSMZaQu6wrTbi3kYYwGw9nBqOHr47pVLxfr5v8CalsdrG5gfs9XUlPOZjHRVISp3oQrh1j7d3E+ulHPjQ==
+"@firebase/analytics-compat@0.2.19":
+  version "0.2.19"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.2.19.tgz#785039d3239c1d6f0109cc748d9e21c01a4bf463"
+  integrity sha512-l/PYILG9Tu4D5XtazqzvT5J6f7B/laqlaoSjiee6QdQkEg1kmMIeAaLKWGbf8tR/T3g6Lv3lx1AwJBuLhVaqTQ==
   dependencies:
-    "@firebase/analytics" "0.10.12"
+    "@firebase/analytics" "0.10.13"
     "@firebase/analytics-types" "0.8.3"
-    "@firebase/component" "0.6.13"
-    "@firebase/util" "1.11.0"
+    "@firebase/component" "0.6.14"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/analytics-types@0.8.3":
@@ -1236,27 +1244,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.8.3.tgz#d08cd39a6209693ca2039ba7a81570dfa6c1518f"
   integrity sha512-VrIp/d8iq2g501qO46uGz3hjbDb8xzYMrbu8Tp0ovzIzrvJZ2fvmj649gTjge/b7cCCcjT0H37g1gVtlNhnkbg==
 
-"@firebase/analytics@0.10.12":
-  version "0.10.12"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.12.tgz#b49b9351b8cb19da007320a52932b953fff90d71"
-  integrity sha512-iDCGnw6qdFqwI5ywkgece99WADJNoymu+nLIQI4fZM/vCZ3bEo4wlpEetW71s1HqGpI0hQStiPhqVjFxDb2yyw==
+"@firebase/analytics@0.10.13":
+  version "0.10.13"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.10.13.tgz#57569e44a8f97b6d4366037df76525667c6011e4"
+  integrity sha512-X+6wMOPgA9l0AeeMdMcMfaCP4XKPvrhx55MGuMrfHvUrOvFKldpzBum7KkoGJMoexKmqmKP+mCmJMY9Fb8K6Hw==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/installations" "0.6.13"
+    "@firebase/component" "0.6.14"
+    "@firebase/installations" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/app-check-compat@0.3.20":
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.20.tgz#0dfce42699402f3b621be98857a8109b9397a37b"
-  integrity sha512-/twgmlnNAaZ/wbz3kcQrL/26b+X+zUX+lBmu5LwwEcWcpnb+mrVEAKhD7/ttm52dxYiSWtLDeuXy3FXBhqBC5A==
+"@firebase/app-check-compat@0.3.22":
+  version "0.3.22"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.3.22.tgz#083d1bff90eb8be2a84b6dceb77c574fd7c1a192"
+  integrity sha512-Tag7kI0vnzlsKrpnnhUgbTTTv2NNGR+Sf2pHiy3QApOaOG5tx6W5OQyvKv3+KaGbjEU19mvgOzOe1q5XHDoRvQ==
   dependencies:
-    "@firebase/app-check" "0.8.13"
+    "@firebase/app-check" "0.9.1"
     "@firebase/app-check-types" "0.5.3"
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/app-check-interop-types@0.3.3":
@@ -1269,25 +1277,25 @@
   resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.5.3.tgz#38ba954acf4bffe451581a32fffa20337f11d8e5"
   integrity sha512-hyl5rKSj0QmwPdsAxrI5x1otDlByQ7bvNvVt8G/XPO2CSwE++rmSVf3VEhaeOR4J8ZFaF0Z0NDSmLejPweZ3ng==
 
-"@firebase/app-check@0.8.13":
-  version "0.8.13"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.8.13.tgz#20b212d0ea5b79c9492f434abc276d4f28b19371"
-  integrity sha512-ONsgml8/dplUOAP42JQO6hhiWDEwR9+RUTLenxAN9S8N6gel/sDQ9Ci721Py1oASMGdDU8v9R7xAZxzvOX5lPg==
+"@firebase/app-check@0.9.1":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.9.1.tgz#c5e130d5609c40fe530fde284e696910d34347f4"
+  integrity sha512-3gt4yt7oFXalJ2pLpawxKZI9lLLv2Jo2H3AoVKv9Fqy6zQmAC0nSItt9JUl2iDNd11V/bj4OC5rfoAjtyK22dQ==
   dependencies:
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/app-compat@0.2.53":
-  version "0.2.53"
-  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.2.53.tgz#ad5c520a2ea6df4cff0a8b4d5cc14c03c0d7bc57"
-  integrity sha512-vDeZSit0q4NyaDIVcaiJF3zhLgguP6yc0JwQAfpTyllgt8XMtkMFyY/MxJtFrK2ocpQX/yCbV2DXwvpY2NVuJw==
+"@firebase/app-compat@0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.3.1.tgz#0fd9c7bac9a4473f8879240b0be2800ec74c0923"
+  integrity sha512-NCW2H/FawF0cBs3ciRx7NLt0H/VKn71H/q1RfTfctFez7maZ3KJi8QudpmIwoEqEW1N5HiXWxKAHY18Uo6o2Bg==
   dependencies:
-    "@firebase/app" "0.11.4"
-    "@firebase/component" "0.6.13"
+    "@firebase/app" "0.12.1"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/app-types@0.9.3":
@@ -1295,26 +1303,26 @@
   resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.9.3.tgz#8408219eae9b1fb74f86c24e7150a148460414ad"
   integrity sha512-kRVpIl4vVGJ4baogMDINbyrIOtOxqhkZQg4jTq3l8Lw6WSk0xfpEYzezFu+Kl4ve4fbPl79dvwRtaFqAC/ucCw==
 
-"@firebase/app@0.11.4":
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.11.4.tgz#93f2637ed5b8dbc1ddf879c727d66a00c656c959"
-  integrity sha512-GPREsZjfSaHzwyC6cI/Cqvzf6zxqMzya+25tSpUstdqC2w0IdfxEfOMjfdW7bDfVEf4Rb4Nb6gfoOAgVSp4c4g==
+"@firebase/app@0.12.1":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.12.1.tgz#562173e5afdbab74af23ac185687949b4b1345ba"
+  integrity sha512-ASExOlmmjRMdwOQ65Oj6R9JBqa7iiT1/LgZjtbU7FqxoJZNWHrt39NJ/z2bjyYDdAHX8jkY7muFqzahScCXgfA==
   dependencies:
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     idb "7.1.1"
     tslib "^2.1.0"
 
-"@firebase/auth-compat@0.5.20":
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.5.20.tgz#b17755e874f1f0fe5e2b638c462bbdfb519526f4"
-  integrity sha512-8FwODTSBnaqGQbKfML7LcpzGGPyouB7YHg3dZq+CZMziVc7oBY1jJeNvpnM1hAQoVuTjWPXoRrCltdGeOlkKfQ==
+"@firebase/auth-compat@0.5.22":
+  version "0.5.22"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.5.22.tgz#21dd8d8e719f076e9a71e6d62b5fce685f3ae25a"
+  integrity sha512-RC7QdBIgg/hyxhJW2sso9Syb9iSr2wZ+vB6c/PnN+64uNZhp8bdxauhmDJGmbvStwCf/l2RpBsusVXQXVMnrgQ==
   dependencies:
-    "@firebase/auth" "1.10.0"
+    "@firebase/auth" "1.10.2"
     "@firebase/auth-types" "0.13.0"
-    "@firebase/component" "0.6.13"
-    "@firebase/util" "1.11.0"
+    "@firebase/component" "0.6.14"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/auth-interop-types@0.2.4":
@@ -1327,77 +1335,77 @@
   resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.13.0.tgz#ae6e0015e3bd4bfe18edd0942b48a0a118a098d9"
   integrity sha512-S/PuIjni0AQRLF+l9ck0YpsMOdE8GO2KU6ubmBB7P+7TJUCQDa3R1dlgYm9UzGbbePMZsp0xzB93f2b/CgxMOg==
 
-"@firebase/auth@1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-1.10.0.tgz#eabfe747700a835a89c0069177ac58c40bfa6153"
-  integrity sha512-S7SqBsN7sIQsftNE3bitLlK+4bWrTHY+Rx2JFlNitgVYu2nK8W8ZQrkG8GCEwiFPq0B2vZ9pO5kVTFfq2sP96A==
+"@firebase/auth@1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-1.10.2.tgz#292ead208f2afd513416e8ffc6d789e6c832d3ad"
+  integrity sha512-HHudcj3CJyXpoMKslNOVHGSNJdAUjvy5xBA/G/uPb32QFqvx5F3EW9RDYvve2IHEN7Vpc1QTkk/28J32x83UGA==
   dependencies:
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/component@0.6.13":
-  version "0.6.13"
-  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.13.tgz#6513379f1c09264133969d87282ce0d5bbbb2cd9"
-  integrity sha512-I/Eg1NpAtZ8AAfq8mpdfXnuUpcLxIDdCDtTzWSh+FXnp/9eCKJ3SNbOCKrUCyhLzNa2SiPJYruei0sxVjaOTeg==
+"@firebase/component@0.6.14":
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.14.tgz#8aef19162e739f594686744fdcc15e154b1e49b8"
+  integrity sha512-kf/zAT8GQJ9nYoHuj0mv7twp1QzifKYrO+GsmsVHHM+Hi9KkmI7E3B3J0CtihHpb34vinl4gbJrYJ2p2wfvc9A==
   dependencies:
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/data-connect@0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@firebase/data-connect/-/data-connect-0.3.3.tgz#644e67c248ceccbed749b1eb10418079783c5542"
-  integrity sha512-JsgppNX1wcQYP5bg4Sg6WTS7S0XazklSjr1fG3ox9DHtt4LOQwJ3X1/c81mKMIZxocV22ujiwLYQWG6Y9D1FiQ==
+"@firebase/data-connect@0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@firebase/data-connect/-/data-connect-0.3.5.tgz#a9c6a3674a918309b64375f621c5d074b1cd7a64"
+  integrity sha512-YtiSRdiJicaXuyRC/yJjErQ/aHIlWt2umcBSpggYCP9TqKRIsJtgoskSSGzWJhzHn13BojYa7rWXmutTc5tovg==
   dependencies:
     "@firebase/auth-interop-types" "0.2.4"
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/database-compat@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-2.0.5.tgz#110f612901995f9800f2435f58686e0c6f3d2544"
-  integrity sha512-CNf1UbvWh6qIaSf4sn6sx2DTDz/em/D7QxULH1LTxxDQHr9+CeYGvlAqrKnk4ZH0P0eIHyQFQU7RwkUJI0B9gQ==
+"@firebase/database-compat@2.0.6":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-2.0.6.tgz#74917b0b32e37fe4d629cb4ef749338dd2c91145"
+  integrity sha512-vv15b1E59sLwoVdjGKvJ75ok9Qu1VRJC/7KXAQGnXvURAL199Ndy1YEw6/GA9twoFlLCYnd2ltxxB2pPiL1Vqw==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/database" "1.0.14"
-    "@firebase/database-types" "1.0.10"
+    "@firebase/component" "0.6.14"
+    "@firebase/database" "1.0.15"
+    "@firebase/database-types" "1.0.11"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/database-types@1.0.10":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-1.0.10.tgz#14cfed45bb06394cf1641e19265cbf90e4f6fb51"
-  integrity sha512-mH6RC1E9/Pv8jf1/p+M8YFTX+iu+iHDN89hecvyO7wHrI4R1V0TXjxOHvX3nLJN1sfh0CWG6CHZ0VlrSmK/cwg==
+"@firebase/database-types@1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-1.0.11.tgz#75c01325da1247a131c9db1a747b92414e9e82e6"
+  integrity sha512-LBZG/nT6GbntbIdGxBNvu9PBtj4xUEE9wX8AFF6njFK/MufYBESiKqT+jhDwmbcM4zAha9U0Pcca8FvJ1z1bYw==
   dependencies:
     "@firebase/app-types" "0.9.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
 
-"@firebase/database@1.0.14":
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-1.0.14.tgz#1d579b345c0f926eaddb7703051999489300c3bd"
-  integrity sha512-9nxYtkHAG02/Nh2Ssms1T4BbWPPjiwohCvkHDUl4hNxnki1kPgsLo5xe9kXNzbacOStmVys+RUXvwzynQSKmUQ==
+"@firebase/database@1.0.15":
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-1.0.15.tgz#766d796970bb8663adbda6bc6f75803361a7a3eb"
+  integrity sha512-xmeTqKoIB2u1AXvLc1jq3Val0QAHUr49YycAr6feoDD7zM9dCjSk8rq9s1ESTv+tbbqS2BRoTpjIvxwXRTKhQQ==
   dependencies:
     "@firebase/app-check-interop-types" "0.3.3"
     "@firebase/auth-interop-types" "0.2.4"
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     faye-websocket "0.11.4"
     tslib "^2.1.0"
 
-"@firebase/firestore-compat@0.3.45":
-  version "0.3.45"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.45.tgz#93061f7d3644cd511749c9268d146e8c8c49a5de"
-  integrity sha512-uRvi7AYPmsDl7UZwPyV7jgDGYusEZ2+U2g7MndbQHKIA8fNHpYC6QrzMs58+/IjX+kF/lkUn67Vrr0AkVjlY+Q==
+"@firebase/firestore-compat@0.3.47":
+  version "0.3.47"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.3.47.tgz#9db5dd55d3ad04a4777e826ad5ad66cc49561682"
+  integrity sha512-8fs4Zz2nXOgOf62wCK06Fo6uMGojyEhNEg/x2Pdnir9H9AH4T5T5q4/0MXdgPFSNBFcrPl+SVlmD1WTEZL+XGA==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/firestore" "4.7.10"
+    "@firebase/component" "0.6.14"
+    "@firebase/firestore" "4.7.12"
     "@firebase/firestore-types" "3.0.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/firestore-types@3.0.3":
@@ -1405,28 +1413,28 @@
   resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-3.0.3.tgz#7d0c3dd8850c0193d8f5ee0cc8f11961407742c1"
   integrity sha512-hD2jGdiWRxB/eZWF89xcK9gF8wvENDJkzpVFb4aGkzfEaKxVRD1kjz1t1Wj8VZEp2LCB53Yx1zD8mrhQu87R6Q==
 
-"@firebase/firestore@4.7.10":
-  version "4.7.10"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-4.7.10.tgz#6fe0cd31fcd7f4a8e13f9585f53e9300cf3114c0"
-  integrity sha512-6nKsyo2U+jYSCcSE5sjMdDNA23DMUvYPUvsYGg09CNvcTO8GGKsPs7SpOhspsB91mbacq+u627CDAx3FUhPSSQ==
+"@firebase/firestore@4.7.12":
+  version "4.7.12"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-4.7.12.tgz#5ce8bf9200afba62f0f8205edca207a8946a132d"
+  integrity sha512-50KRdSp8xA7+G0wfWxlnCoEN951mt8BVdLMxeP57Rehj2DqIb41q6Fc6JH0dfQ4TlMqWua1YfVY1jPEAaHVF9w==
   dependencies:
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     "@firebase/webchannel-wrapper" "1.0.3"
     "@grpc/grpc-js" "~1.9.0"
     "@grpc/proto-loader" "^0.7.8"
     tslib "^2.1.0"
 
-"@firebase/functions-compat@0.3.20":
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.20.tgz#addf89242be8b4d63feacb15ef27785e16c5e220"
-  integrity sha512-iIudmYDAML6n3c7uXO2YTlzra2/J6lnMzmJTXNthvrKVMgNMaseNoQP1wKfchK84hMuSF8EkM4AvufwbJ+Juew==
+"@firebase/functions-compat@0.3.21":
+  version "0.3.21"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.3.21.tgz#6181d0c79be82452ec4b27117fb19ca524e6e533"
+  integrity sha512-FFtdZt6ve6VxOW6Y6IytR5wXXRQ0/IXTXsztrPd9HhilzzbHbXKYyyvODrnHfraslTW50gdZlj7WlZieiVhcig==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/functions" "0.12.3"
+    "@firebase/component" "0.6.14"
+    "@firebase/functions" "0.12.4"
     "@firebase/functions-types" "0.6.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/functions-types@0.6.3":
@@ -1434,27 +1442,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.6.3.tgz#f5faf770248b13f45d256f614230da6a11bfb654"
   integrity sha512-EZoDKQLUHFKNx6VLipQwrSMh01A1SaL3Wg6Hpi//x6/fJ6Ee4hrAeswK99I5Ht8roiniKHw4iO0B1Oxj5I4plg==
 
-"@firebase/functions@0.12.3":
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.12.3.tgz#b3e395aed1641d0d7169a22698c684a2745e02dd"
-  integrity sha512-Wv7JZMUkKLb1goOWRtsu3t7m97uK6XQvjQLPvn8rncY91+VgdU72crqnaYCDI/ophNuBEmuK8mn0/pAnjUeA6A==
+"@firebase/functions@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.12.4.tgz#ec4713623767e3b500ce8858a362629cb4f62ed6"
+  integrity sha512-XAvDHvJ1222+9lPHssgRzALejCSW/CN+mlyLbLXHSJHujfIfn9yPHOcAj9KfACavd+F8ey7h4mpxfHowczpVXw==
   dependencies:
     "@firebase/app-check-interop-types" "0.3.3"
     "@firebase/auth-interop-types" "0.2.4"
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/messaging-interop-types" "0.2.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/installations-compat@0.2.13":
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.13.tgz#0db0867ed58b782f7e2d142d9289a9eef1da24d5"
-  integrity sha512-f/o6MqCI7LD/ulY9gvgkv6w5k6diaReD8BFHd/y/fEdpsXmFWYS/g28GXCB72bRVBOgPpkOUNl+VsMvDwlRKmw==
+"@firebase/installations-compat@0.2.14":
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.2.14.tgz#41d4a7d4c2613718e997b0f0a605397fc534d95f"
+  integrity sha512-6+xTtM2WwnVWY2qO8seWZqkrwhklFsgDCzmburqppHrGXW7Saxpyb+EqSHjFRcQleq5UGFwo0xqorLCwHa9WXA==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/installations" "0.6.13"
+    "@firebase/component" "0.6.14"
+    "@firebase/installations" "0.6.14"
     "@firebase/installations-types" "0.5.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/installations-types@0.5.3":
@@ -1462,13 +1470,13 @@
   resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.5.3.tgz#cac8a14dd49f09174da9df8ae453f9b359c3ef2f"
   integrity sha512-2FJI7gkLqIE0iYsNQ1P751lO3hER+Umykel+TkLwHj6plzWVxqvfclPUZhcKFVQObqloEBTmpi2Ozn7EkCABAA==
 
-"@firebase/installations@0.6.13":
-  version "0.6.13"
-  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.13.tgz#a2a00aebb5dfb74fae08600ea98cd2681211dd3c"
-  integrity sha512-6ZpkUiaygPFwgVneYxuuOuHnSPnTA4KefLEaw/sKk/rNYgC7X6twaGfYb0sYLpbi9xV4i5jXsqZ3WO+yaguNgg==
+"@firebase/installations@0.6.14":
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.6.14.tgz#4c3c9f4020ff83466c49609a36b289b469069de8"
+  integrity sha512-uE837g9+sv6PfjWPgOfG3JtjZ+hJ7KBHO4UVenVsvhzgOxFkvLjO/bgE7fyvsaD3fOHSXunx3adRIg4eUEMPyA==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/util" "1.11.0"
+    "@firebase/component" "0.6.14"
+    "@firebase/util" "1.11.1"
     idb "7.1.1"
     tslib "^2.1.0"
 
@@ -1479,14 +1487,14 @@
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/messaging-compat@0.2.17":
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.2.17.tgz#fc223495319fe3784347dea77094b6e03548647d"
-  integrity sha512-5Q+9IG7FuedusdWHVQRjpA3OVD9KUWp/IPegcv0s5qSqRLBjib7FlAeWxN+VL0Ew43tuPJBY2HKhEecuizmO1Q==
+"@firebase/messaging-compat@0.2.18":
+  version "0.2.18"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.2.18.tgz#cc7d941cb1f30cfb8a35b9c50df00950bdff9da7"
+  integrity sha512-Msrm6krO0SNqJak5cLK1IuNYmQgWwofE/o2Zz/k1Ckb9qZTMjfmKkjWq7II9se+BFsPAe3YH+05Kx2RldwYYGw==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/messaging" "0.12.17"
-    "@firebase/util" "1.11.0"
+    "@firebase/component" "0.6.14"
+    "@firebase/messaging" "0.12.18"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/messaging-interop-types@0.2.3":
@@ -1494,28 +1502,28 @@
   resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.3.tgz#e647c9cd1beecfe6a6e82018a6eec37555e4da3e"
   integrity sha512-xfzFaJpzcmtDjycpDeCUj0Ge10ATFi/VHVIvEEjDNc3hodVBQADZ7BWQU7CuFpjSHE+eLuBI13z5F/9xOoGX8Q==
 
-"@firebase/messaging@0.12.17":
-  version "0.12.17"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.12.17.tgz#41eaeee70a89136715a4f7cb2b1a602423fc44ec"
-  integrity sha512-W3CnGhTm6Nx8XGb6E5/+jZTuxX/EK8Vur4QXvO1DwZta/t0xqWMRgO9vNsZFMYBqFV4o3j4F9qK/iddGYwWS6g==
+"@firebase/messaging@0.12.18":
+  version "0.12.18"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.12.18.tgz#989ee15dddb41ce36fac3b1899bb66d47a01ddaa"
+  integrity sha512-2MGhUGoCZloB7ysoYzG/T2nnRmHYLT+AcqYouZuD6APabpkDhF8lHsmSQq4MFSlXhI3DKFOXxjuvbY8ec4C2JQ==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/installations" "0.6.13"
+    "@firebase/component" "0.6.14"
+    "@firebase/installations" "0.6.14"
     "@firebase/messaging-interop-types" "0.2.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     idb "7.1.1"
     tslib "^2.1.0"
 
-"@firebase/performance-compat@0.2.15":
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.15.tgz#4e5034add63917cb6357938126e9e6562d0e7208"
-  integrity sha512-wUxsw7hGBEMN6XfvYQqwPIQp5LcJXawWM5tmYp6L7ClCoTQuEiCKHWWVurJgN8Q1YHzoHVgjNfPQAOVu29iMVg==
+"@firebase/performance-compat@0.2.16":
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.2.16.tgz#35f2ee55b1401e47129c632c03c0e6ac0e59aeae"
+  integrity sha512-B0Wv11TnS4leQmkCHDx/quyy3B6Qz+Zog0y/um2dSlfwO8YnbfJYqG+zUlJsCs/dB8dnyNbcP0o80cZq6y8UyQ==
   dependencies:
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/performance" "0.7.2"
+    "@firebase/performance" "0.7.3"
     "@firebase/performance-types" "0.2.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/performance-types@0.2.3":
@@ -1523,28 +1531,28 @@
   resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.2.3.tgz#5ce64e90fa20ab5561f8b62a305010cf9fab86fb"
   integrity sha512-IgkyTz6QZVPAq8GSkLYJvwSLr3LS9+V6vNPQr0x4YozZJiLF5jYixj0amDtATf1X0EtYHqoPO48a9ija8GocxQ==
 
-"@firebase/performance@0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.7.2.tgz#e30ee3e3c120c53f48bde7bdd915687f1e3b27e1"
-  integrity sha512-DXLLp0R0jdxH/yTmv+WTkOzsLl8YYecXh4lGZE0dzqC0IV8k+AxpLSSWvOTCkAETze8yEU/iF+PtgYVlGjfMMQ==
+"@firebase/performance@0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.7.3.tgz#9088ac36b5376258f37b7ff84cd0e9bb3955e1e9"
+  integrity sha512-PNBBbMskmSK8D8S1uZRzTqC2LpPDxVw/RbM5IsfrzyyJcyT6Lo+L8Y1vjBvVuK2Mw6pS6M6TgGncf2s+wq3kRA==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/installations" "0.6.13"
+    "@firebase/component" "0.6.14"
+    "@firebase/installations" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
     web-vitals "^4.2.4"
 
-"@firebase/remote-config-compat@0.2.13":
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.13.tgz#4a35c2c6bb582d96aecc45da18f5094359cb5361"
-  integrity sha512-UmHoO7TxAEJPIZf8e1Hy6CeFGMeyjqSCpgoBkQZYXFI2JHhzxIyDpr8jVKJJN1dmAePKZ5EX7dC13CmcdTOl7Q==
+"@firebase/remote-config-compat@0.2.14":
+  version "0.2.14"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.2.14.tgz#2a001ba99a163e40d1cb645e12c8aecebae78297"
+  integrity sha512-qr0H1+y58ErLRbvD58IzlyVK+DjtGCNRDq0E1EM6xj5K3rB+3Ifmwq1EU5gzX0kI+xQlXYNHMFYxd+PTgwblUg==
   dependencies:
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/remote-config" "0.6.0"
+    "@firebase/remote-config" "0.6.1"
     "@firebase/remote-config-types" "0.4.0"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/remote-config-types@0.4.0":
@@ -1552,26 +1560,26 @@
   resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.4.0.tgz#91b9a836d5ca30ced68c1516163b281fbb544537"
   integrity sha512-7p3mRE/ldCNYt8fmWMQ/MSGRmXYlJ15Rvs9Rk17t8p0WwZDbeK7eRmoI1tvCPaDzn9Oqh+yD6Lw+sGLsLg4kKg==
 
-"@firebase/remote-config@0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.6.0.tgz#24a6966a4d092260983ba8597cc039f5795cd35f"
-  integrity sha512-Yrk4l5+6FJLPHC6irNHMzgTtJ3NfHXlAXVChCBdNFtgmzyGmufNs/sr8oA0auEfIJ5VpXCaThRh3P4OdQxiAlQ==
+"@firebase/remote-config@0.6.1":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.6.1.tgz#49081baf475589df4953c45d91a934b90a4f7769"
+  integrity sha512-nlZ75rEVuGFGjUHuQuZIeLTTyHgCjW4jD2uCXu6mwNrQ6Mh18gjN3rS0Pfxz40NYcNlzfWPf0uvA4CYMXWa6yA==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/installations" "0.6.13"
+    "@firebase/component" "0.6.14"
+    "@firebase/installations" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/storage-compat@0.3.17":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.17.tgz#67f6bbc498971e6e404e0ea660fa5df81c5ba5ea"
-  integrity sha512-CBlODWEZ5b6MJWVh21VZioxwxNwVfPA9CAdsk+ZgVocJQQbE2oDW1XJoRcgthRY1HOitgbn4cVrM+NlQtuUYhw==
+"@firebase/storage-compat@0.3.18":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.3.18.tgz#d9d8d4d89c209f03cfe26d07deadbed7cd04fc98"
+  integrity sha512-2A4LoqVV4GG8YlLU07ktjw8Xl558odeTg9a24wnT4P8Syf17Q6TjYCTwYGaFxYjQ00V7HUh9TfJIg9uO5zjeJw==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/storage" "0.13.7"
+    "@firebase/component" "0.6.14"
+    "@firebase/storage" "0.13.8"
     "@firebase/storage-types" "0.8.3"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/storage-types@0.8.3":
@@ -1579,31 +1587,31 @@
   resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.8.3.tgz#2531ef593a3452fc12c59117195d6485c6632d3d"
   integrity sha512-+Muk7g9uwngTpd8xn9OdF/D48uiQ7I1Fae7ULsWPuKoCH3HU7bfFPhxtJYzyhjdniowhuDpQcfPmuNRAqZEfvg==
 
-"@firebase/storage@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.13.7.tgz#809fc23685ad9ba8fdfb3bc758e3353867c9e796"
-  integrity sha512-FkRyc24rK+Y6EaQ1tYFm3TevBnnfSNA0VyTfew2hrYyL/aYfatBg7HOgktUdB4kWMHNA9VoTotzZTGoLuK92wg==
+"@firebase/storage@0.13.8":
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.13.8.tgz#1ca84b51bf406c2ecf4455efe2c3c4e29b43487b"
+  integrity sha512-DjO8bSbwY/o+dbri3wear1gkrorgTpqi4uBTMoZZ02WOVR1A5AX8k/eYpUVuAvWyEDMWz/ECv4PgEokNajDsow==
   dependencies:
-    "@firebase/component" "0.6.13"
-    "@firebase/util" "1.11.0"
+    "@firebase/component" "0.6.14"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
-"@firebase/util@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.11.0.tgz#e74ee2dc260ec4f9e75fe5d52bc4b0254d9872a9"
-  integrity sha512-PzSrhIr++KI6y4P6C/IdgBNMkEx0Ex6554/cYd0Hm+ovyFSJtJXqb/3OSIdnBoa2cpwZT1/GW56EmRc5qEc5fQ==
+"@firebase/util@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.11.1.tgz#654551a89e8b0d1a0668b482865b2c9e5b153ec2"
+  integrity sha512-RXg4WE8C2LUrvoV/TMGRTu223zZf9Dq9MR8yHZio9nF9TpLnpCPURw9VWWB2WATDl6HfIdWfl2x2SJYtHkN4hw==
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/vertexai@1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@firebase/vertexai/-/vertexai-1.2.1.tgz#6962b8b389f10b58033b8c700b27d0cfdc9ebd22"
-  integrity sha512-cukZ5ne2RsOWB4PB1EO6nTXgOLxPMKDJfEn+XnSV5ZKWM0ID5o0DvbyS59XihFaBzmy2SwJldP5ap7/xUnW4jA==
+"@firebase/vertexai@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@firebase/vertexai/-/vertexai-1.2.2.tgz#b6a156567de87a2ba5120d158baed013d69b0dc9"
+  integrity sha512-DtHkD24fkewl88MRYlAdvyo1yXg2AQMa/3u+eW47EKKifKoVfDSyN9HVCP51saqzlRmDaeVuS1i2CY3Tu16lgQ==
   dependencies:
     "@firebase/app-check-interop-types" "0.3.3"
-    "@firebase/component" "0.6.13"
+    "@firebase/component" "0.6.14"
     "@firebase/logger" "0.4.4"
-    "@firebase/util" "1.11.0"
+    "@firebase/util" "1.11.1"
     tslib "^2.1.0"
 
 "@firebase/webchannel-wrapper@1.0.3":
@@ -2154,12 +2162,12 @@
     clsx "^2.1.0"
     prop-types "^15.8.1"
 
-"@mui/material-nextjs@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@mui/material-nextjs/-/material-nextjs-7.0.2.tgz#72c2d2f00479ed83619b9f5b4566896a600bf189"
-  integrity sha512-hjm0MFSjx7HWbORMRldbwfKrQPHTSMXD6dkCCSTQZ2XX8fkKlnOXNnoXUFzlzFtMKMzs9QOfe3dHooTvnDEfuQ==
+"@mui/material-nextjs@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@mui/material-nextjs/-/material-nextjs-7.1.0.tgz#a0dc8bac7e4e7c96899062536606accefc6c9f69"
+  integrity sha512-8gV+nsoK9mPZPK9+E8ecYvWaLn7FZgqdCt2/C8hWAKb/I6e7Kt3zbjACffEIEeO3G/aybIi1Is7FoWspRI74nQ==
   dependencies:
-    "@babel/runtime" "^7.27.0"
+    "@babel/runtime" "^7.27.1"
 
 "@mui/material@^5.17.1":
   version "5.17.1"
@@ -2229,6 +2237,15 @@
     prop-types "^15.8.1"
     react-is "^19.0.0"
 
+"@napi-rs/wasm-runtime@^0.2.9":
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.10.tgz#f3b7109419c6670000b2401e0c778b98afc25f84"
+  integrity sha512-bCsCyeZEwVErsGmyPNSzwfwFn4OdxBj0mmv6hOFucB/k81Ojdu68RbZdxYsRQUPc9l6SU5F/cG+bXgWs3oUgsQ==
+  dependencies:
+    "@emnapi/core" "^1.4.3"
+    "@emnapi/runtime" "^1.4.3"
+    "@tybys/wasm-util" "^0.9.0"
+
 "@newrelic/native-metrics@^11.0.0":
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/@newrelic/native-metrics/-/native-metrics-11.0.0.tgz#338329bf2a47adc8873441b78b5e4369143b4843"
@@ -2267,69 +2284,69 @@
     uuid "^9.0.1"
     ws "^8.17.1"
 
-"@next/bundle-analyzer@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-15.3.1.tgz#7c5197743646fbb907dff38d20b7fa8d53f2d045"
-  integrity sha512-NqUZrjVruGbdQaPE3OSEXP+ZuULqumeHVTuU9pOX1V0/9BWY9FOck3jgQGFdBtG41nOYuO8+CoHKDQAVIPQJrw==
+"@next/bundle-analyzer@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-15.3.2.tgz#cdd42380e9046be4ae7bc2163fa5608478230210"
+  integrity sha512-zY5O1PNKNxWEjaFX8gKzm77z2oL0cnj+m5aiqNBgay9LPLCDO13Cf+FJONeNq/nJjeXptwHFT9EMmTecF9U4Iw==
   dependencies:
     webpack-bundle-analyzer "4.10.1"
 
-"@next/env@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.3.1.tgz#fca98dcb90d92d555972cdbf03adf9aa982e2115"
-  integrity sha512-cwK27QdzrMblHSn9DZRV+DQscHXRuJv6MydlJRpFSqJWZrTYMLzKDeyueJNN9MGd8NNiUKzDQADAf+dMLXX7YQ==
+"@next/env@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.3.2.tgz#7143eafa9b11cfdf3d3c7318b0facb9dfdb2948f"
+  integrity sha512-xURk++7P7qR9JG1jJtLzPzf0qEvqCN0A/T3DXf8IPMKo9/6FfjxtEffRJIIew/bIL4T3C2jLLqBor8B/zVlx6g==
 
-"@next/eslint-plugin-next@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-15.3.1.tgz#8f57c6ccb80ae31e40935f70da57be5f03f225d5"
-  integrity sha512-oEs4dsfM6iyER3jTzMm4kDSbrQJq8wZw5fmT6fg2V3SMo+kgG+cShzLfEV20senZzv8VF+puNLheiGPlBGsv2A==
+"@next/eslint-plugin-next@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-15.3.2.tgz#6a371b022d6de47f2bafc868c7c2220f4e6a2903"
+  integrity sha512-ijVRTXBgnHT33aWnDtmlG+LJD+5vhc9AKTJPquGG5NKXjpKNjc62woIhFtrAcWdBobt8kqjCoaJ0q6sDQoX7aQ==
   dependencies:
     fast-glob "3.3.1"
 
-"@next/swc-darwin-arm64@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.3.1.tgz#8f9589aed9f6816687440aa36a86376b3a16af58"
-  integrity sha512-hjDw4f4/nla+6wysBL07z52Gs55Gttp5Bsk5/8AncQLJoisvTBP0pRIBK/B16/KqQyH+uN4Ww8KkcAqJODYH3w==
-
-"@next/swc-darwin-x64@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.3.1.tgz#2df013226d848394ed7307188c141f0e6da4ab3e"
-  integrity sha512-q+aw+cJ2ooVYdCEqZVk+T4Ni10jF6Fo5DfpEV51OupMaV5XL6pf3GCzrk6kSSZBsMKZtVC1Zm/xaNBFpA6bJ2g==
-
-"@next/swc-linux-arm64-gnu@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.3.1.tgz#d1c4e24b2b27c36a7ebc21ae0573e9e98f794143"
-  integrity sha512-wBQ+jGUI3N0QZyWmmvRHjXjTWFy8o+zPFLSOyAyGFI94oJi+kK/LIZFJXeykvgXUk1NLDAEFDZw/NVINhdk9FQ==
-
-"@next/swc-linux-arm64-musl@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.3.1.tgz#bce27533f9f046800f850a9c20832e8c15b10955"
-  integrity sha512-IIxXEXRti/AulO9lWRHiCpUUR8AR/ZYLPALgiIg/9ENzMzLn3l0NSxVdva7R/VDcuSEBo0eGVCe3evSIHNz0Hg==
-
-"@next/swc-linux-x64-gnu@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.3.1.tgz#f90558d93bc25e01b0b271725e291863286753c4"
-  integrity sha512-bfI4AMhySJbyXQIKH5rmLJ5/BP7bPwuxauTvVEiJ/ADoddaA9fgyNNCcsbu9SlqfHDoZmfI6g2EjzLwbsVTr5A==
-
-"@next/swc-linux-x64-musl@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.3.1.tgz#639f143bd0f3fd6e1bde4b383dc6cd8a8ff12628"
-  integrity sha512-FeAbR7FYMWR+Z+M5iSGytVryKHiAsc0x3Nc3J+FD5NVbD5Mqz7fTSy8CYliXinn7T26nDMbpExRUI/4ekTvoiA==
-
-"@next/swc-win32-arm64-msvc@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.3.1.tgz#52ee1e63b192fec8f0230caf839cfc308d0d44d1"
-  integrity sha512-yP7FueWjphQEPpJQ2oKmshk/ppOt+0/bB8JC8svPUZNy0Pi3KbPx2Llkzv1p8CoQa+D2wknINlJpHf3vtChVBw==
-
-"@next/swc-win32-x64-msvc@15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.3.1.tgz#df5ceb9c3b97bf0d61cb6e84f79bbf9e91a89d29"
-  integrity sha512-3PMvF2zRJAifcRNni9uMk/gulWfWS+qVI/pagd+4yLF5bcXPZPPH2xlYRYOsUjmCJOXSTAC2PjRzbhsRzR2fDQ==
-
-"@next/third-parties@^15.3.1":
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/@next/third-parties/-/third-parties-15.3.1.tgz#36b98762529831abfdd220eb20aaa47ff3f1deba"
-  integrity sha512-8v1pAtRjcaCbs80qcYLLCrSsECgeSb0WMU0J3pMBYNavG3Y3yQOgFog18nVgiNrNB20HkyrScquWsy8gcdiGRA==
+"@next/swc-darwin-arm64@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.3.2.tgz#1a7b36bf3c439f899065c878a580bc57a3630ec7"
+  integrity sha512-2DR6kY/OGcokbnCsjHpNeQblqCZ85/1j6njYSkzRdpLn5At7OkSdmk7WyAmB9G0k25+VgqVZ/u356OSoQZ3z0g==
+
+"@next/swc-darwin-x64@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.3.2.tgz#3742026344f49128cf1b0f43814c67e880db7361"
+  integrity sha512-ro/fdqaZWL6k1S/5CLv1I0DaZfDVJkWNaUU3un8Lg6m0YENWlDulmIWzV96Iou2wEYyEsZq51mwV8+XQXqMp3w==
+
+"@next/swc-linux-arm64-gnu@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.3.2.tgz#fb29d45c034e3d2eef89b0e2801d62eb86155823"
+  integrity sha512-covwwtZYhlbRWK2HlYX9835qXum4xYZ3E2Mra1mdQ+0ICGoMiw1+nVAn4d9Bo7R3JqSmK1grMq/va+0cdh7bJA==
+
+"@next/swc-linux-arm64-musl@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.3.2.tgz#396784ef312666600ab1ae481e34cb1f6e3ae730"
+  integrity sha512-KQkMEillvlW5Qk5mtGA/3Yz0/tzpNlSw6/3/ttsV1lNtMuOHcGii3zVeXZyi4EJmmLDKYcTcByV2wVsOhDt/zg==
+
+"@next/swc-linux-x64-gnu@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.3.2.tgz#ac01fda376878e02bc6b57d1e88ab8ceae9f868e"
+  integrity sha512-uRBo6THWei0chz+Y5j37qzx+BtoDRFIkDzZjlpCItBRXyMPIg079eIkOCl3aqr2tkxL4HFyJ4GHDes7W8HuAUg==
+
+"@next/swc-linux-x64-musl@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.3.2.tgz#327a5023003bcb3ca436efc08733f091bba2b1e8"
+  integrity sha512-+uxFlPuCNx/T9PdMClOqeE8USKzj8tVz37KflT3Kdbx/LOlZBRI2yxuIcmx1mPNK8DwSOMNCr4ureSet7eyC0w==
+
+"@next/swc-win32-arm64-msvc@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.3.2.tgz#ce3a6588bd9c020960704011ab20bd0440026965"
+  integrity sha512-LLTKmaI5cfD8dVzh5Vt7+OMo+AIOClEdIU/TSKbXXT2iScUTSxOGoBhfuv+FU8R9MLmrkIL1e2fBMkEEjYAtPQ==
+
+"@next/swc-win32-x64-msvc@15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.3.2.tgz#43cc36097ac27639e9024a5ceaa6e7727fa968c8"
+  integrity sha512-aW5B8wOPioJ4mBdMDXkt5f3j8pUr9W8AnlX0Df35uRWNT1Y6RIybxjnSUe+PhM+M1bwgyY8PHLmXZC6zT1o5tA==
+
+"@next/third-parties@^15.3.2":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@next/third-parties/-/third-parties-15.3.2.tgz#194cc7cc48b72d8ab27515dc574fef2d00901ce9"
+  integrity sha512-zE9xYkMKZ6gLbkP6lWt60yaeKB5r0A4eZhFKAhgik/eO+zzZPFkTy5K7+0ykgfB6MTkcend3BaDXZhz9KnDjYw==
   dependencies:
     third-party-capital "1.0.20"
 
@@ -2393,6 +2410,73 @@
   resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.32.0.tgz#a15e8f78f32388a7e4655e7f539570e40958ca3f"
   integrity sha512-s0OpmpQFSfMrmedAn9Lhg4KWJELHCU6uU9dtIJ28N8UGhf9Y55im5X8fEzwhwDwiSqN+ZPSNrDJF7ivf/AuRPQ==
 
+"@oxc-resolver/binding-darwin-arm64@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-9.0.2.tgz#345ff11258dbec11d333bf088a79b864f5f03ec5"
+  integrity sha512-MVyRgP2gzJJtAowjG/cHN3VQXwNLWnY+FpOEsyvDepJki1SdAX/8XDijM1yN6ESD1kr9uhBKjGelC6h3qtT+rA==
+
+"@oxc-resolver/binding-darwin-x64@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-9.0.2.tgz#cd19f263a31b601356002ebd2eb8dda193753704"
+  integrity sha512-7kV0EOFEZ3sk5Hjy4+bfA6XOQpCwbDiDkkHN4BHHyrBHsXxUR05EcEJPPL1WjItefg+9+8hrBmoK0xRoDs41+A==
+
+"@oxc-resolver/binding-freebsd-x64@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-9.0.2.tgz#e6e0b9b9409cb4eb71307ca880f1d868cce88c94"
+  integrity sha512-6OvkEtRXrt8sJ4aVfxHRikjain9nV1clIsWtJ1J3J8NG1ZhjyJFgT00SCvqxbK+pzeWJq6XzHyTCN78ML+lY2w==
+
+"@oxc-resolver/binding-linux-arm-gnueabihf@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-9.0.2.tgz#e4ef8e0a831fa05101ca8fc0501cd7b536093e66"
+  integrity sha512-aYpNL6o5IRAUIdoweW21TyLt54Hy/ZS9tvzNzF6ya1ckOQ8DLaGVPjGpmzxdNja9j/bbV6aIzBH7lNcBtiOTkQ==
+
+"@oxc-resolver/binding-linux-arm64-gnu@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-9.0.2.tgz#c95345cf91b9597a469a8d3028d0b182e2e22055"
+  integrity sha512-RGFW4vCfKMFEIzb9VCY0oWyyY9tR1/o+wDdNePhiUXZU4SVniRPQaZ1SJ0sUFI1k25pXZmzQmIP6cBmazi/Dew==
+
+"@oxc-resolver/binding-linux-arm64-musl@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-9.0.2.tgz#d968aadd446a6c1d729764f3ddd0e1b66e3ec53f"
+  integrity sha512-lxx/PibBfzqYvut2Y8N2D0Ritg9H8pKO+7NUSJb9YjR/bfk2KRmP8iaUz3zB0JhPtf/W3REs65oKpWxgflGToA==
+
+"@oxc-resolver/binding-linux-riscv64-gnu@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-9.0.2.tgz#698f364bf15489e69c8441c842a09a468c7389ca"
+  integrity sha512-yD28ptS/OuNhwkpXRPNf+/FvrO7lwURLsEbRVcL1kIE0GxNJNMtKgIE4xQvtKDzkhk6ZRpLho5VSrkkF+3ARTQ==
+
+"@oxc-resolver/binding-linux-s390x-gnu@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-9.0.2.tgz#dfcbf0531f0ade1197275f40e6f8900635af187c"
+  integrity sha512-WBwEJdspoga2w+aly6JVZeHnxuPVuztw3fPfWrei2P6rNM5hcKxBGWKKT6zO1fPMCB4sdDkFohGKkMHVV1eryQ==
+
+"@oxc-resolver/binding-linux-x64-gnu@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-9.0.2.tgz#73f7157f3b052c44c206b672b970da060125c533"
+  integrity sha512-a2z3/cbOOTUq0UTBG8f3EO/usFcdwwXnCejfXv42HmV/G8GjrT4fp5+5mVDoMByH3Ce3iVPxj1LmS6OvItKMYQ==
+
+"@oxc-resolver/binding-linux-x64-musl@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-9.0.2.tgz#2b047ce69cb7fa1900174d43e4a7b6027146a449"
+  integrity sha512-bHZF+WShYQWpuswB9fyxcgMIWVk4sZQT0wnwpnZgQuvGTZLkYJ1JTCXJMtaX5mIFHf69ngvawnwPIUA4Feil0g==
+
+"@oxc-resolver/binding-wasm32-wasi@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-9.0.2.tgz#df8eab1815ae0da0c70f0f9dda4bcd84c70d7024"
+  integrity sha512-I5cSgCCh5nFozGSHz+PjIOfrqW99eUszlxKLgoNNzQ1xQ2ou9ZJGzcZ94BHsM9SpyYHLtgHljmOZxCT9bgxYNA==
+  dependencies:
+    "@napi-rs/wasm-runtime" "^0.2.9"
+
+"@oxc-resolver/binding-win32-arm64-msvc@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-9.0.2.tgz#9530c2e08ebb5d02870b004135ef0b4438a620b7"
+  integrity sha512-5IhoOpPr38YWDWRCA5kP30xlUxbIJyLAEsAK7EMyUgqygBHEYLkElaKGgS0X5jRXUQ6l5yNxuW73caogb2FYaw==
+
+"@oxc-resolver/binding-win32-x64-msvc@9.0.2":
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-9.0.2.tgz#15dc9cecd2e89bbcad07247477fc04dd8c3ffbbe"
+  integrity sha512-Qc40GDkaad9rZksSQr2l/V9UubigIHsW69g94Gswc2sKYB3XfJXfIfyV8WTJ67u6ZMXsZ7BH1msSC6Aen75mCg==
+
 "@polka/url@^1.0.0-next.24":
   version "1.0.0-next.28"
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.28.tgz#d45e01c4a56f143ee69c54dd6b12eade9e270a73"
@@ -2461,10 +2545,10 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@reduxjs/toolkit@^2.7.0":
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.7.0.tgz#6a8823aa741a5aab2a2ce58e6326243f36fe31f2"
-  integrity sha512-XVwolG6eTqwV0N8z/oDlN93ITCIGIop6leXlGJI/4EKy+0POYkR+ABHRSdGXY+0MQvJBP8yAzh+EYFxTuvmBiQ==
+"@reduxjs/toolkit@^2.8.1":
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.8.1.tgz#85a50572627bce1e6cfbc3803b31a3290f5f344d"
+  integrity sha512-GLjHS13LiBdiuxSJvfWs3+Cx5yt97mCbuVlDteTusS6VRksPhoWviO8L1e3Re1G94m6lkw/l4pjEEyyNaGf19g==
   dependencies:
     "@standard-schema/spec" "^1.0.0"
     "@standard-schema/utils" "^0.3.0"
@@ -2569,10 +2653,10 @@
     "@storyblok/richtext" "3.2.0"
     storyblok-js-client "6.10.11"
 
-"@storyblok/react@^4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@storyblok/react/-/react-4.6.0.tgz#521c3eae2e62dcdfa67f3ef4a553d354b888c21f"
-  integrity sha512-DJb/+PZdKKJy9XFyteWCXbCBN8TjGoHTaK7DwU9F6nXRbKSHAZ02Je0UmO7X239vc1pc3Ry3sIM8A6ryZPpfwQ==
+"@storyblok/react@^4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@storyblok/react/-/react-4.6.1.tgz#fb098dc7cffe80553fa2208186eb320d8031091c"
+  integrity sha512-1v9pIbEymqT5lQCSAAhH7QdAfJVYDSz217n7WO3GiNJB+U5fmz49eBD673oXzLDriZN9oFqhFiM6tOUstW+Xiw==
   dependencies:
     "@storyblok/js" "3.4.0"
 
@@ -2629,6 +2713,13 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
+"@tybys/wasm-util@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.9.0.tgz#3e75eb00604c8d6db470bf18c37b7d984a0e3355"
+  integrity sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==
+  dependencies:
+    tslib "^2.4.0"
+
 "@types/aria-query@^5.0.1":
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708"
@@ -2767,15 +2858,15 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
-"@types/newrelic@^9.14.3":
-  version "9.14.7"
-  resolved "https://registry.yarnpkg.com/@types/newrelic/-/newrelic-9.14.7.tgz#62b92b8573df73f1e6d7dfa84b1ddcb5ca75cb55"
-  integrity sha512-d22uZq5lc6Wwxc4h6dz9mSNBv7doxMhorkNrX5//aE8jISxs85TLGHi/gPr/Xkxfe/d43bEIMe4EhQvpvgCJ/w==
+"@types/newrelic@^9.14.8":
+  version "9.14.8"
+  resolved "https://registry.yarnpkg.com/@types/newrelic/-/newrelic-9.14.8.tgz#68cb95f327dc212b8d0bebc083ff9e69dac864ee"
+  integrity sha512-rkOTEVR7Lui4TTEykDUxIxCbFkcI/yw3C8URLOWM84zjuHh9W35RAequHTEvGBbbrLCdn43FVTHMLji4uunDWQ==
 
-"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^22.14.1":
-  version "22.14.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.14.1.tgz#53b54585cec81c21eee3697521e31312d6ca1e6f"
-  integrity sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==
+"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^22.15.19":
+  version "22.15.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.19.tgz#ba9f321675243af0456d607fa82a4865931e0cef"
+  integrity sha512-3vMNr4TzNQyjHcRZadojpRaD9Ofr6LsonZAoQ+HMUa/9ORTPoxVIw0e0mpqWpdjj8xybyCM+oKOUH2vwFu/oEw==
   dependencies:
     undici-types "~6.21.0"
 
@@ -2809,10 +2900,10 @@
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044"
   integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
 
-"@types/react@19.1.2":
-  version "19.1.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.2.tgz#11df86f66f188f212c90ecb537327ec68bfd593f"
-  integrity sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw==
+"@types/react@19.1.4":
+  version "19.1.4"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.4.tgz#4d125f014d6ac26b4759775698db118701e314fe"
+  integrity sha512-EB1yiiYdvySuIITtD5lhW4yPyJ31RkJkkDw794LaQYrxCSaQV/47y5o1FMC4zF9ZyjUjzJMZwbovEnT5yHTW6g==
   dependencies:
     csstype "^3.0.2"
 
@@ -3319,19 +3410,10 @@ axe-core@^4.10.0:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
   integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
 
-axios@^1.7.9:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
-  integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
-axios@^1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
-  integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
+axios@^1.7.9, axios@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.9.0.tgz#25534e3b72b54540077d33046f77e3b8d7081901"
+  integrity sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -3712,14 +3794,14 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@~0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.5.tgz#013b91351762739c16a9567c21a04632e449bf2f"
-  integrity sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==
+cli-table3@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
+  integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
   dependencies:
     string-width "^4.2.0"
   optionalDependencies:
-    "@colors/colors" "1.5.0"
+    colors "1.4.0"
 
 cli-truncate@^2.1.0:
   version "2.1.0"
@@ -3752,11 +3834,6 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
 clsx@^2.1.0, clsx@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
@@ -3805,6 +3882,11 @@ colorette@^2.0.16:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
+colors@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3974,10 +4056,10 @@ csstype@^3.0.2, csstype@^3.1.3:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
-cypress@^14.3.1:
-  version "14.3.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-14.3.1.tgz#b0570c0e5b198d930a2c0f640d099e777bec2d2f"
-  integrity sha512-/2q06qvHMK3PNiadnRW1Je0lJ43gAFPQJUAK2zIxjr22kugtWxVQznTBLVu1AvRH+RP3oWZhCdWqiEi+0NuqCg==
+cypress@^14.3.3:
+  version "14.3.3"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-14.3.3.tgz#cbf7fbc79fd139ba55ea51a6d1ee3d9018a59ce2"
+  integrity sha512-1Rz7zc9iqLww6BysaESqUhtIuaFHS7nL3wREovAKYsNhLTfX3TbcBWHWgEz70YimH2NkSOsm4oIcJJ9HYHOlew==
   dependencies:
     "@cypress/request" "^3.0.8"
     "@cypress/xvfb" "^1.2.4"
@@ -3992,7 +4074,7 @@ cypress@^14.3.1:
     check-more-types "^2.24.0"
     ci-info "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-table3 "~0.6.5"
+    cli-table3 "0.6.1"
     commander "^6.2.1"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
@@ -4071,6 +4153,11 @@ data-view-byte-offset@^1.0.1:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
+date-fns@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14"
+  integrity sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==
+
 date-format@^4.0.14:
   version "4.0.14"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
@@ -4139,13 +4226,6 @@ default-require-extensions@^3.0.0:
   dependencies:
     strip-bom "^4.0.0"
 
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
 define-data-property@^1.0.1, define-data-property@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
@@ -4262,15 +4342,6 @@ duplexer@^0.1.2:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-easy-table@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/easy-table/-/easy-table-1.2.0.tgz#ba9225d7138fee307bfd4f0b5bc3c04bdc7c54eb"
-  integrity sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==
-  dependencies:
-    ansi-regex "^5.0.1"
-  optionalDependencies:
-    wcwidth "^1.0.1"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -4318,7 +4389,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.15.0, enhanced-resolve@^5.18.1:
+enhanced-resolve@^5.15.0:
   version "5.18.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf"
   integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==
@@ -4511,12 +4582,12 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-next@15.3.1:
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-15.3.1.tgz#2ba06a63adfead7c003f224b47c4b778392ce1c4"
-  integrity sha512-GnmyVd9TE/Ihe3RrvcafFhXErErtr2jS0JDeCSp3vWvy86AXwHsRBt0E3MqP/m8ACS1ivcsi5uaqjbhsG18qKw==
+eslint-config-next@15.3.2:
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-15.3.2.tgz#ed2bc6607f54555bbeaf23a032b4e430e453b63c"
+  integrity sha512-FerU4DYccO4FgeYFFglz0SnaKRe1ejXQrDb8kWUkTAg036YWi+jUsgg4sIGNCDhAsDITsZaL4MzBWKB6f4G1Dg==
   dependencies:
-    "@next/eslint-plugin-next" "15.3.1"
+    "@next/eslint-plugin-next" "15.3.2"
     "@rushstack/eslint-patch" "^1.10.3"
     "@typescript-eslint/eslint-plugin" "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0"
     "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -4527,10 +4598,10 @@ eslint-config-next@15.3.1:
     eslint-plugin-react "^7.37.0"
     eslint-plugin-react-hooks "^5.0.0"
 
-eslint-config-prettier@^10.1.2:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.2.tgz#31a4b393c40c4180202c27e829af43323bf85276"
-  integrity sha512-Epgp/EofAUeEpIdZkW60MHKvPyru1ruQJxPL+WIycnaPApuseK0Zpkrh/FwL9oIpQvIhJwV7ptOy0DWUjTlCiA==
+eslint-config-prettier@^10.1.5:
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz#00c18d7225043b6fbce6a665697377998d453782"
+  integrity sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==
 
 eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.9:
   version "0.3.9"
@@ -4655,19 +4726,19 @@ eslint-visitor-keys@^4.2.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
-eslint@9.25.0:
-  version "9.25.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.25.0.tgz#ebf629bb26d8e7490ff94f87321863cd73272351"
-  integrity sha512-MsBdObhM4cEwkzCiraDv7A6txFXEqtNXOb877TsSp2FCkBNl8JfVQrmiuDqC1IkejT6JLPzYBXx/xAiYhyzgGA==
+eslint@9.27.0:
+  version "9.27.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.27.0.tgz#a587d3cd5b844b68df7898944323a702afe38979"
+  integrity sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"
     "@eslint/config-array" "^0.20.0"
     "@eslint/config-helpers" "^0.2.1"
-    "@eslint/core" "^0.13.0"
+    "@eslint/core" "^0.14.0"
     "@eslint/eslintrc" "^3.3.1"
-    "@eslint/js" "9.25.0"
-    "@eslint/plugin-kit" "^0.2.8"
+    "@eslint/js" "9.27.0"
+    "@eslint/plugin-kit" "^0.3.1"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.4.2"
@@ -4898,6 +4969,13 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
+fd-package-json@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fd-package-json/-/fd-package-json-1.2.0.tgz#4f218bb8ff65c21011d1f4f17cb3d0c9e72f8da7"
+  integrity sha512-45LSPmWf+gC5tdCQMNH4s9Sr00bIkiD9aN7dc5hqkrEw1geRYyDQS1v1oMHAW3ysfxfndqGsrDREHHjNNbKUfA==
+  dependencies:
+    walk-up-path "^3.0.1"
+
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -4980,39 +5058,39 @@ find@^0.2.4:
   dependencies:
     traverse-chain "~0.1.0"
 
-firebase@^11.6.0:
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/firebase/-/firebase-11.6.0.tgz#0a0d76144decc988812cba0bea5e62588ba69fc3"
-  integrity sha512-Xqm6j6zszIEmI5nW1MPR8yTafoRTSrW3mWG9Lk9elCJtQDQSiTEkKZiNtUm9y6XfOPl8xoF1TNpxZe8HjgA0Og==
-  dependencies:
-    "@firebase/analytics" "0.10.12"
-    "@firebase/analytics-compat" "0.2.18"
-    "@firebase/app" "0.11.4"
-    "@firebase/app-check" "0.8.13"
-    "@firebase/app-check-compat" "0.3.20"
-    "@firebase/app-compat" "0.2.53"
+firebase@^11.7.1:
+  version "11.7.1"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-11.7.1.tgz#258d5824e5b2081e7abcdf2467fd3d4e88479b8d"
+  integrity sha512-Jr0uKRwHAtnlyHis9+48mo3aXeChekaxhy6kSaqBC44qdogwAlTWiY3OTqmRomGA8B62rqS3LwpNyAEZsrhf7w==
+  dependencies:
+    "@firebase/analytics" "0.10.13"
+    "@firebase/analytics-compat" "0.2.19"
+    "@firebase/app" "0.12.1"
+    "@firebase/app-check" "0.9.1"
+    "@firebase/app-check-compat" "0.3.22"
+    "@firebase/app-compat" "0.3.1"
     "@firebase/app-types" "0.9.3"
-    "@firebase/auth" "1.10.0"
-    "@firebase/auth-compat" "0.5.20"
-    "@firebase/data-connect" "0.3.3"
-    "@firebase/database" "1.0.14"
-    "@firebase/database-compat" "2.0.5"
-    "@firebase/firestore" "4.7.10"
-    "@firebase/firestore-compat" "0.3.45"
-    "@firebase/functions" "0.12.3"
-    "@firebase/functions-compat" "0.3.20"
-    "@firebase/installations" "0.6.13"
-    "@firebase/installations-compat" "0.2.13"
-    "@firebase/messaging" "0.12.17"
-    "@firebase/messaging-compat" "0.2.17"
-    "@firebase/performance" "0.7.2"
-    "@firebase/performance-compat" "0.2.15"
-    "@firebase/remote-config" "0.6.0"
-    "@firebase/remote-config-compat" "0.2.13"
-    "@firebase/storage" "0.13.7"
-    "@firebase/storage-compat" "0.3.17"
-    "@firebase/util" "1.11.0"
-    "@firebase/vertexai" "1.2.1"
+    "@firebase/auth" "1.10.2"
+    "@firebase/auth-compat" "0.5.22"
+    "@firebase/data-connect" "0.3.5"
+    "@firebase/database" "1.0.15"
+    "@firebase/database-compat" "2.0.6"
+    "@firebase/firestore" "4.7.12"
+    "@firebase/firestore-compat" "0.3.47"
+    "@firebase/functions" "0.12.4"
+    "@firebase/functions-compat" "0.3.21"
+    "@firebase/installations" "0.6.14"
+    "@firebase/installations-compat" "0.2.14"
+    "@firebase/messaging" "0.12.18"
+    "@firebase/messaging-compat" "0.2.18"
+    "@firebase/performance" "0.7.3"
+    "@firebase/performance-compat" "0.2.16"
+    "@firebase/remote-config" "0.6.1"
+    "@firebase/remote-config-compat" "0.2.14"
+    "@firebase/storage" "0.13.8"
+    "@firebase/storage-compat" "0.3.18"
+    "@firebase/util" "1.11.1"
+    "@firebase/vertexai" "1.2.2"
 
 flat-cache@^4.0.0:
   version "4.0.1"
@@ -5079,6 +5157,13 @@ form-data@^4.0.0, form-data@~4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+formatly@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/formatly/-/formatly-0.2.3.tgz#30c4d3605c4f66d97a97a7dafbd9bb4a2467b26f"
+  integrity sha512-WH01vbXEjh9L3bqn5V620xUAWs32CmK4IzWRRY6ep5zpa/mrisL4d9+pRVuETORVDTQw8OycSO1WC68PL51RaA==
+  dependencies:
+    fd-package-json "^1.2.0"
+
 fromentries@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a"
@@ -6613,21 +6698,20 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-knip@^5.50.5:
-  version "5.50.5"
-  resolved "https://registry.yarnpkg.com/knip/-/knip-5.50.5.tgz#cd4b6573eafaa63bdeff3cc8f203ed813107d84a"
-  integrity sha512-I3mfebuG5x8i/mJJA41xjnmHMbLw75ymbDxlS7HMP+4CjY+jXEDSJyP3A2xmI5JF5/o47Fr8D7Pq3BVT0/nQPw==
+knip@^5.56.0:
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/knip/-/knip-5.56.0.tgz#23c1cc9a7ee7183a0f4884f1cc2d083f40471f58"
+  integrity sha512-4RNCi41ax0zzl7jloxiUAcomwHIW+tj201jfr7TmHkSvb1/LkChsfXH0JOFFesVHhtSrMw6Dv4N6fmfFd4sJ0Q==
   dependencies:
     "@nodelib/fs.walk" "^1.2.3"
-    easy-table "1.2.0"
-    enhanced-resolve "^5.18.1"
     fast-glob "^3.3.3"
+    formatly "^0.2.3"
     jiti "^2.4.2"
     js-yaml "^4.1.0"
     minimist "^1.2.8"
+    oxc-resolver "^9.0.2"
     picocolors "^1.1.0"
     picomatch "^4.0.1"
-    pretty-ms "^9.0.0"
     smol-toml "^1.3.1"
     strip-json-comments "5.0.1"
     zod "^3.22.4"
@@ -6827,10 +6911,10 @@ magic-string@^0.25.0, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-mailslurp-client@^15.21.0:
-  version "15.21.0"
-  resolved "https://registry.yarnpkg.com/mailslurp-client/-/mailslurp-client-15.21.0.tgz#c10b2b639ec9f779eec91ed4821c65ba8b053f4b"
-  integrity sha512-HenjRwPRvxuVOzHTZgB3NH00iRibM4FclRvpjykyobU+BuHfyRYttX58A3GZcgl0jIsFMlKozhZvyYWZvWknRw==
+mailslurp-client@^15.22.1:
+  version "15.22.1"
+  resolved "https://registry.yarnpkg.com/mailslurp-client/-/mailslurp-client-15.22.1.tgz#0e7c0de2affb161f9a7b4ebbd8545fe1db5f2d82"
+  integrity sha512-cyHY72lUYctShX+5yeo3k9I9O1PmZ65HoZKhCzokbHrV+Ru7ykenztwQhjvIEJ/wm6uFPHZ2/H0lk3ooT5AkaQ==
   dependencies:
     cross-fetch "^4.1.0"
 
@@ -6979,10 +7063,10 @@ negotiator@^1.0.0:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a"
   integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
 
-newrelic@^12.18.0:
-  version "12.18.0"
-  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-12.18.0.tgz#60a2b3915f81d0d276f75ef8df7b0c38abfe8fbf"
-  integrity sha512-Nslha2a64qJwb4M1uF3pPr0NSwmeHIb2W5P+TYxa0AOQiure5It0FLO4CaIIrje1QaIuQeGlisc1h7PEo4qdNQ==
+newrelic@^12.18.2:
+  version "12.18.2"
+  resolved "https://registry.yarnpkg.com/newrelic/-/newrelic-12.18.2.tgz#1f01f19440909046aca0caa50fba6c0f7d4131b2"
+  integrity sha512-/e7uiVrSx3ESgbnqTJnzB+eltQ8xKcfn533RaniHCYmflVEoCBQLrdEWCfqc6NHeDbuABRReBmg4SgK9NXJSAA==
   dependencies:
     "@grpc/grpc-js" "^1.13.2"
     "@grpc/proto-loader" "^0.7.5"
@@ -7006,14 +7090,14 @@ newrelic@^12.18.0:
     "@newrelic/native-metrics" "^11.0.0"
     "@prisma/prisma-fmt-wasm" "^4.17.0-16.27eb2449f178cd9fe1a4b892d732cc4795f75085"
 
-next-intl@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/next-intl/-/next-intl-4.0.2.tgz#952cb392e441c4feedc78d158a27c5d3c1d24991"
-  integrity sha512-3cKVflwdrqxCOvAL+DtGN68qR802i0PEj0dttkAD5IK5XxOjugQs4yU8aSakvPMbkOrhEJ+89z5lG2EAqi7Gkw==
+next-intl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/next-intl/-/next-intl-4.1.0.tgz#91fc7adc4790f4ad0296b5a43a08f0197f24aded"
+  integrity sha512-JNJRjc7sdnfUxhZmGcvzDszZ60tQKrygV/VLsgzXhnJDxQPn1cN2rVpc53adA1SvBJwPK2O6Sc6b4gYSILjCzw==
   dependencies:
     "@formatjs/intl-localematcher" "^0.5.4"
     negotiator "^1.0.0"
-    use-intl "^4.0.2"
+    use-intl "^4.1.0"
 
 next-pwa@^5.6.0:
   version "5.6.0"
@@ -7027,12 +7111,12 @@ next-pwa@^5.6.0:
     workbox-webpack-plugin "^6.5.4"
     workbox-window "^6.5.4"
 
-next@^15.3.1:
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/next/-/next-15.3.1.tgz#69cf2c124e504db64e14fc75eb29bd64c0c787a7"
-  integrity sha512-8+dDV0xNLOgHlyBxP1GwHGVaNXsmp+2NhZEYrXr24GWLHtt27YrBPbPuHvzlhi7kZNYjeJNR93IF5zfFu5UL0g==
+next@^15.3.2:
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/next/-/next-15.3.2.tgz#97510629e38a058dd154782a5c2ec9c9ab94d0d8"
+  integrity sha512-CA3BatMyHkxZ48sgOCLdVHjFU36N7TF1HhqAHLFOkV6buwZnvMI84Cug8xD56B9mCuKrqXnLn94417GrZ/jjCQ==
   dependencies:
-    "@next/env" "15.3.1"
+    "@next/env" "15.3.2"
     "@swc/counter" "0.1.3"
     "@swc/helpers" "0.5.15"
     busboy "1.6.0"
@@ -7040,14 +7124,14 @@ next@^15.3.1:
     postcss "8.4.31"
     styled-jsx "5.1.6"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "15.3.1"
-    "@next/swc-darwin-x64" "15.3.1"
-    "@next/swc-linux-arm64-gnu" "15.3.1"
-    "@next/swc-linux-arm64-musl" "15.3.1"
-    "@next/swc-linux-x64-gnu" "15.3.1"
-    "@next/swc-linux-x64-musl" "15.3.1"
-    "@next/swc-win32-arm64-msvc" "15.3.1"
-    "@next/swc-win32-x64-msvc" "15.3.1"
+    "@next/swc-darwin-arm64" "15.3.2"
+    "@next/swc-darwin-x64" "15.3.2"
+    "@next/swc-linux-arm64-gnu" "15.3.2"
+    "@next/swc-linux-arm64-musl" "15.3.2"
+    "@next/swc-linux-x64-gnu" "15.3.2"
+    "@next/swc-linux-x64-musl" "15.3.2"
+    "@next/swc-win32-arm64-msvc" "15.3.2"
+    "@next/swc-win32-x64-msvc" "15.3.2"
     sharp "^0.34.1"
 
 nextjs-hotjar@^1.2.0:
@@ -7306,6 +7390,25 @@ own-keys@^1.0.1:
     object-keys "^1.1.1"
     safe-push-apply "^1.0.0"
 
+oxc-resolver@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/oxc-resolver/-/oxc-resolver-9.0.2.tgz#0a86ee1e26f6c3f5f2af73dece276f8f588d4ef8"
+  integrity sha512-w838ygc1p7rF+7+h5vR9A+Y9Fc4imy6C3xPthCMkdFUgFvUWkmABeNB8RBDQ6+afk44Q60/UMMQ+gfDUW99fBA==
+  optionalDependencies:
+    "@oxc-resolver/binding-darwin-arm64" "9.0.2"
+    "@oxc-resolver/binding-darwin-x64" "9.0.2"
+    "@oxc-resolver/binding-freebsd-x64" "9.0.2"
+    "@oxc-resolver/binding-linux-arm-gnueabihf" "9.0.2"
+    "@oxc-resolver/binding-linux-arm64-gnu" "9.0.2"
+    "@oxc-resolver/binding-linux-arm64-musl" "9.0.2"
+    "@oxc-resolver/binding-linux-riscv64-gnu" "9.0.2"
+    "@oxc-resolver/binding-linux-s390x-gnu" "9.0.2"
+    "@oxc-resolver/binding-linux-x64-gnu" "9.0.2"
+    "@oxc-resolver/binding-linux-x64-musl" "9.0.2"
+    "@oxc-resolver/binding-wasm32-wasi" "9.0.2"
+    "@oxc-resolver/binding-win32-arm64-msvc" "9.0.2"
+    "@oxc-resolver/binding-win32-x64-msvc" "9.0.2"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -7390,11 +7493,6 @@ parse-json@^5.0.0, parse-json@^5.2.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse-ms@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-4.0.0.tgz#c0c058edd47c2a590151a718990533fd62803df4"
-  integrity sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==
-
 parse5@^7.0.0, parse5@^7.1.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a"
@@ -7564,13 +7662,6 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-ms@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-9.2.0.tgz#e14c0aad6493b69ed63114442a84133d7e560ef0"
-  integrity sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==
-  dependencies:
-    parse-ms "^4.0.0"
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -7835,11 +7926,6 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
 regenerator-transform@^0.15.2:
   version "0.15.2"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
@@ -9109,10 +9195,10 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-use-intl@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/use-intl/-/use-intl-4.0.2.tgz#e63f69dc2cad48f8633e7bab220f1bbb071baaba"
-  integrity sha512-6RAP/5KJMRzLMLS25/BVh2u09cRK8S6HRGc1RnZvqR547qAKZCpjYylOqMPU9eNIirAiKoGmsoUPa7JrlaA/yg==
+use-intl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/use-intl/-/use-intl-4.1.0.tgz#b22f776e255d9de66b8c3d56097d33025928cf59"
+  integrity sha512-mQvDYFvoGn+bm/PWvlQOtluKCknsQ5a9F1Cj0hMfBjMBVTwnOqLPd6srhjvVdEQEQFVyHM1PfyifKqKYb11M9Q==
   dependencies:
     "@formatjs/fast-memoize" "^2.2.0"
     "@schummar/icu-type-parser" "1.21.5"
@@ -9163,6 +9249,11 @@ w3c-xmlserializer@^4.0.0:
   dependencies:
     xml-name-validator "^4.0.0"
 
+walk-up-path@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886"
+  integrity sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==
+
 walker@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
@@ -9170,13 +9261,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
 web-vitals@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.2.4.tgz#1d20bc8590a37769bd0902b289550936069184b7"
@@ -9679,6 +9763,6 @@ zod-validation-error@^3.0.3:
   integrity sha512-ZOPR9SVY6Pb2qqO5XHt+MkkTRxGXb4EVtnjc9JpXUOtUB1T9Ru7mZOT361AN3MsetVe7R0a1KZshJDZdgp9miQ==
 
 zod@^3.22.4:
-  version "3.24.1"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.1.tgz#27445c912738c8ad1e9de1bea0359fa44d9d35ee"
-  integrity sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==
+  version "3.24.4"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.4.tgz#e2e2cca5faaa012d76e527d0d36622e0a90c315f"
+  integrity sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==