From 8cbdb1b8a6609dd19c7abfabe4bed6ac4edf8af6 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Sat, 1 Jul 2023 16:25:34 +0100
Subject: [PATCH] manage family active task forward and back btn fixed

---
 src/components/FamilyAcc/FamilyManage.jsx          | 1 +
 src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx | 1 +
 src/components/FamilyAcc/Tabs/FamilyTasks.jsx      | 7 +++----
 src/components/MyActiveJobs/ActiveJobs.jsx         | 9 +++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/FamilyAcc/FamilyManage.jsx b/src/components/FamilyAcc/FamilyManage.jsx
index 94b87eb..cbb0978 100644
--- a/src/components/FamilyAcc/FamilyManage.jsx
+++ b/src/components/FamilyAcc/FamilyManage.jsx
@@ -11,6 +11,7 @@ export default function FamilyManage() {
   let location = useLocation();
   let navigate = useNavigate();
   let accountDetails = location?.state;
+  
   //   tab handler
   const filterHandler = (value) => {
     setValue(value);
diff --git a/src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx b/src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx
index 2e71732..daafb08 100644
--- a/src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx
@@ -172,6 +172,7 @@ export default function FamilyManageTabs({
                             loader={details.familyTasks.loading}
                             familyData={details.familyTasks.data}
                             familyDetails={details.familyDetails.data}
+                            accountDetails={accountDetails}
                           />
                         )}
                         {name === "Account" && (
diff --git a/src/components/FamilyAcc/Tabs/FamilyTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyTasks.jsx
index 348b978..61568cc 100644
--- a/src/components/FamilyAcc/Tabs/FamilyTasks.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyTasks.jsx
@@ -10,7 +10,7 @@ import ModalCom from "../../Helpers/ModalCom";
 import Detail from "../../jobPopout/popoutcomponent/Detail";
 import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
 
-export default function FamilyTasks({ familyData, familyDetails, className, loader }) {
+export default function FamilyTasks({ familyData, familyDetails, className, loader, accountDetails }) {
   let navigate = useNavigate();
   let { pathname } = useLocation();
 
@@ -122,9 +122,8 @@ export default function FamilyTasks({ familyData, familyDetails, className, load
                                       state: {
                                         ...value,
                                         pathname,
-                                        dueDate,
-                                        thePrice,
-                                      },
+                                        accountDetails
+                                      }
                                     });
                                   }}
                                   className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx
index 9cf198a..cfab6a6 100644
--- a/src/components/MyActiveJobs/ActiveJobs.jsx
+++ b/src/components/MyActiveJobs/ActiveJobs.jsx
@@ -259,8 +259,13 @@ function ActiveJobs(props) {
             <button
               type="button"
               className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
-              onClick={() =>
-                navigate(props.details.pathname, { replace: true })
+              onClick={() =>{
+                  if(props.details.pathname == '/manage-family'){
+                    navigate(props.details.pathname, {state: { ...props.details.accountDetails }}, { replace: true })
+                  }else{
+                    navigate(props.details.pathname, { replace: true })
+                  }
+                }
               }
             >
               <svg