diff --git a/src/components/MyCoupons/CouponPopup.jsx b/src/components/MyCoupons/CouponPopup.jsx index ac6cfd8..3127db5 100644 --- a/src/components/MyCoupons/CouponPopup.jsx +++ b/src/components/MyCoupons/CouponPopup.jsx @@ -26,7 +26,8 @@ const CouponPopup = ({ popUpHandler, data }) => { setStatusMsg({ error: "An error occurred" }); else setStatusMsg({ success: res.data?.status_text }); - dispatch(tableReload({ type: "COUPONTABLE" })); + // dispatch(tableReload({ type: "COUPONTABLE" })); + dispatch(tableReload({ type: "WALLETTABLE" })); setTimeout(() => { popUpHandler(); setLoader(false); diff --git a/src/components/MyCoupons/MyCoupons.jsx b/src/components/MyCoupons/MyCoupons.jsx index a43cc7e..d009193 100644 --- a/src/components/MyCoupons/MyCoupons.jsx +++ b/src/components/MyCoupons/MyCoupons.jsx @@ -7,7 +7,7 @@ import { useSelector } from "react-redux"; export default function MyCoupons() { const apiCall = useMemo(() => new usersService(), []); - const {couponTable} = useSelector(state => state.tableReload) + const {couponTable, walletTable} = useSelector(state => state.tableReload) let [couponHistory, setCouponHistory] = useState({ // FOR COUPON HISTORY loading: true, @@ -38,7 +38,7 @@ export default function MyCoupons() { useEffect(() => { getCouponHistory(); - }, [couponTable]); + }, [couponTable, walletTable]); return ( <> diff --git a/src/components/MyWallet/Wallet.jsx b/src/components/MyWallet/Wallet.jsx index 4b63383..5965446 100644 --- a/src/components/MyWallet/Wallet.jsx +++ b/src/components/MyWallet/Wallet.jsx @@ -5,34 +5,17 @@ import Layout from "../Partials/Layout"; import LoadingSpinner from "../Spinners/LoadingSpinner"; const WalletBox = lazy(() => import("./WalletBox")); + const WalletRoutes = () => { const apiCall = new usersService(); + const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE const { walletTable } = useSelector((state) => state.tableReload); - const [walletList, setWalletList] = useState({ - loading: true, - data: [], - reload: false, - }); + const [paymentHistory, setPaymentHistory] = useState({ loading: true, data: [], }); - const getWalletList = () => { - apiCall - .getUserWallets() - .then((res) => { - if (res.data.internal_return < 0) { - setWalletList({ loading: false, data: [] }); - } else { - setWalletList({ loading: false, data: res.data?.result_list }); - } - }) - .catch(() => { - setWalletList({ loading: false, data: [] }); - }); - }; - const getPaymentHistory = () => { apiCall .getPaymentHx() @@ -49,21 +32,13 @@ const WalletRoutes = () => { }; useEffect(() => { - // const fetchData = async () => { - // await Promise.all([getWalletList(), getPaymentHistory()]); - // }; - - // if (walletList.loading) { - // fetchData(); - // } - getWalletList(); getPaymentHistory(); }, [walletTable]); return ( }> - + ); diff --git a/src/components/MyWallet/WalletBox.jsx b/src/components/MyWallet/WalletBox.jsx index ec3ac39..7316e76 100644 --- a/src/components/MyWallet/WalletBox.jsx +++ b/src/components/MyWallet/WalletBox.jsx @@ -13,7 +13,7 @@ export default function WalletBox({ wallet, payment }) { ) : wallet.data.length ? ( wallet.data.map((item, index) => ( -
+
)) diff --git a/src/components/MyWallet/WalletHeader.jsx b/src/components/MyWallet/WalletHeader.jsx index e4cfd60..e8ba3b6 100644 --- a/src/components/MyWallet/WalletHeader.jsx +++ b/src/components/MyWallet/WalletHeader.jsx @@ -41,8 +41,8 @@ export default function WalletHeader(props) {