From 90ff0ebb5f26cdf85828cf7381b7cac71c6f22b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20=C5=BBegle=C5=84?= <flesz3@o2.pl>
Date: Mon, 21 Mar 2022 12:35:19 +0100
Subject: [PATCH] Remove initial data from tracking number form (#1910)

---
 .../OrderFulfillmentTrackingDialog.tsx                      | 6 +++++-
 src/orders/views/OrderDetails/OrderNormalDetails/index.tsx  | 4 ++--
 .../views/OrderDetails/OrderUnconfirmedDetails/index.tsx    | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
index d7af6b4e3..ca9198402 100644
--- a/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
+++ b/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
@@ -46,9 +46,13 @@ const OrderFulfillmentTrackingDialog: React.FC<OrderFulfillmentTrackingDialogPro
   const formFields = ["trackingNumber"];
   const formErrors = getFormErrors(formFields, errors);
 
+  const initialData: FormData = {
+    trackingNumber: trackingNumber || ""
+  };
+
   return (
     <Dialog onClose={onClose} open={open} fullWidth maxWidth="xs">
-      <Form confirmLeave initial={{ trackingNumber }} onSubmit={onConfirm}>
+      <Form confirmLeave initial={initialData} onSubmit={onConfirm}>
         {({ change, data, submit }) => (
           <>
             <DialogTitle>
diff --git a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
index 570a60521..98f172662 100644
--- a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
+++ b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
@@ -309,11 +309,11 @@ export const OrderNormalDetails: React.FC<OrderNormalDetailsProps> = ({
             ?.orderFulfillmentUpdateTracking.errors || []
         }
         open={params.action === "edit-fulfillment"}
-        trackingNumber={getStringOrPlaceholder(
+        trackingNumber={
           data?.order?.fulfillments.find(
             fulfillment => fulfillment.id === params.id
           )?.trackingNumber
-        )}
+        }
         onConfirm={variables =>
           orderFulfillmentUpdateTracking.mutate({
             id: params.id,
diff --git a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
index 27057a7be..5f58f0470 100644
--- a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
+++ b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
@@ -385,11 +385,11 @@ export const OrderUnconfirmedDetails: React.FC<OrderUnconfirmedDetailsProps> = (
             ?.orderFulfillmentUpdateTracking.errors || []
         }
         open={params.action === "edit-fulfillment"}
-        trackingNumber={getStringOrPlaceholder(
+        trackingNumber={
           data?.order?.fulfillments.find(
             fulfillment => fulfillment.id === params.id
           )?.trackingNumber
-        )}
+        }
         onConfirm={variables =>
           orderFulfillmentUpdateTracking.mutate({
             id: params.id,