Merged master into amount-alignment

amount alignment changed
Merge branch 'tx_ref-change' of WrenchBoard/Users-Wrench into master
2023-07-31 14:23:57 +01:00 · 2023-07-31 14:22:55 +01:00 · 2023-07-31 12:04:22 +00:00 · 2023-07-31 13:02:31 +01:00 · 2023-07-30 16:29:28 +00:00
3 changed files with 18 additions and 12 deletions
@@ -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>
@@ -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"
@@ -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]">
Author	SHA1	Message	Date
victorAnumudu	b96e8a3ed5	Merged master into amount-alignment	2023-07-31 14:23:57 +01:00
victorAnumudu	f3226a6cfc	amount alignment changed	2023-07-31 14:22:55 +01:00
ameye	ff4c503100	Merge branch 'tx_ref-change' of WrenchBoard/Users-Wrench into master	2023-07-31 12:04:22 +00:00
Ebube	f543a2d893	testing topupResult	2023-07-31 13:02:31 +01:00
ameye	41badd52be	Merge branch 'list-alignment-fix' of WrenchBoard/Users-Wrench into master	2023-07-30 16:29:28 +00:00