From c966533f2661031b6d369eb86f29c0dbf1d3f18d Mon Sep 17 00:00:00 2001
From: Harsh Singh <harshrajeevsingh@gmail.com>
Date: Thu, 14 Nov 2024 22:21:54 +0530
Subject: [PATCH] fix: search error in filter & sort dropdowns (#8493)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: #8483

Co-authored-by: Félix Malfait <felix@twenty.com>
---
 .../components/ObjectFilterDropdownFilterSelect.tsx         | 4 +---
 .../components/ObjectSortDropdownButton.tsx                 | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
index e97dd2c59028..906661a66c68 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
@@ -187,9 +187,7 @@ export const ObjectFilterDropdownFilterSelect = ({
                 </SelectableItem>
               ),
             )}
-          </DropdownMenuItemsContainer>
-          {shoudShowSeparator && <DropdownMenuSeparator />}
-          <DropdownMenuItemsContainer>
+            {shoudShowSeparator && <DropdownMenuSeparator />}
             {hiddenColumnsFilterDefinitions.map(
               (hiddenFilterDefinition, index) => (
                 <SelectableItem
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index f069f854a243..52fd645bf76b 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -15,8 +15,8 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
-import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useContext } from 'react';
 import { SORT_DIRECTIONS } from '../types/SortDirection';
 
@@ -200,9 +200,7 @@ export const ObjectSortDropdownButton = ({
                     />
                   ),
                 )}
-              </DropdownMenuItemsContainer>
-              {shoudShowSeparator && <DropdownMenuSeparator />}
-              <DropdownMenuItemsContainer>
+                {shoudShowSeparator && <DropdownMenuSeparator />}
                 {hiddenColumnsSortDefinitions.map(
                   (hiddenSortDefinition, index) => (
                     <MenuItem