4.2.1 final fixes

src/routes/+page.svelte

@@ -5,7 +5,6 @@
   import HeroSection from '$lib/components/HeroSection.svelte';
   import InfoSection from '$lib/components/InfoSection.svelte';
   import InstagramSection from '$lib/components/InstagramSection.svelte';
-  import IntroStrip from '$lib/components/IntroStrip.svelte';
   import BookingSection from '$lib/components/BookingSection.svelte';
   import PromiseSection from '$lib/components/PromiseSection.svelte';
   import ServicesSection from '$lib/components/ServicesSection.svelte';
@@ -137,12 +136,11 @@
 />
 
 <Header navigation={data.content.navigation} />
-<HeroSection hero={data.content.hero} />
-<IntroStrip intro={data.content.intro} />
+<HeroSection hero={data.content.hero} reviewCta={data.content.intro.reviewCta} />
 <PromiseSection promise={data.content.promise} />
 <ServicesSection services={data.content.services} />
-<ValuesSection values={data.content.values} />
 <TestimonialsSection testimonials={data.content.testimonials} />
+<ValuesSection values={data.content.values} />
 <BookingSection booking={data.content.booking} />
 <InfoSection info={data.content.info} />
 <InstagramSection instagram={data.content.instagram} />

src/routes/[slug]/+page.svelte

@@ -218,7 +218,11 @@
 {:else if data.slug === 'privacy-policy'}
   <LegalPage pageContent={privacyPolicyContent} />
 {:else if data.slug === 'contact-us'}
-  <BookingPage booking={data.content.booking} allowGeneralEnquiry={data.generalEnquiryEnabled} />
+  <BookingPage
+    booking={data.content.booking}
+    info={data.content.info}
+    allowGeneralEnquiry={data.generalEnquiryEnabled}
+  />
 {:else}
   <main class="static-page">
     <section class="static-page-hero">

src/routes/[slug]/slug-page.test.ts

@@ -60,4 +60,13 @@ describe('static slug route page', () => {
 
     expect(screen.queryByLabelText(/General enquiry/i)).not.toBeInTheDocument();
   });
+
+  it('renders the shared FAQ section on the contact page', () => {
+    render(SlugPage, {
+      data: createStaticRouteData('contact-us')
+    });
+
+    expect(screen.getByText('FAQs')).toBeInTheDocument();
+    expect(screen.getByText('Can any dog use your service?')).toBeInTheDocument();
+  });
 });