diff --git a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx index 9c274fa069..ceb89c27a8 100644 --- a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx +++ b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled'; -import { plural, t } from '@lingui/core/macro'; +import { plural } from '@lingui/core/macro'; import { useMemo, useRef, useState, type MouseEvent } from 'react'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; @@ -191,7 +191,6 @@ export const SettingsMorphRelationMultiSelect = ({ isDisabled={isDisabled} selectSizeVariant={selectSizeVariant} hasRightElement={hasRightElement} - placeholderText={t`Select objects...`} /> ) : ( } dropdownComponents={ diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationForm.tsx index 2110f45ff7..2637b36181 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationForm.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/morph-relation/components/SettingsDataModelFieldRelationForm.tsx @@ -17,7 +17,6 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; import styled from '@emotion/styled'; import { useLingui } from '@lingui/react/macro'; -import { useMemo } from 'react'; import { isDefined } from 'twenty-shared/utils'; import { RelationType } from '~/generated-metadata/graphql'; @@ -115,14 +114,10 @@ export const SettingsDataModelFieldRelationForm = ({ relationType: initialRelationType, }); - const initialMorphRelationsObjectMetadataIds = useMemo( - () => - initialRelationObjectMetadataItems.map( - (relationObjectMetadataItem) => relationObjectMetadataItem.id, - ), - [initialRelationObjectMetadataItems], - ); - + const initialMorphRelationsObjectMetadataIds = + initialRelationObjectMetadataItems.map( + (relationObjectMetadataItem) => relationObjectMetadataItem.id, + ); const isMobile = useIsMobile(); return ( diff --git a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx index af59e7df7c..4c75faa35e 100644 --- a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx +++ b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx @@ -20,7 +20,6 @@ type MultiSelectControlProps = Omit & { fixedIcon?: IconComponent; fixedText?: string; selectedOptions: MultiSelectOptionType[]; - placeholderText?: string; }; export const MultiSelectControl = ({ @@ -31,22 +30,16 @@ export const MultiSelectControl = ({ selectSizeVariant, textAccent = 'default', hasRightElement, - placeholderText, }: MultiSelectControlProps) => { const theme = useTheme(); - const firstSelectedOption = selectedOptions[0]; - const hasSelection = selectedOptions.length > 0; - + const firstSelectedOption = selectedOptions?.[0]; return ( {isDefined(fixedIcon) ? ( @@ -55,7 +48,7 @@ export const MultiSelectControl = ({ size: theme.icon.size.md, stroke: theme.icon.stroke.sm, }) - ) : hasSelection && isDefined(firstSelectedOption.Icon) ? ( + ) : isDefined(firstSelectedOption?.Icon) ? ( - ) : hasSelection ? ( - - ) : isDefined(placeholderText) ? ( - - ) : null} + ) : ( + + )}