From d22302838ba85b877926b44ec4e5fa2b915775b2 Mon Sep 17 00:00:00 2001
From: root <root@whpoejrmfc.local>
Date: Fri, 12 Jun 2026 17:20:29 +0000
Subject: [PATCH] fix: driver assignment only on delivery tab, hidden on pickup
 tab

---
 src/components/orders/OrderDetailPanel.jsx | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/orders/OrderDetailPanel.jsx b/src/components/orders/OrderDetailPanel.jsx
index 3918884..11b54d3 100644
--- a/src/components/orders/OrderDetailPanel.jsx
+++ b/src/components/orders/OrderDetailPanel.jsx
@@ -980,17 +980,19 @@ export const OrderDetailPanel = ({
       ) : null}
 
 
-      <DriverAssignmentPanel
-        order={order}
-        userRole={userRole}
-        canManageDelivery={canManageDelivery}
-        isSavingDriverAssignment={isSavingDriverAssignment}
-        selectedDriverId={selectedDriverId}
-        onDriverSelect={(id) => { setSelectedDriverId(id); setDriverMessage(""); }}
-        onConfirmDriver={() => setConfirmAction({ type: 'driver' })}
-        driverMessage={driverMessage}
-        drivers={drivers}
-      />
+      {deliveryType === "delivery" && (
+        <DriverAssignmentPanel
+          order={order}
+          userRole={userRole}
+          canManageDelivery={canManageDelivery}
+          isSavingDriverAssignment={isSavingDriverAssignment}
+          selectedDriverId={selectedDriverId}
+          onDriverSelect={(id) => { setSelectedDriverId(id); setDriverMessage(""); }}
+          onConfirmDriver={() => setConfirmAction({ type: 'driver' })}
+          driverMessage={driverMessage}
+          drivers={drivers}
+        />
+      )}
 
 
       <StatusActionPanel