From 47ac97dd256bab31fc723ef42bb32e415a8174ad Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:58:14 +0100
Subject: [PATCH] Fix Select (#3327)

---
 .../src/ui/navigation/link/contactLinkCode.js |  7 ++++---
 .../command-menu/hooks/useCommandMenu.ts      | 20 ++++++++++++++-----
 .../components/SettingsObjectFieldPreview.tsx |  1 +
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/twenty-docs/src/ui/navigation/link/contactLinkCode.js b/packages/twenty-docs/src/ui/navigation/link/contactLinkCode.js
index d18076dd5..86e31dd8e 100644
--- a/packages/twenty-docs/src/ui/navigation/link/contactLinkCode.js
+++ b/packages/twenty-docs/src/ui/navigation/link/contactLinkCode.js
@@ -1,9 +1,10 @@
-import { ContactLink } from "@/ui/navigation/link/components/ContactLink";
-import { BrowserRouter as Router } from "react-router-dom";
+import { BrowserRouter as Router } from 'react-router-dom';
+
+import { ContactLink } from '@/ui/navigation/link/components/ContactLink';
 
 export const MyComponent = () => {
   const handleLinkClick = (event) => {
-    console.log("Contact link clicked!", event);
+    console.log('Contact link clicked!', event);
   };
 
   return (
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
index 0d2978c7d..f9448debc 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
@@ -26,11 +26,21 @@ export const useCommandMenu = () => {
     setHotkeyScopeAndMemorizePreviousScope(AppHotkeyScope.CommandMenuOpen);
   };
 
-  const closeCommandMenu = () => {
-    setIsCommandMenuOpened(false);
-    resetSelectedItem();
-    goBackToPreviousHotkeyScope();
-  };
+  const closeCommandMenu = useRecoilCallback(
+    ({ snapshot }) =>
+      () => {
+        const isCommandMenuOpened = snapshot
+          .getLoadable(isCommandMenuOpenedState)
+          .getValue();
+
+        if (isCommandMenuOpened) {
+          setIsCommandMenuOpened(false);
+          resetSelectedItem();
+          goBackToPreviousHotkeyScope();
+        }
+      },
+    [goBackToPreviousHotkeyScope, resetSelectedItem, setIsCommandMenuOpened],
+  );
 
   const toggleCommandMenu = useRecoilCallback(({ snapshot }) => async () => {
     const isCommandMenuOpened = snapshot
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
index 1683bdc35..12ce75b4b 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
@@ -144,6 +144,7 @@ export const SettingsObjectFieldPreview = ({
                   fieldName,
                   relationObjectMetadataNameSingular:
                     relationObjectMetadataItem?.nameSingular,
+                  options: selectOptions,
                 },
               },
               hotkeyScope: 'field-preview',