Merged master into amount-alignment

src/components/MyJobs/MyJobTable.jsx

@@ -175,7 +175,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
             }}
             className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
           >
-            Manage
+            Assign
           </button>
         </td>
       </tr>

src/components/MyWallet/Popup/AddFundPop.jsx

@@ -110,7 +110,7 @@ function AddFundPop({
               </h1>
               <div className="field w-full max-w-[250px]">
                 <InputCom
-                  fieldClass="px-6"
+                  fieldClass="px-6 text-right"
                   type="text"
                   name="amount"
                   placeholder="0"

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -128,20 +128,21 @@ function ConfirmAddFund({
       logo: "https://www.wrenchboard.com/assets/images/wrench-500-500-icon.png",
     },
   };
-//debugger;
+  //debugger;
   const fwConfig = {
     ...config,
     text: "Proceed",
     callback: (response) => {
       onSuccessPayment();
-      closePaymentModal();
+      setTimeout(() => {
+        closePaymentModal();
+      }, 2000);
     },
-    onClose: () => {},
   };
 
   const onSuccessPayment = () => {
     setRequestStatus({ message: "", loading: true, status: false });
-    const reqData = { amount: Number(__confirmData?.amount), currency: "NGN" };
+    const reqData = { tx_ref: __confirmData?.credit_reference };
     console.log("**** onSuccessPayment **** THIS WAS REACHED");
     apiURL
       .resultTopUp(reqData)
@@ -159,8 +160,15 @@ function ConfirmAddFund({
             loading: false,
             status: true,
           });
-          toast.success("Account Topup was successful");
+
-          onClose()
+          setConfirmCredit((prev) => ({
+            ...prev,
+            show: {
+              awaitConfirm: { loader: false, state: false },
+              acceptConfirm: { loader: false, state: true },
+            },
+            data: res,
+          }));
           dispatch(tableReload({ type: "WALLETTABLE" }));
           navigate("/my-wallet", { replace: true });
           // setTimeout(() => {
@@ -267,7 +275,7 @@ function ConfirmAddFund({
         }));
         return;
       }
-      
+
       setTimeout(() => {
         setConfirmCredit((prev) => ({
           ...prev,
@@ -300,9 +308,7 @@ function ConfirmAddFund({
       },
       data: {},
     }));
-  }
+  };
-
-  console.log(__confirmData)
 
   return (
     <div className="content-wrapper w-full h-[32rem]">