diff --git a/front/src/modules/activities/timeline/components/TimelineActivity.tsx b/front/src/modules/activities/timeline/components/TimelineActivity.tsx index 6ab3b1090..d86e1653e 100644 --- a/front/src/modules/activities/timeline/components/TimelineActivity.tsx +++ b/front/src/modules/activities/timeline/components/TimelineActivity.tsx @@ -144,7 +144,7 @@ export function TimelineActivity({ activity }: OwnProps) { created a {activity.type.toLowerCase()} - {beautifiedCreatedAt} ago + {beautifiedCreatedAt} )} - - Added {beautifiedCreatedAt} ago - + Added {beautifiedCreatedAt} { it('should return the correct relative date', () => { const mockDate = '2023-01-01'; const actualDate = new Date(mockDate); - const expected = formatDistanceToNow(actualDate); + const expected = formatDistanceToNow(actualDate, { addSuffix: true }); const result = beautifyPastDateRelativeToNow(mockDate); expect(result).toEqual(expected); diff --git a/front/src/utils/date-utils.ts b/front/src/utils/date-utils.ts index feeb34c89..4b1cdd38b 100644 --- a/front/src/utils/date-utils.ts +++ b/front/src/utils/date-utils.ts @@ -61,7 +61,9 @@ export function beautifyPastDateRelativeToNow( try { const parsedDate = parseDate(pastDate); - return formatDistanceToNow(parsedDate.toJSDate()); + return formatDistanceToNow(parsedDate.toJSDate(), { + addSuffix: true, + }).replace('less than a minute ago', 'now'); } catch (error) { logError(error); return '';