From 601eed8887536b59e49db28708954b07e2b45fec Mon Sep 17 00:00:00 2001
From: Vinay Badgujar <vinaybadgujar8@gmail.com>
Date: Sat, 11 Jan 2025 19:39:46 +0530
Subject: [PATCH] fix: merge conflicts

---
 .../MyTimeline/useMyTimelineStore.tsx                | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/MyTimeComponents/MyTimeline/useMyTimelineStore.tsx b/src/components/MyTimeComponents/MyTimeline/useMyTimelineStore.tsx
index 3648104ed..b6210f9df 100644
--- a/src/components/MyTimeComponents/MyTimeline/useMyTimelineStore.tsx
+++ b/src/components/MyTimeComponents/MyTimeline/useMyTimelineStore.tsx
@@ -77,9 +77,6 @@ export const useMyTimelineStore = (day: string) => {
     if (actionName === TaskAction.Done) {
       return handleDoneClick(task);
     }
-    if (actionName === TaskAction.NotNow) {
-      return setOpenReschedule({ ...task });
-    }
     if (day === "Today") {
       const taskItem = await getTaskByGoalId(task.goalid);
       if (!taskItem) {
@@ -89,15 +86,12 @@ export const useMyTimelineStore = (day: string) => {
           id: uuidv4(),
           goalId: task.goalid,
           title: task.title,
-          completedTodayIds: [],
-          skippedToday: [],
-          completedToday: 0,
-          lastSkipped: "",
-          lastCompleted: "",
-          hoursSpent: 0,
           blockedSlots: [],
         });
       }
+      if (actionName === TaskAction.NotNow) {
+        return setOpenReschedule({ ...task });
+      }
     } else {
       setShowToast({ open: true, message: "Let's focus on Today :)", extra: "" });
     }