From 71f799d157261a0a5450f0973cc7ae0b5a577c9e Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 24 Jul 2023 15:01:03 +0100
Subject: [PATCH 1/2] Checked Errors in Wallet Page and made some tiny fixes

---
 src/components/MyWallet/Popup/AddFundDollars.jsx    |  4 ++--
 src/components/MyWallet/Popup/ConfirmAddFund.jsx    | 13 ++++++++++++-
 .../MyWallet/Popup/ConfirmNairaWithdraw.jsx         |  4 ++--
 src/components/MyWallet/Popup/ConfirmTransfer.jsx   |  8 --------
 src/components/MyWallet/Popup/NairaWithdraw.jsx     |  7 ++++---
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/MyWallet/Popup/AddFundDollars.jsx b/src/components/MyWallet/Popup/AddFundDollars.jsx
index c933d58..3cc0dd2 100644
--- a/src/components/MyWallet/Popup/AddFundDollars.jsx
+++ b/src/components/MyWallet/Popup/AddFundDollars.jsx
@@ -487,7 +487,7 @@ function AddFundDollars(props) {
 
                             {/* Postal Code and State */}
                             <div className="sm:grid gap-5 grid-cols-3 my-2">
-                              <div className="field w-full mb-6 xl:mb-0 col-span-1">
+                              <div className="field w-full xl:mb-0 col-span-1">
                                 <InputCom
                                   fieldClass="px-6"
                                   spanTag="*"
@@ -521,7 +521,7 @@ function AddFundDollars(props) {
                         </div>
                       </div>
 
-                      <div className="md:px-8 md:pt-4 px-4 pt-2 add-fund-btn flex justify-end items-center gap-3">
+                      <div className="md:px-8 add-fund-btn flex justify-end items-center gap-3">
                         <button
                           className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full"
                           onClick={handleClose}
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index 9f402b3..b1f12ff 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -291,6 +291,17 @@ function ConfirmAddFund({
     }
   };
 
+  const getBack = () => {
+    setConfirmCredit((prev) => ({
+      ...prev,
+      show: {
+        awaitConfirm: { loader: false, state: false },
+        acceptConfirm: { loader: false, state: false },
+      },
+      data: {},
+    }));
+  }
+
   return (
     <div className="content-wrapper w-full h-[32rem]">
       <div className="w-full mb-10">
@@ -359,7 +370,7 @@ function ConfirmAddFund({
           <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 border-gradient text-base rounded-full"
-              onClick={onClose}
+              onClick={getBack}
             >
               Cancel
             </button>
diff --git a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
index 8b392a0..16d3ffe 100644
--- a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
@@ -89,11 +89,11 @@ function ConfirmNairaWithdraw({
                 loading: false,
                 status: false,
               }),
-            1500
+            5000
           );
         }
         setRequestStatus({
-          message: "transfer successful",
+          message: "Transfer Successful!",
           loading: false,
           status: true,
         });
diff --git a/src/components/MyWallet/Popup/ConfirmTransfer.jsx b/src/components/MyWallet/Popup/ConfirmTransfer.jsx
index 95a4f4c..d6c772e 100644
--- a/src/components/MyWallet/Popup/ConfirmTransfer.jsx
+++ b/src/components/MyWallet/Popup/ConfirmTransfer.jsx
@@ -60,14 +60,6 @@ function ConfirmTransfer({ payment, wallet }) {
       });
   };
 
-  useEffect(() => {
-    // what happens if not state redirect user
-    if (!state) {
-      navigate("/my-wallet/transfer-fund", { replace: true });
-    } else {
-      setPageLoading(false);
-    }
-  }, []);
   return (
     <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
       {pageLoading ? (
diff --git a/src/components/MyWallet/Popup/NairaWithdraw.jsx b/src/components/MyWallet/Popup/NairaWithdraw.jsx
index 585bb9b..6e52033 100644
--- a/src/components/MyWallet/Popup/NairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/NairaWithdraw.jsx
@@ -1,6 +1,5 @@
 import { Form, Formik } from "formik";
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import ModalCom from "../../Helpers/ModalCom";
@@ -13,7 +12,7 @@ function NairaWithdraw({
   state,
   setShowConfirmNairaWithdraw,
 }) {
-  const apiCall = new usersService(); 
+  const apiCall = new usersService();
   const [tab, setTab] = useState("previous");
   let [requestStatus, setRequestStatus] = useState(false);
 
@@ -630,7 +629,9 @@ function NairaWithdraw({
                                       className="text-slate-500 text-lg"
                                       value=""
                                     >
-                                      No Options Found!
+                                      {allCountries.data?.length
+                                        ? "Select..."
+                                        : "No Options Found!"}
                                     </option>
                                   )}
                                 </select>

From 4876ba80c1b6291a592891554cf240dea4b6dfb4 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 24 Jul 2023 15:07:22 +0100
Subject: [PATCH 2/2] Changed name to back

---
 src/components/MyWallet/Popup/ConfirmAddFund.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index b1f12ff..b826916 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -372,7 +372,7 @@ function ConfirmAddFund({
               className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full"
               onClick={getBack}
             >
-              Cancel
+              Back
             </button>
             {__confirmCountry === "US" && (
               <button