collapse-icon fixed, family icon fixed

.env

@@ -68,6 +68,8 @@ REACT_APP_APPLE_REDIRECT_URL='http://localhost:9082/login/auth/apple'
 REACT_APP_MAX_FILE_SIZE=1000000
 REACT_APP_TOTAL_NUM_FILE=4
 
+REACT_APP_LOGOUT_TEXT="Sign Out"
+
 
 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227

.env.development

@@ -41,4 +41,6 @@ REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https:
 REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
 
 REACT_APP_MAX_FILE_SIZE=1000000
-REACT_APP_TOTAL_NUM_FILE=4
+REACT_APP_TOTAL_NUM_FILE=4
+
+REACT_APP_LOGOUT_TEXT="Sign Out"

.env.production

@@ -48,4 +48,6 @@ REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin
 DISABLE_ESLINT_PLUGIN=true
 
 REACT_APP_MAX_FILE_SIZE=1000000
-REACT_APP_TOTAL_NUM_FILE=4
+REACT_APP_TOTAL_NUM_FILE=4
+
+REACT_APP_LOGOUT_TEXT="Sign Out"

src/components/AuthPages/Login/index.jsx

@@ -275,8 +275,8 @@ export default function Login() {
                     <div className="input-item mb-5">
                       <InputCom
                         labelClass="tracking-wider"
-                        fieldClass="sm:px-6 px-2"
-                        value={password}
+                        fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
+                        value={password.replace(/./g, "●")}
                         inputHandler={handlePassword}
                         placeholder="● ● ● ● ● ●"
                         label="Password"

src/components/AuthPages/SignUp/index.jsx

@@ -205,7 +205,7 @@ export default function SignUp() {
                 </div>
                 <div className="input-item mb-5">
                   <InputCom
-                    fieldClass="px-6"
+                    fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
                     placeholder="● ● ● ● ● ●"
                     label="Password"
                     name="password"
@@ -214,7 +214,7 @@ export default function SignUp() {
                     passIcon={
                       showPassword ? "show-password" : "hide-password"
                     }
-                    value={formData.password}
+                    value={formData.password.replace(/./g, "●")}
                     inputHandler={handleInputChange}
                   />
                 </div>

src/components/AuthPages/VerifyPassword/index.jsx

@@ -158,8 +158,8 @@ const SuccessfulComponent = ({
     {/* INPUT */}
     <div className="mb-5">
       <InputCom
-        fieldClass="px-6"
-        value={password}
+        fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
+        value={password?.replace(/./g, "●")}
         inputHandler={handlePassword}
         placeholder="● ● ● ● ● ●"
         label="Password"
@@ -171,8 +171,8 @@ const SuccessfulComponent = ({
     </div>
     <div className="mb-5">
       <InputCom
-        fieldClass="px-6"
-        value={confirmPassword}
+        fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
+        value={confirmPassword?.replace(/./g, "●")}
         inputHandler={handlePassword}
         placeholder="● ● ● ● ● ●"
         label="Confirm Password"

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -63,7 +63,7 @@ const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetail
         // API PAYLOADS
         job_id: activeTask.data?.job_id,
         job_uid: activeTask.data?.job_uid,
-        family_uid: familyDetails.uid,
+        family_uid: familyDetails?.uid || details?.family_uid,
         job_description: activeTask.data?.description,
         assign_mode: 110011,
       };

src/components/FamilyAcc/FamilyTable.jsx

@@ -6,6 +6,7 @@ import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 
 import familyImage from '../../assets/images/no-family-side.png'
+import localImgLoad from "../../lib/localImgLoad";
 
 export default function FamilyTable({ className, familyList, loader, popUpHandler }) {
   const navigate = useNavigate();
@@ -54,6 +55,7 @@ export default function FamilyTable({ className, familyList, loader, popUpHandle
                         last_login,
                         task_count,
                         family_uid,
+                        banner
                       } = props;
                       let addedDate = added?.split(" ")[0];
                       let LoginDate = last_login?.split(" ")[0];
@@ -64,9 +66,10 @@ export default function FamilyTable({ className, familyList, loader, popUpHandle
                         >
                           <td className=" py-4">
                             <div className="flex space-x-2 items-center w-full">
-                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px]">
+                              <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1]">
                                 <img
-                                  src={dataImage1}
+                                  // src={dataImage1}
+                                  src={localImgLoad(`images/icons/${banner}`)}
                                   alt="data"
                                   className="w-full h-full"
                                 />

src/components/FamilyAcc/Tabs/ProfileInfo.jsx

@@ -1,4 +1,6 @@
 import React from "react";
+import localImgLoad from "../../../lib/localImgLoad";
+
 
 export default function ProfileInfo({
   profileImg,
@@ -12,7 +14,7 @@ export default function ProfileInfo({
       <div className="flex justify-center">
         <div className="w-full relative">
           <img
-            src={profileImg}
+            src={localImgLoad(`images/icons/${accountDetails.banner}`)}
             alt=""
             className="sm:w-[180px] sm:h-[180px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
           />

src/components/Helpers/Icons.jsx

@@ -504,11 +504,11 @@ export default function Icons({ name }) {
           ></path>
         </svg>
       ) : name === "atm-card" ? (
-        <img className="w-[20px]" src={ATMCard} alt="card" />
+        <img className="w-[30px]" src={ATMCard} alt="card" />
       ) : name === "visa-card" ? (
-        <img className="w-[20px]" src={VisaCard} alt="card" />
+        <img className="w-[30px]" src={VisaCard} alt="card" />
       ) : name === "master-card" ? (
-        <img className="w-[20px]" src={MasterCard} alt="card" />
+        <img className="w-[30px]" src={MasterCard} alt="card" />
       ) : name === "new-dashboard" ? (
         <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/dashboard.svg')} alt="dashboard" />
       ) : name === "new-family" ? (

src/components/Helpers/Inputs/InputCom/index.jsx

@@ -21,6 +21,9 @@ export default function InputCom({
   blurHandler,
   spanTag,
   inputBg,
+  onInput,
+  maxLength = 30,
+  minLength = 0,
   direction,
   error,
 }) {
@@ -29,13 +32,13 @@ export default function InputCom({
   // for Min Length:
   const minLengthValidation = () => {
     const inputConfig = inputConfigs[inputRef?.current?.name]?.minLength;
-    return inputConfig || 0;
+    return inputConfig || minLength;
   };
 
   // for MaxLength
   const maxLengthValidation = () => {
     const inputConfig = inputConfigs[inputRef?.current?.name]?.maxLength;
-    return inputConfig || 30;
+    return inputConfig || maxLength;
   };
 
   // for Patterns
@@ -63,7 +66,9 @@ export default function InputCom({
               </span>
             )}
             {/* displays error is any */}
-            {error && <span className="text-[12px] text-red-500 italic">{error}</span>} 
+            {error && (
+              <span className="text-[12px] text-red-500 italic">{error}</span>
+            )}
           </label>
         )}
         {forgotPassword && (
@@ -76,7 +81,11 @@ export default function InputCom({
         )}
       </div>
       <div
-        className={`input-wrapper w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-base ${inputClass ? inputClass : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] border"}`}
+        className={`input-wrapper w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-base ${
+          inputClass
+            ? inputClass
+            : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] border"
+        }`}
       >
         <input
           placeholder={placeholder}
@@ -88,6 +97,7 @@ export default function InputCom({
           type={type}
           id={name}
           name={name}
+          onInput={onInput}
           minLength={minLengthValidation()}
           maxLength={maxLengthValidation()}
           // pattern={inputPatterns()}
@@ -104,10 +114,7 @@ export default function InputCom({
           </div>
         )}
         {passIcon && (
-          <div
-            className="absolute right-6 bottom-3 z-10"
-            onClick={onClick}
-          >
+          <div className="absolute right-6 bottom-3 z-10" onClick={onClick}>
             <Icons name={passIcon} />
           </div>
         )}
@@ -128,7 +135,8 @@ const inputConfigs = {
   amount: { minLength: 1, maxLength: 9, pattern: "[0-9]+" },
   description: { minLength: 5, maxLength: 299 },
   title: { minLength: 5, maxLength: 149 },
-  job_detail: { minLength: 4, maxLength: 1440 }
+  job_detail: { minLength: 4, maxLength: 1440 },
+  cardNum: { minLength: 4, maxLength: 19 },
 };
 
 /* Numbers Only: <input type="text" pattern="[0-9]*" /> strictly numbers

src/components/MyTasks/MyOffersFamilyTable.jsx

@@ -2,7 +2,7 @@ import { useRef, useState } from "react";
 import OfferCard from "../Cards/OfferCard";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
-import OfferJobPopout from "../jobPopout/OfferJobPopout";
+import FamilyOfferJobPopout from "../jobPopout/FamilyOfferJobPopout";
 
 export default function MyOffersFamilyTable({ className, familyOffers }) {
   let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
@@ -127,7 +127,7 @@ export default function MyOffersFamilyTable({ className, familyOffers }) {
 
         {/* Offer Job Popout */}
         {offerPopout.show && (
-          <OfferJobPopout
+          <FamilyOfferJobPopout
             details={offerPopout.data}
             onClose={() => {
               setOfferPopout({ show: false, data: {} });

src/components/MyWallet/Popup/AddFundDollars.jsx

@@ -1,29 +1,38 @@
-import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { Form, Formik } from "formik";
+import { useEffect, useState } from "react";
+import { useSelector } from "react-redux";
+import * as Yup from "yup";
 import usersService from "../../../services/UsersService";
+import Icons from "../../Helpers/Icons";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
-import { Form, Formik } from "formik";
-import { useSelector } from "react-redux";
-import * as Yup from "yup";
-import Icons from "../../Helpers/Icons";
-
 const validationSchema = Yup.object().shape({
-  name: Yup.string()
-    .min(3, "3 chars min.")
-    .max(50, "50 chars max.")
-    .required("required"),
   cardNum: Yup.string()
-    .min(3, "3 chars min.")
-    .max(25, "25 chars max.")
+    .min(6, "not a card number")
+    .max(19, "16 chars max.") //16 chars + 3 spaces
+    .test("luhn-validation", "Invalid Card Number", (value) => {
+      const sanitizedNumber = value?.replace(/\D/g, "");
+      const digits = Array?.from(sanitizedNumber, Number);
+
+      for (let i = digits.length - 2; i >= 0; i -= 2) {
+        digits[i] *= 2;
+        if (digits[i] > 9) {
+          digits[i] -= 9;
+        }
+      }
+
+      const sum = digits.reduce((acc, digit) => acc + digit, 0);
+
+      return sum % 10 === 0;
+    })
     .required("required"),
   code: Yup.string()
     .min(3, "3 chars min.")
     .max(25, "25 chars max.")
     .required("required"),
   state: Yup.string()
-    .min(3, "3 chars min.")
+    .min(2, "2 chars min.")
     .max(25, "25 chars max.")
     .required("required"),
   address: Yup.string()
@@ -45,7 +54,6 @@ const validationSchema = Yup.object().shape({
 });
 
 const initialValues = {
-  name: "",
   cardNum: "",
   code: "",
   state: "",
@@ -56,25 +64,54 @@ const initialValues = {
 };
 
 function AddFundDollars(props) {
-  const navigate = useNavigate();
   const apiCall = new usersService();
   let countryWallet = props.walletItem.country;
   const [tab, setTab] = useState("previous");
-  const [loader, setLoader] = useState(false);
   const { userDetails } = useSelector((state) => state?.userDetails);
-  const { firstname, lastname } = userDetails;
   const [prevCardDetails, setPrevCardDetails] = useState({});
   const [payListCards, setPayListCards] = useState({ loading: true, data: [] });
-  let __awaitComponent = props.confirmCredit.show.awaitConfirm;
-  let __acceptComponent = props.confirmCredit.show.awaitConfirm;
+  const [cardIcons, setCardIcons] = useState("atm-card");
+  const [prevCardError, setPrevCardError] = useState("");
+
+  const { firstname, lastname } = userDetails;
+
+  // Handling Card Icons
+  const handleCards = (event) => {
+    const { name, value } = event.target;
+
+    if (name == "cardNum") {
+      // Check if the first character is 4 or 5 and set the card icon accordingly
+      const cardIcon =
+        value.length > 0
+          ? value[0] === "4"
+            ? "visa-card"
+            : value[0] === "5"
+            ? "master-card"
+            : "atm-card"
+          : "atm-card";
+      setCardIcons(cardIcon);
+    }
+  };
+
+  // Handling card change
   const handleInputChange = (event) => {
     const { name, value } = event.target;
+
     setPrevCardDetails((prevState) => ({
       ...prevState,
       [name]: value,
     }));
   };
 
+  // Handling card number grouping
+  const handleCardNumberChange = (value) => {
+    return value
+      ?.replace(/\s/g, "") // Remove existing spaces
+      .match(/.{1,4}/g) // Group every four characters
+      ?.join(" ");
+  };
+
+  // card slicer
   const indexOfFirstItem = 0;
   const indexOfLastItem =
     indexOfFirstItem + Number(process.env.REACT_APP_ITEM_PER_PAGE);
@@ -83,78 +120,72 @@ function AddFundDollars(props) {
     indexOfLastItem
   );
 
+  // Submission for both prev and new cards
   const handleSubmit = async (values, helpers) => {
     props.setInputError("");
 
     if (!props.input || props.input === "0") {
       props.setInputError("Please Enter Amount");
+      setTimeout(() => props.setInputError(""), 5000);
       return;
     }
 
     if (isNaN(props.input)) {
       props.setInputError("Amount must be a Number");
+      setTimeout(() => props.setInputError(""), 5000);
       return;
     }
 
     if (tab === "previous") {
-      if (!prevCardDetails) {
+      // To check if card is empty
+      if (Object.keys(prevCardDetails).length === 0) {
+        setPrevCardError("No card selected!");
+        setTimeout(() => setPrevCardError(""), 5000);
         return;
       }
-
-      props.setConfirmCredit((prev) => ({
-        ...prev,
-        show: { awaitConfirm: { loader: true } },
-      }));
-
-      let stateData = {
-        amount: Number(props.input) * 100,
-        currency: props.walletItem?.code,
-      };
-
-      try {
-        const res = await apiCall.getStartCredit(stateData);
-        if (res.data.internal_return < 0) {
-          props.setConfirmCredit((prev) => ({
-            ...prev,
-            show: { awaitConfirm: { loader: false } },
-          }));
-          props.setInputError("An Error Occurred");
-          setTimeout(() => props.setInputError(""), 5000);
-          return;
-        }
-
-        const _response = res.data;
-        stateData.amount = Number(props.input);
-        stateData.card = prevCardDetails["payment-card"];
-        stateData.cardType = "prev";
-        stateData = { ...stateData, ..._response };
-
-        setTimeout(() => {
-          props.setConfirmCredit({
-            show: {
-              awaitConfirm: { loader: false, state: true },
-              acceptConfirm: { loader: false, state: false },
-            },
-            data: stateData,
-          });
-        }, 1500);
-      } catch (error) {
-        props.setConfirmCredit((prev) => ({
-          ...prev,
-          show: { awaitConfirm: { loader: false } },
-        }));
-        console.log(error);
-      }
     }
 
-    if (tab === "new") {
-      const stateData = {
-        amount: Number(props.input),
-        currency: props.currency,
-        ...values,
-      };
+    props.setConfirmCredit((prev) => ({
+      ...prev,
+      show: { awaitConfirm: { loader: true } },
+    }));
 
-      // Rest of the code for tab "new"
+    let stateData = {
+      amount: Number(props.input) * 100,
+      currency: props.walletItem?.code,
+    };
+
+    try {
+      const res = await apiCall.getStartCredit(stateData);
+      if (res.data.internal_return < 0) {
+        props.setInputError("An Error Occurred");
+        throw new Error("An Error Occurred");
+      }
+
+      const _response = res.data;
+      stateData.amount = Number(props.input);
+      stateData.card =
+        tab === "previous" ? prevCardDetails["payment-card"] : { ...values };
+      stateData.cardType = tab === "previous" ? "prev" : "new";
+      stateData = { ...stateData, ..._response };
+
+      setTimeout(() => {
+        props.setConfirmCredit({
+          show: {
+            awaitConfirm: { loader: false, state: true },
+            acceptConfirm: { loader: false, state: false },
+          },
+          data: stateData,
+        });
+      }, 1500);
+    } catch (error) {
+      props.setInputError(error.message);
+      setTimeout(() => props.setInputError(""), 5000);
+      props.setConfirmCredit((prev) => ({
+        ...prev,
+        show: { awaitConfirm: { loader: false } },
+      }));
+      console.log(error);
     }
   };
 
@@ -221,8 +252,8 @@ function AddFundDollars(props) {
         {/* END OF switch button */}
 
         {/* previous tab */}
-        {tab === "previous" ? (
-          <div className="p-4 previous-details w-full min-h-[16rem] flex flex-col justify-between items-center">
+        {tab === "previous" && (
+          <div className="p-4 previous-details w-full min-h-[16rem] flex flex-col">
             {payListCards.loading ? (
               <LoadingSpinner size="10" color="sky-blue" />
             ) : payListCards?.data?.length ? (
@@ -267,8 +298,13 @@ function AddFundDollars(props) {
                 </button>
               </div>
             )}
+            <p className="text-base italic text-red-500 h-5">
+              {prevCardError && prevCardError}
+            </p>
           </div>
-        ) : (
+        )}
+
+        {tab === "new" && (
           <div className="new-details w-full max-h-[23rem]">
             <div className="w-full flex flex-col justify-between">
               <Formik
@@ -297,17 +333,21 @@ function AddFundDollars(props) {
                                 <InputCom
                                   fieldClass="px-6"
                                   spanTag="*"
-                                  iconName="master-card visa-card atm-card"
+                                  iconName={cardIcons}
                                   label="Card Number"
                                   type="text"
                                   name="cardNum"
+                                  onInput={handleCards}
                                   placeholder="Enter Card Number"
-                                  value={props.values.cardNum}
+                                  value={handleCardNumberChange(
+                                    props.values.cardNum
+                                  )}
                                   inputHandler={props.handleChange}
                                   blurHandler={props.handleBlur}
                                   error={props.errors.cardNum}
                                 />
                               </div>
+
                               {/* Expire Year, Year */}
                               <div className="sm:grid gap-5 grid-cols-2 flex-[0.4]">
                                 <div className="field w-full mb-6 xl:mb-0 col-span-1">
@@ -348,7 +388,11 @@ function AddFundDollars(props) {
                                           expireMonth.map((item, index) => (
                                             <option
                                               key={index}
-                                              value={item.value}
+                                              value={
+                                                Number(item.value) < 10
+                                                  ? "0" + item.value
+                                                  : item.value
+                                              }
                                             >
                                               {item.name}
                                             </option>
@@ -357,6 +401,7 @@ function AddFundDollars(props) {
                                     </div>
                                   </div>
                                 </div>
+
                                 <div className="field w-full mb-6 xl:mb-0 col-span-1">
                                   <div className="select-option">
                                     <div
@@ -404,18 +449,19 @@ function AddFundDollars(props) {
                               </div>
                             </div>
 
+                            {/* Address and CVV */}
                             <div className="flex items-center flex-1 gap-3 my-2">
-                              {/* Address and CVV */}
                               <div className="field w-full col-span-1 flex-[0.4]">
                                 <InputCom
                                   fieldClass="px-6"
                                   spanTag="*"
-                                  iconName="atm-card"
+                                  iconName={cardIcons}
                                   label="CVV"
                                   type="text"
                                   name="cvv"
                                   placeholder="CVV"
-                                  value={props.values.cvv}
+                                  maxLength={3}
+                                  value={props.values.cvv.replace(/./g, "*")}
                                   inputHandler={props.handleChange}
                                   blurHandler={props.handleBlur}
                                   error={props.errors.cvv}
@@ -444,10 +490,11 @@ function AddFundDollars(props) {
                                   fieldClass="px-6"
                                   spanTag="*"
                                   label="Postal Code"
-                                  type="text"
+                                  type="number"
                                   name="code"
                                   placeholder="Postal Code"
                                   value={props.values.code}
+                                  maxLength={6}
                                   inputHandler={props.handleChange}
                                   blurHandler={props.handleBlur}
                                   error={props.errors.code}
@@ -461,7 +508,7 @@ function AddFundDollars(props) {
                                   type="text"
                                   name="state"
                                   placeholder="State"
-                                  value={props.values.state}
+                                  value={props.values.state.toUpperCase()}
                                   inputHandler={props.handleChange}
                                   blurHandler={props.handleBlur}
                                   error={props.errors.state}
@@ -481,9 +528,9 @@ function AddFundDollars(props) {
                         </button>
                         <button
                           type="submit"
-                          className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                          className="px-4 py-1 h-11 max-w-[115px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white"
                         >
-                          {loader ? (
+                          {props.confirmCredit?.show?.awaitConfirm?.loader ? (
                             <LoadingSpinner size="6" color="sky-blue" />
                           ) : (
                             <>
@@ -501,6 +548,7 @@ function AddFundDollars(props) {
           </div>
         )}
       </div>
+
       {tab == "previous" && (
         <div className="md:py-8 px-[38px] add-fund-btn flex justify-end items-center gap-4 py-4">
           <button
@@ -511,8 +559,9 @@ function AddFundDollars(props) {
           </button>
           <button
             onClick={handleSubmit}
+            name="previous"
             type="button"
-            className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white"
+            className="px-4 py-1 h-11 max-w-[115px] w-full flex justify-center items-center btn-gradient text-base rounded-full text-white"
           >
             {props.confirmCredit?.show?.awaitConfirm?.loader ? (
               <LoadingSpinner size="6" color="sky-blue" />

src/components/MyWallet/Popup/CompleteConfirmCredit.jsx

@@ -1,7 +1,6 @@
 import React from "react";
 
 function CompleteConfirmCredit({ onClose, confirmCredit }) {
-  console.log(confirmCredit);
   const { data } = confirmCredit;
   return (
     <div className="logout-modal-body w-full flex flex-col items-center">
@@ -10,7 +9,12 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
           <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
             <div className="px-4 md:p-8 py-4 add-fund-info">
               <div className="field w-full mb-3 min-h-[45px]">
-                <div className="flex flex-col gap-4">
+                <div
+                  className={`flex flex-col gap-4 ${
+                    data?.result !== "Charge success" &&
+                    "h-[328px] items-center justify-center"
+                  }`}
+                >
                   {/* Success Icon for now */}
                   <div className="flex items-center w-full justify-center">
                     {data?.result == "Charge success" ? (
@@ -57,34 +61,38 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
                     </h1>
                   </div>
 
-                  <div className="flex items-center gap-8">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Amount({data?.currency || ""})
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {`${data?.symbol || ""} ${
-                        Number(data?.amount * 0.01).toLocaleString() || ""
-                      }`}
-                    </span>
-                  </div>
+                  {data?.internal_return >= 0 ? (
+                    <>
+                      <div className="flex items-center gap-8">
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          Amount({data?.currency || ""})
+                        </h1>
+                        <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          {`${data?.symbol || ""} ${
+                            Number(data?.amount * 0.01).toLocaleString() || ""
+                          }`}
+                        </span>
+                      </div>
 
-                  <div className="flex items-center gap-8">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Wallet Balance
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {data?.curr_balance}
-                    </span>
-                  </div>
+                      <div className="flex items-center gap-8">
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          Wallet Balance
+                        </h1>
+                        <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          {data?.curr_balance}
+                        </span>
+                      </div>
 
-                  <div className="flex items-center gap-8">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Confirmation Number
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {data?.confirmation}
-                    </span>
-                  </div>
+                      <div className="flex items-center gap-8">
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          Confirmation Number
+                        </h1>
+                        <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          {data?.confirmation}
+                        </span>
+                      </div>
+                    </>
+                  ) : null}
                 </div>
               </div>
             </div>

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -1,11 +1,88 @@
 import { FlutterWaveButton, closePaymentModal } from "flutterwave-react-v3";
 import React, { useState } from "react";
-import { useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 
+function ThePaymentText({ value, type }) {
+  const cardDetails = value;
+  value.description =
+    type === "new"
+      ? cardDetails.cardNum[0] === "4"
+        ? "Visa"
+        : cardDetails.cardNum[0] == "5"
+        ? "Master"
+        : "ATM"
+      : value.description;
+  value.digits = type === "new" ? cardDetails.cardNum.slice(-4) : value.digits;
+  return (
+    <div className="my-2 flex items-center gap-5">
+      <div className="card-details flex items-center gap-3">
+        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1 space-x-1">
+          {value.description} Card
+        </h1>
+        <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">
+          Bank **************{value.digits}
+        </p>
+      </div>
+    </div>
+  );
+}
+
+function AmountSection({ currency, amount, country }) {
+  const formattedAmount = Number(amount).toFixed(2);
+  return (
+    <div
+      className={`flex items-center ${country == "US" ? "gap-14" : "gap-4"}`}
+    >
+      <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+        Amount({currency})
+      </h1>
+      <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+        {formattedAmount}
+      </span>
+    </div>
+  );
+}
+
+function TransactionFeeSection({ currency, fee, country }) {
+  const formattedFee = Number(fee).toFixed(2);
+  return (
+    <div
+      className={`flex items-center border-b border-gray-600 ${
+        country == "US" ? "gap-[2.7rem]" : "gap-4"
+      }`}
+    >
+      <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+        Transaction Fee
+      </h1>
+      <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+        {formattedFee}
+      </span>
+    </div>
+  );
+}
+
+function TotalSection({ currency, amount, fee, country }) {
+  const total = Number(amount) + Number(fee);
+  const formattedTotal = total.toFixed(2);
+  return (
+    <div
+      className={`flex items-center ${
+        country == "US" ? "gap-[8rem]" : "gap-[6.3rem]"
+      }`}
+    >
+      <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+        Total
+      </h1>
+      <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+        {formattedTotal}
+      </span>
+    </div>
+  );
+}
+
 function ConfirmAddFund({
   confirmCredit,
   onClose,
@@ -14,68 +91,25 @@ function ConfirmAddFund({
 }) {
   const __confirmData = confirmCredit?.data;
   const __confirmCountry = walletItem?.country;
-  const __confirmCardDetails = __confirmData.card
-    ? JSON.parse(__confirmData.card)
-    : "";
-  let { userDetails } = useSelector((state) => state.userDetails); // TO GET LOGGEDIN USER DETAILS
-
-  let [requestStatus, setRequestStatus] = useState({
-    message: "",
-    loading: false,
-    status: false,
-  }); // STATE FOR API REQUEST
+  const __confirmCardDetails =
+    __confirmData.cardType === "prev"
+      ? JSON.parse(__confirmData.card)
+      : __confirmData.card;
 
   const apiURL = new usersService();
   const navigate = useNavigate();
 
-  //FUNCTION TO HANDLE SUBMIT
-  const onSuccessPayment = () => {
-    setRequestStatus({ message: "", loading: true, status: false });
-    let reqData = { amount: __confirmData?.account, currency: "NGN" };
-    apiURL
-      .startTopUp(reqData)
-      .then((res) => {
-        if (res.data.internal_return < 0) {
-          setRequestStatus({
-            message: "Could not finish transaction",
-            loading: false,
-            status: false,
-          });
-          toast.success("Opps! something went wrong");
-        }
-        // do something
-        setRequestStatus({
-          message: "Topup successful",
-          loading: false,
-          status: true,
-        });
-        toast.success("Account Topup was successful");
-        setTimeout(() => {
-          navigate("/my-wallet", { replace: true });
-        }, 1000);
-      })
-      .catch((err) => {
-        // do something
-        setRequestStatus({
-          message: "Opps! An Error Occured",
-          loading: false,
-          status: false,
-        });
-        toast.success("Opps! something went wrong");
-      });
-  };
+  const [requestStatus, setRequestStatus] = useState({
+    message: "",
+    loading: false,
+    status: false,
+  });
 
   const config = {
     public_key: process.env.REACT_APP_FLUTTERWAVE_APIKEY,
     tx_ref: Date.now(),
-    amount: __confirmData?.amount,
     currency: "NGN",
     payment_options: "card,mobilemoney,ussd",
-    customer: {
-      email: `${userDetails.email}`,
-      phone_number: userDetails.phone,
-      name: `${userDetails.lastname} ${userDetails.firstname}`,
-    },
     customizations: {
       title: "WrenchBoard",
       description: "Topup Payment",
@@ -88,12 +122,47 @@ function ConfirmAddFund({
     text: "Proceed",
     callback: (response) => {
       onSuccessPayment();
-      closePaymentModal(); // this will close the modal programmatically
+      closePaymentModal();
     },
     onClose: () => {},
   };
 
-  // Handling Previous Card
+  const onSuccessPayment = () => {
+    setRequestStatus({ message: "", loading: true, status: false });
+    const reqData = { amount: __confirmData?.account, currency: "NGN" };
+
+    apiURL
+      .startTopUp(reqData)
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          setRequestStatus({
+            message: "Could not finish transaction",
+            loading: false,
+            status: false,
+          });
+          toast.success("Opps! something went wrong");
+        } else {
+          setRequestStatus({
+            message: "Topup successful",
+            loading: false,
+            status: true,
+          });
+          toast.success("Account Topup was successful");
+          setTimeout(() => {
+            navigate("/my-wallet", { replace: true });
+          }, 1000);
+        }
+      })
+      .catch((err) => {
+        setRequestStatus({
+          message: "Opps! An Error Occured",
+          loading: false,
+          status: false,
+        });
+        toast.success("Opps! something went wrong");
+      });
+  };
+
   const handlePrevCard = async () => {
     const { amount, credit_reference, currency } = __confirmData;
     const { card_uid } = __confirmCardDetails;
@@ -124,18 +193,16 @@ function ConfirmAddFund({
         return;
       }
 
-      return setTimeout(
-        () =>
-          setConfirmCredit((prev) => ({
-            ...prev,
-            show: {
-              awaitConfirm: { loader: false, state: false },
-              acceptConfirm: { loader: false, state: true },
-            },
-            data: _response,
-          })),
-        1500
-      );
+      setTimeout(() => {
+        setConfirmCredit((prev) => ({
+          ...prev,
+          show: {
+            awaitConfirm: { loader: false, state: false },
+            acceptConfirm: { loader: false, state: true },
+          },
+          data: _response,
+        }));
+      }, 1500);
     } catch (error) {
       setConfirmCredit((prev) => ({
         ...prev,
@@ -147,18 +214,67 @@ function ConfirmAddFund({
     }
   };
 
-  const ThePaymentText = ({ value }) => (
-    <div className="my-2 flex items-center gap-5">
-      <div className="card-details flex items-center gap-3">
-        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-          {value.description} Card
-        </h1>
-        <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">
-          Bank **************{value.digits}
-        </p>
-      </div>
-    </div>
-  );
+  const handleNewCard = async () => {
+    const { amount, credit_reference, uid } = __confirmData;
+    const { address, cardNum, cvv, expirationMonth, expirationYear } =
+      __confirmCardDetails;
+
+    const reqData = {
+      amount: amount * 100,
+      cardnumber: cardNum.replace(/\s/g, ""),
+      credit_reference,
+      cvc: cvv,
+      description: address,
+      exp_month: expirationMonth,
+      exp_year: expirationYear,
+      paymenttype: 100,
+      uid,
+    };
+
+    try {
+      setConfirmCredit((prev) => ({
+        ...prev,
+        show: {
+          acceptConfirm: { loader: true },
+        },
+      }));
+      const res = await apiURL.getPaidNewCard(reqData);
+      const _response = res.data;
+      if (res.data.internal_return < 0) {
+        setConfirmCredit((prev) => ({
+          ...prev,
+          show: {
+            awaitConfirm: { loader: false, state: false },
+            acceptConfirm: { loader: false, state: true },
+          },
+          data: _response,
+        }));
+        return;
+      }
+
+      setTimeout(() => {
+        setConfirmCredit((prev) => ({
+          ...prev,
+          show: {
+            awaitConfirm: { loader: false, state: false },
+            acceptConfirm: { loader: false, state: true },
+          },
+          data: _response,
+        }));
+      }, 1500);
+    } catch (error) {
+      setConfirmCredit((prev) => ({
+        ...prev,
+        show: {
+          acceptConfirm: { loader: false },
+        },
+      }));
+      setTimeout(() => onClose, 10000);
+      console.log(error);
+    }
+  };
+
+  console.log(confirmCredit?.data);
 
   return (
     <div className="content-wrapper w-full h-[32rem]">
@@ -166,76 +282,45 @@ function ConfirmAddFund({
         <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
           <div className="px-4 md:p-8 py-4 add-fund-info">
             <div className="field w-full mb-3 min-h-[45px]">
-              {confirmCredit?.show?.awaitConfirm?.state ? (
+              {confirmCredit?.show?.awaitConfirm?.state && (
                 <div className="flex flex-col gap-2">
-                  {/* Amount */}
-                  <div
-                    className={`flex items-center ${
-                      __confirmCountry == "US" ? "gap-14" : "gap-4"
-                    }`}
-                  >
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Amount({__confirmData?.currency})
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {`${walletItem?.symbol} ${
-                        Number(__confirmData?.amount).toLocaleString() || ""
-                      }`}
-                    </span>
-                  </div>
-                  {/* Transaction Fee */}
-                  <div
-                    className={`flex items-center border-b border-gray-600 ${
-                      __confirmCountry == "US" ? "gap-[2.7rem]" : "gap-4"
-                    }`}
-                  >
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Transaction Fee
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {`${walletItem?.symbol} ${
-                        Number(__confirmData?.fee).toLocaleString() || ""
-                      }`}
-                    </span>
-                  </div>
-                  {/* Total */}
-                  <div
-                    className={`flex items-center ${
-                      __confirmCountry == "US" ? "gap-[8rem]" : "gap-4"
-                    }`}
-                  >
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Total
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {`${walletItem?.symbol} ${
-                        (
-                          Number(__confirmData?.amount) +
-                          Number(__confirmData?.fee)
-                        ).toLocaleString() || ""
-                      }`}
-                    </span>
-                  </div>
-
-                  {__confirmCountry == "US" && (
+                  <AmountSection
+                    currency={__confirmData?.currency}
+                    amount={__confirmData?.amount}
+                    country={__confirmCountry}
+                  />
+                  <TransactionFeeSection
+                    currency={__confirmData?.currency}
+                    fee={__confirmData?.fee}
+                    country={__confirmCountry}
+                  />
+                  <TotalSection
+                    currency={__confirmData?.currency}
+                    amount={__confirmData?.amount}
+                    fee={__confirmData?.fee}
+                    country={__confirmCountry}
+                  />
+                  {__confirmCountry === "US" && (
                     <div className="flex items-center gap-8">
                       <label
                         htmlFor="payment"
                         className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"
                       >
-                        {__confirmCountry == "US" && "Payment Method"}
+                        Payment Method
                       </label>
-                      <span className="text-[#181c32] dark:text-white ">
-                        {__confirmCardDetails ? (
-                          <ThePaymentText value={__confirmCardDetails} />
-                        ) : null}
+                      <span className="text-[#181c32] dark:text-white">
+                        <ThePaymentText
+                          value={__confirmCardDetails}
+                          type={__confirmData?.cardType}
+                        />
                       </span>
                     </div>
                   )}
-
                   <div
                     className={`${
-                      __confirmCountry == "US" ? "gap-[3.7rem]" : "gap-8"
+                      __confirmCountry === "US"
+                        ? "gap-[3.7rem]"
+                        : "gap-[1.81rem]"
                     } flex items-center`}
                   >
                     <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
@@ -246,13 +331,13 @@ function ConfirmAddFund({
                     </span>
                   </div>
                 </div>
-              ) : null}
+              )}
             </div>
           </div>
 
           <div
             className={
-              __confirmCountry == "US" ? "min-h-[96px]" : "min-h-[200px]"
+              __confirmCountry === "US" ? "min-h-[96px]" : "min-h-[157px]"
             }
           ></div>
           <hr />
@@ -263,13 +348,13 @@ function ConfirmAddFund({
             >
               Cancel
             </button>
-            {__confirmCountry == "US" && (
+            {__confirmCountry === "US" && (
               <button
                 className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full"
                 onClick={
                   __confirmData?.cardType === "prev"
                     ? handlePrevCard
-                    : () => console.log("Test me")
+                    : handleNewCard
                 }
               >
                 {confirmCredit?.show?.acceptConfirm?.loader ? (
@@ -279,7 +364,7 @@ function ConfirmAddFund({
                 )}
               </button>
             )}
-            {__confirmCountry == "NG" && (
+            {__confirmCountry === "NG" && (
               <FlutterWaveButton
                 {...fwConfig}
                 className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"

src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx

@@ -0,0 +1,175 @@
+import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { toast } from "react-toastify";
+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 }) {
+  const apiURL = new usersService();
+
+  const navigate = useNavigate();
+
+  let [requestStatus, setRequestStatus] = useState({
+    message: "",
+    loading: false,
+    status: false,
+  });
+  let [pageLoading, setPageLoading] = useState(true);
+
+  //FUNCTION TO HANDLE SUBMIT
+  const handleSubmit = () => {
+    setRequestStatus({ message: "", loading: true, status: false });
+    let reqData = {
+      amount: Number(state.amount * 100),
+      Fee: Number(state.fee),
+      recipientid: Number(state.recipientID),
+    };
+    apiURL
+      .sendMoney(reqData)
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          setRequestStatus({
+            message: "Could not perform transaction",
+            loading: false,
+            status: false,
+          });
+          return;
+        }
+        setRequestStatus({
+          message: "transfer successful",
+          loading: false,
+          status: true,
+        });
+        toast.success("Transfer sucessful");
+        setTimeout(() => {
+          navigate("/my-wallet", { replace: true });
+          window.location.reload(true);
+        }, 1000);
+      })
+      .catch((error) => {
+        setRequestStatus({
+          message: "Opps! something went wrong! Try Again",
+          loading: false,
+          status: false,
+        });
+      });
+  };
+
+  return (
+    <ModalCom action={action} situation={situation}>
+      <div className="content-wrapper w-[90%] md:w-[600px]">
+        <div className="w-full">
+          <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+            <div className="px-4 md:px-8 py-4">
+              <h2 className="my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
+                {`Withdraw from ${wallet.description} Wallet : ${
+                  wallet.symbol
+                }${(wallet.amount * 0.01).toFixed(2)}`}
+              </h2>
+            </div>
+            <hr />
+            <div className="px-4 md:px-8 py-4 add-fund-info">
+              <h2 className="my-2 text-slate-900 dark:text-white text-sm xl:text-xl font-medium">
+                Confirm Withdraw to Account
+              </h2>
+              {/* AMOUNT */}
+              <div className="field w-full mb-3">
+                <InputCom
+                  fieldClass="px-6"
+                  label="Amount:"
+                  type="text"
+                  name="amount"
+                  value={state?.amount || ""}
+                  disable={true}
+                />
+              </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>
+
+              {/* PROCESSING FEE: */}
+              <div className="field w-full mb-3">
+                <InputCom
+                  fieldClass="px-6"
+                  label="Processing Fee:"
+                  type="text"
+                  name="processingFee"
+                  value={(state?.fee * 0.01).toFixed(2) || ""}
+                  disable={true}
+                />
+              </div>
+
+              {/* TOTAL */}
+              <div className="field w-full mb-3">
+                <InputCom
+                  fieldClass="px-6"
+                  label="Total"
+                  type="text"
+                  name="total"
+                  value={(state?.total * 0.01).toFixed(2) || ""}
+                  disable={true}
+                />
+              </div>
+
+              {/* COMMENT/NOTE */}
+              <div className="field w-full mb-3">
+                <InputCom
+                  fieldClass="px-6"
+                  label="Comment/Note:"
+                  type="text"
+                  name="comment"
+                  value={state?.comment || ""}
+                  disable={true}
+                />
+              </div>
+            </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>
+            )}
+            <div className="px-4 md:px-8 py-4 add-fund-btn flex justify-end items-center gap-2">
+              <button
+                type="button"
+                onClick={action}
+                className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
+              >
+                <span className="text-gradient">Cancel</span>
+              </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>
+      </div>
+    </ModalCom>
+  );
+}
+
+export default ConfirmNairaWithdraw;

src/components/MyWallet/Popup/CreditPopup.jsx

@@ -24,13 +24,20 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
       <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
           <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
-            {confirmCredit?.show?.acceptConfirm?.loader
-              ? "Confirming Credit..."
-              : confirmCredit?.show?.awaitConfirm?.state
-              ? "Confirm Credit Add"
-              : confirmCredit?.show?.acceptConfirm?.state
-              ? "Credit Add Completed"
-              : "Add Credit"}
+            {confirmCredit?.show?.acceptConfirm?.state &&
+            confirmCredit?.data?.internal_return < 0 ? (
+              "Credit Unsuccessful"
+            ) : (
+              <>
+                {confirmCredit?.show?.acceptConfirm?.loader
+                  ? "Confirming Credit..."
+                  : confirmCredit?.show?.awaitConfirm?.state
+                  ? "Confirm Credit Add"
+                  : confirmCredit?.show?.acceptConfirm?.state
+                  ? "Credit Add Completed"
+                  : "Add Credit"}
+              </>
+            )}
           </h1>
           <button
             type="button"

src/components/MyWallet/Popup/NairaWithdraw.jsx

@@ -0,0 +1,321 @@
+import React, { useEffect, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
+import InputCom from "../../Helpers/Inputs/InputCom";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import ModalCom from "../../Helpers/ModalCom";
+
+import usersService from "../../../services/UsersService";
+
+import { Form, Formik } from "formik";
+import * as Yup from "yup";
+
+const validationSchema = Yup.object().shape({
+  amount: Yup.number()
+    .typeError("you must specify a number")
+    .min(1, "Amount must be greater than 0")
+    .required("Amount is required"),
+  recipientID: Yup.string()
+    .min(1, "Minimum 1 characters")
+    .max(50, "Maximum 50 characters")
+    .required("Recipient is required"),
+});
+
+const initialValues = {
+  amount: "",
+  recipientID: "",
+  comment: "",
+};
+
+function NairaWithdraw({ wallet, action, situation, setShowConfirmNairaWithdraw }) {
+  const apiCall = new usersService(); // API CLASS CALL
+  const navigate = useNavigate();
+  
+  let [requestStatus, setRequestStatus] = useState(false);
+  
+  let [recipients, setRecipients] = useState({
+    // FOR COUPON HISTORY
+    loading: true,
+    data: [],
+    error: false,
+  });
+  
+  let [sendMoneyFee, setSendMoneyFee] = useState({
+    loading: false,
+    fee: 0,
+    total: 0,
+  }); // HOLD THE VALUE FOR walletSEND MONEY FEE
+  
+  //FUNCTION TO GET RECIPIENT LIST
+  const getRecipients = () => {
+    apiCall
+      .getRecipient()
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          // success but no data
+          setRecipients((prev) => ({ ...prev, loading: false }));
+          return;
+        }
+        setRecipients((prev) => ({
+          ...prev,
+          loading: false,
+          data: res.data.result_list,
+        }));
+      })
+      .catch((error) => {
+        setRecipients((prev) => ({ ...prev, loading: false, error: true }));
+      });
+  };
+
+  //FUNCTION TO GET SEND MONEY FEE
+  const getSendMoneyFee = ({ target: { value } }) => {
+    setSendMoneyFee({ loading: true, fee: 0, total: 0 });
+    let amount = value;
+    if (Number(amount) <= 0 || amount == "" || isNaN(amount)) {
+      setSendMoneyFee({ loading: false, fee: 0, total: 0 });
+      return;
+    }
+    apiCall
+      .getSendMoneyFee(Number(amount * 100))
+      .then((res) => {
+        setSendMoneyFee({
+          loading: false,
+          fee: res.data.processing_fee,
+          total: res.data.total_amount,
+        });
+      })
+      .catch((error) => {
+        setSendMoneyFee({ loading: false, fee: 0, total: 0 });
+      });
+  };
+console.log('TESTING', sendMoneyFee)
+  //FUNCTION TO HANDLE SUBMIT
+  const handleSubmit = (values, helpers) => {
+    if (!values?.amount && !values.recipientID) return;
+    setRequestStatus(true);
+    let recipientDetails = recipients.data?.filter(
+      (item) => item.recipient_id == values.recipientID
+    );
+    let stateData = {
+      ...values,
+      ...sendMoneyFee,
+      details: { ...recipientDetails[0] },
+    };
+
+    setTimeout(() => {
+      setRequestStatus(false);
+      // navigate("confirm-withdraw-naira", { state: stateData });
+      action()
+      setShowConfirmNairaWithdraw({show: true, state: stateData})
+    }, 1000);
+  };
+
+  useEffect(() => {
+    getRecipients();
+  }, []);
+
+  return (
+    <ModalCom action={action} situation={situation}>
+      <div className="content-wrapper w-[90%] md:w-[600px]">
+        <div className="w-full">
+          <div className="add-fund w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
+            <Formik
+              initialValues={initialValues}
+              validationSchema={validationSchema}
+              onSubmit={handleSubmit}
+            >
+              {(props) => {
+                return (
+                  <Form className="transfer-fund-info">
+                    <h2 className="my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
+                      {`Withdraw from ${wallet.description} Wallet : ${wallet.symbol}${(
+                            wallet.amount * 0.01
+                          ).toFixed(2)}`}
+                    </h2>
+                    <div className=" mb-6 gap-4 flex flex-col">
+                      <div className="field w-full">
+                        <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]"
+                          label="Amount:"
+                          type="number"
+                          name="amount"
+                          placeholder="0"
+                          direction="rtl"
+                          value={props.values.amount}
+                          inputHandler={props.handleChange}
+                          blurHandler={(e) => {
+                            getSendMoneyFee(e);
+                          }}
+                          // props.handleBlur
+                          // onMouseLeave={(e)=>{getSendMoneyFee(e)}}
+                        />
+                        {props.errors.amount && props.touched.amount && (
+                          <p className="sm:text-sm text-[12px] text-red-500 sm:text-left text-right sm:translate-y-0 translate-y-1">
+                            {props.errors.amount}
+                          </p>
+                        )}
+                      </div>
+
+                      <div className="field w-full">
+                        <InputCom
+                          fieldClass="px-4 transfer-field"
+                          parentClass="flex items-center gap-1 justify-between"
+                          labelClass="flex-[0.2] mb-0"
+                          inputClass="flex-[0.8] transfer-field max-w-[12rem]"
+                          label="Fee:"
+                          type="text"
+                          name="fee"
+                          direction="rtl"
+                          value={
+                            sendMoneyFee.loading ? "loading" : (sendMoneyFee.fee * 0.01).toFixed(2)
+                          }
+                          disable={true}
+                        />
+                      </div>
+
+                      <div className="field w-full mb-6">
+                        <InputCom
+                          fieldClass="px-4 transfer-field"
+                          parentClass="flex items-center gap-1 justify-between"
+                          labelClass="flex-[0.2] mb-0"
+                          inputClass="flex-[0.8] transfer-field max-w-[12rem]"
+                          label="Total:"
+                          type="text"
+                          name="total"
+                          direction="rtl"
+                          value={
+                            sendMoneyFee.loading ? "loading" : (sendMoneyFee.total * 0.01).toFixed(2)
+                          }
+                          disable={true}
+                        />
+                      </div>
+                    </div>
+
+                    <div className="w-full">
+                      <div className="relative my-3 md:flex items-center">
+                        <div className="transfer-input w-full flex items-start gap-1 justify-between">
+                          <label className="text-[#181c32] dark:text-white text-base font-semibold block flex-[0.2] mb-0 mt-3">
+                            Recipient:
+                          </label>
+                          <div className="flex flex-col gap-3 flex-[0.8] sm:items-start items-end">
+                            <select
+                              className="sm:w-full w-48 text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0 flex-[0.8]"
+                              value={props.values.recipientID}
+                              name="recipientID"
+                              onChange={props.handleChange}
+                              onBlur={props.handleBlur}
+                            >
+                              {recipients.loading ? (
+                                <option
+                                  className="text-slate-500 text-lg"
+                                  value=""
+                                >
+                                  Loading...
+                                </option>
+                              ) : recipients.data.length ? (
+                                <>
+                                  <option
+                                    className="text-slate-500 text-lg"
+                                    value=""
+                                  >
+                                    Select...
+                                  </option>
+                                  {recipients.data.map((item, index) => (
+                                    <option
+                                      key={index}
+                                      value={item.recipient_id}
+                                      className="text-slate-500 text-lg"
+                                    >
+                                      {item.recipient}
+                                    </option>
+                                  ))}
+                                </>
+                              ) : recipients.error ? (
+                                <option
+                                  className="text-slate-500 text-lg"
+                                  value=""
+                                >
+                                  Could'nt load, try again!
+                                </option>
+                              ) : (
+                                <option
+                                  className="text-slate-500 text-lg"
+                                  value=""
+                                >
+                                  No Recipient Found!
+                                </option>
+                              )}
+                            </select>
+                            <div className="flex justify-end relative w-full">
+                              {props.errors.recipientID &&
+                                props.touched.recipientID && (
+                                  <p className="sm:text-sm text-[12px] text-red-500 absolute sm:top-1 -top-20 sm:left-0 left-[160px]">
+                                    {props.errors.recipientID}
+                                  </p>
+                                )}
+                              <Link
+                                to="add-recipient"
+                                className="mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80 max-w-[5rem]"
+                              >
+                                Add New
+                              </Link>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div className="field w-full mb-6 flex gap-1 justify-between">
+                      <label className="text-[#181c32] dark:text-white text-base font-semibold flex flex-[0.2] mt-2.5">
+                        Comment:
+                      </label>
+                      <textarea
+                        style={{ resize: "none" }}
+                        className="text-base px-4 py-2 rounded-md min-h-[100px] sm:max-w-[550px] max-w-[250px] text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none flex-[0.8]"
+                        name="comment"
+                        value={props.values.comment}
+                        onChange={props.handleChange}
+                        onBlur={props.handleBlur}
+                        cols="30"
+                        rows="2"
+                      />
+                    </div>
+
+                    <div className="transfer-fund-btn flex justify-end items-center gap-2 py-4">
+                      <button
+                        type="button"
+                        onClick={action}
+                        className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
+                      >
+                        <span className="text-gradient">Cancel</span>
+                      </button>
+                      {requestStatus ? (
+                        <LoadingSpinner size="8" color="sky-blue" />
+                      ) : (
+                        <button
+                          type="submit"
+                          disabled={
+                            props.isSubmitting || sendMoneyFee.loading
+                              ? true
+                              : false
+                          }
+                          className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
+                        >
+                          Continue
+                        </button>
+                      )}
+                    </div>
+                  </Form>
+                );
+              }}
+            </Formik>
+          </div>
+        </div>
+      </div>
+    </ModalCom>
+  );
+}
+
+export default NairaWithdraw;

src/components/MyWallet/Wallet.jsx

@@ -5,8 +5,9 @@ import React, {
   useEffect,
   useMemo,
   useReducer,
+  useState,
 } from "react";
-import { Routes, Route, Outlet, Navigate } from "react-router-dom";
+import { Navigate, Outlet, Route, Routes } from "react-router-dom";
 import usersService from "../../services/UsersService";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
@@ -15,16 +16,18 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";
 // const ConfirmAddFund = lazy(() => import("./ConfirmAddFund"));
 // const TransferFund = lazy(() => import("./TransferFund"));
 const WalletBox = lazy(() => import("./WalletBox"));
+// const NairaWithdraw = lazy(() => import("./Popup/NairaWithdraw"));
+// const ConfirmNairaWithdraw = lazy(() => import("./ConfirmNairaWithdraw"));
 // const AddRecipient = lazy(() => import("./AddRecipient"));
 // const ConfirmTransfer = lazy(() => import("./ConfirmTransfer"));
 
-function Wallet() {
-  return (
-    <Layout>
-      <Outlet />
-    </Layout>
-  );
-}
+// function Wallet() {
+//   return (
+//     <Layout>
+//       <Outlet />
+//     </Layout>
+//   );
+// }
 
 const initialState = {
   loading: true,
@@ -53,83 +56,52 @@ const reducer = (state, action) => {
 };
 
 const WalletRoutes = () => {
-  const apiCall = useMemo(() => new usersService(), []);
+  const apiCall = new usersService();
 
-  const [walletList, dispatchWalletList] = useReducer(reducer, initialState);
-  const [paymentHistory, dispatchPaymentHistory] = useReducer(
-    reducer,
-    initialState
-  );
+  const [walletList, setWalletList] = useState({loading: true, data: []});
+  const [paymentHistory, setPaymentHistory] = useState({loading: true, data: []});
 
-  const getWalletList = useCallback(() => {
+  const getWalletList = () => {
     apiCall
-      .getUserWallets(null)
+      .getUserWallets()
       .then((res) => {
         if (res.data.internal_return < 0) {
-          dispatchWalletList({ type: "FETCH_SUCCESS", payload: [] });
+          setWalletList({loading: false, data: []})
         } else {
-          dispatchWalletList({
-            type: "FETCH_SUCCESS",
-            payload: res.data.result_list,
-          });
+          setWalletList({loading: false, data: res.data?.result_list})
         }
       })
       .catch(() => {
-        dispatchWalletList({ type: "FETCH_ERROR" });
+        setWalletList({loading: false, data: []})
       });
-  }, [apiCall]);
+  }
 
-  const getPaymentHistory = useCallback(() => {
+  const getPaymentHistory = () => {
     apiCall
       .getPaymentHx()
       .then((res) => {
         if (res.data.internal_return < 0) {
-          dispatchPaymentHistory({ type: "FETCH_SUCCESS", payload: [] });
+          setPaymentHistory({loading: false, data: []})
         } else {
-          dispatchPaymentHistory({
-            type: "FETCH_SUCCESS",
-            payload: res.data.result_list,
-          });
+          setPaymentHistory({loading: false, data: res.data?.result_list})
         }
       })
       .catch(() => {
-        dispatchPaymentHistory({ type: "FETCH_ERROR" });
+        setPaymentHistory({loading: false, data: []})
       });
-  }, [apiCall]);
+  }
 
   useEffect(() => {
-    let isMounted = true;
-
-    if (isMounted) {
-      getWalletList();
-      getPaymentHistory();
-    }
-
-    return () => {
-      isMounted = false;
-    };
-  }, [getWalletList, getPaymentHistory]);
+    getWalletList();
+    getPaymentHistory();
+  }, []);
 
   return (
-    <Routes>
-      <Route
-        element={
-          <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
-            <Wallet />
-          </Suspense>
-        }
-      >
-        <Route
-          index
-          element={
-            <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
-              <WalletBox wallet={walletList} payment={paymentHistory} />
-            </Suspense>
-          }
-        />
-        <Route path="*" element={<Navigate to="/" />} />
-      </Route>
-    </Routes>
+    <Layout>
+      <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
+        <WalletBox wallet={walletList} payment={paymentHistory} />
+      </Suspense>
+    </Layout>
   );
 };
 

src/components/MyWallet/WalletAction.jsx

@@ -1,30 +1,40 @@
-import React from 'react'
-import { Link } from 'react-router-dom';
+import React, { useState } from "react";
+import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
+import NairaWithdraw from "./Popup/NairaWithdraw";
+
+function WalletAction({ walletItem, payment, openPopUp }) {
+  const [showNairaWithdraw, setShowNairaWithdraw] = useState(false); // DETERMINES WHEN NAIRA WITHDRAWAL POPS UP
+
+  const [showConfirmNairaWithdraw, setShowConfirmNairaWithdraw] = useState({
+    show: false,
+    state: {},
+  }); // DETERMINES WHEN CONFIRM NAIRA WITHDRAWAL POPS UP
 
-function WalletAction({walletItem, payment, openPopUp}) {
   return (
     <div className="counters w-full flex justify-between gap-2">
-        <div className='w-1/2 flex justify-center items-center'>
-        <Link
-            to="transfer-fund"
-            className={`${
-            walletItem.code != "NAIRA" && "invisible"
-            } px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white`}
-        >
-            Spend
-        </Link>
-        </div>
-        <div className='w-1/2 flex justify-center items-center'>
+      <div className="w-1/2 flex justify-center items-center">
         <button
-            className='px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white'
-            onClick={() => {
-            openPopUp({
-                payment: payment,
-                currency: walletItem?.description,
-            });
-            }}
+          onClick={() => {
+            setShowNairaWithdraw(true);
+          }}
+          className={`${
+            walletItem.code != "NAIRA" && "invisible"
+          } px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white`}
         >
-            {/* <span className="">
+          Spend
+        </button>
+      </div>
+      <div className="w-1/2 flex justify-center items-center">
+        <button
+          className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+          onClick={() => {
+            openPopUp({
+              payment: payment,
+              currency: walletItem?.description,
+            });
+          }}
+        >
+          {/* <span className="">
             <svg
                 xmlns="http://www.w3.org/2000/svg"
                 width="38"
@@ -39,11 +49,36 @@ function WalletAction({walletItem, payment, openPopUp}) {
                 ></path>
             </svg>
             </span> */}
-            <span className="">Add Credit</span>
+          <span className="">Add Credit</span>
         </button>
-        </div>
+      </div>
+
+      {showNairaWithdraw && (
+        <NairaWithdraw
+          wallet={walletItem}
+          action={() => {
+            setShowNairaWithdraw((prev) => !prev);
+          }}
+          situation={showNairaWithdraw}
+          setShowConfirmNairaWithdraw={setShowConfirmNairaWithdraw}
+        />
+      )}
+
+      {showConfirmNairaWithdraw.show && (
+        <ConfirmNairaWithdraw
+          wallet={walletItem}
+          state={showConfirmNairaWithdraw.state}
+          action={() => {
+            setShowConfirmNairaWithdraw((prev) => ({
+              ...prev,
+              show: !prev.show,
+            }));
+          }}
+          situation={showConfirmNairaWithdraw.show}
+        />
+      )}
     </div>
-  )
+  );
 }
 
-export default WalletAction
+export default WalletAction;

src/components/MyWallet/WalletBox.jsx

@@ -1,7 +1,7 @@
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import WalletItemCard from "./WalletItemCard";
 
-export default function WalletBox({ wallet, coupon, payment }) {
+export default function WalletBox({ wallet, payment }) {
   return (
     <>
       <div className="my-wallet-wrapper w-full mb-10">

src/components/OffersInterest/ManageInterestOffer.jsx

@@ -166,22 +166,22 @@ export default function ManageInterestOffer(props) {
 
                                 <div className="w-full">
                                     {/* switch button */}
-                                    <div className="my-1 flex items-center border-b border-slate-300">
+                                    <div className="pl-7 my-2 flex items-center border-b border-slate-300 gap-3">
                                         <button
                                         name="info"
                                         onClick={(e) => setTab(e.target.name)}
-                                        className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                                            tab == "info" ? "border-sky-blue" : "border-slate-300"
-                                        } tracking-wide transition duration-200`}
+                                        className={`px-4 py-1 rounded-t-2xl ${
+                                            tab == "info" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                                          }`}
                                         >
                                         Info
                                         </button>
                                         <button
                                         name="message"
                                         onClick={(e) => setTab(e.target.name)}
-                                        className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                                            tab == "message" ? "border-sky-blue" : "border-slate-300"
-                                        }  tracking-wide transition duration-200`}
+                                        className={`px-4 py-1 rounded-t-2xl ${
+                                            tab == "message" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                                          }`}
                                         >
                                         Messages ({messageList.data.length})
                                         </button>

src/components/Partials/Header.jsx

@@ -472,10 +472,10 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
               </Link>
             </div>
             {/* profile */}
-            <div className="user-profile relative lg:block hidden">
+            <div className="user-profile relative">
               <div
                 onClick={() => handlerProfile()}
-                className="flex items-center space-x-3.5"
+                className="hidden lg:flex items-center space-x-3.5"
               >
                 {/* profile-image */}
                 <div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden">
@@ -492,6 +492,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                  {userDetails && userDetails?.account_type !== "FAMILY" && <p className="text-sm text-thin-light-gray">@{userEmail}</p>}
                 </div>
               </div>
+
+              <div className="for-mobile-profile lg:hidden block">
+                <div
+                  // to="/profile"
+                  onClick={() => handlerProfile()}
+                  className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
+                >
+                  <img src={profileImg} alt="profile" className="w-full h-full" />
+                </div>
+              </div>
+
               <div
                 className={`profile-dropdown w-[293px] z-30 bg-white dark:bg-dark-white   absolute lg:right-16 -right-[16px]  rounded-lg ${
                   userProfileDropdown ? "active" : ""
@@ -675,7 +686,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                     <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg cursor-pointer">
                       <div className="name" onClick={logoutModalHandler}>
                         <p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
-                          Sign Out
+                          {process.env.REACT_APP_LOGOUT_TEXT}
                         </p>
                       </div>
                     </li>
@@ -684,14 +695,15 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 </div>
               </div>
             </div>
-            <div className="for-mobile-profile lg:hidden block">
-              <Link
-                to="/profile"
+            {/* <div className="for-mobile-profile lg:hidden block">
+              <div
+                // to="/profile"
+                onClick={() => handlerProfile()}
                 className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
               >
                 <img src={profileImg} alt="profile" className="w-full h-full" />
-              </Link>
-            </div>
+              </div>
+            </div> */}
           </div>
         </div>
       </div>

src/components/Partials/Layout.jsx

@@ -8,7 +8,6 @@ import Header from "./Header";
 import MobileSidebar from "./MobileSideBar";
 import RightSideBar from "./RightSideBar";
 import Sidebar from "./Sidebar";
-import usersService from "../../services/UsersService";
 
 export default function Layout({ children }) {
   const { drawer } = useSelector((state) => state.drawer);
@@ -179,7 +178,7 @@ export default function Layout({ children }) {
                   type="button"
                   className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
                 >
-                  Yes Logout
+                  {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
                 </button>
                 <button
                   onClick={logoutModalHandler}

src/components/Partials/MobileSideBar.jsx

@@ -8,7 +8,12 @@ import {
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
 
-export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJobList }) {
+export default function MobileSidebar({
+  sidebar,
+  action,
+  logoutModalHandler,
+  myJobList,
+}) {
   let { userDetails } = useSelector((state) => state.userDetails);
   const darkMode = useContext(DarkModeContext);
 
@@ -110,74 +115,72 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
 
         {/* menu and settings item */}
         {userDetails?.account_type !== "FAMILY" && (
-              <div
-                  className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-5" : "mb-2"
-                  }`}
-              >
-                <div className="heading mb-5">
-                  <h1 className="title text-xl font-bold text-sky-blue">
-                    Family
-                  </h1>
-                </div>
-                <div className="items">
-                  <ul className="flex flex-col space-y-6">
-                    <ListItem
-                        title="Family Corner"
-                        route="/acc-family"
-                        iconName="new-family"
-                        sidebar={sidebar}
-                    />
-                  </ul>
-                </div>
-              </div>
+          <div
+            className={`menu-item transition-all duration-300 ease-in-out ${
+              sidebar ? "mb-5" : "mb-2"
+            }`}
+          >
+            <div className="heading mb-5">
+              <h1 className="title text-xl font-bold text-sky-blue">Family</h1>
+            </div>
+            <div className="items">
+              <ul className="flex flex-col space-y-6">
+                <ListItem
+                  title="Family Corner"
+                  route="/acc-family"
+                  iconName="new-family"
+                  sidebar={sidebar}
+                />
+              </ul>
+            </div>
+          </div>
         )}
 
         {userDetails?.account_type !== "FAMILY" && (
           <>
             {!userDetails?.post_jobs ? (
-                <div
-                  className={`menu-item transition-all duration-300 ease-in-out bg-[#f0f8ff] dark:bg-dark-white rounded-2xl p-3 ${
-                    sidebar ? "mb-5" : "mb-2 rounded-none p-0"
-                  }`}
-                >
-                  <div className="heading mb-5">
-                    <h1 className="title text-xl font-bold text-sky-blue">
-                      Job Post
-                    </h1>
-                  </div>
-                  <div className="items">
-                    <ul className="flex flex-col space-y-6">
-                      <li className="item group">
-                        <NavLink
-                          to="/start-job"
-                          className={`nav-item flex items-center ${
-                            ((navData) => (navData.isActive ? "active" : ""),
-                            sidebar
-                              ? "justify-start space-x-3.5"
-                              : "justify-center")
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out bg-[#f0f8ff] dark:bg-dark-white rounded-2xl p-3 ${
+                  sidebar ? "mb-5" : "mb-2 rounded-none p-0"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-sky-blue">
+                    Job Post
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <li className="item group">
+                      <NavLink
+                        to="/start-job"
+                        className={`nav-item flex items-center ${
+                          ((navData) => (navData.isActive ? "active" : ""),
+                          sidebar
+                            ? "justify-start space-x-3.5"
+                            : "justify-center")
+                        }`}
+                      >
+                        <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                          <Icons name="people-two" />
+                        </span>
+                        <span
+                          className={`item-content group-hover:text-sky-blue text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                            sidebar ? "active flex-1" : "w-0"
                           }`}
                         >
-                          <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                            <Icons name="people-two" />
-                          </span>
-                          <span
-                            className={`item-content group-hover:text-sky-blue text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                              sidebar ? "active flex-1" : "w-0"
-                            }`}
-                          >
-                            Enable Job Post
-                          </span>
-                        </NavLink>
-                      </li>
-                    </ul>
-                  </div>
+                          Enable Job Post
+                        </span>
+                      </NavLink>
+                    </li>
+                  </ul>
                 </div>
+              </div>
             ) : myJobList?.data?.result_list?.length ? (
               <div
-                  className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-5" : "mb-2"
-                  }`}
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
               >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-sky-blue">
@@ -212,9 +215,9 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
               </div>
             ) : (
               <div
-                  className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-5" : "mb-2"
-                  }`}
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
               >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-sky-blue">
@@ -245,14 +248,14 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
           className="signout-btn flex items-center space-x-1  p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full"
         >
           <span className="">
-            <Icons name='new-logout' />
+            <Icons name="new-logout" />
           </span>
           <span
             className={`signout-btn-content text-white text-xl font-bold ${
               sidebar ? "active" : ""
             }`}
           >
-            Signout
+            {process.env.REACT_APP_LOGOUT_TEXT}
           </span>
         </button>
       ) : (

src/components/Resources/index.jsx

@@ -66,6 +66,7 @@ export default function Resources(props) {
         return blogItems?.blogdata?.length
       }else if(name == 'onsale'){
         return onSaleProducts?.length
+        // return null
       }else if(name == 'owned'){
         return ownProducts?.length
       }else if(name == 'created'){
@@ -88,6 +89,7 @@ export default function Resources(props) {
         >
           {tabValue.content}
         </span>
+        {tabValue.name != 'onsale' &&
         <span
           className={`w-5 h-5 group-hover:bg-pink group-hover:text-white text-[10px] rounded-full absolute -top-2 -right-5 flex justify-center items-center ${
             isActive
@@ -95,9 +97,9 @@ export default function Resources(props) {
               : "text-thin-light-gray bg-[#F2B8FD]"
           }`}
         >
-          {/* 16 blog, onsale, owned,created */}
           {countNumber(tabValue.name)}
         </span>
+        }
       </li>
     );
   };

src/components/Resources/tabs/QuestionsTab.jsx

@@ -1,26 +1,44 @@
 import ProductCardStyleTwo from "../../Cards/ProductCardStyleTwo";
 import DataIteration from "../../Helpers/DataIteration";
 import SearchCom from "../../Helpers/SearchCom";
+import localImgLoad from "../../../lib/localImgLoad";
 
 export default function QuestionsTab({ className, products }) {
     return (
         <>
             <div className={`onsale-tab-wrapper w-full ${className || ""}`}>
                 <div className="main-container w-full">
-                    <div className="filter-section w-full items-center sm:flex justify-between mb-6">
-                        {/* filter-search */}
-                        <div className="sm:w-1/2 w-full sm:pr-20 pr-0 mb-5 sm:mb-0">
-                            <SearchCom />
+                    <div className="filter-section w-fullmb-6">
+                        <h1 className="text-xl lg:text-2xl font-bold text-dark-gray dark:text-white tracking-wide">Ask our A.I</h1>
+                        <div className="mt-2 lg:grid grid-cols-2 gap-2 h-full lg:h-[500px]">
+                            <div className="h-full mb-5 lg:mb-0">
+                                <img className="w-full h-full rounded-2xl" src={localImgLoad(`images/resources-ask.jpg`)} alt='AI' />
+                            </div>
+                            <div className="p-8 bg-white rounded-2xl h-full">
+                                <div className="input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base">
+                                    <select className="input-field px-2 placeholder:text-base text-dark-gray w-full h-full tracking-wide dark:bg-[#11131F] bg-[#fafafa] focus:ring-0 focus:outline-none">
+                                        <option className="rounded-full">Find answer on:</option>
+                                    </select>
+                                </div>
+                                {/* filter-search */}
+                                <div className="w-full my-5 border-2 rounded-full">
+                                    <SearchCom />
+                                </div>
+                                <div className="w-full flex justify-end items-center border-b-2 pb-4">
+                                    <button
+                                        className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
+                                        >
+                                        Search
+                                    </button>
+                                </div>
+                            </div>
                         </div>
 
                     </div>
-                    <div className="content-section w-full-width">
+                    {/* <div className="content-section w-full-width">
                         <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
-
-
-
                         </div>
-                    </div>
+                    </div> */}
                 </div>
             </div>
         </>

src/components/jobPopout/FamilyOfferJobPopout.jsx

@@ -0,0 +1,261 @@
+import React, { useState } from "react";
+import Detail from "./popoutcomponent/Detail";
+import ModalCom from "../Helpers/ModalCom";
+import { useNavigate } from "react-router-dom";
+
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import localImgLoad from "../../lib/localImgLoad";
+
+import { tableReload } from "../../store/TableReloads";
+import { useDispatch } from "react-redux";
+
+function FamilyOfferJobPopout({ details, onClose, situation }) {
+  const apiUrl = new usersService();
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+
+  const [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+    trigger: "",
+  });
+
+  //FUNCTION TO HANDLE AN OFFER
+  const handleOffer = ({ target: { name } }) => {
+    const reqData = {
+      // offer_result: 100,
+      offer_code: details.contract,
+      contract: details.contract,
+    };
+
+    //logic to determine the button pressed and set reqDate accordingly
+    if (name == "accept") {
+      setRequestStatus({
+        loading: true,
+        status: false,
+        message: "",
+        trigger: "offer",
+      });
+      reqData.offer_result = 100;
+    }
+    if (name == "reject") {
+      setRequestStatus({
+        loading: true,
+        status: false,
+        message: "",
+        trigger: "reject",
+      });
+      reqData.offer_result = 333;
+    }
+
+    // API CALL
+    apiUrl
+      .offersResponse(reqData)
+      .then((response) => {
+        if (response.status != 200 || response.data.internal_return < 0) {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: `Unable to ${name} Offer, try again later`,
+            trigger: "",
+          });
+          return;
+        }
+        setRequestStatus({
+          loading: false,
+          status: true,
+          message: `Offer ${name}ed Successfully`,
+          trigger: "",
+        });
+        setTimeout(() => {
+          onClose();
+          dispatch(tableReload({ type: "MYTASKTABLE" }));
+          navigate("/mytask", { replace: true });
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "",
+            trigger: "",
+          });
+        }, 2000);
+      })
+      .catch((error) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: `Opps! An Error Occurred`,
+          trigger: "",
+        });
+      })
+      .finally(() => {
+        setTimeout(() => {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "",
+            trigger: "",
+          });
+        }, 5000);
+      });
+  };
+
+  return (
+    <ModalCom action={onClose} situation={situation}>
+      <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            Start Task
+          </h1>
+          <button
+            type="button"
+            className="text-[#374557] dark:text-red-500"
+            onClick={onClose}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <div className="md:flex bg-white rounded-lg shadow-lg">
+          <div className="p-4 w-full md:w-3/4 md:border-r-2">
+            <div className="flex gap-2">
+                <div className="image-wrapper w-32">
+                    <img className="w-full h-auto" src={localImgLoad(`images/taskbanners/${details.banner}`)} alt='Banner-Image' />
+                </div>
+                <div className="details-wrapper">
+                    <p className="text-lg my-5 font-semibold text-slate-900 tracking-wide">
+                    {details.title}
+                    </p>
+
+                    {/* INPUT SECTION */}
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Date"
+                        value={
+                        (details.offer_added && details.offer_added?.split(" ")[0]) ||
+                        "default"
+                        }
+                    />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail label="Description" value={details.description} />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Offer Expire"
+                        value={details.expire && details.expire.split(" ")[0]}
+                    />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail label="Price" value={details.thePrice} />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Duration"
+                        value={`${details.timeline_days} day(s)`}
+                    />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Detail"
+                        value={details.job_description || details.description}
+                    />
+                    </div>
+                </div>
+            </div>
+          </div>
+
+          {/* ACTION SECTION */}
+          <div className="p-4 w-full md:w-1/4 h-full">
+            <div className="my-3 md:flex md:justify-center">
+              {requestStatus.loading && requestStatus.trigger == "offer" ? (
+                <LoadingSpinner size={8} color="sky-blue" />
+              ) : (
+                <button
+                  name="accept"
+                  onClick={handleOffer}
+                  disabled={requestStatus.loading}
+                  className="px-2 py-2 w-20 flex justify-center items-center border-2 border-green-900 bg-green-500 text-base rounded-2xl text-white"
+                >
+                  I am ready to start
+                </button>
+              )}
+            </div>
+
+            {/* <div className="mt-10 md:mt-20 md:flex md:justify-center">
+              {requestStatus.loading && requestStatus.trigger == "reject" ? (
+                <LoadingSpinner size={8} color="sky-blue" />
+              ) : (
+                <button
+                  name="reject"
+                  onClick={handleOffer}
+                  disabled={requestStatus.loading}
+                  className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                  Reject Offer
+                </button>
+              )}
+            </div> */}
+
+            {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+            {requestStatus.message != "" &&
+              (!requestStatus.status ? (
+                <div
+                  className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                >
+                  {requestStatus.message}
+                </div>
+              ) : (
+                requestStatus.status && (
+                  <div
+                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                  >
+                    {requestStatus.message}
+                  </div>
+                )
+              ))}
+            {/* End of error or success display */}
+          </div>
+        </div>
+
+        {/* close button */}
+        <div className="p-6 flex justify-end">
+          <button
+            onClick={onClose}
+            disabled={requestStatus.loading}
+            type="button"
+            className="border-gradient text-18 tracking-wide px-2 py-2 rounded-full"
+          >
+            <span className="text-gradient">Cancel</span>
+          </button>
+        </div>
+        {/* end of close button */}
+      </div>
+    </ModalCom>
+  );
+}
+
+export default FamilyOfferJobPopout;

src/services/UsersService.js

@@ -216,6 +216,7 @@ class usersService {
     return this.postAuxEnd("/sendmoneyfee", postData);
   }
 
+  // Start Credit for Cards 
   getStartCredit(value) {
     var postData = {
       uid: localStorage.getItem("uid"),
@@ -227,6 +228,7 @@ class usersService {
     return this.postAuxEnd("/startcredit", postData);
   }
 
+  // Paying using Previous Cards
   getPaidPrevCard(value) {
     var postData = {
       uid: localStorage.getItem("uid"),
@@ -238,6 +240,18 @@ class usersService {
     return this.postAuxEnd("/payprevcard", postData);
   }
 
+  // Paying using New Card
+  getPaidNewCard(value) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 11054,
+      ...value,
+    };
+    return this.postAuxEnd("/paynewcard", postData);
+  }
+
   getFamilySampleTasks() {
     var postData = {
       uid: localStorage.getItem("uid"),