diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts index 200fa450d9..dcdd3a1838 100644 --- a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts +++ b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts @@ -15,7 +15,7 @@ import { type TaskTarget } from '@/activities/types/TaskTarget'; import { useOpenRecordInCommandMenu } from '@/command-menu/hooks/useOpenRecordInCommandMenu'; import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems'; import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord'; -import { isDefined } from 'twenty-shared/utils'; +import { findTargetFieldInfo } from '@/object-record/record-field/ui/utils/junction/findTargetFieldInfo'; export const useOpenCreateActivityDrawer = ({ activityObjectNameSingular, @@ -90,17 +90,15 @@ export const useOpenCreateActivityDrawer = ({ item.nameSingular === targetableObjects[0].targetObjectNameSingular, ); - const targetField = activityTargetObjectMetadata?.fields.find( - (field) => - field.relation?.targetObjectMetadata.id === - targetObjectMetadataItem?.id, + const targetFieldInfo = findTargetFieldInfo( + activityTargetObjectMetadata?.fields ?? [], + targetObjectMetadataItem?.id ?? '', + objectMetadataItems, ); - const joinColumnName = targetField?.settings?.joinColumnName; - - const targetableObjectRelationIdName = isDefined(joinColumnName) - ? joinColumnName - : `${targetableObjects[0].targetObjectNameSingular}Id`; + const targetableObjectRelationIdName = + targetFieldInfo?.joinColumnName ?? + `${targetableObjects[0].targetObjectNameSingular}Id`; await createOneActivityTarget({ ...(activityObjectNameSingular === CoreObjectNameSingular.Task