From 7ac3a40159636dfe9fcebbf0412d897a22faf76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chy=C5=82a?= <chyla1988@gmail.com>
Date: Thu, 19 Oct 2023 10:13:12 +0200
Subject: [PATCH] Fix sentry errors with can not read property of undefined
 (#4332)

---
 .changeset/ninety-pillows-sing.md                  | 5 +++++
 src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts | 3 ++-
 src/utils/handlers/metadataCreateHandler.ts        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/ninety-pillows-sing.md

diff --git a/.changeset/ninety-pillows-sing.md b/.changeset/ninety-pillows-sing.md
new file mode 100644
index 00000000000..4854b907514
--- /dev/null
+++ b/.changeset/ninety-pillows-sing.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Fix error related to can not read property of undefined in metadata and reading search page info
diff --git a/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts b/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts
index 82db71ea462..34ea8e0df71 100644
--- a/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts
+++ b/src/hooks/makeTopLevelSearch/makeTopLevelSearch.ts
@@ -26,7 +26,8 @@ function makeTopLevelSearch<
       result.loadMore(
         (prev, next) => {
           if (
-            prev.search.pageInfo.endCursor === next.search.pageInfo.endCursor
+            prev.search?.pageInfo?.endCursor ===
+            next.search?.pageInfo?.endCursor
           ) {
             return prev;
           }
diff --git a/src/utils/handlers/metadataCreateHandler.ts b/src/utils/handlers/metadataCreateHandler.ts
index c0ff0656ad2..aecf7f59e7e 100644
--- a/src/utils/handlers/metadataCreateHandler.ts
+++ b/src/utils/handlers/metadataCreateHandler.ts
@@ -42,7 +42,7 @@ function createMetadataCreateHandler<T extends MetadataFormData, TError>(
       }
     }
 
-    if (data.privateMetadata.length > 0) {
+    if (data?.privateMetadata?.length > 0) {
       const updatePrivateMetaResult = await setPrivateMetadata({
         variables: {
           id,