diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx
index 9695f98c5..282cc43e5 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineActivities.tsx
@@ -3,7 +3,6 @@ import styled from '@emotion/styled';
import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';
import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { EventList } from '@/activities/timeline-activities/components/EventList';
-import { TimelineCreateButtonGroup } from '@/activities/timeline-activities/components/TimelineCreateButtonGroup';
import { useTimelineActivities } from '@/activities/timeline-activities/hooks/useTimelineActivities';
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
@@ -41,10 +40,8 @@ const StyledMainContainer = styled.div`
export const TimelineActivities = ({
targetableObject,
- isInRightDrawer = false,
}: {
targetableObject: ActivityTargetableObject;
- isInRightDrawer?: boolean;
}) => {
const { timelineActivities, loading, fetchMoreRecords } =
useTimelineActivities(targetableObject);
@@ -65,13 +62,12 @@ export const TimelineActivities = ({
- Add your first Activity
+ No activity yet
- There are no activities associated with this record.{' '}
+ There is no activity associated with this record.
-
);
}
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCreateButtonGroup.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCreateButtonGroup.tsx
deleted file mode 100644
index e5bc090bc..000000000
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCreateButtonGroup.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { TAB_LIST_COMPONENT_ID } from '@/ui/layout/show-page/components/ShowPageSubContainer';
-import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
-import { useSetRecoilState } from 'recoil';
-import {
- Button,
- ButtonGroup,
- IconCheckbox,
- IconNotes,
- IconPaperclip,
-} from 'twenty-ui';
-
-export const TimelineCreateButtonGroup = ({
- isInRightDrawer = false,
-}: {
- isInRightDrawer?: boolean;
-}) => {
- const { activeTabIdState } = useTabList(
- `${TAB_LIST_COMPONENT_ID}-${isInRightDrawer}`,
- );
- const setActiveTabId = useSetRecoilState(activeTabIdState);
-
- return (
-
-
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx
index d1e3e68ba..549ebbf24 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/CardComponents.tsx
@@ -40,11 +40,8 @@ type CardComponentProps = {
type CardComponentType = (props: CardComponentProps) => JSX.Element | null;
export const CardComponents: Record = {
- [CardType.TimelineCard]: ({ targetableObject, isInRightDrawer }) => (
-
+ [CardType.TimelineCard]: ({ targetableObject }) => (
+
),
[CardType.FieldCard]: ({ targetableObject, isInRightDrawer }) => (
diff --git a/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx b/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
index 063a1cca4..2bf0fbb87 100644
--- a/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
+++ b/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
@@ -71,8 +71,8 @@ export const Default: Story = {
}),
).toBeInTheDocument();
expect(
- await canvas.findByText('Add your first Activity', undefined, {
- timeout: 3000,
+ await canvas.findByText('No activity yet', undefined, {
+ timeout: 5000,
}),
).toBeInTheDocument();
},