diff --git a/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx b/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx index 43e8849eb7..602ded66fe 100644 --- a/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx +++ b/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx @@ -43,19 +43,21 @@ export function OrderCreateShipmentForm({ }) const handleSubmit = form.handleSubmit(async (data) => { + const addedLabels = data.labels + .filter((l) => !!l.tracking_number) + .map((l) => ({ + tracking_number: l.tracking_number, + tracking_url: "#", + label_url: "#", + })) + await createShipment( { items: fulfillment?.items?.map((i) => ({ id: i.line_item_id, quantity: i.quantity, })), - labels: data.labels - .filter((l) => !!l.tracking_number) - .map((l) => ({ - tracking_number: l.tracking_number, - tracking_url: "#", - label_url: "#", - })), + labels: [...addedLabels, ...(fulfillment?.labels || [])], no_notification: !data.send_notification, }, {