diff --git a/src/components/Helpers/Inputs/InputCom/index.jsx b/src/components/Helpers/Inputs/InputCom/index.jsx
index 11c9cb8..1f76eb7 100644
--- a/src/components/Helpers/Inputs/InputCom/index.jsx
+++ b/src/components/Helpers/Inputs/InputCom/index.jsx
@@ -91,8 +91,8 @@ export default function InputCom({
           placeholder={placeholder}
           value={value}
           onChange={inputHandler}
-          className={`input-field placeholder:text-base text-dark-gray w-full h-full tracking-wide ${
-            inputBg ? inputBg : "bg-[#FAFAFA]"
+          className={`input-field placeholder:text-base text-dark-gray w-full h-full ${
+            inputBg ? inputBg : "bg-[#FAFAFA] tracking-wide"
           } dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
           type={type}
           id={name}
diff --git a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
index b483cfe..0452182 100644
--- a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
@@ -1,12 +1,19 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
+import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import ModalCom from "../../Helpers/ModalCom";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
-import usersService from "../../../services/UsersService";
 
-function ConfirmNairaWithdraw({ payment, wallet, action, situation, state }) {
+function ConfirmNairaWithdraw({
+  payment,
+  wallet,
+  action,
+  situation,
+  state,
+  setShowNairaWithdraw,
+}) {
   const apiURL = new usersService();
   const navigate = useNavigate();
 
@@ -23,9 +30,22 @@ function ConfirmNairaWithdraw({ payment, wallet, action, situation, state }) {
     let reqData = {
       amount: Number(state.amount * 100),
       Fee: Number(state.fee),
-      recipient_uid: state.details?.recipient_uid,
       wallet_uid: wallet.wallet_uid,
     };
+
+    if (state?.choice === "prev") {
+      reqData.recipient_uid = state.details?.recipient_uid;
+    }
+
+    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;
+    }
+
     apiURL
       .sendMoney(reqData)
       .then((res) => {
@@ -36,6 +56,14 @@ function ConfirmNairaWithdraw({ payment, wallet, action, situation, state }) {
               loading: false,
               status: false,
             });
+          } else if (
+            res.data?.status_message?.toLowerCase().includes("not_found")
+          ) {
+            setRequestStatus({
+              message: "Sorry, wallet not found",
+              loading: false,
+              status: false,
+            });
           } else {
             setRequestStatus({
               message: "Could not perform transaction",
@@ -73,7 +101,13 @@ function ConfirmNairaWithdraw({ payment, wallet, action, situation, state }) {
       });
   };
 
-  console.log(state);
+  const getBack = () => {
+    action();
+    setShowNairaWithdraw({
+      show: true,
+      data: state,
+    });
+  };
 
   return (
     <ModalCom action={action} situation={situation} className="edit-popup">
@@ -129,17 +163,40 @@ function ConfirmNairaWithdraw({ payment, wallet, action, situation, state }) {
                 />
               </div>
 
-              {/* RECIPIENT ACC: */}
-              <div className="field w-full mb-3">
-                <InputCom
-                  fieldClass="px-6"
-                  label="Recipient Acc:"
-                  type="text"
-                  name="recipient"
-                  value={state?.details.recipient || ""}
-                  disable={true}
-                />
-              </div>
+              {state?.choice === "prev" && (
+                <>
+                  {/* RECIPIENT ACC: */}
+                  <div className="field w-full mb-3">
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Recipient Acc:"
+                      type="text"
+                      name="recipient"
+                      value={state?.details?.recipient || ""}
+                      disable={true}
+                    />
+                  </div>
+                </>
+              )}
+
+              {state?.choice === "new" && (
+                <>
+                  {/* RECIPIENT ACC: */}
+                  <div className="field w-full mb-3">
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Bank Acc:"
+                      type="text"
+                      name="bank"
+                      value={
+                        `${state?.details?.name} ${state?.details?.country}` ||
+                        ""
+                      }
+                      disable={true}
+                    />
+                  </div>
+                </>
+              )}
 
               {/* PROCESSING FEE: */}
               <div className="field w-full mb-3">
@@ -179,33 +236,31 @@ function ConfirmNairaWithdraw({ payment, wallet, action, situation, state }) {
             </div>
 
             <hr />
-            {requestStatus.message && (
-              <p
-                className={`text-base ${
-                  requestStatus.status ? "text-green-500" : "text-red-500"
-                } px-4 md:px-8 py-4`}
-              >
-                {requestStatus.message}
-              </p>
-            )}
+            <p
+              className={`text-base ${
+                requestStatus.status ? "text-green-500" : "text-red-500"
+              } px-4 md:px-8 py-4 h-5`}
+            >
+              {requestStatus.message && requestStatus.message}
+            </p>
             <div className="px-4 md:px-8 py-4 add-fund-btn flex justify-end items-center gap-2">
               <button
                 type="button"
-                onClick={action}
+                onClick={state?.choice === "prev" ? getBack : action}
                 className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
               >
-                <span className="text-gradient">Cancel</span>
+                <span className="text-gradient">{state?.choice === "prev" ? "Back" : "Cancel"}</span>
+              </button>
+              <button
+                onClick={handleSubmit}
+                className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer min-w-[100px]"
+              >
+                {requestStatus.loading ? (
+                  <LoadingSpinner size="6" color="sky-blue" />
+                ) : (
+                  "Transfer"
+                )}
               </button>
-              {requestStatus.loading ? (
-                <LoadingSpinner size="8" color="sky-blue" />
-              ) : (
-                <button
-                  onClick={handleSubmit}
-                  className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
-                >
-                  Transfer
-                </button>
-              )}
             </div>
           </div>
         </div>
diff --git a/src/components/MyWallet/Popup/NairaWithdraw.jsx b/src/components/MyWallet/Popup/NairaWithdraw.jsx
index 361fd7a..6cbeb1b 100644
--- a/src/components/MyWallet/Popup/NairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/NairaWithdraw.jsx
@@ -1,40 +1,39 @@
 import { Form, Formik } from "formik";
 import React, { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { checkAndSetError } from "../../../lib";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import ModalCom from "../../Helpers/ModalCom";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
-const initialValues = {
-  amount: "",
-  comment: "",
-  previousAccount: {
-    recipientID: "",
-  },
-  newAccount: {
-    country: "",
-    bank: "",
-    accountNumber: "",
-    accountType: "",
-    state: "",
-    city: "",
-  },
-};
-
 function NairaWithdraw({
   wallet,
   action,
   situation,
+  state,
   setShowConfirmNairaWithdraw,
 }) {
-  const apiCall = new usersService(); // API CLASS CALL
-  const navigate = useNavigate();
+  const apiCall = new usersService(); 
   const [tab, setTab] = useState("previous");
   let [requestStatus, setRequestStatus] = useState(false);
+
+  const initialValues = {
+    amount: state?.amount || "",
+    comment: state?.comment || "",
+    previousAccount: {
+      recipientID: state?.previousAccount?.recipientID || "",
+    },
+    newAccount: {
+      country: state?.newAccount?.amount || "",
+      bank: state?.newAccount?.amount || "",
+      accountNumber: state?.newAccount?.amount || "",
+      accountType: state?.newAccount?.amount || "",
+      state: state?.newAccount?.amount || "",
+      city: state?.newAccount?.amount || "",
+    },
+  };
+
   const [errorMsgs, setErrorMsgs] = useState(initialValues);
-  const { isNotEmpty, textCount } = checkAndSetError();
 
   let [sendMoneyFee, setSendMoneyFee] = useState({
     loading: false,
@@ -67,7 +66,7 @@ function NairaWithdraw({
 
   // Handling card change
   const handleBankOptions = (event) => {
-    const { name, value } = event.target;
+    const { value } = event.target;
     setBankName((prev) => ({ loading: true, data: [] }));
     apiCall
       .getCountryBank({ country: value })
@@ -169,13 +168,9 @@ function NairaWithdraw({
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = async (values, helpers) => {
     try {
-      // Validate the form using Yup validation schema
-      // await validationSchema.validate(values, { abortEarly: false });
-      // If validation passes, proceed with form submission
-      console.log("Form data is valid!", values);
       if (!values?.amount) {
-        setErrorMsgs({ amount: "Please enter an amount" });
-        setTimeout(() => setErrorMsgs({ amount: "" }), 1000);
+        setErrorMsgs({ amount: "amount required" });
+        setTimeout(() => setErrorMsgs({ amount: "" }), 3000);
         return;
       }
       if (values?.comment?.length >= 50) {
@@ -230,63 +225,40 @@ function NairaWithdraw({
         const { accountNumber, accountType, bank, city, country, state } =
           values?.newAccount;
 
-        const isAccountNumberValid = isNotEmpty(
-          "accountNumber",
-          accountNumber,
-          setErrorMsgs,
-          "Please enter the account number"
-        );
-        const isAccountTypeValid = isNotEmpty(
-          "accountType",
-          accountType,
-          setErrorMsgs,
-          "Please select an account type"
-        );
-        const isBankValid = isNotEmpty(
-          "bank",
-          bank,
-          setErrorMsgs,
-          "Please enter the bank name"
-        );
-        const isCityValid = isNotEmpty(
-          "city",
-          city,
-          setErrorMsgs,
-          "Please enter the city"
-        );
-        const isCountryValid = isNotEmpty(
-          "country",
-          country,
-          setErrorMsgs,
-          "Please enter the country"
-        );
-        const isStateValid = isNotEmpty(
-          "state",
-          state,
-          setErrorMsgs,
-          "Please enter the state"
-        );
-
         if (
-          !isAccountNumberValid ||
-          !isAccountTypeValid ||
-          !isBankValid ||
-          !isCityValid ||
-          !isCountryValid ||
-          !isStateValid
+          !accountNumber ||
+          !accountType ||
+          !bank ||
+          !city ||
+          !country ||
+          !state
         ) {
           return;
         }
 
         setRequestStatus(true);
 
+        // Ensure bankDetails is an array and not undefined
+        const bankDetails = bankName.data?.filter(
+          (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
+          setRequestStatus(false);
+          return;
+        }
+
         const stateData = {
           amount: values.amount,
           comment: values.comment,
           choice: "new",
           wallet_uid: wallet.wallet_uid,
           ...sendMoneyFee,
-          ...values?.newAccount,
+          details: { ...bankDetails[0], ...values?.newAccount },
         };
 
         return setTimeout(() => {
@@ -298,7 +270,6 @@ function NairaWithdraw({
     } catch (errors) {
       // If validation fails, handle the validation errors
       throw new Error("Validation errors:", errors);
-      //
     }
   };
 
@@ -343,11 +314,7 @@ function NairaWithdraw({
             </button>
           </div>
           <div className="add-fund w-full md:p-8 p-4 bg-white dark:bg-dark-white h-full rounded-2xl">
-            <Formik
-              initialValues={initialValues}
-              // validationSchema={validationSchema}
-              onSubmit={handleSubmit}
-            >
+            <Formik initialValues={initialValues} onSubmit={handleSubmit}>
               {(props) => {
                 return (
                   <Form className="transfer-fund-info">
@@ -357,8 +324,8 @@ function NairaWithdraw({
                         <InputCom
                           fieldClass="px-4"
                           parentClass="flex items-center gap-1 justify-between"
-                          labelClass="flex-[0.2] mb-0"
-                          inputClass="flex-[0.8] max-w-[12rem]"
+                          labelClass="flex-[0.3] mb-0"
+                          inputClass="flex-[0.7] max-w-[12rem]"
                           label="Amount:"
                           type="number"
                           name="amount"
@@ -371,11 +338,6 @@ function NairaWithdraw({
                           }}
                           error={errorMsgs.amount && errorMsgs.amount}
                         />
-                        {/* {errorMsgs?.amount && (
-                          <p className="sm:text-sm text-[12px] text-red-500 sm:text-left text-right sm:translate-y-0 translate-y-1">
-                            
-                          </p>
-                        )} */}
                       </div>
 
                       <div className="field w-full">
@@ -572,14 +534,13 @@ function NairaWithdraw({
                                   <span className="text-red-500">*</span>
                                 </label>
                                 <select
-                                  className="w-full text-base p-2 text-dark-gray dark:text-white border border-slate-300 outline-0 flex-[0.6] rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding"
+                                  className="w-full text-base p-2 text-dark-gray dark:text-white border border-slate-300 outline-0 flex-[0.6] rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding tracking-[1.5px]"
                                   name="newAccount.country"
                                   value={props.values.newAccount?.country}
                                   onChange={(e) => {
                                     props.handleChange(e);
                                     handleBankOptions(e);
                                   }}
-                                  // onBlur={(e) => handleBankOptions(e)}
                                 >
                                   {allCountries.loading ? (
                                     <option
@@ -629,7 +590,7 @@ function NairaWithdraw({
                               <div className="add-recipient w-full flex items-center flex-1">
                                 <label
                                   htmlFor="newAccount.bank"
-                                  className="input-label text-[#181c32] dark:text-white text-base font-semibold inline-flex flex-[0.4]"
+                                  className="input-label text-[#181c32] dark:text-white text-base font-semibold inline-flex flex-[0.4] tracking-[1.5px]"
                                 >
                                   Bank Name{" "}
                                   <span className="text-red-500">*</span>
@@ -660,7 +621,7 @@ function NairaWithdraw({
                                         <option
                                           key={index}
                                           className="text-slate-500 text-lg"
-                                          value={item.code}
+                                          value={item.bank_uid}
                                         >
                                           {item.name}
                                         </option>
@@ -694,11 +655,12 @@ function NairaWithdraw({
                                   <span className="text-red-500">*</span>
                                 </label>
                                 <InputCom
-                                  fieldClass="px-6"
+                                  fieldClass="px-6 tracking-[1.5px]"
                                   inputClass="flex items-center max-w-[15rem]"
                                   type="text"
                                   name="newAccount.accountNumber"
                                   placeholder="Account No"
+                                  maxLength={10}
                                   value={props.values.newAccount?.accountNumber}
                                   inputHandler={props.handleChange}
                                   blurHandler={props.handleBlur}
@@ -720,7 +682,7 @@ function NairaWithdraw({
                                   Type <span className="text-red-500">*</span>
                                 </label>
                                 <select
-                                  className="w-full text-base p-2 text-dark-gray dark:text-white border border-slate-300 outline-0 flex-[0.6] rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding flex-grow"
+                                  className="w-full text-base p-2 text-dark-gray dark:text-white border border-slate-300 outline-0 flex-[0.6] rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding flex-grow tracking-[1.5px]"
                                   name="newAccount.accountType"
                                   value={props.values.newAccount?.accountType}
                                   onChange={props.handleChange}
@@ -779,7 +741,7 @@ function NairaWithdraw({
                                   State <span className="text-red-500">*</span>
                                 </label>
                                 <InputCom
-                                  fieldClass="px-6"
+                                  fieldClass="px-6 tracking-[1.5px]"
                                   inputClass="max-w-[10rem]"
                                   type="text"
                                   name="newAccount.state"
@@ -804,7 +766,7 @@ function NairaWithdraw({
                                   City <span className="text-red-500">*</span>
                                 </label>
                                 <InputCom
-                                  fieldClass="px-6"
+                                  fieldClass="px-6 tracking-[1.5px]"
                                   type="text"
                                   inputClass="max-w-[10rem]"
                                   name="newAccount.city"
diff --git a/src/components/MyWallet/WalletAction.jsx b/src/components/MyWallet/WalletAction.jsx
index 0fef3e6..330de08 100644
--- a/src/components/MyWallet/WalletAction.jsx
+++ b/src/components/MyWallet/WalletAction.jsx
@@ -1,10 +1,13 @@
 import React, { useCallback, useState } from "react";
+import usersService from "../../services/UsersService";
 import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
 import NairaWithdraw from "./Popup/NairaWithdraw";
-import usersService from "../../services/UsersService";
 
 function WalletAction({ walletItem, payment, openPopUp }) {
-  const [showNairaWithdraw, setShowNairaWithdraw] = useState(false); // DETERMINES WHEN NAIRA WITHDRAWAL POPS UP
+  const [showNairaWithdraw, setShowNairaWithdraw] = useState({
+    show: false,
+    state: {},
+  }); // DETERMINES WHEN NAIRA WITHDRAWAL POPS UP
   const [countries, setCountries] = useState([]);
   const [showConfirmNairaWithdraw, setShowConfirmNairaWithdraw] = useState({
     show: false,
@@ -34,7 +37,7 @@ function WalletAction({ walletItem, payment, openPopUp }) {
       <div className="w-1/2 flex justify-center items-center">
         <button
           onClick={() => {
-            setShowNairaWithdraw(true);
+            setShowNairaWithdraw((prev) => ({ ...prev, show: true }));
           }}
           className={`${
             walletItem.code != "NAIRA" && "invisible"
@@ -57,13 +60,17 @@ function WalletAction({ walletItem, payment, openPopUp }) {
         </button>
       </div>
 
-      {showNairaWithdraw && (
+      {showNairaWithdraw.show && (
         <NairaWithdraw
           wallet={walletItem}
           action={() => {
-            setShowNairaWithdraw((prev) => !prev);
+            setShowNairaWithdraw((prev) => ({
+              ...prev,
+              show: !prev.show,
+            }));
           }}
-          situation={showNairaWithdraw}
+          situation={showNairaWithdraw.show}
+          state={showNairaWithdraw.state}
           setShowConfirmNairaWithdraw={setShowConfirmNairaWithdraw}
         />
       )}
@@ -78,6 +85,7 @@ function WalletAction({ walletItem, payment, openPopUp }) {
               show: !prev.show,
             }));
           }}
+          setShowNairaWithdraw={setShowNairaWithdraw}
           situation={showConfirmNairaWithdraw.show}
         />
       )}