From 22f6eb436ddf3f1909f22ce7b360f27d4ce3a871 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Wed, 13 Mar 2024 00:00:58 +0100
Subject: [PATCH] Completed the flow

---
 .../FamilyPopout/AssignTaskPopout.jsx         | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx b/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
index 274baf2..bc1fd1b 100644
--- a/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
+++ b/src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx
@@ -188,17 +188,19 @@ const AssignTaskPopout = React.memo(
         });
     };
 
-    console.log(details);
-
     return (
       <>
         <ModalCom action={action} situation={situation}>
           <div className="w-11/12 lg:w-[700px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
             <div className="w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
               <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide flex items-center">
-                <>
-                  Assign task to{" "}
-                  {pathname === "/acc-family/activities" ? (
+                {details ? (
+                  ` Assign ${details?.firstname}'s Task`
+                ) : familyDetailsData ? (
+                  ` Assign ${familyDetailsData.firstname}'s Task`
+                ) : (
+                  <div className="flex items-center">
+                    Assign task to{" "}
                     <div className="w-[270px] h-[40px] ml-2">
                       <select
                         name=""
@@ -213,10 +215,8 @@ const AssignTaskPopout = React.memo(
                         {familyList}
                       </select>
                     </div>
-                  ) : (
-                    <>{familyDetailsData?.firstname || details?.firstName}</>
-                  )}
-                </>
+                  </div>
+                )}
               </h1>
               <button
                 type="button"
@@ -443,9 +443,11 @@ const AssignTaskPopout = React.memo(
                           onClick={assignFamilyTask}
                           className="px-1 w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
                         >
-                          {`Assign to ${
-                            familyDetailsData?.firstname || details?.firstName
-                          }`}
+                          {details
+                            ? `Assign task to ${details?.firstname}`
+                            : familyDetailsData
+                            ? `Assign task to ${familyDetailsData.firstname}`
+                            : "Assign"}
                         </button>
                       )}
                     </div>