From 1c88bd8d686b4b97cd5d26d39f0aa3a7bcef3adb Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Thu, 2 Jul 2026 10:27:01 +0000
Subject: [PATCH] fix

---
 .../backoffice/src/pages/operations/FirstMilePage.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 01e5ded57..9f6e82d03 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -469,9 +469,14 @@ const FirstMilePage = () => {
   const firstMileEligiblePaidBookings = useMemo(
     () =>
       paidBookings.filter(
-        (booking) =>
-          booking.tradeDirection === "EXPORT" &&
-          !existingFirstMileBookingIds.has(booking.id),
+        (booking) => {
+          if (existingFirstMileBookingIds.has(booking.id)) return false;
+          return (
+            booking.tradeDirection === "EXPORT" ||
+            (booking.firstMilePickupAddress?.trim() ?? false) ||
+            booking.serviceType?.includesFirstMile
+          );
+        },
       ),
     [existingFirstMileBookingIds, paidBookings],
   );