From e21d4803d420c1a1fe3f900cf644303fa810bf7c Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 16 Mar 2020 10:55:16 +0100
Subject: [PATCH] Fix form error

---
 .../views/ServiceCreate/ServiceCreate.tsx     |  8 ++---
 .../views/ServiceDetails/ServiceDetails.tsx   | 33 +++++++++----------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/services/views/ServiceCreate/ServiceCreate.tsx b/src/services/views/ServiceCreate/ServiceCreate.tsx
index 4af4e264b..efe6e8b7a 100644
--- a/src/services/views/ServiceCreate/ServiceCreate.tsx
+++ b/src/services/views/ServiceCreate/ServiceCreate.tsx
@@ -6,7 +6,6 @@ import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import useShop from "@saleor/hooks/useShop";
 import { commonMessages } from "@saleor/intl";
-import { maybe } from "@saleor/misc";
 import { ServiceCreateMutation } from "@saleor/services/mutations";
 import { ServiceCreate as ServiceCreateData } from "@saleor/services/types/ServiceCreate";
 import ServiceCreatePage, {
@@ -61,13 +60,10 @@ export const ServiceCreate: React.FC<ServiceCreateProps> = ({ setToken }) => {
             />
             <ServiceCreatePage
               disabled={false}
-              errors={maybe(
-                () => serviceCreateOpts.data.serviceAccountCreate.errors,
-                []
-              )}
+              errors={serviceCreateOpts.data?.serviceAccountCreate.errors || []}
               onBack={handleBack}
               onSubmit={handleSubmit}
-              permissions={maybe(() => shop.permissions)}
+              permissions={shop?.permissions}
               saveButtonBarState={serviceCreateOpts.status}
             />
           </>
diff --git a/src/services/views/ServiceDetails/ServiceDetails.tsx b/src/services/views/ServiceDetails/ServiceDetails.tsx
index ff49922a5..7cbf86008 100644
--- a/src/services/views/ServiceDetails/ServiceDetails.tsx
+++ b/src/services/views/ServiceDetails/ServiceDetails.tsx
@@ -7,7 +7,7 @@ import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import useShop from "@saleor/hooks/useShop";
 import { commonMessages } from "@saleor/intl";
-import { maybe } from "@saleor/misc";
+import { maybe, getStringOrPlaceholder } from "@saleor/misc";
 import ServiceDeleteDialog from "@saleor/services/components/ServiceDeleteDialog";
 import ServiceTokenCreateDialog from "@saleor/services/components/ServiceTokenCreateDialog";
 import ServiceTokenDeleteDialog from "@saleor/services/components/ServiceTokenDeleteDialog";
@@ -154,15 +154,16 @@ export const ServiceDetails: React.FC<OrderListProps> = ({
 
                           return (
                             <>
-                              <WindowTitle title={service?.name || "..."} />
+                              <WindowTitle
+                                title={getStringOrPlaceholder(service?.name)}
+                              />
                               <ServiceDetailsPage
                                 apiUri={API_URI}
                                 disabled={loading}
-                                errors={maybe(
-                                  () =>
-                                    updateServiceOpts.data.serviceAccountUpdate
-                                      .errors
-                                )}
+                                errors={
+                                  updateServiceOpts.data?.serviceAccountUpdate
+                                    .errors || []
+                                }
                                 token={token}
                                 onApiUriClick={() => open(API_URI, "blank")}
                                 onBack={handleBack}
@@ -175,15 +176,14 @@ export const ServiceDetails: React.FC<OrderListProps> = ({
                                     id
                                   })
                                 }
-                                permissions={maybe(() => shop.permissions)}
-                                service={maybe(() => data.serviceAccount)}
+                                permissions={shop?.permissions}
+                                service={data?.serviceAccount}
                                 saveButtonBarState={updateServiceOpts.status}
                               />
                               <ServiceDeleteDialog
                                 confirmButtonState={deleteServiceOpts.status}
-                                name={maybe(
-                                  () => data.serviceAccount.name,
-                                  "..."
+                                name={getStringOrPlaceholder(
+                                  data?.serviceAccount?.name
                                 )}
                                 onClose={closeModal}
                                 onConfirm={handleRemoveConfirm}
@@ -194,11 +194,10 @@ export const ServiceDetails: React.FC<OrderListProps> = ({
                                 onClose={closeModal}
                                 onCreate={handleTokenCreate}
                                 open={params.action === "create-token"}
-                                token={maybe(
-                                  () =>
-                                    createTokenOpts.data
-                                      .serviceAccountTokenCreate.authToken
-                                )}
+                                token={
+                                  createTokenOpts.data
+                                    ?.serviceAccountTokenCreate.authToken
+                                }
                               />
                               <ServiceTokenDeleteDialog
                                 confirmButtonState={deleteTokenOpts.status}