diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx index d0b83e1088..00a6ff56b6 100644 --- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx +++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx @@ -48,12 +48,16 @@ const StyledSidePanelPlaceholderWrapper = styled.div` export const TimelineCard = () => { const targetRecord = useTargetRecord(); const { isInSidePanel } = useLayoutRenderingContext(); - const { timelineActivities, loading, fetchMoreRecords } = - useTimelineActivities(targetRecord); + const { + timelineActivities, + firstQueryLoading, + loadingMore, + fetchMoreRecords, + } = useTimelineActivities(targetRecord); const isTimelineActivitiesEmpty = timelineActivities.length === 0; - if (loading === true) { + if (firstQueryLoading === true) { return ; } @@ -92,7 +96,7 @@ export const TimelineCard = () => { events={timelineActivities ?? []} /> diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts index 30622f1427..39c25ebece 100644 --- a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts +++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts @@ -2,9 +2,9 @@ import { useLinkedObjectsTitle } from '@/activities/timeline-activities/hooks/us import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity'; import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity'; import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem'; -import { CoreObjectNameSingular } from 'twenty-shared/types'; import { useGenerateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/hooks/useGenerateDepthRecordGqlFieldsFromObject'; import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords'; +import { CoreObjectNameSingular } from 'twenty-shared/types'; import { capitalize, isDefined } from 'twenty-shared/utils'; // do we need to test this? @@ -62,11 +62,16 @@ export const useTimelineActivities = ( useLinkedObjectsTitle(activityIds); - const loading = loadingTimelineActivities; + const firstQueryLoading = + loadingTimelineActivities && timelineActivities.length === 0; + + const loadingMore = + loadingTimelineActivities && timelineActivities.length > 0; return { timelineActivities, - loading, + firstQueryLoading, + loadingMore, fetchMoreRecords, }; };