From 34b87bbcee8e36688347bb037a05517a10dd9d4f Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Thu, 2 Jul 2026 14:06:45 +0000
Subject: [PATCH] fix

---
 .../src/pages/operations/FirstMilePage.tsx       | 16 ++++++++++++++--
 .../src/pages/operations/LastMilePage.tsx        | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
index 34bf68c21..b956c2f31 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -1037,11 +1037,17 @@ const FirstMilePage = () => {
           <Divider />
           <Select
             label="Vehicle"
-            placeholder="Select a vehicle"
+            placeholder={vehicleOptions.length === 0 ? "No free vehicles" : "Select a vehicle"}
+            description={
+              vehicleOptions.length === 0
+                ? "No free vehicles available — all vehicles are busy, in maintenance, or retired. Free up a vehicle in Fleet › Vehicles first."
+                : undefined
+            }
             data={vehicleOptions}
             value={vehicleValue}
             onChange={setVehicleValue}
             searchable
+            disabled={vehicleOptions.length === 0}
           />
           <Group justify="flex-end" gap="sm">
             <Button variant="default" onClick={closeAssign}>Cancel</Button>
@@ -1202,12 +1208,18 @@ const FirstMilePage = () => {
             <Divider />
             <Select
               label="Assign Vehicle (optional)"
-              placeholder="Select a vehicle"
+              placeholder={vehicleOptions.length === 0 ? "No free vehicles" : "Select a vehicle"}
+              description={
+                vehicleOptions.length === 0
+                  ? "No free vehicles available — you can still accept and assign a vehicle later."
+                  : undefined
+              }
               data={vehicleOptions}
               value={acceptVehicleValue}
               onChange={setAcceptVehicleValue}
               searchable
               clearable
+              disabled={vehicleOptions.length === 0}
             />
             <Group justify="space-between" gap="sm">
               <Button variant="subtle" onClick={() => setAcceptStep(1)}>← Back</Button>
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
index ba02483a7..cfb73a860 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -1095,12 +1095,18 @@ const LastMilePage = () => {
             <Divider />
             <Select
               label="Assign Vehicle (optional)"
-              placeholder="Select a vehicle"
+              placeholder={vehicleOptions.length === 0 ? "No free vehicles" : "Select a vehicle"}
+              description={
+                vehicleOptions.length === 0
+                  ? "No free vehicles available — you can still accept and assign a vehicle later."
+                  : undefined
+              }
               data={vehicleOptions}
               value={acceptVehicleValue}
               onChange={setAcceptVehicleValue}
               searchable
               clearable
+              disabled={vehicleOptions.length === 0}
             />
             <Group justify="space-between" gap="sm">
               <Button variant="subtle" onClick={() => setAcceptStep(1)}>← Back</Button>
@@ -1143,11 +1149,17 @@ const LastMilePage = () => {
           <Divider />
           <Select
             label="Vehicle"
-            placeholder="Select a vehicle"
+            placeholder={vehicleOptions.length === 0 ? "No free vehicles" : "Select a vehicle"}
+            description={
+              vehicleOptions.length === 0
+                ? "No free vehicles available — all vehicles are busy, in maintenance, or retired. Free up a vehicle in Fleet › Vehicles first."
+                : undefined
+            }
             data={vehicleOptions}
             value={vehicleValue}
             onChange={setVehicleValue}
             searchable
+            disabled={vehicleOptions.length === 0}
           />
           <Group justify="flex-end" gap="sm">
             <Button variant="default" onClick={closeAssign}>Cancel</Button>