Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master

src/components/MyWallet/Popup/CompleteConfirmCredit.jsx

@@ -2,6 +2,11 @@ import React from "react";
 
 function CompleteConfirmCredit({ onClose, confirmCredit }) {
   const { data } = confirmCredit;
+
+  const backToWallet = () => {
+    onClose();
+    window.location.reload(true);
+  };
   return (
     <div className="logout-modal-body w-full flex flex-col items-center">
       <div className="content-wrapper w-full h-[32rem]">
@@ -99,7 +104,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
             <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
               <button
                 className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full w-[100px]"
-                onClick={onClose}
+                onClick={backToWallet}
               >
                 Ok
               </button>

src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx

@@ -22,7 +22,6 @@ function ConfirmNairaWithdraw({
     loading: false,
     status: false,
   });
-  let [pageLoading, setPageLoading] = useState(true);
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = () => {
@@ -35,15 +34,17 @@ function ConfirmNairaWithdraw({
 
     if (state?.choice === "prev") {
       reqData.recipient_uid = state.details?.recipient_uid;
+      reqData.mode = 100;
     }
 
     if (state?.choice === "new") {
-      reqData.account_no = state?.accountNumber;
-      reqData.account_type = state?.accountType;
-      reqData.bank_uid = state?.bank_uid;
-      reqData.country = state?.country;
-      reqData.state = state?.state;
-      reqData.city = state?.city;
+      reqData.account_no = state?.details?.accountNumber;
+      reqData.account_type = Number(state?.details?.accountType);
+      reqData.bank_uid = state?.details?.bank_uid;
+      reqData.country = state?.details?.country;
+      reqData.state = state?.details?.state;
+      reqData.city = state?.details?.city;
+      reqData.mode = 500;
     }
 
     apiURL
@@ -64,6 +65,16 @@ function ConfirmNairaWithdraw({
               loading: false,
               status: false,
             });
+          } else if (
+            res.data?.status_message
+              ?.toLowerCase()
+              .includes("recipient_add_error")
+          ) {
+            setRequestStatus({
+              message: res.data?.error,
+              loading: false,
+              status: false,
+            });
           } else {
             setRequestStatus({
               message: "Could not perform transaction",
@@ -105,7 +116,7 @@ function ConfirmNairaWithdraw({
     action();
     setShowNairaWithdraw({
       show: true,
-      data: state,
+      data: {},
     });
   };
 
@@ -249,7 +260,9 @@ function ConfirmNairaWithdraw({
                 onClick={state?.choice === "prev" ? getBack : action}
                 className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
               >
-                <span className="text-gradient">{state?.choice === "prev" ? "Back" : "Cancel"}</span>
+                <span className="text-gradient">
+                  {state?.choice === "prev" ? "Back" : "Cancel"}
+                </span>
               </button>
               <button
                 onClick={handleSubmit}

src/components/MyWallet/Popup/NairaWithdraw.jsx

@@ -243,8 +243,6 @@ function NairaWithdraw({
           (item) => item.bank_uid === bank
         );
 
-        console.log(bankDetails);
-
         // Ensure bankDetails is not empty
         if (!bankDetails || bankDetails.length === 0) {
           // Handle the case when bankDetails is empty or undefined

src/services/UsersService.js

@@ -480,7 +480,6 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 33020,
-      mode: 100,
       ...reqData,
     };
     return this.postAuxEnd("/sendmoney", postData);