diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx index a9d87e9..c9d62d4 100644 --- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx +++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx @@ -1,7 +1,7 @@ import React from "react"; function CompleteConfirmCredit({ onClose, confirmCredit }) { - const { data } = confirmCredit + const { data } = confirmCredit; return (
@@ -17,7 +17,8 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) { > {/* Success Icon for now */}
- {data?.result == "Charge success" ? ( + {data?.result == "Charge success" || + data?.return_status == "successful" ? (

- {data?.result == "Charge success" + {data?.result == "Charge success" || + data?.return_status == "successful" ? "Credit was Successful!" : "Credit was Unsuccessful"}

diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx index 74737dc..6310390 100644 --- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx +++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx @@ -148,11 +148,25 @@ function ConfirmAddFund({ .resultTopUp(reqData) .then((res) => { if (res.data.internal_return < 0) { + console.log("**** internal return **** THIS WAS REACHED"); + setRequestStatus({ message: "Could not finish transaction", loading: false, status: false, }); + + setTimeout(() => { + setConfirmCredit((prev) => ({ + ...prev, + show: { + awaitConfirm: { loader: false, state: false }, + acceptConfirm: { loader: false, state: true }, + }, + data: res, + })); + }, 1500); + toast.success("Opps! something went wrong"); } else { setRequestStatus({ @@ -160,20 +174,7 @@ function ConfirmAddFund({ loading: false, status: true, }); - - setConfirmCredit((prev) => ({ - ...prev, - show: { - awaitConfirm: { loader: false, state: false }, - acceptConfirm: { loader: false, state: true }, - }, - data: res, - })); dispatch(tableReload({ type: "WALLETTABLE" })); - navigate("/my-wallet", { replace: true }); - // setTimeout(() => { - // navigate("/my-wallet", { replace: true }); - // }, 1000); } }) .catch((err) => { diff --git a/src/components/MyWallet/Popup/NairaWithdraw.jsx b/src/components/MyWallet/Popup/NairaWithdraw.jsx index 70a2ed9..284004f 100644 --- a/src/components/MyWallet/Popup/NairaWithdraw.jsx +++ b/src/components/MyWallet/Popup/NairaWithdraw.jsx @@ -448,7 +448,7 @@ function NairaWithdraw({ {/* */}