From 14566de0377c1273938bcc6e4b10c5b679453ffe Mon Sep 17 00:00:00 2001 From: Ebube Date: Fri, 8 Mar 2024 04:32:19 +0100 Subject: [PATCH] . --- .../FamilyAcc/Tabs/FamilyNewPending.jsx | 20 +++++++++++-------- .../FamilyAcc/Tabs/FamilyNewTasks.jsx | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx index a09ed1f..9328ff6 100644 --- a/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyNewPending.jsx @@ -1,5 +1,4 @@ import { useMemo, useState } from "react"; -import localImgLoad from "../../../lib/localImgLoad"; import { PriceFormatter } from "../../Helpers/PriceFormatter"; import { PaginatedList, handlePagingFunc } from "../../Pagination"; import PendingJobsPopout from "../../jobPopout/PendingJobsPopout"; @@ -14,10 +13,10 @@ export default function FamilyPending({ let filteredFamilyData = useMemo( () => - familyData?.result_list?.filter( + familyData?.filter( (data) => data?.family_uid === accountDetails?.family_uid ), - [accountDetails?.family_uid, familyData?.result_list] + [accountDetails?.family_uid, familyData] ); const [currentPage, setCurrentPage] = useState(0); @@ -25,7 +24,7 @@ export default function FamilyPending({ const indexOfFirstItem = Number(currentPage); const indexOfLastItem = Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE); - const currentPendingTasks = filteredFamilyData?.slice( + const currentPendingTasks = familyData?.slice( indexOfFirstItem, indexOfLastItem ); @@ -34,13 +33,14 @@ export default function FamilyPending({ handlePagingFunc(e, setCurrentPage); }; + console.log(familyData); return (
- {filteredFamilyData && ( + {familyData && (
@@ -54,7 +54,11 @@ export default function FamilyPending({ value?.currency_code, value?.currency ); - let image = `${familyData.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}` + let image = `${ + familyData.session_image_server + }${localStorage.getItem("session_token")}/job/${ + value.job_uid + }`; return ( = filteredFamilyData.length} - data={filteredFamilyData} + next={currentPage + itemsPerPage >= familyData.length} + data={familyData} start={indexOfFirstItem} stop={indexOfLastItem} /> diff --git a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx index 60c1062..e3ee045 100644 --- a/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyNewTasks.jsx @@ -33,7 +33,7 @@ export default function FamilyNewTasks({ const handlePagination = (e) => handlePagingFunc(e, setCurrentPage); console.log(familyData) - console.log(typeof familyData?.length) + console.log(typeof familyData) return (