diff --git a/src/components/MyWallet/Popup/AddFundDollars.jsx b/src/components/MyWallet/Popup/AddFundDollars.jsx index 30f1569..c5414fd 100644 --- a/src/components/MyWallet/Popup/AddFundDollars.jsx +++ b/src/components/MyWallet/Popup/AddFundDollars.jsx @@ -66,6 +66,8 @@ const initialValues = { function AddFundDollars(props) { let MaxNoOfCards = process.env.REACT_APP_MAX_CREDIT_CARDS; // HOLDS THE VALUE OF THE MAX NUMBER OF CARDS USER CAN ADD + let [loadingState, setLoadingState] = useState(false) + const apiCall = new usersService(); let countryWallet = props.walletItem.country; const [selectedOption, setSelectedOption] = useState("previous"); @@ -162,10 +164,11 @@ function AddFundDollars(props) { } } - props.setConfirmCredit((prev) => ({ - ...prev, - show: { awaitConfirm: { loader: true } }, - })); + // props.setConfirmCredit((prev) => ({ + // ...prev, + // show: { awaitConfirm: { loader: true } }, + // })); + setLoadingState(true) // Extracting card_uid from the previous card details const paymentCardValue = prevCardDetails["payment-card"]; @@ -193,6 +196,18 @@ function AddFundDollars(props) { if (res.data.internal_return < 0) { props.setInputError("An Error Occurred"); throw new Error("An Error Occurred"); + + // use commented code when you when to display pop for failed start credit API + // props.setConfirmCredit((prev) => ({ + // ...prev, + // show: { + // awaitConfirm: { loader: false, state: false }, + // acceptConfirm: { loader: false, state: true }, + // }, + // data: {internal_return: -1} + // })); + setLoadingState(false) + return } const _response = res.data; @@ -204,6 +219,7 @@ function AddFundDollars(props) { stateData = { ...stateData, ..._response }; setTimeout(() => { + setLoadingState(false) props.setConfirmCredit({ show: { awaitConfirm: { loader: false, state: true }, @@ -213,6 +229,7 @@ function AddFundDollars(props) { }); }, 1500); } catch (error) { + setLoadingState(false) props.setInputError(error.message); setTimeout(() => props.setInputError(""), 5000); props.setConfirmCredit((prev) => ({ @@ -582,7 +599,7 @@ function AddFundDollars(props) { type="submit" className="px-4 py-1 h-11 max-w-[115px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white" > - {props.confirmCredit?.show?.awaitConfirm?.loader ? ( + {loadingState ? ( ) : ( <> @@ -616,7 +633,7 @@ function AddFundDollars(props) { type="button" className="px-4 py-1 h-11 max-w-[115px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white" > - {props.confirmCredit?.show?.awaitConfirm?.loader ? ( + {loadingState ? ( ) : ( Continue diff --git a/src/components/MyWallet/Popup/AddFundPop.jsx b/src/components/MyWallet/Popup/AddFundPop.jsx index c4f761a..15c2f3f 100644 --- a/src/components/MyWallet/Popup/AddFundPop.jsx +++ b/src/components/MyWallet/Popup/AddFundPop.jsx @@ -86,6 +86,16 @@ function AddFundPop({ })); setInputError("An Error Occurred"); setTimeout(() => setInputError(""), 5000); + + // use commented code when you when to display pop for failed start credit API + // setConfirmCredit((prev) => ({ + // ...prev, + // show: { + // awaitConfirm: { loader: false, state: false }, + // acceptConfirm: { loader: false, state: true }, + // }, + // data: {internal_return: -1} + // })); return; } diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx index ba75cc8..9302b17 100644 --- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx +++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx @@ -70,7 +70,8 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) { }`} - + + {data?.curr_balance &&

Wallet Balance @@ -79,6 +80,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) { {data?.curr_balance * 0.01}

+ } {isSuccess && (
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx index 443786b..866f7fc 100644 --- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx +++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx @@ -239,7 +239,8 @@ function ConfirmAddFund({ setConfirmCredit((prev) => ({ ...prev, show: { - acceptConfirm: { loader: false }, + awaitConfirm: { loader: false, state: false }, + acceptConfirm: { loader: false, state: true }, }, })); return; @@ -261,7 +262,8 @@ function ConfirmAddFund({ setConfirmCredit((prev) => ({ ...prev, show: { - acceptConfirm: { loader: false }, + awaitConfirm: { loader: false, state: false }, + acceptConfirm: { loader: false, state: true }, }, })); console.log(error); @@ -333,7 +335,8 @@ function ConfirmAddFund({ setConfirmCredit((prev) => ({ ...prev, show: { - acceptConfirm: { loader: false }, + awaitConfirm: { loader: false, state: false }, + acceptConfirm: { loader: false, state: true }, }, })); setTimeout(() => onClose, 10000); diff --git a/src/components/MyWallet/Wallet.jsx b/src/components/MyWallet/Wallet.jsx index 64d3dd7..04741e5 100644 --- a/src/components/MyWallet/Wallet.jsx +++ b/src/components/MyWallet/Wallet.jsx @@ -47,7 +47,7 @@ const WalletRoutes = () => { } setAllCountries((prev) => ({ loading: false, - data: res.data.result_list, + data: res?.data?.result_list, })); }) .catch((error) => {