diff --git a/src/components/MyTasks/MyOffersTable.jsx b/src/components/MyTasks/MyOffersTable.jsx index 562045f..e3cd4db 100644 --- a/src/components/MyTasks/MyOffersTable.jsx +++ b/src/components/MyTasks/MyOffersTable.jsx @@ -50,9 +50,9 @@ export default function MyOffersTable({ className, MyActiveOffersList}) { // } }; -// if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){ -// return(''); // want blank or no appear when no items -// } + if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){ + return(''); // want blank or no appear when no items + } return ( <> @@ -113,11 +113,9 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
- { MyActiveOffersList.loading ? - - : - MyActiveOffersList?.data?.length > 0 ? - MyActiveOffersList.data.map((value, index) => ( + { + MyActiveOffersList && MyActiveOffersList?.result_list?.length > 0 && + MyActiveOffersList?.result_list?.map((value, index) => (
{/* title */} @@ -155,23 +153,6 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
)) - : - MyActiveOffersList.status ? - ( -
-
- No Tasks! -
-
- ) - : - ( -
-

- Error Occurred! Unable to display Tasks! -

-
- ) } diff --git a/src/views/MyTaskPage.jsx b/src/views/MyTaskPage.jsx index 8b5ac2b..68840c1 100644 --- a/src/views/MyTaskPage.jsx +++ b/src/views/MyTaskPage.jsx @@ -9,7 +9,7 @@ export default function MyTaskPage() { const {jobListTable} = useSelector((state) => state.tableReload) const [MyActiveJobList, setMyActiveJobList] = useState({loading: true, status:false, data:[]}); - const [MyActiveOffersList, setMyActiveOffersList] = useState({loading: true, status:false, data:[]}); + const [MyActiveOffersList, setMyActiveOffersList] = useState([]); const api = new usersService(); const commonHeadData =()=>{ console.log("COMMON HEAD DATA ----------------=====---------------------"); @@ -26,12 +26,12 @@ export default function MyTaskPage() { } }; const getMyActiveOffersList = async () => { - setMyActiveOffersList({loading: true, status:false, data:[]}); + // setMyActiveOffersList({loading: true, status:false, data:[]}); try { const res = await api.getOffersList(); - setMyActiveOffersList({loading: false, status:true, data:res.data.result_list}); + setMyActiveOffersList(res.data); } catch (error) { - setMyActiveOffersList({loading: false, status:false, data:[]}); + // setMyActiveOffersList({loading: false, status:false, data:[]}); console.log("Error getting offers"); } };