From da26d5c24a3481168562fd0d958dfb802e7ae988 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Fri, 8 Mar 2024 02:12:35 +0100
Subject: [PATCH] Task page bug fix

---
 src/components/FamilyAcc/FamilyTableNew.jsx      | 2 +-
 src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx | 9 +++++----
 src/components/FamilyPopup/SuggestTask.jsx       | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/FamilyAcc/FamilyTableNew.jsx b/src/components/FamilyAcc/FamilyTableNew.jsx
index bc1de5d..741cb84 100644
--- a/src/components/FamilyAcc/FamilyTableNew.jsx
+++ b/src/components/FamilyAcc/FamilyTableNew.jsx
@@ -282,7 +282,7 @@ export default function FamilyTableNew({
           setFamilyTask={setFamilyTask}
           setActiveTask={setActiveTask}
           activeTask={activeTask}
-          familyDetailsData={details.familyDetails.data}
+        //   familyDetailsData={details.familyDetails.data}
           setUpdatePage={setUpdatePage}
         />
       )}
diff --git a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
index aa65341..c39e3fc 100644
--- a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
+++ b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx
@@ -7,7 +7,7 @@ import PaginatedList from "../../Pagination/PaginatedList";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
 export default function FamilyNewTasks({
-  familyData = [],
+  familyData,
   className,
   loader,
   accountDetails,
@@ -32,6 +32,7 @@ export default function FamilyNewTasks({
 
   const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
 
+  console.log(familyData)
   return (
     <div
       className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[538px] overflow-hidden rounded-2xl section-shadow p-3 ${
@@ -44,13 +45,13 @@ export default function FamilyNewTasks({
         </div>
       ) : (
         <>
-          {familyData.length && (
+          {familyData?.length && (
             <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
               <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
                 <tbody>
                   {
                     <>
-                      {familyData.length > 0 ? (
+                      {familyData?.length > 0 ? (
                         currentTasks.map((value, index) => {
                           // find due date
                           const dueDate = value?.delivery_date.split(" ")[0];
@@ -149,7 +150,7 @@ export default function FamilyNewTasks({
                 prev={currentPage == 0 ? true : false}
                 next={
                   currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-                  familyData?.result_list.length
+                  familyData?.result_list?.length
                     ? true
                     : false
                 }
diff --git a/src/components/FamilyPopup/SuggestTask.jsx b/src/components/FamilyPopup/SuggestTask.jsx
index a46c0d6..958a78f 100644
--- a/src/components/FamilyPopup/SuggestTask.jsx
+++ b/src/components/FamilyPopup/SuggestTask.jsx
@@ -64,6 +64,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
       <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
           <h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
+            {pathname === '/acc-family/activities' && "activities"}
             {pathname === "/manage-family"
               ? `${state?.firstname}'s Suggested Task`
               : "Suggest to Parent"}