Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into Jobs-Manager-Side

.env.production

@@ -72,4 +72,4 @@ REACT_APP_FAMILY_MINIMUM_AGE=4
 REACT_APP_FAMILY_MAXIMUM_AGE=18
 
 #CHANGE LOGIN LAYOUT
-REACT_APP_NEW_LOGIN_LAYOUT=0
+REACT_APP_NEW_LOGIN_LAYOUT=1

src/Routers.jsx

@@ -1,65 +1,61 @@
 import { Route, Routes } from "react-router-dom";
 import FourZeroFour from "./components/FourZeroFour";
 import ScrollToTop from "./components/Helpers/ScrollToTop";
-import MyCollection from "./components/MyCollection";
+import StartJob from "./components/MyJobs/StartJob";
 import Notification from "./components/Notification";
 import AuthRoute from "./middleware/AuthRoute";
-import AcitveBidsPage from "./views/AcitveBidsPage";
+import AppDownloadPage from "./views/AppDownloadPage";
+import AppleRedirectPage from "./views/AppleRedirectPage";
 import AuthProfilePage from "./views/AuthProfilePage";
+import AuthRedirect from "./views/AuthRedirect";
+import BlogPage from "./views/BlogPage";
+import CalendarPage from "./views/CalendarPage";
 import CollectionItemPage from "./views/CollectionItemPage";
+import FacebookRedirect from "./views/FacebookRedirect";
+import FamilyAccPage from "./views/FamilyAccPage";
+import FamilyManagePage from "./views/FamilyManagePage";
+import FamilyMarketPage from "./views/FamilyMarketPage";
+import FamilySettingsPage from "./views/FamilySettingsPage";
 import ForgotPasswordPages from "./views/ForgotPasswordPages";
 import ForgotPasswordPagesTwo from "./views/ForgotPasswordPagesTwo";
 import HistoryPage from "./views/HistoryPage";
 import HomePages from "./views/HomePages";
+import JobGroupsPage from "./views/JobGroupsPage";
+import LndPage from "./views/LndPage";
 import LoginPage from "./views/LoginPage";
 import LoginPageTwo from "./views/LoginPageTwo";
+import ManageActiveJobs from "./views/ManageActiveJobs";
+import ManageInterestOfferPage from "./views/ManageInterestOfferPage";
 import MarketPlacePage from "./views/MarketPlacePage";
+import MyActiveJobsPage from "./views/MyActiveJobsPage";
+import MyCouponPage from "./views/MyCouponPage";
+import MyJobsPage from "./views/MyJobsPage";
+import MyOffersPage from "./views/MyOffersPage";
+import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
+import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
+import MyTaskPage from "./views/MyTaskPage";
+import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
 import MyWalletPage from "./views/MyWalletPage";
+import OffersInterestPage from "./views/OffersInterestPage";
+import ReferralPage from "./views/ReferralPage";
+import RemindersPage from "./views/RemindersPage";
+import ResourcePage from "./views/ResourcePage";
 import SavedPage from "./views/SavedPage";
 import SellPage from "./views/SellPage";
 import SettingsPage from "./views/SettingsPage";
-import ShopDetailsPage from "./views/ShopDetailsPage";
 import SignupPage from "./views/SignupPage";
 import SignupPageTwo from "./views/SignupPageTwo";
+import TrackingPage from "./views/TrackingPage";
 import UpdatePasswordPages from "./views/UpdatePasswordPages";
 import UpdatePasswordPagesTwo from "./views/UpdatePasswordPagesTwo";
 import UploadProductPage from "./views/UploadProductPage";
 import UserProfilePage from "./views/UserProfilePage";
-import VerifyYouPages from "./views/VerifyYouPages";
-import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
-import VerifyPasswordPages from "./views/VerifyPasswordPages";
-import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo";
-import RemindersPage from './views/RemindersPage';
-import TrackingPage from "./views/TrackingPage";
-import CalendarPage from "./views/CalendarPage";
-import ResourcePage from "./views/ResourcePage";
-import MyTaskPage from "./views/MyTaskPage";
-import MyJobsPage from "./views/MyJobsPage";
-import ReferralPage from "./views/ReferralPage";
 import VerifyLinkPages from "./views/VerifyLinkPages";
 import VerifyLinkPagesTwo from "./views/VerifyLinkPagesTwo";
