Merge branch 'balance-refresh' of WrenchBoard/Users-Wrench into master

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -1,6 +1,6 @@
 import { FlutterWaveButton, closePaymentModal } from "flutterwave-react-v3";
 import React, { useState } from "react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
@@ -99,6 +99,9 @@ function ConfirmAddFund({
       : __confirmData.card;
 
   const apiURL = new usersService();
+
+  const { userDetails } = useSelector((state) => state?.userDetails);
+
   const navigate = useNavigate();
   const dispatch = useDispatch();
 
@@ -112,7 +115,13 @@ function ConfirmAddFund({
     public_key: process.env.REACT_APP_FLUTTERWAVE_APIKEY,
     tx_ref: Date.now(),
     currency: "NGN",
+    amount: Number(__confirmData.amount),
     payment_options: "card,mobilemoney,ussd",
+    customer: {
+      email: userDetails.email,
+      phone_number: userDetails.phone,
+      name: `${userDetails.lastname} ${userDetails.firstname}`,
+    },
     customizations: {
       title: "WrenchBoard",
       description: "Topup Payment",
@@ -132,7 +141,7 @@ function ConfirmAddFund({
 
   const onSuccessPayment = () => {
     setRequestStatus({ message: "", loading: true, status: false });
-    const reqData = { amount: __confirmData?.account, currency: "NGN" };
+    const reqData = { amount: Number(__confirmData?.amount), currency: "NGN" };
 
     apiURL
       .startTopUp(reqData)
@@ -151,9 +160,12 @@ function ConfirmAddFund({
             status: true,
           });
           toast.success("Account Topup was successful");
-          setTimeout(() => {
-            navigate("/my-wallet", { replace: true });
-          }, 1000);
+          onClose()
+          dispatch(tableReload({ type: "WALLETTABLE" }));
+          navigate("/my-wallet", { replace: true });
+          // setTimeout(() => {
+          //   navigate("/my-wallet", { replace: true });
+          // }, 1000);
         }
       })
       .catch((err) => {
@@ -205,6 +217,7 @@ function ConfirmAddFund({
           },
           data: _response,
         }));
+        dispatch(tableReload({ type: "WALLETTABLE" }));
       }, 1500);
     } catch (error) {
       setConfirmCredit((prev) => ({
@@ -256,7 +269,6 @@ function ConfirmAddFund({
       }
       
       setTimeout(() => {
-        dispatch(tableReload({ type: "WALLETTABLE" }));
         setConfirmCredit((prev) => ({
           ...prev,
           show: {
@@ -265,6 +277,7 @@ function ConfirmAddFund({
           },
           data: _response,
         }));
+        dispatch(tableReload({ type: "WALLETTABLE" }));
       }, 1500);
     } catch (error) {
       setConfirmCredit((prev) => ({
@@ -278,8 +291,6 @@ function ConfirmAddFund({
     }
   };
 
-  // console.log(confirmCredit?.data);
-
   return (
     <div className="content-wrapper w-full h-[32rem]">
       <div className="w-full mb-10">