From a7bbcfdc1ba50799a6cfc479bc96ae4b703d0189 Mon Sep 17 00:00:00 2001 From: Ebube Date: Tue, 1 Aug 2023 11:37:56 +0100 Subject: [PATCH 1/4] complete popup fixed --- .../MyWallet/Popup/CompleteConfirmCredit.jsx | 4 +- .../MyWallet/Popup/ConfirmAddFund.jsx | 61 +++++++++++-------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx index c9d62d4..7a579b0 100644 --- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx +++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx @@ -18,7 +18,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) { {/* Success Icon for now */}
{data?.result == "Charge success" || - data?.return_status == "successful" ? ( + data?.status == "successful" ? (

{data?.result == "Charge success" || - data?.return_status == "successful" + data?.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 49c1fa3..31a99bc 100644 --- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx +++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx @@ -1,12 +1,11 @@ import { FlutterWaveButton, closePaymentModal } from "flutterwave-react-v3"; import React, { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { useNavigate } from "react-router-dom"; import { toast } from "react-toastify"; +import debounce from "../../../hooks/debounce"; import usersService from "../../../services/UsersService"; import { tableReload } from "../../../store/TableReloads"; import LoadingSpinner from "../../Spinners/LoadingSpinner"; -import debounce from "../../../hooks/debounce"; function ThePaymentText({ value, type }) { const cardDetails = value; @@ -133,11 +132,18 @@ function ConfirmAddFund({ ...config, text: "Proceed", callback: (response) => { - debouncedSuccessPayment(); + debouncedSuccessPayment(); //delays the call for 5 secs setTimeout(() => { - dispatch(tableReload({ type: "WALLETTABLE" })); - onClose() closePaymentModal(); + setConfirmCredit((prev) => ({ + ...prev, + show: { + awaitConfirm: { loader: false, state: false }, + acceptConfirm: { loader: false, state: true }, + }, + data: response, + })); + console.log("**** checking fw res **** ", response); }, 1500); }, }; @@ -150,33 +156,25 @@ function ConfirmAddFund({ .resultTopUp(reqData) .then((res) => { if (res.data.internal_return < 0) { - console.log("**** internal return **** THIS WAS REACHED"); - + 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); + // setConfirmCredit((prev) => ({ + // ...prev, + // show: { + // awaitConfirm: { loader: false, state: false }, + // acceptConfirm: { loader: false, state: true }, + // }, + // data: res, + // })); + + // toast.success("Opps! something went wrong"); + } else return dispatch(tableReload({ type: "WALLETTABLE" })); - toast.success("Opps! something went wrong"); - } else { - setRequestStatus({ - message: "Topup successful", - loading: false, - status: true, - }); - } }) .catch((err) => { setRequestStatus({ @@ -184,11 +182,22 @@ function ConfirmAddFund({ loading: false, status: false, }); + + setTimeout(() => { + setConfirmCredit((prev) => ({ + ...prev, + show: { + awaitConfirm: { loader: false, state: false }, + acceptConfirm: { loader: false, state: true }, + }, + data: err, + })); + }, 1500); toast.success("Opps! something went wrong"); }); }; - const debouncedSuccessPayment = debounce(onSuccessPayment, 5000) + const debouncedSuccessPayment = debounce(onSuccessPayment, 5000); const handlePrevCard = async () => { const { amount, credit_reference, currency } = __confirmData; From a2047cc2de1493b85558c8bb2d94815de2312c42 Mon Sep 17 00:00:00 2001 From: Ebube Date: Tue, 1 Aug 2023 11:41:57 +0100 Subject: [PATCH 2/4] clean up --- src/components/MyWallet/Popup/ConfirmAddFund.jsx | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx index 31a99bc..d436ecb 100644 --- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx +++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx @@ -162,19 +162,9 @@ function ConfirmAddFund({ loading: false, status: false, }); + } - // setConfirmCredit((prev) => ({ - // ...prev, - // show: { - // awaitConfirm: { loader: false, state: false }, - // acceptConfirm: { loader: false, state: true }, - // }, - // data: res, - // })); - - // toast.success("Opps! something went wrong"); - } else return dispatch(tableReload({ type: "WALLETTABLE" })); - + return dispatch(tableReload({ type: "WALLETTABLE" })); }) .catch((err) => { setRequestStatus({ From 172f0ccbce171a0d64a55e0d563658c8670ab3a1 Mon Sep 17 00:00:00 2001 From: Ebube Date: Tue, 1 Aug 2023 11:46:33 +0100 Subject: [PATCH 3/4] cleanup 2 --- src/components/MyWallet/Popup/ConfirmAddFund.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx index d436ecb..edbb68f 100644 --- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx +++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx @@ -133,6 +133,9 @@ function ConfirmAddFund({ text: "Proceed", callback: (response) => { debouncedSuccessPayment(); //delays the call for 5 secs + + if (response?.status === "successful") + return dispatch(tableReload({ type: "WALLETTABLE" })); setTimeout(() => { closePaymentModal(); setConfirmCredit((prev) => ({ @@ -143,7 +146,6 @@ function ConfirmAddFund({ }, data: response, })); - console.log("**** checking fw res **** ", response); }, 1500); }, }; @@ -156,7 +158,6 @@ 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, From f46c6232b001e4a1bfb8b61e514710cee9e04a9d Mon Sep 17 00:00:00 2001 From: Ebube Date: Tue, 1 Aug 2023 12:05:27 +0100 Subject: [PATCH 4/4] updated error scenario for the modal header --- src/components/MyWallet/Popup/ConfirmAddFund.jsx | 2 -- src/components/MyWallet/Popup/CreditPopup.jsx | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx index edbb68f..991b1e4 100644 --- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx +++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx @@ -134,8 +134,6 @@ function ConfirmAddFund({ callback: (response) => { debouncedSuccessPayment(); //delays the call for 5 secs - if (response?.status === "successful") - return dispatch(tableReload({ type: "WALLETTABLE" })); setTimeout(() => { closePaymentModal(); setConfirmCredit((prev) => ({ diff --git a/src/components/MyWallet/Popup/CreditPopup.jsx b/src/components/MyWallet/Popup/CreditPopup.jsx index d186081..b8ecccd 100644 --- a/src/components/MyWallet/Popup/CreditPopup.jsx +++ b/src/components/MyWallet/Popup/CreditPopup.jsx @@ -25,7 +25,8 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {

{confirmCredit?.show?.acceptConfirm?.state && - confirmCredit?.data?.internal_return < 0 ? ( + (confirmCredit?.data?.internal_return < 0 || + confirmCredit?.data?.status !== "successful") ? ( "Credit Unsuccessful" ) : ( <>