-import MyActiveJobsPage from "./views/MyActiveJobsPage";
+import VerifyPasswordPages from "./views/VerifyPasswordPages";
-import FamilyAccPage from "./views/FamilyAccPage";
+import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo";
-import StartJob from "./components/MyJobs/StartJob";
+import VerifyYouPages from "./views/VerifyYouPages";
-import AddJobPage from "./views/AddJobPage";
+import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
-import MyPendingJobsPage from "./views/MyPendingJobsPage";
-import ManageActiveJobs from "./views/ManageActiveJobs";
-import FamilyManagePage from "./views/FamilyManagePage";
-import MyCouponPage from "./views/MyCouponPage";
-import AuthRedirect from "./views/AuthRedirect";
-import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
-import BlogPage from "./views/BlogPage";
-import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
-import OffersInterestPage from "./views/OffersInterestPage";
-import ManageInterestOfferPage from './views/ManageInterestOfferPage'
-import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
-import FamilyMarketPage from "./views/FamilyMarketPage";
-import FacebookRedirect from "./views/FacebookRedirect";
-import AppleRedirectPage from "./views/AppleRedirectPage";
-import LndPage from "./views/LndPage";
-import FamilySettingsPage from "./views/FamilySettingsPage";
-import AppDownloadPage from "./views/AppDownloadPage";
-import JobGroupsPage from "./views/JobGroupsPage";
 import YourPages from "./views/YourPage_";
 
 export default function Routers() {
@@ -67,31 +63,47 @@ export default function Routers() {
     <ScrollToTop>
       <Routes>
         {/* guest routes */}
-        {process.env.REACT_APP_NEW_LOGIN_LAYOUT == 1 ?
+        {process.env.REACT_APP_NEW_LOGIN_LAYOUT == 1 ? (
-        <>
+          <>
-          <Route exact path="/login" element={<LoginPageTwo />} />
+            <Route exact path="/login" element={<LoginPageTwo />} />
-          <Route exact path="/signup" element={<SignupPageTwo />} />
+            <Route exact path="/signup" element={<SignupPageTwo />} />
-          <Route exact path="/forgot-password" element={<ForgotPasswordPagesTwo />} />
+            <Route
-          <Route exact path="/update-password" element={<UpdatePasswordPagesTwo />} />
+              exact
-          <Route path="/vemail" element={<VerifyLinkPagesTwo />} />
+              path="/forgot-password"
-          <Route path="/complereset" element={<VerifyPasswordPagesTwo />} />
+              element={<ForgotPasswordPagesTwo />}
-          <Route exact path="/outmessage" element={<VerifyYouPagesTwo />} />
+            />
-          <Route exact path="/eoffer" element={<LoginPageTwo />} />
+            <Route
-          <Route exact path="/invite" element={<LoginPageTwo />} />
+              exact
-        </>
+              path="/update-password"
-        :
+              element={<UpdatePasswordPagesTwo />}
-        <>
+            />
-          <Route exact path="/login" element={<LoginPage />} />
+            <Route path="/vemail" element={<VerifyLinkPagesTwo />} />
-          <Route exact path="/signup" element={<SignupPage />} />
+            <Route path="/complereset" element={<VerifyPasswordPagesTwo />} />
-          <Route exact path="/forgot-password" element={<ForgotPasswordPages />} />
+            <Route exact path="/outmessage" element={<VerifyYouPagesTwo />} />
-          <Route exact path="/update-password" element={<UpdatePasswordPages />} />
+            <Route exact path="/eoffer" element={<LoginPageTwo />} />
-          <Route path="/vemail" element={<VerifyLinkPages />} />
+            <Route exact path="/invite" element={<LoginPageTwo />} />
-          <Route path="/complereset" element={<VerifyPasswordPages />} />
+          </>
-          <Route exact path="/outmessage" element={<VerifyYouPages />} />
+        ) : (
-          <Route exact path="/eoffer" element={<LoginPage />} />
+          <>
-          <Route exact path="/invite" element={<LoginPage />} />
+            <Route exact path="/login" element={<LoginPage />} />
-        </>
+            <Route exact path="/signup" element={<SignupPage />} />
-        }
+            <Route
+              exact
+              path="/forgot-password"
+              element={<ForgotPasswordPages />}
+            />
+            <Route
+              exact
+              path="/update-password"
+              element={<UpdatePasswordPages />}
+            />
+            <Route path="/vemail" element={<VerifyLinkPages />} />
+            <Route path="/complereset" element={<VerifyPasswordPages />} />
+            <Route exact path="/outmessage" element={<VerifyYouPages />} />
+            <Route exact path="/eoffer" element={<LoginPage />} />
+            <Route exact path="/invite" element={<LoginPage />} />
+          </>
+        )}
         <Route exact path="/login/auth" element={<AuthRedirect />} />
         <Route exact path="/login/auth/flogin" element={<FacebookRedirect />} />
         <Route exact path="/login/auth/apple" element={<AppleRedirectPage />} />
@@ -117,25 +129,48 @@ export default function Routers() {
           <Route exact path="/market-place" element={<MarketPlacePage />} />
           <Route exact path="/market" element={<MarketPlacePage />} />
           <Route exact path="/familymarket" element={<FamilyMarketPage />} />
-          <Route exact path="/familysettings" element={<FamilySettingsPage />} />
+          <Route
+            exact
+            path="/familysettings"
+            element={<FamilySettingsPage />}
+          />
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
           <Route exact path="/myjobs" element={<MyJobsPage />} />
           {/* <Route exact path="/add-job" element={<AddJobPage />} /> */}
-          <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
+          <Route exact path="/my-active-jobs" element={<MyActiveJobsPage />} />
-          <Route exact path="/my-pastdue-jobs"  element={<MyPastDueJobsPage />} />
+          <Route
-          <Route exact path="/my-pending-jobs"  element={<MyPendingJobsPage />} />
+            exact
-          <Route exact path="/pend-interest"  element={<MyWaitingJobsPage />} />
+            path="/my-pastdue-jobs"
-          <Route exact path="/my-review-jobs"  element={<MyReviewDueJobsPage />} />
+            element={<MyPastDueJobsPage />}
-          <Route exact path="/acc-family"  element={<FamilyAccPage />} />
+          />
-          <Route exact path="/manage-family"  element={<FamilyManagePage />} />
+          <Route exact path="/my-offers" element={<MyOffersPage />} />
-          <Route exact path="/start-job"  element={<StartJob />} />
+          <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
-          <Route exact path="/yourpage"  element={<YourPages />} />
+          <Route
-          <Route exact path="/manage-active-job"  element={<ManageActiveJobs />} />
+            exact
-          <Route exact path="/blog-page"  element={<BlogPage />} />
+            path="/my-review-jobs"
-          <Route exact path="/offer-interest"  element={<OffersInterestPage />} />
+            element={<MyReviewDueJobsPage />}
-          <Route exact path="/manage-offer"  element={<ManageInterestOfferPage />} />
+          />
-
+          <Route exact path="/acc-family" element={<FamilyAccPage />} />
+          <Route exact path="/manage-family" element={<FamilyManagePage />} />
+          <Route exact path="/start-job" element={<StartJob />} />
+          <Route exact path="/yourpage" element={<YourPages />} />
+          <Route
+            exact
+            path="/manage-active-job"
+            element={<ManageActiveJobs />}
+          />
+          <Route exact path="/blog-page" element={<BlogPage />} />
+          <Route
+            exact
+            path="/offer-interest"
+            element={<OffersInterestPage />}
+          />
+          <Route
+            exact
+            path="/manage-offer"
+            element={<ManageInterestOfferPage />}
+          />
 
           <Route
             exact

src/components/AuthPages/AuthLayout2.jsx

@@ -1,20 +1,28 @@
-import React, { lazy } from "react";
+import React, { lazy, useContext } from "react";
 import { Link } from "react-router-dom";
 import { localImgLoad } from "../../lib";
 
+import DarkModeContext from "../Contexts/DarkModeContext";
+
 export default function LoginLayout({ slogan, children }) {
   const bgImg = localImgLoad('images/left-wrenchboard.jpg')
+  const bgImgNig = localImgLoad('images/wrench-home-back-nigeria.jpg')
+  const bgImgCom = localImgLoad('images/wrench-home-back-common.jpg')
+
+  const {countryMode} = useContext(DarkModeContext);
 
   return (
-    <div className={`layout-wrapper login`}>
+    <div className={`h-screen overflow-y-auto bg-cover bg-center`}
-      <div className={`w-full min-h-screen overflow-y-auto lg:grid grid-cols-2`}>
+    style={{backgroundImage: `url(${ countryMode == 'NG' ? bgImgNig : bgImgCom})`}}
-        <div 
+    >
+      <div className={`w-full grid grid-cols-1 lg:grid-cols-2`}>
+        {/* <div 
             className={`auth-bg hidden lg:block bg-blue-50 relative bg-cover bg-no-repeat border-0 after:content-[''] after:absolute after:inset-0`} 
             style={{backgroundImage: `url(${bgImg})`}}
         >
-        </div>
+        </div> */}
-        <div className="p-5 sm:p-7 flex place-content-center">
+        <div className="p-5 sm:p-7 flex place-content-center lg:col-start-2">
-          <div className="py-10 w-11/12 h-full flex flex-col justify-between items-center content-wrapper login shadow-md xl:bg-white dark:bg-dark-white rounded-[0.475rem]">
+          <div className="py-10 w-full sm:w-11/12 max-w-2xl shadow-md bg-slate-50 dark:bg-dark-white rounded-[0.475rem]">
             <div className="w-full flex justify-center items-center">
               {children && children}
             </div>
@@ -48,7 +56,7 @@ export default function LoginLayout({ slogan, children }) {
                 </div>
               </div>
               <p className="py-1 text-black text-[15px] px-2 font-medium flex items-center gap-1">
-                <span className="">&copy; {new Date().getFullYear()} -</span>
+                <span className="dark:text-white">&copy; {new Date().getFullYear()} -</span>
                 <Link to="/" className="text-[#009ef7] ml-1">
                   WrenchBoard
                 </Link>{" "}

src/components/AuthPages/ForgotPassword/index2.jsx

@@ -99,7 +99,7 @@ export default function ForgotPassword() {
             </Link>
           </div>
           <div className="flex place-content-center">
-            <div className="w-11/12 sm:max-w-[400px]">
+            <div className="w-10/12">
             {msgSuccess == null ?
               <>
                 <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">

src/components/AuthPages/Login/index2.jsx

@@ -264,7 +264,7 @@ export default function Login() {
           </div>
           {/* <div className="content-wrapper login shadow-md w-10/12 mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5"> */}
           <div className="flex place-content-center">
-            <div className="w-11/12 sm:max-w-[530px]">
+            <div className="w-10/12">
               {/* HIDES THIS IF USER SESSION HAS EXPIRED */}
               {sessionExpired != "true" && (
                 <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">

src/components/AuthPages/SignUp/index2.jsx

@@ -158,7 +158,7 @@ export default function SignUp() {
             </Link>
           </div>
           <div className="flex place-content-center">
-            <div className="w-11/12 sm:max-w-[530px]">
+            <div className="w-10/12">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
                 <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Create Account

src/components/AuthPages/UpdatePassword/index2.jsx

@@ -19,7 +19,7 @@ export default function UpdatePassword() {
       <AuthLayout slogan="Welcome to  myFit">
         {updated === false ? (
           <div className="flex place-content-center">
-            <div className="w-11/12 sm:max-w-[600px]">
+            <div className="w-10/12">
               <div className="title-area relative flex flex-col justify-center items-center mb-7">
                 <h1 className="sm:text-5xl text-4xl font-bold leading-[74px]   text-dark-gray dark:text-white">
                   Update Password

src/components/AuthPages/VerifyLink/index2.jsx

@@ -132,7 +132,7 @@ export default function VerifyLink() {
               </Link>
             </div>
             <div className="flex place-content-center">
-              <div className="w-11/12 sm:max-w-[500px]">
+              <div className="w-10/12">
                 <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
                   <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                     {linkSuccess

src/components/AuthPages/VerifyPassword/index2.jsx

@@ -152,7 +152,7 @@ const VerifyPassword = () => {
             {requestStatus.loading ? (
               <LoadingSpinner color="sky-blue" size="16" height="h-300px" />
             ) : !requestStatus.loading && requestStatus.status ? (
-              <div className="w-11/12 sm:max-w-[500px]">
+              <div className="w-10/12">
                 {linkSuccess == null ? (
                   <>
                     <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">

src/components/AuthPages/VerifyYou/index2.jsx

@@ -18,7 +18,7 @@ export default function VerifyYou() {
             </Link>
           </div>
           <div className="flex place-content-center">
-            <div className="w-11/12 sm:max-w-[500px]">
+            <div className="w-10/12">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
                 <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Let's verify your email now

src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx

@@ -38,7 +38,7 @@ const validationSchema = Yup.object().shape({
   };
 
 
-export default function InviteRelative({action, situation, setReloadRelList}) {
+export default function InviteRelative({action, situation, setReloadRelList, relativeList}) {
 
     const api = new usersService()
 
@@ -49,8 +49,6 @@ export default function InviteRelative({action, situation, setReloadRelList}) {
       }); // STATE FOR KNOWING WHEN A REQUEST IS MADE TO THE SERVER
 
     const handleInvite = (values) => {
-        // delete values.firstname
-        // delete values.lasttname
         setRequestStatus({loading: true, status: false, message: ""})
         api.inviteFamilyRelative(values).then(response => {
             let {status, data} = response
@@ -169,7 +167,7 @@ export default function InviteRelative({action, situation, setReloadRelList}) {
 
                                 {/* Type */}
                                 <div className="md:flex md:space-x-7 items-end mb-6">
-                                    <div className="field w-full mb-6 md:mb-0">
+                                    {/* <div className="field w-full mb-6 md:mb-0">
                                         <InputCom
                                         fieldClass="px-6"
                                         label="Type"
@@ -181,6 +179,52 @@ export default function InviteRelative({action, situation, setReloadRelList}) {
                                         blurHandler={props.handleBlur}
                                         error={(props.errors.family_type && props.touched.family_type) ? props.errors.family_type : '' }
                                         />
+                                    </div> */}
+                                    <div className="field w-full mb-6 xl:mb-0">
+                                    <label
+                                        htmlFor="family_type"
+                                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex item-center gap-1"
+                                    >
+                                        Family Type
+                                        {props.errors.family_type && props.touched.family_type && (
+                                        <span className="text-[12px] text-red-500">
+                                            {props.errors.family_type}
+                                        </span>
+                                        )}
+                                    </label>
+                                    <select
+                                        id="family_type"
+                                        name="family_type"
+                                        value={props.values.family_type}
+                                        className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none border`}
+                                        onChange={props.handleChange}
+                                        onBlur={props.handleBlur}
+                                    >
+                                        {relativeList?.loading ? (
+                                        <option className="text-slate-500 text-lg" value="">
+                                            Loading...
+                                        </option>
+                                        ) : relativeList?.family_types?.length ? (
+                                        <>
+                                            <option className="text-slate-500 text-lg" value="">
+                                            Select Family Type
+                                            </option>
+                                            {relativeList?.family_types?.map((item, index) => (
+                                            <option
+                                                key={index}
+                                                className="text-slate-500 text-lg"
+                                                value={item?.ty}
+                                            >
+                                                {item?.ty}
+                                            </option>
+                                            ))}
+                                        </>
+                                        ) : (
+                                        <option className="text-slate-500 text-lg" value="">
+                                            No Options Found! Try Again
+                                        </option>
+                                        )}
+                                    </select>
                                     </div>
                                     <div className="field w-full flex justify-end">
                                         <div className="flex">

src/components/FamilyAcc/FamilySettings/Tabs/RelativeTable.jsx

@@ -24,21 +24,22 @@ export default function RelativeTable({relativeList}) {
                     {relativeList && relativeList?.length > 0 ? (
                         currentRelativeList.map((value, index) => (
                         <tr key={value.uid || index} className="border-b dark:border-[#5356fb29] hover:bg-gray-50">
-                          <td className='py-2'>
+                          <td className='p-2'>
                             <div className="flex flex-col">
                               <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                {/* {value.firstname && value.firstname} {value.lastname && value.lastname} */} Firstname Lastname
+                                {value.firstname && value.firstname} {value.lastname && value.lastname}
                               </h1>
                               <span className="text-sm text-thin-light-gray">
-                                {/* {value.email && value.email} */} email.gmail.com
+                                {value.email && value.email}
                               </span>
                             </div>
                           </td>
-                          <td className='py-2'>
+                          <td className='p-2'>
-                            family type
+                            {/* <span>Family Type</span> */}
+                            <span>{value.family_type && value.family_type.toUpperCase()}</span>
                           </td>
-                          <td className='py-2 text-right'>
+                          <td className='p-2 text-right'>
-                            {0}
+                            {value.status && value.status}
                           </td>
                         </tr>
                         ))

src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx

@@ -12,7 +12,7 @@ const Relatives = () => {
 
   const [invitePopout, setInvitePopout] = useState(false)
 
-  const [relativeList, setRelativeList] = useState({loading: true, data:[]})
+  const [relativeList, setRelativeList] = useState({loading: true, result_list:[], family_types:[]})
 
   const showInviteMemberPopout = () => {
       setInvitePopout(true)
@@ -21,10 +21,14 @@ const Relatives = () => {
   const getRelativeList = () => {
     setRelativeList(prev => ({...prev, loading: true}))
     api.getFamilyRelativeList().then(response => {
-      setRelativeList({loading:false, data:response.data.family_types})
+      let {status, data} = response
-      // console.log('RESPONSE',response.data)
+      if(status != 200 || !data){
+        setRelativeList({loading:false, result_list:[], family_types:[]})
+        return
+      }
+      setRelativeList({loading:false, result_list:data?.result_list, family_types:data?.family_types})
     }).catch(error => {
-      setRelativeList({loading:false, data:[]})
+      setRelativeList({loading:false, result_list:[], family_types:[]})
     })
   }
 
@@ -43,7 +47,7 @@ const Relatives = () => {
           {relativeList.loading ?
           <LoadingSpinner size='8' height='h-full' />
           :
-          <RelativeTable relativeList={relativeList.data} />
+          <RelativeTable relativeList={relativeList.result_list} />
           }
         </div>
       </div>
@@ -54,6 +58,7 @@ const Relatives = () => {
             action={()=>setInvitePopout(false)}
             situation={invitePopout}
             setReloadRelList={setReloadRelList}
+            relativeList={relativeList}
         />
         }
       {/* END OF INVITE RELATIVE POPOUT */}

src/components/Home/FamilyDash.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import ParentWaiting from "../MyPendingJobs/ParentWaiting";
+import ParentWaiting from "../MyOffers/ParentWaiting";
 import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";
 import FamilyActiveLSlde from "./FamilyActiveLSlde";
 
@@ -19,7 +19,11 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
           />
         )}
         {trending && trending.length > 0 && (
-          <FamilyActiveLSlde trending={trending} className="mb-10" image_server={familyOffers?.session_image_server} />
+          <FamilyActiveLSlde
+            trending={trending}
+            className="mb-10"
+            image_server={familyOffers?.session_image_server}
+          />
         )}
 
         {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}

src/components/JobGroups/DeleteGroup.jsx

@@ -73,7 +73,7 @@ export default function DeleteGroup({action, situation, details}) {
           </div>
           <div className="mb-6">
             <p className="text-xl text-center tracking-wide text-dark-gray dark:text-white">
-              Are you sure, you want to delete <br /> <span>'{details?.group_name}'</span>
+              Are you sure, you want to delete <br /> <span>'{details?.group_name}'</span> group?
             </p>
           </div>
           <div className="flex space-x-2.5">

src/components/JobGroups/DeleteMember.jsx

@@ -23,7 +23,7 @@ export default function DeleteMember({action, situation, details}) {
       <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
         <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
           <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
-            Delete Member
+            Remove Member
           </h1>
           <button
             type="button"
@@ -73,7 +73,7 @@ export default function DeleteMember({action, situation, details}) {
           </div>
           <div className="mb-6">
             <p className="text-xl text-center tracking-wide text-dark-gray dark:text-white">
-              Are you sure, you want to delete <br /> <span>'{details?.firstname} {details.lastname}'</span>
+              Are you sure, you want to remove <br /> <span>'{details?.firstname} {details.lastname}'</span>
             </p>
           </div>
           <div className="flex space-x-2.5">
@@ -92,7 +92,7 @@ export default function DeleteMember({action, situation, details}) {
                 type="button"
                 className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
               >
-                Confirm Delete
+                Remove
               </button>
             )}
           </div>

src/components/JobGroups/GroupList.jsx

@@ -1,72 +1,104 @@
-import React, { useState } from 'react'
+import React, { useState } from "react";
 
-import InputCom from '../../components/Helpers/Inputs/InputCom/index'
+import AddGroup from "./AddGroup";
-import DeleteGroup from './DeleteGroup'
+import DeleteGroup from "./DeleteGroup";
-import AddGroup from './AddGroup'
+import { localImgLoad } from "../../lib";
 
-export default function GroupList({groupList, selectedGroup, changeSelectedGroup, setUpdateList}) {
+export default function GroupList({
+  groupList,
+  selectedGroup,
+  changeSelectedGroup,
+  setUpdateList,
+}) {
+  const [deletePopout, setDeletePopout] = useState({
+    status: false,
+    data: {},
+  });
 
-    const [deletePopout, setDeletePopout] = useState({
+  const [addGroupPopout, setAddGroupPopout] = useState(false);
-        status: false,
-        data: {}
-    })
 
-    const [addGroupPopout, setAddGroupPopout] = useState(false)
+  const handleAddGroup = () => {
-
+    setAddGroupPopout(true);
-    const handleAddGroup = () => {
+  };
-        setAddGroupPopout(true)
-    }
-
-    const handleDeleteGroup = (item) => {
-        setDeletePopout({
-            status: true,
-            data: {...item}
-        })
-    }
 
+  const handleDeleteGroup = (item) => {
+    setDeletePopout({
+      status: true,
+      data: { ...item },
+    });
+  };
 
   return (
     <>
-        <div className='p-5 w-full lg:w-[400px] min-h-[300px] bg-sky-100 dark:bg-dark-gray rounded-2xl'>
+      <div className="p-5 w-full lg:w-[400px] min-h-[300px] bg-sky-100 dark:bg-dark-gray rounded-2xl flex flex-col">
-            {/* <h1 className='mb-5 text-lg lg:text-2xl tracking-wide font-bold text-slate-900 dark:text-slate-100'>Jobs Groups</h1> */}
+        {/* <h1 className='mb-5 text-lg lg:text-2xl tracking-wide font-bold text-slate-900 dark:text-slate-100'>Jobs Groups</h1> */}
-            <div className='flex justify-end items-center'>
+        <div className="flex justify-end items-center">
-                <button onClick={handleAddGroup} className='py-2 px-4 flex justify-center items-center bg-sky-blue hover:bg-sky-600 text-base rounded-full text-white font-bold'>Add Group</button>
+          <button
-            </div>
+            onClick={handleAddGroup}
-
+            className="py-2 px-4 flex justify-center items-center bg-sky-blue hover:bg-sky-600 text-base rounded-full text-white font-bold"
-            {groupList && groupList.length < 1 ?
+          >
-            <h1 className='my-5 text-lg tracking-wide text-slate-900 dark:text-slate-100'>No Group Found!</h1>
+            Add Group
-            :
+          </button>
-            <div className='my-4 max-h-[400px] overflow-y-auto'>
-                <div className='flex flex-col'>
-                    {groupList.map(item=> (
-                        <div key={item.group_uid} className='p-2 flex gap-2 items-center justify-between w-full'>
-                            <div className='flex gap-2 items-center'>
-                                <input type='radio' name='grouplist' value={item.group_id} checked={selectedGroup?.id == item?.group_id} onChange={changeSelectedGroup} className='w-[20px] h-[20px] outline-none' />
-                                <p className='text-sm lg:text-base text-slate-900 dark:text-slate-100'>{item.group_name}</p>
-                            </div>
-                            <button onClick={()=>{handleDeleteGroup(item)}} className='rounded-lg text-sm bg-red-500 hover:bg-red-400 text-white font-bold py-1 px-2.5 flex justify-center items-center'>X</button>
-                        </div>
-                    ))}
-                </div>
-            </div>
-            }
         </div>
 
-        {deletePopout.status &&
+        {groupList && groupList.length < 1 ? (
-            <DeleteGroup 
+          <h1 className="my-5 text-lg tracking-wide text-slate-900 dark:text-slate-100">
-                action={()=>setDeletePopout({status:false, data:{}})}
+            No Group Found!
-                situation={deletePopout.status}
+          </h1>
-                details={deletePopout.data}
+        ) : (
-            />
+          <div className="my-4 max-h-[596px] bg-[#fffef6] rounded overflow-y-auto flex-1">
-        }
+            <div className="flex flex-col">
+              {groupList.map((item) => (
+                <div
+                  key={item.group_uid}
+                  className="p-2 flex gap-2 items-center justify-between w-full"
+                >
+                  <div className="flex gap-2 items-center">
+                    <input
+                      type="radio"
+                      name="grouplist"
+                      value={item.group_id}
+                      checked={selectedGroup?.id == item?.group_id}
+                      onChange={changeSelectedGroup}
+                      className="w-[20px] h-[20px] outline-none"
+                    />
+                    <p className="text-sm lg:text-base text-slate-900 dark:text-slate-100">
+                      {item.group_name}
+                    </p>
+                  </div>
+                  <button
+                    onClick={() => {
+                      handleDeleteGroup(item);
+                    }}
+                    className="flex relative items-center justify-center border-0 w-6 h-6"
+                  >
+                    <img
+                      src={localImgLoad("images/icons/remove_grp.svg")}
+                      alt="remove-icon"
+                    />
+                  </button>
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
+      </div>
 
-        {addGroupPopout &&
+      {deletePopout.status && (
-            <AddGroup 
+        <DeleteGroup
-                action={()=>setAddGroupPopout(false)}
+          action={() => setDeletePopout({ status: false, data: {} })}
-                situation={addGroupPopout}
+          situation={deletePopout.status}
-                setUpdateList={setUpdateList}
+          details={deletePopout.data}
-            />
+        />
-        }
+      )}
+
+      {addGroupPopout && (
+        <AddGroup
+          action={() => setAddGroupPopout(false)}
+          situation={addGroupPopout}
+          setUpdateList={setUpdateList}
+        />
+      )}
     </>
-  )
+  );
 }

src/components/JobGroups/GroupMemberTable.jsx

@@ -1,98 +1,118 @@
-import React, { useState } from 'react'
+import React, { useState } from "react";
-import { handlePagingFunc } from '../Pagination/HandlePagination';
+import { handlePagingFunc } from "../Pagination/HandlePagination";
-import PaginatedList  from '../Pagination/PaginatedList';
+import PaginatedList from "../Pagination/PaginatedList";
-import DeleteMember from './DeleteMember';
+import DeleteMember from "./DeleteMember";
+import { localImgLoad } from "../../lib";
 
-export default function GroupMemberTable({selectedList}) {
+export default function GroupMemberTable({ selectedList }) {
+  // Handle Pagination
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
 
-    // Handle Pagination
+  const currentSelectedList = selectedList?.slice(
-    const [currentPage, setCurrentPage] = useState(0);
+    indexOfFirstItem,
-    const indexOfFirstItem = Number(currentPage);
+    indexOfLastItem
-    const indexOfLastItem =Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  );
 
-    const currentSelectedList = selectedList?.slice(indexOfFirstItem, indexOfLastItem);
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
 
-    const handlePagination = (e) => {
+  const [deletePopout, setDeletePopout] = useState({
-      handlePagingFunc(e, setCurrentPage);
+    status: false,
-    };
+    data: {},
+  });
 
-    const [deletePopout, setDeletePopout] = useState({
+  const handleDeleteMember = (item) => {
-        status: false,
+    setDeletePopout({
-        data: {}
+      status: true,
-    })
+      data: { ...item },
+    });
+  };
 
-    const handleDeleteMember = (item) => {
+  return (
-        setDeletePopout({
+    <div
-            status: true,
+      className={`w-full p-8 dark:bg-dark-gray overflow-hidden rounded-2xl section-shado bg-[#fffef6]`}
-            data: {...item}
+    >
-        })
+      <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between min-h-[400px]">
-    }
+        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-   
+          <tbody>
-    return (
+            <>
-        <div className={`w-full p-8 bg-white dark:bg-dark-gray overflow-hidden rounded-2xl section-shadow`}>
+              {selectedList && selectedList?.length > 0 ? (
-            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between min-h-[400px]">
+                currentSelectedList.map((value, index) => (
-              <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                  <tr
-                <tbody>
+                    key={value.uid}
-                  <>
+                    className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
-                    {selectedList && selectedList?.length > 0 ? (
+                  >
-                        currentSelectedList.map((value, index) => (
+                    {/* <td className="p-1">{value?.firstname}</td>
-                        <tr key={value.uid} className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
-                          {/* <td className="p-1">{value?.firstname}</td>
                           <td className="p-1">{value?.lastname}</td>
                           <td className="p-1">{value?.email}</td>
                           <td className="p-1 text-right">
                             <button onClick={()=>{handleDeleteMember(value)}} className='rounded-lg text-sm bg-red-500 hover:bg-red-400 text-white font-bold py-1 px-2.5'>X</button>
                           </td> */}
-                          <td className='py-2'>
+                    <td className="py-2">
-                            <div className="flex flex-col">
+                      <div className="flex flex-col">
-                              <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                {value.firstname && value.firstname} {value.lastname && value.lastname}
+                          {value.firstname && value.firstname}{" "}
-                              </h1>
+                          {value.lastname && value.lastname}
-                              <span className="text-sm text-thin-light-gray">
+                        </h1>
-                                {value.email && value.email}
+                        <span className="text-sm text-thin-light-gray">
-                              </span>
+                          {value.email && value.email}
-                            </div>
+                        </span>
-                          </td>
+                      </div>
-                          <td className='py-2 text-right'>
+                    </td>
-                            <button onClick={()=>{handleDeleteMember(value)}} className='rounded-lg text-sm bg-red-500 hover:bg-red-400 text-white font-bold py-1 px-2.5'>X</button>
+                    <td className="py-2 text-right">
-                          </td>
+                      <button
-                        </tr>
+                        onClick={() => {
-                        ))
+                          handleDeleteMember(value);
-                    ) : (
+                        }}
-                      <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                        className="flex relative items-center justify-center border-0 w-8 h-8"
-                        <td className="p-2">No Members Found</td>
+                      >
-                      </tr>
+                        <img
-                    )}
+                          src={localImgLoad("images/icons/remove_grp.svg")}
-                  </>
+                          alt="remove-icon"
-                </tbody>
+                        />
-              </table>
+                      </button>
+                    </td>
+                  </tr>
+                ))
+              ) : (
+                <tr className="font-semibold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                  <td className="p-2">No Members Found. Please add</td>
+                </tr>
+              )}
+            </>
+          </tbody>
+        </table>
 
-              {/* PAGINATION BUTTON */}
+        {/* PAGINATION BUTTON */}
-              <PaginatedList
+        <PaginatedList
-                onClick={handlePagination}
+          onClick={handlePagination}
-                prev={currentPage == 0 ? true : false}
+          prev={currentPage == 0 ? true : false}
-                next={
+          next={
-                  currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+            currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-                  selectedList?.length
+            selectedList?.length
-                    ? true
+              ? true
-                    : false
+              : false
-                }
+          }
-                data={selectedList}
+          data={selectedList}
-                start={indexOfFirstItem}
+          start={indexOfFirstItem}
-                stop={indexOfLastItem}
+          stop={indexOfLastItem}
-              />
+        />
-              {/* END OF PAGINATION BUTTON */}
+        {/* END OF PAGINATION BUTTON */}
-            </div>
+      </div>
 
-          {/* DELETE MEMBER POPOUT */}
+      {/* DELETE MEMBER POPOUT */}
-          {deletePopout.status &&
+      {deletePopout.status && (
-                <DeleteMember 
+        <DeleteMember
-                    action={()=>setDeletePopout({status:false, data:{}})}
+          action={() => setDeletePopout({ status: false, data: {} })}
-                    situation={deletePopout.status}
+          situation={deletePopout.status}
-                    details={deletePopout.data}
+          details={deletePopout.data}
-                />
+        />
-            }
+      )}
-          {/* END OF DELETE MEMBER POPOUT */}
+      {/* END OF DELETE MEMBER POPOUT */}
-        </div>
+    </div>
-      );
+  );
-    };
+}

src/components/JobGroups/JobGroups.jsx

@@ -1,79 +1,119 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState } from "react";
-import Layout from '../Partials/Layout'
+import Layout from "../Partials/Layout";
 
-import GroupList from './GroupList'
+import GroupList from "./GroupList";
-import MemberList from './MemberList'
+import MemberList from "./MemberList";
-import LoadingSpinner from '../Spinners/LoadingSpinner'
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
-import usersService from '../../services/UsersService'
+import usersService from "../../services/UsersService";
 
 export default function JobGroups() {
+  const userApi = new usersService();
 
-    const userApi = new usersService();
+  const [updateList, setUpdateList] = useState(false);
 
-    const [updateList, setUpdateList] = useState(false)
+  const [groupList, setGroupList] = useState({
+    loading: true,
+    groups: [],
+    members: [],
+  });
 
+  const [selectedGroup, setSelectedGroup] = useState({
+    id: "",
+    name: "",
+    data: [],
+  });
 
-    const [groupList, setGroupList] = useState({
+  const changeSelectedGroup = (e) => {
-        loading:true,
+    let groupID = e.target.value;
-        groups: [],
+    const activeMembers = groupList?.members?.filter(
-        members: []
+      (item) => item.group_id == groupID
-    })
+    );
+    const activeGroup = groupList?.groups?.filter(
+      (item) => item.group_id == groupID
+    );
+    setSelectedGroup({
+      id: groupID,
+      name: activeGroup[0]?.group_name,
+      data: activeMembers,
+    });
+  };
 
-    const [selectedGroup, setSelectedGroup] = useState({id:'', name:'', data: []})
+  useEffect(() => {
-
+    setGroupList({ loading: true, groups: [], members: [] });
-    const changeSelectedGroup = (e) => {
+    userApi
-        let groupID = e.target.value
+      .jobGroupList({})
-        const activeMembers = groupList?.members?.filter(item => item.group_id == groupID)
+      .then((res) => {
-        const activeGroup = groupList?.groups?.filter(item => item.group_id == groupID)
+        const { status, data } = res;
-        setSelectedGroup({id: groupID, name:activeGroup[0]?.group_name, data:activeMembers})
+        if (status != 200 || data?.internal_return < 0) {
-    }
+          setGroupList({ loading: false, groups: [], members: [] });
-
+          return;
-    useEffect(()=>{
+        }
-        setGroupList({loading: true, groups: [], members: []})
+        if (data.result_list.length < 0) {
-        userApi.jobGroupList({}).then(res => {
+          setGroupList({ loading: false, groups: [], members: [] });
-            const {status, data} = res
+          return;
-            if(status != 200 || data?.internal_return < 0){
+        }
-                setGroupList({loading: false, groups: [], members: []})
+        setGroupList({
-                return
+          loading: false,
-            }
+          groups: data.result_list,
-            if(data.result_list.length < 0){
+          members: data.result_list_member,
-                setGroupList({loading: false, groups: [], members: []})
+        });
-                return
+        if (selectedGroup.id == "") {
-            }
+          let activeGroupId = data.result_list[0].group_id;
-            setGroupList({loading: false, groups: data.result_list, members: data.result_list_member})
+          let activeGroup = data.result_list[0].group_name;
-            if(selectedGroup.id == ''){
+          let activeMembers = data.result_list_member?.filter(
-                let activeGroupId = data.result_list[0].group_id
+            (item) => item.group_id == activeGroupId
-                let activeGroup = data.result_list[0].group_name
+          );
-                let activeMembers = data.result_list_member?.filter(item => item.group_id == activeGroupId)
+          setSelectedGroup({
-                setSelectedGroup({id: activeGroupId, name:activeGroup, data:activeMembers})
+            id: activeGroupId,
-            }else{
+            name: activeGroup,
-                let activeMembers = data.result_list_member?.filter(item => item.group_id == selectedGroup?.id)
+            data: activeMembers,
-                setSelectedGroup({id: selectedGroup?.id, name:selectedGroup?.name, data:activeMembers})
+          });
-            }
+        } else {
-        }).catch(error => {
+          let activeMembers = data.result_list_member?.filter(
-            setGroupList({loading: false, groups: [], members: []})
+            (item) => item.group_id == selectedGroup?.id
-            console.log(error)
+          );
-        })
+          setSelectedGroup({
-    },[updateList])
+            id: selectedGroup?.id,
+            name: selectedGroup?.name,
+            data: activeMembers,
+          });
+        }
+      })
+      .catch((error) => {
+        setGroupList({ loading: false, groups: [], members: [] });
+        console.log(error);
+      });
+  }, [updateList]);
 
   return (
     <Layout>
-        <div>
+      <div>
-            <h1 className='mb-5 text-lg lg:text-2xl tracking-wide font-bold text-slate-900 dark:text-slate-100'>Jobs Groups</h1>
+        <h1 className="mb-5 text-lg lg:text-2xl tracking-wide font-bold text-slate-900 dark:text-slate-100">
-        </div>
+          Job Groups
-        <div className='p-5 w-full min-h-[400px] flex flex-col lg:flex-row gap-3 lg:gap-6 rounded-lg shadow-md bg-white dark:bg-dark-white'>
+        </h1>
-            {groupList.loading ?
+      </div>
-                <div className='w-full h-[400px] flex justify-center items-center'>
+      <div className="p-5 w-full min-h-[400px] flex flex-col lg:flex-row gap-3 lg:gap-6 rounded-lg shadow-md bg-white dark:bg-dark-white">
-                    <LoadingSpinner size='16' />
+        {groupList.loading ? (
-                </div>
+          <div className="w-full h-[400px] flex justify-center items-center">
-            :
+            <LoadingSpinner size="16" />
-            <>
+          </div>
-                <GroupList groupList={groupList?.groups} selectedGroup={selectedGroup} changeSelectedGroup={changeSelectedGroup} setUpdateList={setUpdateList} />
+        ) : (
-                <MemberList groupList={groupList?.groups} selectedGroup={selectedGroup} setUpdateList={setUpdateList} />
+          <>
-            </>
+            <GroupList
-            }
+              groupList={groupList?.groups}
-        </div>
+              selectedGroup={selectedGroup}
+              changeSelectedGroup={changeSelectedGroup}
+              setUpdateList={setUpdateList}
+            />
+            <MemberList
+              groupList={groupList?.groups}
+              selectedGroup={selectedGroup}
+              setUpdateList={setUpdateList}
+            />
+          </>
+        )}
+      </div>
     </Layout>
-  )
+  );
 }

src/components/JobGroups/MemberList.jsx

@@ -6,8 +6,8 @@ import GroupMemberTable from "./GroupMemberTable";
 
 import EmailValidator from "../../lib/EmailValidator";
 
-import usersService from "../../services/UsersService";
 import { apiConst } from "../../lib/apiConst";
+import usersService from "../../services/UsersService";
 
 export default function MemberList({
   groupList,
@@ -277,7 +277,7 @@ export default function MemberList({
                   )}
                 </div>
               </div>
-              <div className="my-2 flex flex-col min-h-[300px]">
+              <div className="my-2 flex flex-col min-h-[300px] h-full">
                 {selectedGroup?.data?.length < 1 ? (
                   <h1 className="my-5 text-lg lg:text-xl tracking-wide text-slate-900 dark:text-slate-100">
                     No Member Found, Please Add

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -1,12 +1,10 @@
 import React, { useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-import localImgLoad from "../../lib/localImgLoad";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 
 export default function MyActiveJobTable({ MyJobList, className }) {
-
   const navigate = useNavigate();
   let { pathname } = useLocation();
 
@@ -45,7 +43,11 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                         value?.currency_code,
                         value?.currency
                       );
-                      let image = `${MyJobList.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                      let image = `${
+                        MyJobList.session_image_server
+                      }${localStorage.getItem("session_token")}/job/${
+                        value.job_uid
+                      }`;
                       return (
                         <tr
                           key={index}
@@ -112,7 +114,7 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                                 className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                               >
                                 {value.owner_status == "OWNER"
-                                  ? "Manage"
+                                  ? "Review"
                                   : "Send Updates"}
                               </button>
                             </div>

src/components/MyJobs/MyJobTable.jsx

@@ -1,21 +1,23 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import dataImage2 from "../../assets/images/data-table-user-2.png";
+import { useDispatch, useSelector } from "react-redux";
-import SelectBox from "../Helpers/SelectBox";
-import DeleteJobPopout from "../jobPopout/DeleteJobPopout";
-import JobListPopout from "../jobPopout/JobListPopout";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import { useSelector } from "react-redux";
 import usersService from "../../services/UsersService";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import SelectBox from "../Helpers/SelectBox";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import DeleteJobPopout from "../jobPopout/DeleteJobPopout";
 import EditJobPopOut from "../jobPopout/EditJobPopout";
-import { PriceFormatter } from "../Helpers/PriceFormatter";
 
-import EditIcon from "../../assets/images/icon-edit.svg";
 import DeleteIcon from "../../assets/images/icon-delete.svg";
-import localImgLoad from "../../lib/localImgLoad";
+import EditIcon from "../../assets/images/icon-edit.svg";
+import { tableReload } from "../AddJob/settings";
+import CreditPopup from "../MyWallet/Popup/CreditPopup";
+import JobListPopout from "../jobPopout/JobListPopout";
 
 export default function MyJobTable({ MyJobList, reloadJobList, className }) {
+  const dispatch = useDispatch();
+
   // Getting the categories
   const currentJobCart = MyJobList?.data?.categories;
   // DropDown Box
@@ -25,24 +27,46 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
     Object.keys(filterCategories)[0]
   );
 
-  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+  const [jobPopout, setJobPopout] = useState({ show: false, data: {} });
 
-  let [deleteJobPopout, setDeleteJobPopout] = useState({
+  const [deleteJobPopout, setDeleteJobPopout] = useState({
     show: false,
     data: {},
-  }); // STATE TO HOLD THE VALUE OF THE ITEM DETAILS TO DELETE AND DETERMINE WHEN TO SHOW
+  });
   const [editJob, setEditJob] = useState({ show: false, data: {} });
 
   const [myCountry, setCountries] = useState("");
+
   const {
     userDetails: { country },
   } = useSelector((state) => state?.userDetails);
 
   const userApi = useMemo(() => new usersService(), []);
 
+  const [creditPopup, setCreditPopup] = useState({ show: false, data: {} });
+  const [walletItem, setWalletItem] = useState(null);
+
+  /**
+   * Opens the credit popup.
+   * @param {Object} value - The value object.
+   */
+  const openPopUp = (value) => {
+    setCreditPopup({
+      show: true,
+      data: { ...value },
+    });
+  };
+
+  /**
+   * Closes the credit popup and dispatches a table reload action.
+   */
+  const closePopUp = () => {
+    setCreditPopup({ show: false, data: {} });
+    dispatch(tableReload({ type: "WALLETTABLE" }));
+  };
+
   // Get Country Api
   const getCountryList = useCallback(async () => {
-    
     try {
       const res = await userApi.getSignupCountryData();
       if (res.status === 200 && res.data.internal_return >= 0) {
@@ -59,7 +83,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
       throw new Error(error);
     }
   }, [userApi, country]);
-  console.log('MY COUNTRY', myCountry)
+
   useEffect(() => {
     getCountryList();
   }, [getCountryList]);
@@ -101,6 +125,121 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
     }
   };
 
+  const { MyJobListHeader, MyJobListTable } = myJobTableFeatures(
+    filterCategories,
+    selectedCategory,
+    handleSetCategory,
+    setDeleteJobPopout,
+    setEditJob,
+    setJobPopout,
+    MyJobList,
+    filteredCurrentJobList,
+    handlePagination,
+    currentPage,
+    currentJobList,
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+        className || ""
+      }`}
+    >
+      <MyJobListHeader />
+      {MyJobList?.loading ? (
+        <LoadingSpinner size="16" color="sky-blue" />
+      ) : (
+        <MyJobListTable />
+      )}
+
+      {/* Job List Popout */}
+      {jobPopout.show && (
+        <JobListPopout
+          details={jobPopout.data}
+          onClose={() => {
+            setJobPopout({ show: false, data: {} });
+          }}
+          setWalletItem={setWalletItem}
+          openWallet={openPopUp}
+          situation={jobPopout.show}
+        />
+      )}
+      {/* End of Job List Popout */}
+
+      {/* Delete Job Popout */}
+      {deleteJobPopout.show && (
+        <DeleteJobPopout
+          details={deleteJobPopout.data}
+          onClose={() => {
+            setDeleteJobPopout({ show: false, data: {} });
+          }}
+          reloadJobList={reloadJobList}
+          situation={deleteJobPopout.show}
+        />
+      )}
+      {/* END of Delete Job Popout */}
+
+      {editJob.show && (
+        <EditJobPopOut
+          details={editJob.data}
+          onClose={() => {
+            setEditJob({
+              show: false,
+              data: {},
+            });
+          }}
+          situation={editJob.show}
+          country={myCountry}
+          categories={currentJobCart}
+        />
+      )}
+
+      {creditPopup.show && (
+        <CreditPopup
+          details={creditPopup.data}
+          walletItem={walletItem}
+          onClose={closePopUp}
+          situation={openPopUp}
+        />
+      )}
+    </div>
+  );
+}
+
+function myJobTableFeatures(
+  filterCategories,
+  selectedCategory,
+  handleSetCategory,
+  setDeleteJobPopout,
+  setEditJob,
+  setJobPopout,
+  MyJobList,
+  filteredCurrentJobList,
+  handlePagination,
+  currentPage,
+  currentJobList,
+  indexOfFirstItem,
+  indexOfLastItem
+) {
+  // List of job table features
+  const MyJobListHeader = () => (
+    <div className="header w-full flex justify-between items-center mb-5">
+      <div className="flex space-x-2 items-center">
+        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+          {filterCategories[selectedCategory]} Jobs
+        </h1>
+      </div>
+      <SelectBox
+        action={handleSetCategory}
+        datas={Object.values(filterCategories)}
+        className="Update-table-dropdown"
+        contentBodyClasses="w-auto min-w-max"
+      />
+    </div>
+  );
+
   const JobListItem = ({ value, index, image_server }) => {
     let thePrice = PriceFormatter(
       value?.price * 0.01,
@@ -190,7 +329,10 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
           <button
             type="button"
             onClick={() => {
-              setJobPopout({ show: true, data: { thePrice, ...value } });
+              setJobPopout({
+                show: true,
+                data: { thePrice, ...value },
+              });
             }}
             className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
           >
@@ -201,117 +343,53 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
     );
   };
 
-  return (
+  const NoJobsRow = ({ text }) => (
-    <div
+    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+      <td className="p-2">{text}</td>
-        className || ""
+    </tr>
-      }`}
+  );
-    >
-      <div className="header w-full flex justify-between items-center mb-5">
-        <div className="flex space-x-2 items-center">
-          <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-            {filterCategories[selectedCategory]} Jobs
-          </h1>
-        </div>
-        <SelectBox
-          action={handleSetCategory}
-          datas={Object.values(filterCategories)}
-          className="Update-table-dropdown"
-          contentBodyClasses="w-auto min-w-max"
-        />
-      </div>
-      {MyJobList?.loading ? (
-        <LoadingSpinner size="16" color="sky-blue" />
-      ) : (
-        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between min-h-[520px]">
-          <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
-            <tbody>
-              <>
-                {MyJobList &&
-                MyJobList?.data?.result_list &&
-                MyJobList.data?.result_list.length > 0 ? (
-                  filteredCurrentJobList?.length ? (
-                    filteredCurrentJobList.map((value, index) => (
-                      <JobListItem
-                        index={index}
-                        key={index}
-                        value={value}
-                        image_server={MyJobList?.data.session_image_server}
-                      />
-                    ))
-                  ) : (
-                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                      <td className="p-2">
-                        No Jobs Available In This Category!
-                      </td>
-                    </tr>
-                  )
-                ) : (
-                  <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                    <td className="p-2">No Jobs Avaliable!</td>
-                  </tr>
-                )}
-              </>
-            </tbody>
-          </table>
 
-          {/* PAGINATION BUTTON */}
+  const MyJobListTable = () => (
-          <PaginatedList
+    <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between min-h-[520px]">
-            onClick={handlePagination}
+      <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
-            prev={currentPage == 0 ? true : false}
+        <tbody>
-            next={
+          <>
-              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+            {MyJobList?.data?.result_list?.length > 0 ? (
-              currentJobList?.length
+              filteredCurrentJobList.length > 0 ? (
-                ? true
+                filteredCurrentJobList.map((value, index) => (
-                : false
+                  <JobListItem
-            }
+                    key={index}
-            data={currentJobList}
+                    index={index}
-            start={indexOfFirstItem}
+                    value={value}
-            stop={indexOfLastItem}
+                    image_server={MyJobList.data.session_image_server}
-          />
+                  />
-          {/* END OF PAGINATION BUTTON */}
+                ))
-        </div>
+              ) : (
-      )}
+                <NoJobsRow text="No Jobs Available In This Category!" />
+              )
+            ) : (
+              <NoJobsRow text="No Jobs Available!" />
+            )}
+          </>
+        </tbody>
+      </table>
 
-      {/* Job List Popout */}
+      {/* PAGINATION BUTTON */}
-      {jobPopout.show && (
+      <PaginatedList
-        <JobListPopout
+        onClick={handlePagination}
-          details={jobPopout.data}
+        prev={currentPage == 0 ? true : false}
-          onClose={() => {
+        next={
-            setJobPopout({ show: false, data: {} });
+          currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-          }}
+          currentJobList?.length
-          situation={jobPopout.show}
+            ? true
-        />
+            : false
-      )}
+        }
-      {/* End of Job List Popout */}
+        data={currentJobList}
-
+        start={indexOfFirstItem}
-      {/* Delete Job Popout */}
+        stop={indexOfLastItem}
-      {deleteJobPopout.show && (
+      />
-        <DeleteJobPopout
+      {/* END OF PAGINATION BUTTON */}
-          details={deleteJobPopout.data}
-          onClose={() => {
-            setDeleteJobPopout({ show: false, data: {} });
-          }}
-          reloadJobList={reloadJobList}
-          situation={deleteJobPopout.show}
-        />
-      )}
-      {/* END of Delete Job Popout */}
-
-      {editJob.show && (
-        <EditJobPopOut
-          details={editJob.data}
-          onClose={() => {
-            setEditJob({
-              show: false,
-              data: {},
-            });
-          }}
-          situation={editJob.show}
-          country={myCountry}
-          categories={currentJobCart}
-        />
-      )}
     </div>
   );
+  return { MyJobListHeader, MyJobListTable };
 }

src/components/MyOffers/MyPendingJobTable.jsx

@@ -6,9 +6,7 @@ import PendingJobsPopout from "../jobPopout/PendingJobsPopout";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import localImgLoad from "../../lib/localImgLoad";
 
-
 export default function MyPendingJobTable({ MyJobList, className }) {
-
   let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
 
   const [currentPage, setCurrentPage] = useState(0);
@@ -46,7 +44,11 @@ export default function MyPendingJobTable({ MyJobList, className }) {
                         value?.currency_code,
                         value?.currency
                       );
-                      let image = `${MyJobList.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
+                      let image = `${
+                        MyJobList.session_image_server
+                      }${localStorage.getItem("session_token")}/job/${
+                        value.job_uid
+                      }`;
                       return (
                         <tr
                           key={index}
@@ -107,7 +109,9 @@ export default function MyPendingJobTable({ MyJobList, className }) {
                               }}
                               className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                             >
-                              {value.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
+                              {value.owner_status == "OWNER"
+                                ? "Manage"
+                                : "View"}
                             </button>
                           </td>
                         </tr>

src/components/MyOffers/index.jsx

@@ -1,11 +1,10 @@
 import React, { useState } from "react";
-import { Link } from "react-router-dom";
 import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 import CommonHead from "../UserHeader/CommonHead";
 import MyPendingJobTable from "./MyPendingJobTable";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
 
-export default function MyPendingJobs(props) {
+export default function MyOffers(props) {
   const [selectTab, setValue] = useState("today");
   const filterHandler = (value) => {
     setValue(value);
@@ -13,9 +12,7 @@ export default function MyPendingJobs(props) {
   // console.log("AMEYE LOC1", props.MyJobList);
   return (
     <Layout>
-      <CommonHead
+      <CommonHead commonHeadData={props.commonHeadData} />
-          commonHeadData={props.commonHeadData}
-      />
       <div className="notification-page w-full mb-10">
         <div className="notification-wrapper w-full">
           {/* heading */}
@@ -25,7 +22,7 @@ export default function MyPendingJobs(props) {
                 <span
                   className={`${selectTab === "today" ? "block" : "hidden"}`}
                 >
-                  Pending Job(s)
+                  Pending Offers
                 </span>
               </h1>
             </div>
@@ -36,13 +33,17 @@ export default function MyPendingJobs(props) {
               ></div>
             </div>
           </div>
-          {props.MyJobList.loading ?
+          {props.MyJobList.loading ? (
-          <div className="bg-white">
+            <div className="bg-white">
-            <LoadingSpinner size='16' color='sky-blue' height='min-h-[300px]' />
+              <LoadingSpinner
-          </div>
+                size="16"
-          :
+                color="sky-blue"
-          <MyPendingJobTable MyJobList={props.MyJobList.data} />
+                height="min-h-[300px]"
-          }
+              />
+            </div>
+          ) : (
+            <MyPendingJobTable MyJobList={props.MyJobList.data} />
+          )}
         </div>
       </div>
     </Layout>

src/components/MyWallet/Popup/CreditPopup.jsx

@@ -79,7 +79,7 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
                 <ConfirmAddFund
                   confirmCredit={confirmCredit}
                   setConfirmCredit={setConfirmCredit}
-                  walletItem={walletItem}
+                  walletItem={walletItem || details}
                   onClose={onClose}
                 />
               ) : confirmCredit?.show?.acceptConfirm?.state ? (

src/components/Partials/Default.jsx

@@ -5,6 +5,13 @@ function Default({ children }) {
   // dark mode setup
   const [theme, setTheme] = useState(null);
 
+  // country mode setup
+  const [countryMode, setCountryMode] = useState(localStorage.getItem('cnt') ? localStorage.getItem('cnt')?.toUpperCase() : '')
+
+
+  const queryParams = new URLSearchParams(location?.search);
+  const country = queryParams.get("cnt")?.toUpperCase();
+
   useEffect(() => {
     if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
       setTheme("dark");
@@ -24,9 +31,17 @@ function Default({ children }) {
   const handleThemeSwitch = () => {
     setTheme(theme === "dark" ? "light" : "dark");
   };
+
+  useEffect(()=>{
+    if(country){
+      setCountryMode(country)
+      localStorage.setItem('cnt', country)
+    }
+  },[countryMode])
+
   return (
     <>
-      <DarkModeContext.Provider value={{ theme, handleThemeSwitch }}>
+      <DarkModeContext.Provider value={{ theme, handleThemeSwitch, countryMode }}>
         {children && children}
       </DarkModeContext.Provider>
     </>

src/components/Partials/Layout.jsx

@@ -24,7 +24,7 @@ export default function Layout({ children }) {
     localStorage.removeItem("member_id");
     localStorage.removeItem("uid");
     sessionStorage.removeItem("family_uid");
-    // localStorage.clear();
+    localStorage.clear();
     // toast.success("Come Back Soon", {
     //   icon: `🙂`,
     // });

src/components/Partials/MobileSideBar.jsx

@@ -192,8 +192,13 @@ export default function MobileSidebar({
                     {[
                       { name: "List", path: "/myjobs", iconName: "job-list" },
                       {
-                        name: "Pending",
+                        name: "Offers",
-                        path: "/my-pending-jobs",
+                        path: "/my-offers",
+                        iconName: "pending-job",
+                      },
+                      {
+                        name: "Waiting",
+                        path: "/pend-interest",
                         iconName: "pending-job",
                       },
                       {

src/components/Partials/RightSideBar.jsx

@@ -190,7 +190,7 @@ export default function RightSideBar({myJobList}) {
                 {/* name */}
                 <div>
                   <p className="text-thin-light-gray text-base font-medium">
-                    <NavLink to="/my-review-jobs">Review Pending</NavLink>
+                    <NavLink to="/my-review-jobs">Review</NavLink>
                   </p>
                 </div>
               </div>

src/components/Partials/Sidebar.jsx

@@ -8,7 +8,6 @@ import {
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
 
-
 export default function Sidebar({
   sidebar,
   action,
@@ -218,8 +217,13 @@ export default function Sidebar({
                         iconName: "job-list",
                       },
                       {
-                        name: "Pending",
+                        name: "Waiting",
-                        path: "/my-pending-jobs",
+                        path: "/pend-interest",
+                        iconName: "pending-job",
+                      },
+                      {
+                        name: "Offers",
+                        path: "/my-offers",
                         iconName: "pending-job",
                       },
                       {
@@ -291,7 +295,7 @@ export default function Sidebar({
           className="signout-btn w-full flex items-center justify-center"
         >
           <span className="p-[1px] w-[40px] h-[40px] border border-purple rounded-full">
-            <Icons name='new-logout' />
+            <Icons name="new-logout" />
           </span>
         </button>
       )}

src/components/jobPopout/JobListPopout.jsx

@@ -1,13 +1,13 @@
 import { Field, Form, Formik } from "formik";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import * as Yup from "yup";
 import usersService from "../../services/UsersService";
+import { tableReload } from "../../store/TableReloads";
 import InputCom from "../Helpers/Inputs/InputCom/index";
 import ModalCom from "../Helpers/ModalCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import Detail from "./popoutcomponent/Detail";
-import { tableReload } from "../../store/TableReloads";
-import { useDispatch } from "react-redux";
 
 const validationSchema = Yup.object().shape({
   family: Yup.string().required("This is required "),
@@ -22,14 +22,22 @@ const validationSchema = Yup.object().shape({
   group: Yup.string(),
 });
 
-function JobListPopout({ details, onClose, situation }) {
+function JobListPopout({
+  details,
+  onClose,
+  situation,
+  openWallet,
+  setWalletItem,
+}) {
+  const [selectedTab, setSelectedTab] = useState("public");
+  const tabs = ["public", "individual", "group"];
 
-  const [selectedTab, setSelectedTab] = useState('public')
+  const dispatch = useDispatch();
-  const tabs = ['public', 'individual', 'group']
 
-const dispatch = useDispatch()
+  const [requestStatus, setRequestStatus] = useState({
-
+    message: "",
-const [requestStatus, setRequestStatus] = useState({message:'', status:false})
+    status: false,
+  });
 
   const [familyList, setFamilyList] = useState([]);
   let [loader, setLoader] = useState({
@@ -43,6 +51,30 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
   });
 
   const apiCall = useMemo(() => new usersService(), []);
+  const { walletDetails } = useSelector((state) => state.walletDetails);
+
+  const getWalletDetail = (currency) => {
+    // A FUNCTION TO GET USER BALANCE BASED ON TASK CURRENCY
+    const walletChecker = walletDetails?.data.find(
+      (item) => item.description === currency
+    );
+    return walletChecker
+      ? {
+          description: walletChecker.description,
+          country: walletChecker.country,
+          code: walletChecker.code,
+          amount: walletChecker.amount,
+        }
+      : 0;
+  };
+
+  const taskWalletSelector = getWalletDetail(details?.currency);
+
+  const openCreditPopup = () => {
+    onClose();
+    setWalletItem(taskWalletSelector);
+    openWallet();
+  };
 
   // member listing
   const memberList = useCallback(async () => {
@@ -117,6 +149,7 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
       job_uid,
       job_description: textArea,
     };
+
     let reqData;
 
     // for family input
@@ -147,7 +180,7 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
       // for group input
       reqData = {
         ...jobReq,
-        email: '',
+        email: "",
         group_id: values?.group,
         assign_mode: 110044,
         duration: details?.timeline_days,
@@ -161,52 +194,106 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
     try {
       const res = await apiCall.assignJobTask(reqData);
       let { status, data } = await res;
-      if(status != 200 || data.internal_return < 0){
+      if (status != 200 || data.internal_return < 0) {
-        setRequestStatus({message:'Unable to complete', status:false})
+        setRequestStatus({ message: "Unable to complete", status: false });
-        return setTimeout(()=>{
+        return setTimeout(() => {
           setLoader({ jobFields: false });
-          setRequestStatus({message:'', status:false})
+          setRequestStatus({ message: "", status: false });
-        },3000)
+        }, 3000);
       }
       dispatch(tableReload({ type: "JOBTABLE" }));
-      setRequestStatus({message:'Successful', status:true})
+      setRequestStatus({ message: "Successful", status: true });
-      setTimeout(()=>{
+      setTimeout(() => {
         setLoader({ jobFields: false });
         onClose();
-        throw new Response(data);
+        // throw new Response(data);
-      },3000)
+      }, 3000);
     } catch (error) {
-      setRequestStatus({message:'Unable to complete', status:false})
+      setRequestStatus({ message: "Unable to complete", status: false });
-      setTimeout(()=>{
+      setTimeout(() => {
-        setRequestStatus({message:'', status:false})
+        setRequestStatus({ message: "", status: false });
         setLoader({ jobFields: false });
         throw new Error(error);
-      },3000)
+      }, 3000);
     }
   };
 
-  const [groupList, setGroupList] = useState({loading: true, groups: [], members: []})
+  const [groupList, setGroupList] = useState({
+    loading: true,
+    groups: [],
+    members: [],
+  });
 
   // FUNCTION TO POPULATE USER GROUP LIST
-  useEffect(()=>{
+  useEffect(() => {
     // setGroupList({loading: true, groups: [], members: []})
-    apiCall.jobGroupList({}).then(res => {
+    apiCall
-        const {status, data} = res
+      .jobGroupList({})
-        if(status != 200 || data?.internal_return < 0){
+      .then((res) => {
-            setGroupList({loading: false, groups: [], members: []})
+        const { status, data } = res;
-            return
+        if (status != 200 || data?.internal_return < 0) {
+          setGroupList({ loading: false, groups: [], members: [] });
+          return;
         }
-        if(data.result_list.length < 0){
+        if (data.result_list.length < 0) {
-            setGroupList({loading: false, groups: [], members: []})
+          setGroupList({ loading: false, groups: [], members: [] });
-            return
+          return;
         }
-        setGroupList({loading: false, groups: data.result_list, members: data.result_list_member})
+        setGroupList({
-    }).catch(error => {
+          loading: false,
-        setGroupList({loading: false, groups: [], members: []})
+          groups: data.result_list,
-    })
+          members: data.result_list_member,
-},[])
+        });
+      })
+      .catch((error) => {
+        setGroupList({ loading: false, groups: [], members: [] });
+      });
+  }, []);
+
+  const DetailsSection = ({ label, value }) => (
+    <div className="my-3 md:flex">
+      <Detail label={label} value={value} />
+    </div>
+  );
+
+  const DetailsComponent = () => {
+    const detailsArray = [
+      { label: "Description", value: details.description },
+      { label: "Price", value: details.thePrice },
+      { label: "Timeline", value: `${details.timeline_days} day(s)` },
+      { label: "Created", value: new Date(details?.created).toDateString() },
+    ];
+
+    return (
+      <div className="px-4 pb-3 w-full md:border-r-2">
+        {/* <p className='text-lg font-semibold text-slate-900 tracking-wide'>{details.title}</p> */}
+
+        {/* INPUT SECTION */}
+        {detailsArray.map((detail, index) => (
+          <DetailsSection
+            key={index}
+            label={detail.label}
+            value={detail.value}
+          />
+        ))}
+
+        <div className="">
+          <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+            Delivery Detail
+          </label>
+          <textarea
+            className={`p-2 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+            rows="7"
+            style={{ resize: "none" }}
+            value={textArea}
+            onChange={handleInputChange}
+          />
+          <p>{errMsg.deliveryDetail}</p>
+        </div>
+      </div>
+    );
+  };
 
-  // console.log("Job List P >> ", details)
   return (
     <ModalCom action={onClose} situation={situation} className="">
       <div className="logout-modal-wrapper w-[90%] md:w-[768px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
@@ -240,211 +327,186 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
             </svg>
           </button>
         </div>
+
         <div className="md:grid grid-cols-2 bg-white dark:bg-dark-white rounded-lg shadow-lg">
-          <div className="p-4 pb-3 w-full md:border-r-2">
+          <DetailsComponent />
-            {/* <p className='text-lg font-semibold text-slate-900 tracking-wide'>{details.title}</p> */}
 
-            {/* INPUT SECTION */}
+          <>
-            <div className="my-3 md:flex">
+            {/* ACTION SECTION */}
-              <Detail label="Description" value={details.description} />
+            {+taskWalletSelector.amount > +details.price ? (
-            </div>
+              <div className="px-4 pb-3 w-full flex flex-col justify-between">
+                <h1 className="text-lg mt-3 font-medium tracking-wide text-black dark:text-white">
+                  Send this Task to:
+                </h1>
+                <div className="flex flex-col grow">
+                  <div className="grid grid-cols-3 mt-4">
+                    {tabs.map((item) => (
+                      <TabButton
+                        key={item}
+                        item={item}
+                        selectedTab={selectedTab}
+                        setSelectedTab={setSelectedTab}
+                      />
+                    ))}
+                  </div>
+                  <div className="grow flex flex-col bg-red-50 dark:bg-[#D85A5A] rounded-b-2xl">
+                    {selectedTab == "family" && (
+                      <Formik
+                        initialValues={initialValues}
+                        validationSchema={validationSchema.fields.family}
+                        onSubmit={jobFieldHandler}
+                      >
+                        {(props) => {
+                          return (
+                            <Form className="hidden">
+                              {/* Assign to Family */}
+                              <JobFieldInput
+                                label="Assign to family"
+                                select={true}
+                                inputName="family"
+                                value={props?.values.family}
+                                data={familyList}
+                                btnText="Assign to family"
+                                optionText="Select Family"
+                                loader={loader?.jobFields?.family}
+                                errorHandler={errorHandler}
+                                parentClass="w-full flex flex-col gap-4"
+                              />
+                              <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                                {" "}
+                                {props?.values?.family === "" && (
+                                  <span>{errMsg?.jobFields?.family}</span>
+                                )}
+                              </p>{" "}
+                            </Form>
+                          );
+                        }}
+                      </Formik>
+                    )}
 
-            <div className="my-3 md:flex">
+                    {selectedTab == "public" && (
-              <Detail label="Price" value={details.thePrice} />
+                      <Formik
-            </div>
+                        initialValues={initialValues}
+                        validationSchema={validationSchema.fields.public}
+                        onSubmit={jobFieldHandler}
+                      >
+                        {(props) => {
+                          return (
+                            <Form className="">
+                              {/* Offer this job to public input */}
+                              <JobFieldInput
+                                label="Offer this job to public"
+                                select={true}
+                                inputName="public"
+                                value={props?.values.public}
+                                data={publicArray}
+                                btnText="Show Task to Public"
+                                optionText="Select Duration"
+                                loader={loader?.jobFields?.public}
+                                errorHandler={errorHandler}
+                                parentClass="w-full flex flex-col gap-4"
+                              />
+                              <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                                {" "}
+                                {props?.values.public === "" && (
+                                  <span>{errMsg?.jobFields?.public}</span>
+                                )}
+                              </p>{" "}
+                            </Form>
+                          );
+                        }}
+                      </Formik>
+                    )}
 
-            <div className="my-3 md:flex">
+                    {selectedTab == "individual" && (
-              <Detail
+                      <Formik
-                label="Timeline"
+                        initialValues={initialValues}
-                value={`${details.timeline_days} day(s)`}
+                        validationSchema={validationSchema.fields.individual}
-              />
+                        onSubmit={jobFieldHandler}
-            </div>
+                      >
+                        {(props) => {
+                          return (
+                            <Form className="">
+                              {/* Offer this job to individual input */}
+                              <JobFieldInput
+                                label="Offer this job to individual"
+                                input={true}
+                                inputName="individual"
+                                value={props?.values.individual}
+                                placeholder="Enter email of individual"
+                                inputHandler={props?.handleChange}
+                                btnText="Send Offer to Individual"
+                                loader={loader?.jobFields?.individual}
+                                errorHandler={errorHandler}
+                                parentClass="w-full flex flex-col gap-4"
+                              />
+                              <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                                {" "}
+                                {props?.values.individual === "" && (
+                                  <span>{errMsg?.jobFields?.individual}</span>
+                                )}
+                              </p>{" "}
+                            </Form>
+                          );
+                        }}
+                      </Formik>
+                    )}
 
-            <div className="my-3 md:flex">
+                    {/* { process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 && } */}
-              <Detail
+                    {selectedTab == "group" && (
-                label="Created"
+                      <Formik
-                value={new Date(details?.created).toDateString()}
+                        initialValues={initialValues}
-                />
+                        validationSchema={validationSchema.fields.group}
-            </div>
+                        onSubmit={jobFieldHandler}
-
+                      >
-            <div className="">
+                        {(props) => {
-              <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+                          return (
-                Delivery Detail
+                            <Form className="">
-              </label>
+                              {/* Offer this job to your group input */}
-              <textarea
+                              <JobFieldInput
-                className={`p-2 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+                                label="Offer this job to your Group"
-                rows="7"
+                                select={true}
-                style={{ resize: "none" }}
+                                inputName="group"
-                value={textArea}
+                                value={props?.values.group}
-                onChange={handleInputChange}
+                                btnText="Send Order to Group"
-              />
+                                optionText="Select Group"
-              <p>{errMsg.deliveryDetail}</p>
+                                loader={loader?.jobFields?.group}
-            </div>
+                                errorHandler={errorHandler}
-          </div>
+                                data={groupList}
-
+                                parentClass="w-full flex flex-col gap-4"
-          {/* ACTION SECTION */}
+                              />
-          <div className="p-4 w-ful flex flex-col justify-between">
+                              <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
-            <h1 className="text-lg mt-3 font-medium tracking-wide text-black dark:text-white">Send this Task to:</h1>
+                                {" "}
-            <div className="flex flex-col grow">
+                                {props?.values.group === "" && (
-              <div className="grid grid-cols-3 mt-4">
+                                  <span>{errMsg?.jobFields?.group}</span>
-                {tabs.map(item => (
+                                )}
-                  <button 
+                              </p>
-                    // className={`px-4 py-1 rounded-t-2xl ${selectedTab == item ? 'btn-gradient border-[2px] text-white' : 'bg-white text-[#000] border-t-[2px]'}`}
+                            </Form>
-                    className={`px-4 py-1 rounded-t-2xl border-t-[2px] transition-all duration-200 flex flex-col justify-center items-center ${selectedTab == item ? 'bg-red-50 dark:bg-[#D85A5A] text-slate-600 font-extrabold' : 'bg-white text-[#000]'}`}
+                          );
-                    value={item} 
+                        }}
-                    name={item}
+                      </Formik>
-                    onClick={()=>setSelectedTab(item)}
+                    )}
-                  >
+                    <p
-                    <div className={`mb-[1px] h-6 w-6 border-4 rounded-full transition-all duration-200 ${selectedTab == item ? 'border-white bg-emerald-500' : 'border-red-50 dark:border-[#D85A5A] bg-white'}`}></div>
+                      className={`text-center w-full text-lg ${
-                    {item[0].toUpperCase() + item.slice(1)}
+                        requestStatus.status
-                  </button>
+                          ? "text-emerald-600"
-                ))}
+                          : "text-red-600"
+                      }`}
+                    >
+                      {requestStatus.message && requestStatus.message}
+                    </p>
+                  </div>
+                </div>
               </div>
-              <div className="grow flex flex-col bg-red-50 dark:bg-[#D85A5A] rounded-b-2xl">
+            ) : (
-                {selectedTab == 'family' &&
+              <ZeroBalanceChecker
-                <Formik
+                {...taskWalletSelector}
-                  initialValues={initialValues}
+                openCreditPopup={openCreditPopup}
-                  validationSchema={validationSchema.fields.family}
+              />
-                  onSubmit={jobFieldHandler}
+            )}
-                >
-                  {(props) => {
-                    return (
-                      <Form className="hidden">
-                        {/* Assign to Family */}
-                        <JobFieldInput
-                          label="Assign to family"
-                          select={true}
-                          inputName="family"
-                          value={props?.values.family}
-                          data={familyList}
-                          btnText="Assign to family"
-                          optionText="Select Family"
-                          loader={loader?.jobFields?.family}
-                          errorHandler={errorHandler}
-                          parentClass='w-full flex flex-col gap-4'
-                        />
-                        <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
-                          {" "}
-                          {props?.values?.family === "" && (
-                            <span>{errMsg?.jobFields?.family}</span>
-                          )}
-                        </p>{" "}
-                      </Form>
-                    );
-                  }}
-                </Formik>
-                }
 
-                {selectedTab == 'public' &&
+            {/* END OF ACTION SECTION */}
-                <Formik
+          </>
-                  initialValues={initialValues}
-                  validationSchema={validationSchema.fields.public}
-                  onSubmit={jobFieldHandler}
-                >
-                  {(props) => {
-                    return (
-                      <Form className="">
-                        {/* Offer this job to public input */}
-                        <JobFieldInput
-                          label="Offer this job to public"
-                          select={true}
-                          inputName="public"
-                          value={props?.values.public}
-                          data={publicArray}
-                          btnText="Show Task to Public"
-                          optionText="Select Duration"
-                          loader={loader?.jobFields?.public}
-                          errorHandler={errorHandler}
-                          parentClass='w-full flex flex-col gap-4'
-                        />
-                        <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
-                          {" "}
-                          {props?.values.public === "" && (
-                            <span>{errMsg?.jobFields?.public}</span>
-                          )}
-                        </p>{" "}
-                      </Form>
-                    );
-                  }}
-                </Formik>
-                }
-
-                {selectedTab == 'individual' &&
-                <Formik
-                  initialValues={initialValues}
-                  validationSchema={validationSchema.fields.individual}
-                  onSubmit={jobFieldHandler}
-                >
-                  {(props) => {
-                    return (
-                      <Form className="">
-                        {/* Offer this job to individual input */}
-                        <JobFieldInput
-                          label="Offer this job to individual"
-                          input={true}
-                          inputName="individual"
-                          value={props?.values.individual}
-                          placeholder="Enter email of individual"
-                          inputHandler={props?.handleChange}
-                          btnText="Send Offer to Individual"
-                          loader={loader?.jobFields?.individual}
-                          errorHandler={errorHandler}
-                          parentClass='w-full flex flex-col gap-4'
-                        />
-                        <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
-                          {" "}
-                          {props?.values.individual === "" && (
-                            <span>{errMsg?.jobFields?.individual}</span>
-                          )}
-                        </p>{" "}
-                      </Form>
-                    );
-                  }}
-                </Formik>
-                }
-                
-                {/* { process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 && } */}
-                {selectedTab == 'group' &&
-                <Formik
-                  initialValues={initialValues}
-                  validationSchema={validationSchema.fields.group}
-                  onSubmit={jobFieldHandler}
-                >
-                  {(props) => {
-                    return (
-                      <Form className="">
-                        {/* Offer this job to your group input */}
-                        <JobFieldInput
-                          label="Offer this job to your Group"
-                          select={true}
-                          inputName="group"
-                          value={props?.values.group}
-                          btnText="Send Order to Group"
-                          optionText="Select Group"
-                          loader={loader?.jobFields?.group}
-                          errorHandler={errorHandler}
-                          data={groupList}
-                          parentClass='w-full flex flex-col gap-4'
-                        />
-                        <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
-                          {" "}
-                          {props?.values.group === "" && (
-                            <span>{errMsg?.jobFields?.group}</span>
-                          )}
-                        </p>
-                      </Form>
-                    );
-                  }}
-                </Formik>
-                }
-              </div>
-            </div>
-
-            {requestStatus.message &&
-              <p className={`mt-4 w-full text-lg ${requestStatus.status ? 'text-emerald-600' : 'text-red-600'}`}>{requestStatus.message}</p>
-            }
-          </div>
-          {/* END OF ACTION SECTION */}
         </div>
       </div>
     </ModalCom>
@@ -480,7 +542,7 @@ const JobFieldInput = ({
             >
               {label && (
                 <label
-                  className="input-label border-2 w-full border-sky-700 py-4 px-2 text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block tracking-wide"
+                  className="input-label border-2 w-full border-sky-700 rounded py-4 px-2 text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block tracking-wide"
                   htmlFor={inputName}
                 >
                   {label}
@@ -497,51 +559,50 @@ const JobFieldInput = ({
                 value={value}
               >
                 {/* <option value="">{optionText}</option> */}
-                {(inputName == 'family' || inputName == 'public') &&
+                {(inputName == "family" || inputName == "public") &&
-                  Array.isArray(data) &&
+                  Array.isArray(data) && (
-                  <>
+                    <>
-                  <option value="">{optionText}</option>
+                      <option value="">{optionText}</option>
-                   { data?.map((item, idx) => (
+                      {data?.map((item, idx) => (
-                      <React.Fragment key={idx}>
+                        <React.Fragment key={idx}>
-                        {inputName === "family" && item?.last_login !== "" && (
+                          {inputName === "family" &&
-                          <option value={item?.family_uid} key={idx}>
+                            item?.last_login !== "" && (
-                            {`${item?.firstname} ${item?.lastname}`}
+                              <option value={item?.family_uid} key={idx}>
-                          </option>
+                                {`${item?.firstname} ${item?.lastname}`}
-                        )}
+                              </option>
-                        {inputName === "public" && (
+                            )}
-                          <option value={item?.duration} key={idx}>
+                          {inputName === "public" && (
-                            {item?.name}
+                            <option value={item?.duration} key={idx}>
-                          </option>
+                              {item?.name}
-                        )}
+                            </option>
-                        {/* {inputName === "group" && (
+                          )}
+                          {/* {inputName === "group" && (
                           <option value={item?.group_id} key={idx}>
                             {item?.group_name}
                           </option>
                         )} */}
-                      </React.Fragment>
+                        </React.Fragment>
-                    ))}
-                  </>
-                }
-                {(inputName == 'group') && 
-                <>
-                  {data.loading ?
-                    <option value={''}>
-                      Loading...
-                    </option>
-                    : data?.groups?.length > 0 ?
-                    <>
-                      <option value="">{optionText}</option>
-                     { data?.groups?.map((item, index)=>(
-                        <option value={item?.group_id} key={index}>
-                          {item?.group_name}
-                        </option>
                       ))}
                     </>
-                    :
+                  )}
-                    <option value="">No Group Found</option>
+                {inputName == "group" && (
-                  }
+                  <>
-                </>
+                    {data.loading ? (
-                }
+                      <option value={""}>Loading...</option>
+                    ) : data?.groups?.length > 0 ? (
+                      <>
+                        <option value="">{optionText}</option>
+                        {data?.groups?.map((item, index) => (
+                          <option value={item?.group_id} key={index}>
+                            {item?.group_name}
+                          </option>
+                        ))}
+                      </>
+                    ) : (
+                      <option value="">No Group Found</option>
+                    )}
+                  </>
+                )}
               </Field>
             </div>
           </div>
@@ -597,3 +658,44 @@ const publicArray = [
   { duration: 21, name: "3 weeks" },
   { duration: 28, name: "4 weeks" },
 ];
+
+const ZeroBalanceChecker = ({ amount, code, country, openCreditPopup }) => {
+  return (
+    <div className="px-4 pb-3 w-full flex flex-col gap-5 items-center">
+      <h1 className="text-lg mt-3 font-medium tracking-wide text-black dark:text-white">
+        Wallet Balance:{` ${code} ${(+amount * 0.01).toFixed(2)}`}
+      </h1>
+      <p className="font-semibold text-center text-red-500 text-lg">
+        You do not have sufficient balance to assign this task
+      </p>
+      <button
+        onClick={openCreditPopup}
+        className="btn-gradient w-48 h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
+      >
+        Add Credit to Wallet
+      </button>
+    </div>
+  );
+};
+
+const TabButton = ({ item, selectedTab, setSelectedTab }) => (
+  <button
+    className={`px-4 py-1 rounded-t-2xl border-t-[2px] transition-all duration-200 flex flex-col justify-center items-center ${
+      selectedTab === item
+        ? "bg-red-50 dark:bg-[#D85A5A] text-slate-600 font-extrabold"
+        : "bg-white text-[#000]"
+    }`}
+    value={item}
+    name={item}
+    onClick={() => setSelectedTab(item)}
+  >
+    <div
+      className={`mb-[1px] h-6 w-6 border-4 rounded-full transition-all duration-200 ${
+        selectedTab === item
+          ? "border-white bg-emerald-500"
+          : "border-red-50 dark:border-[#D85A5A] bg-white"
+      }`}
+    ></div>
+    {item[0].toUpperCase() + item.slice(1)}
+  </button>
+);

src/middleware/AuthRoute.jsx

@@ -38,6 +38,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       localStorage.removeItem("member_id");
       localStorage.removeItem("session_token");
       sessionStorage.removeItem("family_uid");
+      localStorage.clear();
       navigate("/login", { replace: true }); // redirects user to login page after session expires
     };
 

src/views/MyOffersPage.jsx

@@ -1,22 +1,22 @@
-import React, { useContext, useState, useEffect } from "react";
+import React, { useEffect, useState } from "react";
-import usersService from "../services/UsersService";
-import MyPendingJobs from "../components/MyPendingJobs";
 import { useSelector } from "react-redux";
+import MyOffers from "../components/MyOffers";
+import usersService from "../services/UsersService";
 
-export default function MyPendingJobsPage() {
+export default function MyOffersPage() {
   let { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
   let { pendingListTable } = useSelector((state) => state.tableReload);
 
-  const [MyJobList, setMyJobList] = useState({loading: true, data: []});
+  const [MyJobList, setMyJobList] = useState({ loading: true, data: [] });
   const api = new usersService();
 
   const getMyJobList = async () => {
-    setMyJobList({loading: true, data: []});
+    setMyJobList({ loading: true, data: [] });
     try {
       const res = await api.getMyPendingJobList();
-      setMyJobList({loading: false, data: res.data});
+      setMyJobList({ loading: false, data: res.data });
     } catch (error) {
-      setMyJobList({loading: false, data: []});
+      setMyJobList({ loading: false, data: [] });
       console.log("Error getting mode");
     }
   };
@@ -28,7 +28,7 @@ export default function MyPendingJobsPage() {
   // debugger;
   return (
     <>
-      <MyPendingJobs
+      <MyOffers
         MyJobList={MyJobList}
         commonHeadData={commonHeadBanner.result_list}
       />