reverse

src/Routers.jsx

@@ -56,6 +56,8 @@ export default function Routers() {
       <Routes>
         {/* guest routes */}
         <Route exact path="/login" element={<LoginPage />} />
+        <Route exact path="/eoffer" element={<LoginPage />} />
+
         <Route exact path="/signup" element={<SignupPage />} />
         <Route exact path="/login/auth" element={<AuthRedirect />} />
         <Route exact path="/login/auth/flogin" element={<FacebookRedirect />} />

src/components/Cards/OfferCard.jsx

@@ -19,7 +19,7 @@ export default function OfferCard({ datas, hidden = false, setOfferPopout }) {
             className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
             style={{
               background: `url(${localImgLoad(
-                `images/taskbanners/${datas.banner}`
+                `images/taskbanners/${datas?.banner || "default.jpg"}`
               )}) center / contain no-repeat`,
             }}
           >

src/components/MyPendingJobs/MyPendingJobTable.jsx

@@ -58,7 +58,7 @@ export default function MyPendingJobTable({ MyJobList, className }) {
                             <div className="flex space-x-2 items-center w-full">
                               <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                 <img
-                                  src={localImgLoad(`images/taskbanners/${value.banner}`)}
+                                  src={localImgLoad(`images/taskbanners/${value.banner || "default.jpg"}`)}
                                   alt="data"
                                   className="w-full h-full rounded-full"
                                 />

src/components/MyPendingJobs/index.jsx

@@ -9,7 +9,7 @@ export default function MyPendingJobs(props) {
   const filterHandler = (value) => {
     setValue(value);
   };
-  console.log("AMEYE LOC1", props.MyJobList);
+  // console.log("AMEYE LOC1", props.MyJobList);
   return (
     <Layout>
       <CommonHead

src/components/MyWallet/Popup/AddFundDollars.jsx

@@ -136,6 +136,12 @@ function AddFundDollars(props) {
       return;
     }
 
+    if (Number(props.input) * 100 > Number(props.walletItem?.transfer_limit)) {
+      props.setInputError("Credit limit has been exceeded");
+      setTimeout(() => props.setInputError(""), 5000);
+      return;
+    }
+
     if (tab === "previous") {
       // To check if card is empty
       if (Object.keys(prevCardDetails).length === 0) {

src/components/MyWallet/Popup/AddFundPop.jsx

@@ -1,5 +1,4 @@
 import React, { useState } from "react";
-import { useNavigate } from "react-router-dom";
 import usersService from "../../../services/UsersService";
 import Icons from "../../Helpers/Icons";
 import InputCom from "../../Helpers/Inputs/InputCom";
@@ -15,10 +14,9 @@ function AddFundPop({
   setConfirmCredit,
   walletItem,
 }) {
-  const navigate = useNavigate();
   const apiCall = new usersService();
   let countryWallet = walletItem?.country;
-  const { payment, currency } = _payment;
+  const { currency } = _payment;
 
   const [inputError, setInputError] = useState("");
   let __awaitComponent = confirmCredit.show.awaitConfirm;
@@ -44,6 +42,12 @@ function AddFundPop({
       return;
     }
 
+    if (Number(input) * 100 > Number(walletItem?.transfer_limit)) {
+      setInputError("Credit limit has been exceeded");
+      setTimeout(() => setInputError(""), 5000);
+      return;
+    }
+
     if (isNaN(input)) {
       setConfirmCredit((prev) => ({
         ...prev,
@@ -113,7 +117,7 @@ function AddFundPop({
                   value={input}
                   inputHandler={handleChange}
                 />
-                <p className="text-base text-red-500 h-5">
+                <p className="text-base text-red-500 italic h-5">
                   {inputError && inputError}
                 </p>
               </div>

src/components/MyWallet/Popup/CompleteConfirmCredit.jsx

@@ -1,12 +1,7 @@
 import React from "react";
 
 function CompleteConfirmCredit({ onClose, confirmCredit }) {
-  const { data } = confirmCredit;
-
-  const backToWallet = () => {
-    onClose();
-    window.location.reload(true);
-  };
+  const { data } = confirmCredit
   return (
     <div className="logout-modal-body w-full flex flex-col items-center">
       <div className="content-wrapper w-full h-[32rem]">
@@ -104,7 +99,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={backToWallet}
+                onClick={onClose}
               >
                 Ok
               </button>

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -124,8 +124,8 @@ function ConfirmAddFund({
     },
     customizations: {
       title: "WrenchBoard",
-      description: "Topup Payment",
-      logo: "https://st2.depositphotos.com/4403291/7418/v/450/depositphotos_74189661-stock-illustration-online-shop-log.jpg",
+      description: "Add Credit Payment",
+      logo: "https://www.wrenchboard.com/assets/images/wrench-500-500-icon.png",
     },
   };
 
@@ -142,7 +142,7 @@ function ConfirmAddFund({
   const onSuccessPayment = () => {
     setRequestStatus({ message: "", loading: true, status: false });
     const reqData = { amount: Number(__confirmData?.amount), currency: "NGN" };
-
+    console.log("**** onSuccessPayment **** THIS WAS REACHED");
     apiURL
       .startTopUp(reqData)
       .then((res) => {

src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx

@@ -1,9 +1,10 @@
 import { 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";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { useDispatch } from "react-redux";
+import { tableReload } from "../../../store/TableReloads";
 
 function ConfirmNairaWithdraw({
   payment,
@@ -14,7 +15,7 @@ function ConfirmNairaWithdraw({
   setShowNairaWithdraw,
 }) {
   const apiURL = new usersService();
-  const navigate = useNavigate();
+  const dispatch = useDispatch();
 
   let [requestStatus, setRequestStatus] = useState({
     message: "",
@@ -90,6 +91,7 @@ function ConfirmNairaWithdraw({
             state: res.data,
           });
         }, 5000);
+        dispatch(tableReload({ type: "WALLETTABLE" }));
         return;
       })
       .catch((error) => {
@@ -101,19 +103,6 @@ function ConfirmNairaWithdraw({
       });
   };
 
-  const getBack = () => {
-    action();
-    setShowNairaWithdraw({
-      show: true,
-      data: {},
-    });
-  };
-
-  const completeWithdrawal = () => {
-    action();
-    window.location.reload(true);
-  };
-
   return (
     <ModalCom action={action} situation={situation} className="edit-popup">
       <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
@@ -263,6 +252,10 @@ function ConfirmNairaWithdraw({
                                 ?.toLowerCase()
                                 .includes("limit")
                             ? "Transfer limit Error"
+                            : completeNairaWithdraw.state?.bad_param
+                                ?.toLowerCase()
+                                .includes("balance")
+                            ? "Insufficient Balance"
                             : "An Error Occurred"}{" "}
                         </h1>
                       </div>
@@ -283,6 +276,10 @@ function ConfirmNairaWithdraw({
                                 ?.toLowerCase()
                                 .includes("limit")
                             ? "The transfer limit has been exceeded"
+                            : completeNairaWithdraw.state?.bad_param
+                                ?.toLowerCase()
+                                .includes("balance")
+                            ? "Insufficient Balance for Transaction"
                             : "Could not perform transaction"}
                         </span>
                       </div>
@@ -405,7 +402,7 @@ function ConfirmNairaWithdraw({
                   <button
                     onClick={
                       completeNairaWithdraw.show
-                        ? completeWithdrawal
+                        ? action
                         : completeNairaWithdraw?.state?.internal_return < 0
                         ? action
                         : handleSubmit

src/components/MyWallet/Popup/NairaWithdraw.jsx

@@ -171,8 +171,8 @@ function NairaWithdraw({
         setErrorMsgs({ amount: "amount required" });
         setTimeout(() => setErrorMsgs({ amount: "" }), 3000);
         return;
-      } else if (Number(values.amount) > Number(wallet?.transfer_limit)) {
-        setErrorMsgs({ amount: "transfer limit exceeded" });
+      }else      if (Number(values.amount * 100) > Number(wallet?.transfer_limit)) {
+        setErrorMsgs({ amount: "Withdraw limit has been exceeded" });
         setTimeout(() => setErrorMsgs({ amount: "" }), 3000);
         return;
       }
@@ -326,8 +326,8 @@ function NairaWithdraw({
                         <InputCom
                           fieldClass="px-4 text-end"
                           parentClass="flex items-center gap-1 justify-between"
-                          labelClass="flex-[0.3] mb-0"
-                          inputClass="flex-[0.7] max-w-[12rem]"
+                          labelClass="flex-[0.4] mb-0"
+                          inputClass="flex-[0.6] max-w-[12rem]"
                           label="Amount:"
                           type="number"
                           name="amount"

src/components/MyWallet/Wallet.jsx

@@ -67,9 +67,6 @@ const WalletRoutes = () => {
     getPaymentHistory()
   }, [walletTable]);
 
-
-
-  console.log('TESTING',walletTable);
   return (
     <Layout>
       <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>

src/components/MyWallet/WalletAction.jsx

@@ -8,30 +8,12 @@ function WalletAction({ walletItem, payment, openPopUp }) {
     show: false,
     state: {},
   }); // DETERMINES WHEN NAIRA WITHDRAWAL POPS UP
-  const [countries, setCountries] = useState([]);
+  
   const [showConfirmNairaWithdraw, setShowConfirmNairaWithdraw] = useState({
     show: false,
     state: {},
   }); // DETERMINES WHEN CONFIRM NAIRA WITHDRAWAL POPS UP
 
-  const userApi = new usersService();
-
-  // Get Country Api
-  const getCountryList = useCallback(async () => {
-    const res = await userApi.getSignupCountryData();
-
-    try {
-      if (res.status === 200) {
-        const { signup_country } = await res.data;
-        setCountries(signup_country);
-      } else if (res.data.result !== 100) {
-        setCountries("Nothing see here!");
-      }
-    } catch (error) {
-      throw new Error(error);
-    }
-  }, []);
-
   return (
     <div className="counters w-full flex justify-between gap-2">
       <div className="w-1/2 flex justify-center items-center">

src/services/UsersService.js

@@ -586,6 +586,7 @@ class usersService {
       action: 11062,
       ...post,
     };
+    console.log("starttopup",postData);
     return this.postAuxEnd("/starttopup", postData);
   }