From d0a6e10cece86718e5eaeb45c0f0ce023837cac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dro=C5=84?= <dron.official@yahoo.com>
Date: Wed, 27 Oct 2021 11:02:23 +0200
Subject: [PATCH] Fix type error when returning items (#1525) (#1548)

* optional chaining wip

* resolve property of undefined error

* remove error toast when there is no error

* revert makeMutation

* apply suggestions from code review

* revert newline

* code review suggestions

* remove unnecessary optional chaining

* fix orderRefund undefined errors
---
 src/orders/views/OrderRefund/OrderRefund.tsx |  4 ++--
 src/orders/views/OrderReturn/OrderReturn.tsx | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/orders/views/OrderRefund/OrderRefund.tsx b/src/orders/views/OrderRefund/OrderRefund.tsx
index 1208075b8..4d9445efd 100644
--- a/src/orders/views/OrderRefund/OrderRefund.tsx
+++ b/src/orders/views/OrderRefund/OrderRefund.tsx
@@ -108,7 +108,7 @@ const OrderRefund: React.FC<OrderRefundProps> = ({ orderId }) => {
       }
     });
 
-    return response.errors || [];
+    return response?.errors || [];
   };
 
   const handleSubmitProductsRefund = async (
@@ -127,7 +127,7 @@ const OrderRefund: React.FC<OrderRefundProps> = ({ orderId }) => {
       }
     });
 
-    return response.errors || [];
+    return response?.errors || [];
   };
 
   const handleSubmit = async (formData: OrderRefundSubmitData) =>
diff --git a/src/orders/views/OrderReturn/OrderReturn.tsx b/src/orders/views/OrderReturn/OrderReturn.tsx
index c38667bfd..c27711dbf 100644
--- a/src/orders/views/OrderReturn/OrderReturn.tsx
+++ b/src/orders/views/OrderReturn/OrderReturn.tsx
@@ -5,6 +5,7 @@ import OrderReturnPage from "@saleor/orders/components/OrderReturnPage";
 import { OrderReturnFormData } from "@saleor/orders/components/OrderReturnPage/form";
 import { useOrderReturnCreateMutation } from "@saleor/orders/mutations";
 import { useOrderQuery } from "@saleor/orders/queries";
+import { FulfillmentReturnProducts_orderFulfillmentReturnProducts } from "@saleor/orders/types/FulfillmentReturnProducts";
 import { orderUrl } from "@saleor/orders/urls";
 import { OrderErrorCode } from "@saleor/types/globalTypes";
 import React from "react";
@@ -56,9 +57,11 @@ const OrderReturn: React.FC<OrderReturnProps> = ({ orderId }) => {
         });
 
         navigateToOrder(replaceOrder?.id);
+
+        return;
       }
 
-      if (errors[0].code === OrderErrorCode.CANNOT_REFUND) {
+      if (errors.some(err => err.code === OrderErrorCode.CANNOT_REFUND)) {
         notify({
           autohide: 5000,
           status: "error",
@@ -90,8 +93,10 @@ const OrderReturn: React.FC<OrderReturnProps> = ({ orderId }) => {
     });
 
     const {
-      data: { orderFulfillmentReturnProducts }
-    } = result;
+      data: {
+        orderFulfillmentReturnProducts = {} as FulfillmentReturnProducts_orderFulfillmentReturnProducts
+      } = {}
+    } = result || {};
 
     return orderFulfillmentReturnProducts.errors;
   };