diff --git a/src/components/FamilyAcc/FamilyTable.jsx b/src/components/FamilyAcc/FamilyTable.jsx index 78d8e34..72671e7 100644 --- a/src/components/FamilyAcc/FamilyTable.jsx +++ b/src/components/FamilyAcc/FamilyTable.jsx @@ -25,7 +25,7 @@ export default function FamilyTable({ className, familyList, loader, popUpHandle return (
diff --git a/src/components/MyActiveJobs/MyActiveJobTable.jsx b/src/components/MyActiveJobs/MyActiveJobTable.jsx index 257ec1b..500ff6c 100644 --- a/src/components/MyActiveJobs/MyActiveJobTable.jsx +++ b/src/components/MyActiveJobs/MyActiveJobTable.jsx @@ -28,7 +28,7 @@ export default function MyActiveJobTable({ MyJobList, className }) { return (
@@ -45,7 +45,7 @@ export default function MyActiveJobTable({ MyJobList, className }) { <> {MyJobList && MyJobList?.result_list && - MyJobList.result_list.length > 0 && + MyJobList.result_list.length > 0 ? currentActiveJobList.map((value, index) => ( - ))} + )) + : + + + No Active Task! + + + } } diff --git a/src/components/MyJobs/MyJobTable.jsx b/src/components/MyJobs/MyJobTable.jsx index 1f95253..d6ad737 100644 --- a/src/components/MyJobs/MyJobTable.jsx +++ b/src/components/MyJobs/MyJobTable.jsx @@ -70,7 +70,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) { return (
@@ -102,7 +102,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) { <> {MyJobList && MyJobList?.data?.result_list && - MyJobList.data?.result_list.length > 0 && + MyJobList.data?.result_list.length > 0 ? currentJobList.map((value, index) => ( - ))} + )) + : + + + No Jobs Avaliable! + + + } ) : selectedCategory === "Explore" ? ( <> diff --git a/src/components/MyPendingJobs/MyPendingJobTable.jsx b/src/components/MyPendingJobs/MyPendingJobTable.jsx index a7e16c9..d7e6a03 100644 --- a/src/components/MyPendingJobs/MyPendingJobTable.jsx +++ b/src/components/MyPendingJobs/MyPendingJobTable.jsx @@ -25,7 +25,7 @@ export default function MyPendingJobTable({ MyJobList, className }) { return (
@@ -42,7 +42,7 @@ export default function MyPendingJobTable({ MyJobList, className }) { <> {MyJobList && MyJobList?.result_list && - MyJobList.result_list.length > 0 && + MyJobList.result_list.length > 0 ? currentActiveJobList.map((value, index) => ( - ))} + )) + : + + + No Pending Task! + + + } } diff --git a/src/components/MyWallet/Balance.jsx b/src/components/MyWallet/Balance.jsx index 3cf0252..0903af9 100644 --- a/src/components/MyWallet/Balance.jsx +++ b/src/components/MyWallet/Balance.jsx @@ -22,7 +22,7 @@ function Balance({wallet, coupon}) {
{/* WALLET SECTION */}
-
+
{/*

Wallet

*/} {/*

Add New Wallet

*/} diff --git a/src/components/MyWallet/Wallet.jsx b/src/components/MyWallet/Wallet.jsx index 7237fd9..23cf8fe 100644 --- a/src/components/MyWallet/Wallet.jsx +++ b/src/components/MyWallet/Wallet.jsx @@ -20,9 +20,6 @@ function Wallet() { } - - - const WalletRoutes = () => { const apiCall = new usersService() @@ -38,18 +35,6 @@ const WalletRoutes = () => { error: false }) - let [purchaseHistory, setPurchaseHistory] = useState({ // FOR PURCHASE HISTORY - loading: true, - data: [], - error: false - }) - - let [couponHistory, setCouponHistory] = useState({ // FOR COUPON HISTORY - loading: true, - data: [], - error: false - }) - //FUNCTION TO GET WALLET LIST const getWalletList = ()=>{ apiCall.getUserWallets(null).then((res)=>{ @@ -76,38 +61,9 @@ const WalletRoutes = () => { }) } - //FUNCTION TO GET PURCHASE HISTORY - const getPurchaseHistory = ()=>{ - apiCall.getPurchaseHx().then((res)=>{ - if(res.data.internal_return < 0){ // success but no data - setPurchaseHistory(prev => ({...prev, loading: false})) - return - } - // console.log('purchase',res.data) - setPurchaseHistory(prev => ({...prev, loading: false, data: res.data.result_list})) - }).catch((error)=>{ - setPurchaseHistory(prev => ({...prev, loading: false, error: true})) - }) - } - - //FUNCTION TO GET COUPON HISTORY - const getCouponHistory = ()=>{ - apiCall.getCouponHx().then((res)=>{ - if(res.data.internal_return < 0){ // success but no data - setCouponHistory(prev => ({...prev, loading: false})) - return - } - setCouponHistory(prev => ({...prev, loading: false, data: res.data.result_list})) - }).catch((error)=>{ - setCouponHistory(prev => ({...prev, loading: false, error: true})) - }) - } - useEffect(()=>{ getWalletList() getPaymentHistory() - getPurchaseHistory() - getCouponHistory() }, []) return ( @@ -115,7 +71,7 @@ const WalletRoutes = () => { } /> } /> } /> - } /> + } /> } /> } /> } />