From 5b9fcc0f89a1ed07eb2e2a8ed894f7222bc9a07c Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Wed, 24 Jun 2026 14:25:04 +0000
Subject: [PATCH 1/4] fix btn color

---
 .../backoffice/src/pages/fleet/FleetResourcePage.tsx         | 4 +++-
 .../backoffice/src/pages/operations/FirstMilePage.tsx        | 5 +++--
 .../backoffice/src/pages/operations/LastMilePage.tsx         | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index 5be9f1e56..a7fc9efbd 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -360,7 +360,7 @@ const FleetResourcePage = () => {
               {config.subtitle}
             </Text>
           </div>
-          <Button leftSection={<Plus size={16} />} onClick={() => {
+          <Button leftSection={<Plus size={16} />} fw={500} onClick={() => {
             setEditing(null);
             setFormOpen(true);
           }}>
@@ -392,6 +392,7 @@ const FleetResourcePage = () => {
                               radius="md"
                               variant={filter.value === option.value ? "filled" : "outline"}
                               color="green"
+                              fw={500}
                               onClick={() => {
                                 setListFilterValues((prev) => ({
                                   ...prev,
@@ -418,6 +419,7 @@ const FleetResourcePage = () => {
                           radius="md"
                           variant={statusFilter === option.value ? "filled" : "outline"}
                           color="green"
+                          fw={500}
                           onClick={() => setStatusFilter(option.value)}
                         >
                           {option.label}
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 ccd94137e..9040c2322 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -717,11 +717,11 @@ const FirstMilePage = () => {
                 />
                 <Group gap="sm">
                   {selectedIds.length > 0 && (
-                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign}>
+                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} fw={500}>
                       Assign vehicle ({selectedIds.length})
                     </Button>
                   )}
-                  <Button leftSection={<Truck size={16} />} onClick={openAccept}>
+                  <Button leftSection={<Truck size={16} />} onClick={openAccept} fw={500}>
                     Assign Mile
                   </Button>
                 </Group>
@@ -734,6 +734,7 @@ const FirstMilePage = () => {
                       key={option.value}
                       size="xs"
                       variant={active ? "filled" : "default"}
+                      fw={500}
                       onClick={() => {
                         setStatusFilter(option.value);
                         setPagination((p) => ({ ...p, pageIndex: 0 }));
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 7a68e447b..6f2661f35 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -629,11 +629,11 @@ const LastMilePage = () => {
                 />
                 <Group gap="sm">
                   {selectedIds.length > 0 && (
-                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign}>
+                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} fw={500}>
                       Assign vehicle ({selectedIds.length})
                     </Button>
                   )}
-                  <Button leftSection={<Truck size={16} />} onClick={() => openAssign(null)}>
+                  <Button leftSection={<Truck size={16} />} onClick={() => openAssign(null)} fw={500}>
                     Assign Mile
                   </Button>
                 </Group>
@@ -646,6 +646,7 @@ const LastMilePage = () => {
                       key={option.value}
                       size="xs"
                       variant={active ? "filled" : "default"}
+                      fw={500}
                       onClick={() => {
                         setStatusFilter(option.value);
                         setPagination((p) => ({ ...p, pageIndex: 0 }));

From f7bdd19a07b9824c84702ca302e094a4d75aa7d7 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Wed, 24 Jun 2026 14:32:04 +0000
Subject: [PATCH 2/4] fix ui

---
 .../backoffice/src/pages/fleet/FleetResourcePage.tsx        | 6 +++---
 .../backoffice/src/pages/operations/FirstMilePage.tsx       | 6 +++---
 .../backoffice/src/pages/operations/LastMilePage.tsx        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index a7fc9efbd..6e89f265f 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -360,7 +360,7 @@ const FleetResourcePage = () => {
               {config.subtitle}
             </Text>
           </div>
-          <Button leftSection={<Plus size={16} />} fw={500} onClick={() => {
+          <Button leftSection={<Plus size={16} />} styles={{ label: { fontWeight: 500 } }} onClick={() => {
             setEditing(null);
             setFormOpen(true);
           }}>
@@ -392,7 +392,7 @@ const FleetResourcePage = () => {
                               radius="md"
                               variant={filter.value === option.value ? "filled" : "outline"}
                               color="green"
-                              fw={500}
+                              styles={{ label: { fontWeight: 500 } }}
                               onClick={() => {
                                 setListFilterValues((prev) => ({
                                   ...prev,
@@ -419,7 +419,7 @@ const FleetResourcePage = () => {
                           radius="md"
                           variant={statusFilter === option.value ? "filled" : "outline"}
                           color="green"
-                          fw={500}
+                          styles={{ label: { fontWeight: 500 } }}
                           onClick={() => setStatusFilter(option.value)}
                         >
                           {option.label}
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 9040c2322..c875d157e 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -717,11 +717,11 @@ const FirstMilePage = () => {
                 />
                 <Group gap="sm">
                   {selectedIds.length > 0 && (
-                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} fw={500}>
+                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} styles={{ label: { fontWeight: 500 } }}>
                       Assign vehicle ({selectedIds.length})
                     </Button>
                   )}
-                  <Button leftSection={<Truck size={16} />} onClick={openAccept} fw={500}>
+                  <Button leftSection={<Truck size={16} />} onClick={openAccept} styles={{ label: { fontWeight: 500 } }}>
                     Assign Mile
                   </Button>
                 </Group>
@@ -734,7 +734,7 @@ const FirstMilePage = () => {
                       key={option.value}
                       size="xs"
                       variant={active ? "filled" : "default"}
-                      fw={500}
+                      styles={{ label: { fontWeight: 500 } }}
                       onClick={() => {
                         setStatusFilter(option.value);
                         setPagination((p) => ({ ...p, pageIndex: 0 }));
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 6f2661f35..f7807f90a 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -629,11 +629,11 @@ const LastMilePage = () => {
                 />
                 <Group gap="sm">
                   {selectedIds.length > 0 && (
-                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} fw={500}>
+                    <Button variant="light" leftSection={<Truck size={16} />} onClick={openBulkAssign} styles={{ label: { fontWeight: 500 } }}>
                       Assign vehicle ({selectedIds.length})
                     </Button>
                   )}
-                  <Button leftSection={<Truck size={16} />} onClick={() => openAssign(null)} fw={500}>
+                  <Button leftSection={<Truck size={16} />} onClick={() => openAssign(null)} styles={{ label: { fontWeight: 500 } }}>
                     Assign Mile
                   </Button>
                 </Group>
@@ -646,7 +646,7 @@ const LastMilePage = () => {
                       key={option.value}
                       size="xs"
                       variant={active ? "filled" : "default"}
-                      fw={500}
+                      styles={{ label: { fontWeight: 500 } }}
                       onClick={() => {
                         setStatusFilter(option.value);
                         setPagination((p) => ({ ...p, pageIndex: 0 }));

From a1bb458a9158a6c9bf86a2b56703e55bc264f9e5 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Wed, 24 Jun 2026 14:37:45 +0000
Subject: [PATCH 3/4] fix ui

---
 .../backoffice/src/pages/fleet/FleetResourcePage.tsx            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index 6e89f265f..f45a35f34 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -391,7 +391,6 @@ const FleetResourcePage = () => {
                               size="xs"
                               radius="md"
                               variant={filter.value === option.value ? "filled" : "outline"}
-                              color="green"
                               styles={{ label: { fontWeight: 500 } }}
                               onClick={() => {
                                 setListFilterValues((prev) => ({
@@ -418,7 +417,6 @@ const FleetResourcePage = () => {
                           size="xs"
                           radius="md"
                           variant={statusFilter === option.value ? "filled" : "outline"}
-                          color="green"
                           styles={{ label: { fontWeight: 500 } }}
                           onClick={() => setStatusFilter(option.value)}
                         >

From 6cf0ae09f567a059e1b48ccba2e09c29106200b1 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Wed, 24 Jun 2026 14:50:26 +0000
Subject: [PATCH 4/4] fix issue

---
 .../src/modules/first-mile/first-mile.service.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts b/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
index 2d4079a8b..cb35f9a89 100644
--- a/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
@@ -45,7 +45,7 @@ export class FirstMileService {
    * unknown or the booking has not reached PAID status.
    */
   async acceptBooking(bookingReference: string): Promise<FirstMile | null> {
-    const booking = await this.bookingsRepository.findById(bookingReference);
+    const booking = await this.bookingsRepository.findByReference(bookingReference);
 
     if (!booking) {
       return null;