apps/dashboard/modules/estimates/create-invoice-from-estimate-button.tsx

@@ -124,7 +124,7 @@ export function CreateInvoiceFromEstimateButton() {
             </Button>
 
             <Dialog open={open} onOpenChange={setOpen}>
-                <DialogContent className="sm:max-w-5xl">
+                <DialogContent className="min-w-2xl">
                     <DialogHeader>
                         <DialogTitle>Generate Invoice from Estimate</DialogTitle>
                     </DialogHeader>

apps/dashboard/modules/job-cards/job-card-check-in-dialog.tsx

@@ -24,7 +24,6 @@ import {
 import { DEPARTMENT_ROUTES } from "@garage/api"
 import { FUEL_LEVEL_OPTIONS } from "./job-card.schema"
 import { toId } from "@/shared/lib/utils"
-import { DepartmentInlineForm } from "@/modules/services/inline-forms/department-inline-form"
 
 // ── Schema ──
 
@@ -47,7 +46,7 @@ const mapLookupOption = (item: any) => ({
     label: item.name,
 })
 
-const STORE_OBJECT = { getOptionValue: (o: any) => o, getOptionLabel: (o: any) => o.label } as const
+const STORE_OBJECT = { storeObject: true } as const
 
 // ── Props ──
 
@@ -139,10 +138,11 @@ export function JobCardCheckInDialog({
                             required
                             queryKey={[DEPARTMENT_ROUTES.INDEX]}
                             listFn={() => api.departments.list()}
-                            mapOption={(item: any) => ({ value: String(item.id), label: item.name ?? String(item.id) })}
-                            createForm={(props) => <DepartmentInlineForm {...props} />}
-                            createLabel="Department"
+                            mapOption={(op:any)=> ({value: op.id, label: op.name})}
                             {...STORE_OBJECT}
+                            getOptionLabel={op=>op.label}
+                            getOptionValue={op=>op}
+                            
                         />
                         <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
                             <RhfDateField name="delivery_date" label="Delivery Date" />