From 045f569d623f10cd68e3fa607dac5282bea97508 Mon Sep 17 00:00:00 2001
From: Lucas Bordeau <bordeau.lucas@gmail.com>
Date: Fri, 8 Nov 2024 17:11:37 +0100
Subject: [PATCH] Fixed dropdown menu field settings (#8374)

2 dropdown menu components were used. Using only one and using dropdown
props for passing width to its internal dropdown menu component.
---
 ...ettingsObjectFieldActiveActionDropdown.tsx | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
index 4391d783d..765e25811 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
@@ -9,7 +9,6 @@ import {
 } from 'twenty-ui';
 
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
-import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 
@@ -57,30 +56,29 @@ export const SettingsObjectFieldActiveActionDropdown = ({
           accent="tertiary"
         />
       }
+      dropdownMenuWidth={160}
       dropdownComponents={
-        <DropdownMenu width="160px">
-          <DropdownMenuItemsContainer>
+        <DropdownMenuItemsContainer>
+          <MenuItem
+            text={isCustomField ? 'Edit' : 'View'}
+            LeftIcon={isCustomField ? IconPencil : IconEye}
+            onClick={handleEdit}
+          />
+          {!!onSetAsLabelIdentifier && (
             <MenuItem
-              text={isCustomField ? 'Edit' : 'View'}
-              LeftIcon={isCustomField ? IconPencil : IconEye}
-              onClick={handleEdit}
+              text="Set as record text"
+              LeftIcon={IconTextSize}
+              onClick={handleSetAsLabelIdentifier}
             />
-            {!!onSetAsLabelIdentifier && (
-              <MenuItem
-                text="Set as record text"
-                LeftIcon={IconTextSize}
-                onClick={handleSetAsLabelIdentifier}
-              />
-            )}
-            {!!onDeactivate && (
-              <MenuItem
-                text="Deactivate"
-                LeftIcon={IconArchive}
-                onClick={handleDeactivate}
-              />
-            )}
-          </DropdownMenuItemsContainer>
-        </DropdownMenu>
+          )}
+          {!!onDeactivate && (
+            <MenuItem
+              text="Deactivate"
+              LeftIcon={IconArchive}
+              onClick={handleDeactivate}
+            />
+          )}
+        </DropdownMenuItemsContainer>
       }
       dropdownHotkeyScope={{
         scope: dropdownId,