From 587c74667c229a8ccb94d758651003ed34f5355d Mon Sep 17 00:00:00 2001
From: Sunil Kumar Behera <42198140+sunilk4u@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:18:30 +0530
Subject: [PATCH] Fix: create time (#1250)

* change date strings

* remove additional suffix

* fix tests

---------

Co-authored-by: corentin <corentin@twenty.com>
---
 .../activities/timeline/components/TimelineActivity.tsx       | 2 +-
 .../ui/layout/show-page/components/ShowPageSummaryCard.tsx    | 4 +---
 front/src/utils/__tests__/date-utils.test.ts                  | 2 +-
 front/src/utils/date-utils.ts                                 | 4 +++-
 4 files changed, 6 insertions(+), 6 deletions(-)

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()}
         </StyledItemTitleContainer>
         <StyledItemTitleDate id={`id-${activity.id}`}>
-          {beautifiedCreatedAt} ago
+          {beautifiedCreatedAt}
         </StyledItemTitleDate>
         <StyledTooltip
           anchorSelect={`#id-${activity.id}`}
diff --git a/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx b/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
index bb7f09c43..202cc89b5 100644
--- a/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
+++ b/front/src/modules/ui/layout/show-page/components/ShowPageSummaryCard.tsx
@@ -118,9 +118,7 @@ export function ShowPageSummaryCard({
             <OverflowingTextWithTooltip text={title} />
           )}
         </StyledTitle>
-        <StyledDate id={dateElementId}>
-          Added {beautifiedCreatedAt} ago
-        </StyledDate>
+        <StyledDate id={dateElementId}>Added {beautifiedCreatedAt}</StyledDate>
         <StyledTooltip
           anchorSelect={`#${dateElementId}`}
           content={exactCreatedAt}
diff --git a/front/src/utils/__tests__/date-utils.test.ts b/front/src/utils/__tests__/date-utils.test.ts
index 6669f0b1f..90c4225bd 100644
--- a/front/src/utils/__tests__/date-utils.test.ts
+++ b/front/src/utils/__tests__/date-utils.test.ts
@@ -85,7 +85,7 @@ describe('beautifyPastDateRelativeToNow', () => {
   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 '';