fixes

apps/edr-freight-web/portal/src/pages/bookings/NewBookingPage.tsx

@@ -322,7 +322,12 @@ export default function NewBookingPage() {
           )}
           {step === 6 && <StepDocuments form={form} />}
           {step === 7 && (
-            <Step8Review form={form} setStep={setStep} direction={direction!} />
+            <Step8Review
+              form={form}
+              setStep={setStep}
+              direction={direction!}
+              referenceData={referenceData}
+            />
           )}
         </Box>
 

apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step4-route.tsx

@@ -58,14 +58,7 @@ export function Step4Route({
   }, [yardOptions, destinationYard]);
   console.log({ yardOptions, originYard, destinationYard });
   const destData = useMemo(() => {
-    return yardOptions
+    return yardOptions.filter((o) => o.value !== originYard);
-      .filter((o) => o.value !== originYard)
-      .filter((d) => {
-        const origin = referenceData?.yard.find((y) => y.id === originYard);
-        if (!origin) return true;
-
-        return true;
-      });
   }, [yardOptions, originYard]);
 
   const direction = getRouteDirection(

apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step8-review.tsx

@@ -1,5 +1,5 @@
 import { Controller, type UseFormReturn } from "react-hook-form";
-import { Box, Card, Checkbox, SimpleGrid, Text, Textarea, Title } from "@mantine/core";
+import { Box, Card, Checkbox, SimpleGrid, Text, Textarea } from "@mantine/core";
 import {
   BookingFormInputValues,
   BOOKING_DOCS_SETTING,
@@ -9,19 +9,28 @@ import {
 import { StepHeader } from "./shared";
 import type { Freight } from "@/types";
 
-type BookingForm = UseFormReturn<BookingFormInputValues, any, BookingFormValues>;
+type BookingForm = UseFormReturn<
+  BookingFormInputValues,
+  any,
+  BookingFormValues
+>;
 
 export function Step8Review({
   form,
   setStep,
   direction,
+  referenceData,
 }: {
   form: BookingForm;
   setStep: (step: number) => void;
   direction: Freight.ScheduleTradeDirection;
+  referenceData?: Freight.BookingReferenceData;
 }) {
   const values = form.watch();
   const errors = form.formState.errors;
+  const serviceType = referenceData?.service.find(
+    (s) => s.id === values.serviceTypeId,
+  );
 
   function Row({
     label,
@@ -56,17 +65,17 @@ export function Step8Review({
   const containerSummary =
     values.cargoType === "container" && values.containers.length > 0
       ? values.containers
-          .filter((c) => +c.qty > 0)
+        .filter((c) => +c.qty > 0)
-          .map((c) => `${c.qty} × ${c.type}`)
+        .map((c) => `${c.qty} × ${c.type}`)
-          .join(", ")
+        .join(", ")
       : "";
 
   const totalVgm =
     values.cargoType === "container"
       ? values.containers.reduce(
-          (sum, c) => sum + (+c.qty || 0) * (+c.vgm || 0),
+        (sum, c) => sum + (+c.qty || 0) * (+c.vgm || 0),
-          0,
+        0,
-        )
+      )
       : 0;
 
   const documents = (values.documents ?? {}) as BookingDocuments;
@@ -99,7 +108,13 @@ export function Step8Review({
           py="sm"
           className="border-b border-[var(--mantine-color-gray-2)] bg-gray-50/60"
         >
-          <Text size="xs" fw={600} tt="uppercase" c="dimmed" className="tracking-wider">
+          <Text
+            size="xs"
+            fw={600}
+            tt="uppercase"
+            c="dimmed"
+            className="tracking-wider"
+          >
             {title}
           </Text>
         </Box>
@@ -124,17 +139,7 @@ export function Step8Review({
             value={values.contractType === "new" ? "New Contract" : "Renewal"}
             target={1}
           />
-          <Row
+          <Row label="Service" value={serviceType?.name ?? ""} target={2} />
-            label="Service"
-            value={
-              values.serviceType === "rail"
-                ? "Rail Only"
-                : values.serviceType === "rail_forwarding"
-                  ? "Rail + Forwarding"
-                  : ""
-            }
-            target={2}
-          />
         </ReviewCard>
 
         <ReviewCard title="First & Last Mile">
@@ -260,9 +265,7 @@ export function Step8Review({
             }
             checked={field.value}
             onChange={(e) => field.onChange(e.currentTarget.checked)}
-            error={
+            error={fieldState.error?.message ?? errors.termsAccepted?.message}
-              fieldState.error?.message ?? errors.termsAccepted?.message
-            }
             color="edr-green"
             radius="sm"
           />