From 5890354d2132469c62b74d394aa190de34e3b8e2 Mon Sep 17 00:00:00 2001
From: Sunil Kumar Behera <42198140+sunilk4u@users.noreply.github.com>
Date: Thu, 17 Aug 2023 01:18:35 +0530
Subject: [PATCH] Fix: Change title strings (#1212)

* change title strings

* add conditional operator
---
 front/src/modules/activities/components/ActivityTitle.tsx     | 2 +-
 front/src/modules/activities/components/TaskRow.tsx           | 2 +-
 .../activities/timeline/components/TimelineActivity.tsx       | 4 +---
 .../activities/timeline/components/TimelineActivityTitle.tsx  | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/front/src/modules/activities/components/ActivityTitle.tsx b/front/src/modules/activities/components/ActivityTitle.tsx
index 0faeeb27d..0f0b22cc3 100644
--- a/front/src/modules/activities/components/ActivityTitle.tsx
+++ b/front/src/modules/activities/components/ActivityTitle.tsx
@@ -73,7 +73,7 @@ export function ActivityTitle({
       <StyledEditableTitleInput
         autoComplete="off"
         autoFocus
-        placeholder={`${type} title (optional)`}
+        placeholder={`${type} title`}
         onChange={(event) => onTitleChange(event.target.value)}
         value={title}
         completed={completed}
diff --git a/front/src/modules/activities/components/TaskRow.tsx b/front/src/modules/activities/components/TaskRow.tsx
index 019b5b18a..b690aaaf0 100644
--- a/front/src/modules/activities/components/TaskRow.tsx
+++ b/front/src/modules/activities/components/TaskRow.tsx
@@ -86,7 +86,7 @@ export function TaskRow({ task }: { task: TaskForList }) {
         />
       </div>
       <StyledTaskTitle completed={task.completedAt !== null}>
-        {task.title ?? '(No title)'}
+        {task.title ?? 'Task Title'}
       </StyledTaskTitle>
       <StyledTaskBody>
         <OverflowingTextWithTooltip text={body} />
diff --git a/front/src/modules/activities/timeline/components/TimelineActivity.tsx b/front/src/modules/activities/timeline/components/TimelineActivity.tsx
index 112f141a6..6ab3b1090 100644
--- a/front/src/modules/activities/timeline/components/TimelineActivity.tsx
+++ b/front/src/modules/activities/timeline/components/TimelineActivity.tsx
@@ -167,9 +167,7 @@ export function TimelineActivity({ activity }: OwnProps) {
                 onCompletionChange={completeTask}
               />
               <StyledCardContent>
-                <OverflowingTextWithTooltip
-                  text={body ? body : '(No content)'}
-                />
+                {body && <OverflowingTextWithTooltip text={body ? body : ''} />}
               </StyledCardContent>
             </StyledCardDetailsContainer>
             <TimelineActivityCardFooter activity={activity} />
diff --git a/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx b/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx
index 671d1e5ef..684866211 100644
--- a/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx
+++ b/front/src/modules/activities/timeline/components/TimelineActivityTitle.tsx
@@ -66,7 +66,7 @@ export function TimelineActivityTitle({
         completed={completed}
         hasCheckbox={type === ActivityType.Task}
       >
-        <OverflowingTextWithTooltip text={title ? title : '(No title)'} />
+        <OverflowingTextWithTooltip text={title ? title : 'Task title'} />
       </StyledTitleText>
     </StyledTitleContainer>
   );