From 7e7bd6b9e74fb52ae3305ceb760a4d1252db9b08 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charles@twenty.com>
Date: Sun, 3 Dec 2023 12:01:37 +0100
Subject: [PATCH] Prevent setting addition from being broken

---
 .../data-model/hooks/useRelationFieldPreviewValue.ts     | 2 +-
 front/src/modules/ui/input/components/IconPicker.tsx     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/front/src/modules/settings/data-model/hooks/useRelationFieldPreviewValue.ts b/front/src/modules/settings/data-model/hooks/useRelationFieldPreviewValue.ts
index ca11ebf87..7a8b2328f 100644
--- a/front/src/modules/settings/data-model/hooks/useRelationFieldPreviewValue.ts
+++ b/front/src/modules/settings/data-model/hooks/useRelationFieldPreviewValue.ts
@@ -16,7 +16,7 @@ export const useRelationFieldPreviewValue = ({
     : undefined;
 
   const { records: relationObjects } = useFindManyRecords({
-    objectNameSingular: relationObjectMetadataItem?.nameSingular ?? '',
+    objectNameSingular: relationObjectMetadataItem?.nameSingular ?? 'company', // TODO fix this hack
     skip: skip || !relationObjectMetadataItem,
   });
 
diff --git a/front/src/modules/ui/input/components/IconPicker.tsx b/front/src/modules/ui/input/components/IconPicker.tsx
index 587c5c80d..b23be4828 100644
--- a/front/src/modules/ui/input/components/IconPicker.tsx
+++ b/front/src/modules/ui/input/components/IconPicker.tsx
@@ -60,14 +60,15 @@ export const IconPicker = ({
   const { icons, isLoadingIcons: isLoading } = useLazyLoadIcons();
 
   const iconKeys = useMemo(() => {
-    const filteredIconKeys = Object.keys(icons).filter(
-      (iconKey) =>
+    const filteredIconKeys = Object.keys(icons).filter((iconKey) => {
+      return (
         iconKey !== selectedIconKey &&
         (!searchString ||
           [iconKey, convertIconKeyToLabel(iconKey)].some((label) =>
             label.toLowerCase().includes(searchString.toLowerCase()),
-          )),
-    );
+          ))
+      );
+    });
 
     return (
       selectedIconKey