From c13b29a6ea5465353faa8ff0b36c4e49e025aecf Mon Sep 17 00:00:00 2001
From: Vardhaman Bhandari <97441447+Vardhaman619@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:04:25 +0530
Subject: [PATCH] Fix hide calender icon if no deadline on task (#7465)

Closes #7402


![image](https://github.com/user-attachments/assets/46912a22-8dfb-4065-a877-de179fd796d3)

Ensured that the calendar icon is only visible when a deadline is
assigned

---------

Co-authored-by: ehconitin <nitinkoche03@gmail.com>
---
 .../activities/tasks/components/TaskRow.tsx      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
index efd432314..d728f9be2 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@@ -130,6 +130,14 @@ export const TaskRow = ({ task }: { task: Task }) => {
         </StyledTaskBody>
       </StyledLeftSideContainer>
       <StyledRightSideContainer>
+        {task.dueAt && (
+          <StyledDueDate
+            isPast={hasDatePassed(task.dueAt) && task.status === 'TODO'}
+          >
+            <IconCalendar size={theme.icon.size.md} />
+            {beautifyExactDate(task.dueAt)}
+          </StyledDueDate>
+        )}
         {TaskTargetsContextProvider && (
           <TaskTargetsContextProvider>
             <ActivityTargetsInlineCell
@@ -141,14 +149,6 @@ export const TaskRow = ({ task }: { task: Task }) => {
             />
           </TaskTargetsContextProvider>
         )}
-        <StyledDueDate
-          isPast={
-            !!task.dueAt && hasDatePassed(task.dueAt) && task.status === 'TODO'
-          }
-        >
-          <IconCalendar size={theme.icon.size.md} />
-          {task.dueAt && beautifyExactDate(task.dueAt)}
-        </StyledDueDate>
       </StyledRightSideContainer>
     </StyledContainer>
   );