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 (
) : ( <> - {familyData.length && ( + {familyData?.length && (
{ <> - {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 }) => {

+ {pathname === '/acc-family/activities' && "activities"} {pathname === "/manage-family" ? `${state?.firstname}'s Suggested Task` : "Suggest to Parent"}