From adbd8dca7013abe30d61a40a5d31311294cb2c50 Mon Sep 17 00:00:00 2001
From: "Hung-Han (Henry) Chen" <chenhungh@gmail.com>
Date: Wed, 19 May 2021 15:15:06 +0300
Subject: [PATCH] Fix bugs

Signed-off-by: Hung-Han (Henry) Chen <chenhungh@gmail.com>
---
 src/renderer/api/catalog-entity-registry.ts    | 2 +-
 src/renderer/components/hotbar/hotbar-menu.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/api/catalog-entity-registry.ts b/src/renderer/api/catalog-entity-registry.ts
index 42c9b6f224..a7f523cb7c 100644
--- a/src/renderer/api/catalog-entity-registry.ts
+++ b/src/renderer/api/catalog-entity-registry.ts
@@ -65,7 +65,7 @@ export class CatalogEntityRegistry {
 
   getItemsForCategory<T extends CatalogEntity>(category: CatalogCategory): T[] {
     const supportedVersions = category.spec.versions.map((v) => `${category.spec.group}/${v.name}`);
-    const items = this._items.filter((item) => supportedVersions.includes(item.apiVersion) && item.kind === category.spec.names.kind);
+    const items = this._items.filter((item) => supportedVersions.includes(item?.apiVersion) && item.kind === category.spec.names.kind);
 
     return items as T[];
   }
diff --git a/src/renderer/components/hotbar/hotbar-menu.tsx b/src/renderer/components/hotbar/hotbar-menu.tsx
index 33a8d4e0b7..d6f70c7978 100644
--- a/src/renderer/components/hotbar/hotbar-menu.tsx
+++ b/src/renderer/components/hotbar/hotbar-menu.tsx
@@ -52,7 +52,7 @@ export class HotbarMenu extends React.Component<Props> {
       return null;
     }
 
-    return item ? catalogEntityRegistry.items.find((entity) => entity.metadata.uid === item.entity.uid) : null;
+    return item ? catalogEntityRegistry.items.find((entity) => entity?.metadata.uid === item.entity.uid) : null;
   }
 
   onDragEnd(result: DropResult) {