no cache handler added

.env

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="development"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -22,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000

.env.development

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="development"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -22,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000

.env.production

@@ -1,4 +1,5 @@
 SKIP_PREFLIGHT_CHECK=true 
+REACT_APP_NODE_ENV="production"
 
 REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
 REACT_APP_TWITTER="https://twitter.com/fluxtra"
@@ -22,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000

Dockerfile

@@ -1,5 +1,8 @@
 # pull the base image
-FROM node:alpine
+#FROM node:alpine
+FROM node:20.11.0-alpine
+
+
 
 # Build args
 ARG NODE_ENV
@@ -26,7 +29,7 @@ COPY nginx.conf ./
 
 COPY run.sh ./
 
-RUN npm install --legacy-peer-deps
+# RUN npm install --legacy-peer-deps
 
 # add app
 COPY . ./

package.json

@@ -3,6 +3,7 @@
   "version": "0.2.0",
   "private": true,
   "dependencies": {
+    "@fvilers/disable-react-devtools": "^1.3.0",
     "@react-oauth/google": "^0.11.0",
     "@reduxjs/toolkit": "^1.8.2",
     "@tailwindcss/line-clamp": "^0.3.1",
@@ -30,14 +31,14 @@
     "react-to-print": "^2.14.12",
     "react-toastify": "^9.0.1",
     "redux": "^4.2.0",
-    "socket.io-client": "^4.4.1",
     "slick-carousel": "^1.8.1",
+    "socket.io-client": "^4.4.1",
     "web-vitals": "^1.0.1",
     "yup": "^1.1.1"
   },
   "scripts": {
     "start": "react-scripts start -e .env.development",
-    "build": "react-scripts build -e .env.production",
+    "build": "GENERATE_SOURCEMAP=false react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
+  "short_name": "WrenchBoard App",
-  "name": "Create React App Sample",
+  "name": "WrenchBoard User Web",
   "icons": [],
   "start_url": ".",
   "display": "standalone",

run.sh

@@ -14,6 +14,8 @@ else
   echo "Production build"
   npm install --legacy-peer-deps
   npm run build
+  # Testing sometimes
+  # npm run start
   nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
   nginx -c /usr/src/app/nginx.conf
 fi

src/App.jsx

@@ -1,23 +1,33 @@
+import {Suspense, lazy} from 'react'
 import { Navigate, useLocation } from "react-router-dom";
-import Routers from "./Routers";
+// import Routers from "./Routers";
+// import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
 import Toaster from "./components/Helpers/Toaster";
 import Default from "./components/Partials/Default";
-import SocketIOContextProvider from "./components/Contexts/SocketIOContext";
 
+import { disableReactDevTools } from '@fvilers/disable-react-devtools';
+import LoadingSpinner from './components/Spinners/LoadingSpinner';
+
+if (process.env.REACT_APP_NODE_ENV === 'production') {
+    disableReactDevTools();
+}
+const Routers = lazy(()=>import('./Routers'))
 function App() {
   const { pathname } = useLocation();
   return (
     <Default>
-      <SocketIOContextProvider>
+      {/* <SocketIOContextProvider> */}
         <>
           {pathname.startsWith("/@") ? (
             <Navigate to="/app" replace={true} />
           ) : (
-            <Routers />
+            <Suspense fallback={<LoadingSpinner size="32" color="sky-blue" height="h-screen" />}>
+              <Routers />
+            </Suspense>
           )}
           <Toaster />
         </>
-      </SocketIOContextProvider>
+      {/* </SocketIOContextProvider> */}
     </Default>
   );
 }

src/Routers.jsx

@@ -1,83 +1,84 @@
 import { Route, Routes } from "react-router-dom";
-import FourZeroFour from "./components/FourZeroFour";
+import { lazy } from "react";
-import ScrollToTop from "./components/Helpers/ScrollToTop";
+
-import StartJob from "./components/MyJobs/StartJob";
+import LoginLandingPage from './views/LoginLandingPage'
-import Notification from "./components/Notification";
-import AuthRoute from "./middleware/AuthRoute";
-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 SocketConnection from "./middleware/SocketConnection";
-import ManageActiveJobs from "./views/ManageActiveJobs";
+
-import ManageInterestOfferPage from "./views/ManageInterestOfferPage";
+const HomePages = lazy(() => import("./views/HomePages"));
-import MarketPlacePage from "./views/MarketPlacePage";
+const FourZeroFour = lazy(() => import("./components/FourZeroFour"));
-import MyActiveJobsPage from "./views/MyActiveJobsPage";
+const ScrollToTop = lazy(() => import("./components/Helpers/ScrollToTop"));
-import MyCouponPage from "./views/MyCouponPage";
+const StartJob = lazy(() => import("./components/MyJobs/StartJob"));
-import MyJobsPage from "./views/MyJobsPage";
+const Notification = lazy(() => import("./components/Notification"));
-import MyOffersPage from "./views/MyOffersPage";
+const AuthRoute = lazy(() => import("./middleware/AuthRoute"));
-import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
+const AppDownloadPage = lazy(() => import("./views/AppDownloadPage"));
-import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
+const AppleRedirectPage = lazy(() => import("./views/AppleRedirectPage"));
-import MyTaskPage from "./views/MyTaskPage";
+const AuthProfilePage = lazy(() => import("./views/AuthProfilePage"));
-import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
+const AuthRedirect = lazy(() => import("./views/AuthRedirect"));
-import MyWalletPage from "./views/MyWalletPage";
+const BlogPage = lazy(() => import("./views/BlogPage"));
-import OffersInterestPage from "./views/OffersInterestPage";
+const FacebookRedirect = lazy(() => import("./views/FacebookRedirect"));
-import ReferralPage from "./views/ReferralPage";
+const FamilyManagePage = lazy(() => import("./views/FamilyManagePage"));
-import RemindersPage from "./views/RemindersPage";
+const FamilyMarketPage = lazy(() => import("./views/FamilyMarketPage"));
-import ResourcePage from "./views/ResourcePage";
+
-import SavedPage from "./views/SavedPage";
+const ForgotPasswordPages = lazy(()=> import("./views/ForgotPasswordPages"));
-import SellPage from "./views/SellPage";
+const ForgotPasswordPagesTwo = lazy(()=> import("./views/ForgotPasswordPagesTwo"));
-import SettingsPage from "./views/SettingsPage";
+const HistoryPage = lazy(()=> import("./views/HistoryPage"));
-import SignupPage from "./views/SignupPage";
+const JobGroupsPage = lazy(()=> import("./views/JobGroupsPage"));
-import SignupPageTwo from "./views/SignupPageTwo";
+const LndPage = lazy(()=> import("./views/LndPage"));
-import TrackingPage from "./views/TrackingPage";
+const LoginPageTwo = lazy(()=> import("./views/LoginPageTwo"));
-import UpdatePasswordPages from "./views/UpdatePasswordPages";
+const ManageActiveJobs = lazy(()=> import("./views/ManageActiveJobs"));
-import UpdatePasswordPagesTwo from "./views/UpdatePasswordPagesTwo";
+const ManageInterestOfferPage = lazy(()=> import("./views/ManageInterestOfferPage"));
-import UploadProductPage from "./views/UploadProductPage";
+const MarketPlacePage = lazy(()=> import("./views/MarketPlacePage"));
-import UserProfilePage from "./views/UserProfilePage";
+const MyActiveJobsPage = lazy(()=> import("./views/MyActiveJobsPage"));
-import VerifyLinkPages from "./views/VerifyLinkPages";
+const MyCouponPage = lazy(()=> import("./views/MyCouponPage"));
-import VerifyLinkPagesTwo from "./views/VerifyLinkPagesTwo";
+const MyJobsPage = lazy(()=> import("./views/MyJobsPage"));
-import VerifyPasswordPages from "./views/VerifyPasswordPages";
+const MyOffersPage = lazy(()=> import("./views/MyOffersPage"));
-import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo";
+const MyPastDueJobsPage = lazy(()=> import("./views/MyPastDueJobsPage"));
-import VerifyYouPages from "./views/VerifyYouPages";
+const MyReviewDueJobsPage = lazy(()=> import("./views/MyReviewDueJobsPage"));
-import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo";
+const MyTaskPage = lazy(()=> import("./views/MyTaskPage"));
-import YourPages from "./views/YourPage_";
+const MyWaitingJobsPage = lazy(()=> import("./views/MyWaitingJobsPage"));
-import ParentWaitingPage from "./views/ParentWaitingPage";
+const MyWalletPage = lazy(()=> import("./views/MyWalletPage"));
-import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage";
+const OffersInterestPage = lazy(()=> import("./views/OffersInterestPage"));
-import FamBlogPage from "./views/FamBlogPage"
+const ReferralPage = lazy(()=> import("./views/ReferralPage"));
-import FamAIQuestionPage from "./views/FamAIQuestionPage"
+const RemindersPage = lazy(()=> import("./views/RemindersPage"));
-import FamMyFilesPage from "./views/FamMyFilesPage"
+const ResourcePage = lazy(()=> import("./views/ResourcePage"));
-import FamWorkInProgressPage from "./views/FamWorkInProgressPage";
+const SettingsPage = lazy(()=> import("./views/SettingsPage"));
-import MyPastDueTasksPage from "./views/MyPastDueTasksPage";
+const SignupPage = lazy(()=> import("./views/SignupPage"));
-import FamilyWalletPage from "./views/FamilyWalletPage";
+const SignupPageTwo = lazy(()=> import("./views/SignupPageTwo"));
-import FamilyActivitiesPage from "./views/FamilyActivitiesPage";
+const TrackingPage = lazy(()=> import("./views/TrackingPage"));
-import FamGamesPage from "./views/FamGamesPage";
+const UpdatePasswordPages = lazy(()=> import("./views/UpdatePasswordPages"));
-import FamilyRoutesPage from "./views/FamilyRoutesPage";
+const UpdatePasswordPagesTwo = lazy(()=> import("./views/UpdatePasswordPagesTwo"));
-import PromoPage from "./views/PromoPage";
+const UploadProductPage = lazy(()=> import("./views/UploadProductPage"));
+const UserProfilePage = lazy(()=> import("./views/UserProfilePage"));
+const VerifyLinkPages = lazy(()=> import("./views/VerifyLinkPages"));
+const VerifyLinkPagesTwo = lazy(()=> import("./views/VerifyLinkPagesTwo"));
+const VerifyPasswordPages = lazy(()=> import("./views/VerifyPasswordPages"));
+const VerifyPasswordPagesTwo = lazy(()=> import("./views/VerifyPasswordPagesTwo"));
+const VerifyYouPages = lazy(()=> import("./views/VerifyYouPages"));
+const VerifyYouPagesTwo = lazy(()=> import("./views/VerifyYouPagesTwo"));
+const YourPages = lazy(()=> import("./views/YourPage_"));
+const ParentWaitingPage = lazy(()=> import("./views/ParentWaitingPage"));
+const FamilyPendingOfferPage = lazy(()=> import("./views/FamilyPendingOfferPage"));
+const FamBlogPage = lazy(()=> import("./views/FamBlogPage"));
+const FamAIQuestionPage = lazy(()=> import("./views/FamAIQuestionPage"));
+const FamMyFilesPage = lazy(()=> import("./views/FamMyFilesPage"));
+const FamWorkInProgressPage = lazy(()=> import("./views/FamWorkInProgressPage"));
+const MyPastDueTasksPage = lazy(()=> import("./views/MyPastDueTasksPage"));
+const FamilyWalletPage = lazy(()=> import("./views/FamilyWalletPage"));
+const LearnMorePage = lazy(()=> import("./views/LearnMorePage"));
+const FamGamesPage = lazy(()=> import("./views/FamGamesPage"));
+const FamilyRoutesPage = lazy(()=> import("./views/FamilyRoutesPage"));
+const PromoPage = lazy(()=> import("./views/PromoPage"));
 
 export default function Routers() {
   return (
     <ScrollToTop>
       <Routes>
         {/* guest routes */}
-        {process.env.REACT_APP_NEW_LOGIN_LAYOUT == 1 ? (
+        {Number(process.env.REACT_APP_NEW_LOGIN_LAYOUT) === 1 ? (
           <>
-            <Route exact path="/login" element={<LoginPageTwo />} />
+            <Route exact path="/login" element={<LoginLandingPage />} />
+            <Route exact path="/login/:type" element={<LoginPageTwo />} />
             <Route exact path="/signup" element={<SignupPageTwo />} />
             <Route
               exact
@@ -93,7 +94,7 @@ export default function Routers() {
             <Route path="/complereset" element={<VerifyPasswordPagesTwo />} />
             <Route exact path="/outmessage" element={<VerifyYouPagesTwo />} />
             <Route exact path="/eoffer" element={<LoginPageTwo />} />
-            <Route exact path="/invite" element={<LoginPageTwo />} />
+            <Route exact path="/invite" element={<SignupPageTwo />} />
             <Route exact path="/promo/:name/:id" element={<PromoPage />} />
           </>
         ) : (
@@ -124,92 +125,76 @@ export default function Routers() {
         <Route exact path="/app" element={<AppDownloadPage />} />
 
         {/* private route */}
-        <Route element={<AuthRoute />}>
+        <Route element={<SocketConnection />}>
-          <Route exact path="/" element={<HomePages />} />
+          <Route element={<AuthRoute />}>
-          {/*  <Route exact path="/active-bids" element={<AcitveBidsPage />} />
+            <Route exact path="/" element={<HomePages />} />
-          <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/reminders" element={<RemindersPage />} />
-          <Route exact path="/market-place" element={<MarketPlacePage />} />
+            <Route exact path="/tracking" element={<TrackingPage />} />
-          <Route exact path="/shop-details" element={<ShopDetailsPage />} />
+            <Route exact path="/resources" element={<ResourcePage />} />
-        <Route exact path="/my-collection" element={<MyCollection />} />*/}
+            <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
-          <Route exact path="/reminders" element={<RemindersPage />} />
+            <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
-          <Route exact path="/tracking" element={<TrackingPage />} />
+            <Route exact path="/my-coupon" element={<MyCouponPage />} />
-          <Route exact path="/calendar" element={<CalendarPage />} />
+            <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/resources" element={<ResourcePage />} />
+            <Route exact path="/market-place" element={<MarketPlacePage />} />
-          <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
+            <Route exact path="/market" element={<MarketPlacePage />} />
-          <Route exact path="/family-wallet" element={<FamilyWalletPage />} />
+            <Route exact path="/familymarket" element={<FamilyMarketPage />} />
-          <Route exact path="/my-coupon" element={<MyCouponPage />} />
+            <Route exact path="/suggested" element={<ParentWaitingPage />} />
-          <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/parentwaiting" element={<ParentWaitingPage />} />
-          <Route exact path="/market-place" element={<MarketPlacePage />} />
+            <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
-          <Route exact path="/market" element={<MarketPlacePage />} />
+            <Route exact path="/fam-blog" element={<FamBlogPage />} />
-          <Route exact path="/familymarket" element={<FamilyMarketPage />} />
+            <Route exact path="/ai-question" element={<FamAIQuestionPage />} />
-          <Route exact path="/suggested" element={<ParentWaitingPage />} />
+            <Route exact path="/myfiles" element={<FamMyFilesPage />} />
-          <Route exact path="/pending" element={<FamilyPendingOfferPage />} />
+            <Route exact path="/ai-lab" element={<FamAIQuestionPage />} />
-          <Route exact path="/fam-blog" element={<FamBlogPage />} />
+            <Route exact path="/fam-games" element={<FamGamesPage />} />
-          <Route exact path="/ai-question" element={<FamAIQuestionPage />} />
+            <Route exact path="/work-in-progress" element={<FamWorkInProgressPage />} />
-          <Route exact path="/myfiles" element={<FamMyFilesPage />} />
-          <Route exact path="/ai-lab" element={<FamAIQuestionPage />} />
-          <Route exact path="/fam-games" element={<FamGamesPage />} />
-          <Route exact path="/work-in-progress" element={<FamWorkInProgressPage />} />
 
-          <Route exact path="/pastdue" element={<MyPastDueTasksPage />} />
+            <Route exact path="/pastdue" element={<MyPastDueTasksPage />} />
-          <Route exact path="/notification" element={<Notification />} />
+            <Route exact path="/notification" element={<Notification />} />
-          <Route exact path="/mytask" element={<MyTaskPage />} />
+            <Route exact path="/mytask" element={<MyTaskPage />} />
-          <Route exact path="/myjobs" element={<MyJobsPage />} />
+            <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
-          <Route
+              exact
-            exact
+              path="/my-pastdue-jobs"
-            path="/my-pastdue-jobs"
+              element={<MyPastDueJobsPage />}
-            element={<MyPastDueJobsPage />}
+            />
-          />
+            <Route exact path="/my-offers" element={<MyOffersPage />} />
-          <Route exact path="/my-offers" element={<MyOffersPage />} />
+            <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
-          <Route exact path="/pend-interest" element={<MyWaitingJobsPage />} />
+            <Route
-          <Route
+              exact
-            exact
+              path="/my-review-jobs"
-            path="/my-review-jobs"
+              element={<MyReviewDueJobsPage />}
-            element={<MyReviewDueJobsPage />}
+            />
-          />
+            <Route path='/acc-family/*' element={<FamilyRoutesPage />} />
 
-          {/* <Route exact path='/acc-family' element={<FamilyAccPage />} />
+            <Route exact path="/manage-family" element={<FamilyManagePage />} />
-          <Route exact path="/acc-family/activities" element={<FamilyActivitiesPage />} />
+            <Route exact path="/start-job" element={<StartJob />} />
-          <Route exact path="/acc-family/familysettings" element={<FamilySettingsPage />} /> */}
+            <Route exact path="/yourpage" element={<YourPages />} />
-          <Route path='/acc-family/*' element={<FamilyRoutesPage />} />
+            <Route
-
+              exact
-          <Route exact path="/manage-family" element={<FamilyManagePage />} />
+              path="/manage-active-job"
-          <Route exact path="/start-job" element={<StartJob />} />
+              element={<ManageActiveJobs />}
-          <Route exact path="/yourpage" element={<YourPages />} />
+            />
-          <Route
+            <Route exact path="/blog-page" element={<BlogPage />} />
-            exact
+            <Route
-            path="/manage-active-job"
+              exact
-            element={<ManageActiveJobs />}
+              path="/offer-interest"
-          />
+              element={<OffersInterestPage />}
-          <Route exact path="/blog-page" element={<BlogPage />} />
+            />
-          <Route
+            <Route
-            exact
+              exact
-            path="/offer-interest"
+              path="/manage-offer"
-            element={<OffersInterestPage />}
+              element={<ManageInterestOfferPage />}
-          />
+            />
-          <Route
+            <Route exact path="/history" element={<HistoryPage />} />
-            exact
+            <Route exact path="/learnmore" element={<LearnMorePage />} />
-            path="/manage-offer"
+            <Route exact path="/my-uploads" element={<UploadProductPage />} />
-            element={<ManageInterestOfferPage />}
+            <Route exact path="/profile" element={<AuthProfilePage />} />
-          />
+            <Route exact path="/user-profile" element={<UserProfilePage />} />
-
+            <Route exact path="/settings" element={<SettingsPage />} />
-          <Route
+            <Route exact path="/referral" element={<ReferralPage />} />
-            exact
+            <Route exact path="/job-groups" element={<JobGroupsPage />} />
-            path="/my-collection/collection-item"
+          </Route>
-            element={<CollectionItemPage />}
-          />
-          <Route exact path="/sell" element={<SellPage />} />
-          <Route exact path="/saved" element={<SavedPage />} />
-          <Route exact path="/history" element={<HistoryPage />} />
-          {/*<Route exact path="/upload-product" element={<UploadProductPage />} />*/}
-          <Route exact path="/my-uploads" element={<UploadProductPage />} />
-          <Route exact path="/profile" element={<AuthProfilePage />} />
-          <Route exact path="/user-profile" element={<UserProfilePage />} />
-          <Route exact path="/settings" element={<SettingsPage />} />
-          <Route exact path="/referral" element={<ReferralPage />} />
-          <Route exact path="/job-groups" element={<JobGroupsPage />} />
         </Route>
         <Route path="*" element={<FourZeroFour />} />
       </Routes>

src/components/AddJob/AddJob.jsx

@@ -3,7 +3,7 @@ import {
   useDispatch,
   useSelector,
   usersService,
-  initialValues as IV,
+  // initialValues as IV,
   initialReqState,
   useState,
   tableReload,
@@ -75,7 +75,7 @@ function AddJob({ popUpHandler, categories }) {
   // For form initial values
   const initialValues = {
     // initial values for formik
-    country: walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
+    country: walletDetails.data.length === 1 ? walletDetails.data[0].country : '',
     price: "",
     title: "",
     description: "",
@@ -117,7 +117,7 @@ function AddJob({ popUpHandler, categories }) {
                           className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
                           onChange={props.handleChange}
                           onBlur={props.handleBlur}
-                          disabled={walletDetails.data.length == 1}
+                          disabled={walletDetails.data.length === 1}
                         >
                           {walletDetails?.loading ? (
                             <option className="text-slate-500 text-lg" value="">
@@ -138,7 +138,7 @@ function AddJob({ popUpHandler, categories }) {
                                 </option>
                               ))}
                             </>
-                          ) : walletDetails.data.length == 1 ?
+                          ) : walletDetails.data.length === 1 ?
                           <>
                             {walletDetails.data?.map((item, index) => (
                               <option
@@ -367,7 +367,7 @@ function AddJob({ popUpHandler, categories }) {
                 {/* ERROR DISPLAY AND SUBMIT BUTTON */}
                 <div className="content-footer w-full">
                   {/* error or success display */}
-                  {requestStatus.message != "" &&
+                  {requestStatus.message !== "" &&
                     (!requestStatus.status ? (
                       <div
                         className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}

src/components/AddJob/settings.js

@@ -51,7 +51,7 @@ const validationSchema = Yup.object().shape({
     .required("Price is required"),
   title: Yup.string()
     .min(5, "Minimum 5 characters")
-    .max(149, "Maximum 149 characters")
+    .max(80, "Maximum 80 characters")
     .required("Title is required"),
   description: Yup.string()
     .min(5, "Minimum 5 characters")

src/components/AuthPages/AuthLayout2.jsx

@@ -1,11 +1,12 @@
 import React, { useContext } from "react";
 import { Link } from "react-router-dom";
 import { localImgLoad } from "../../lib";
+import WrenchBoard from "../../assets/images/wrenchboard-logo-text.png";
 
 import DarkModeContext from "../Contexts/DarkModeContext";
 
-export default function LoginLayout({ slogan, children }) {
+export default function AuthLayout2({ slogan, children }) {
-  const bgImg = localImgLoad("images/left-wrenchboard.jpg");
+  // 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");
 
@@ -13,65 +14,74 @@ export default function LoginLayout({ slogan, children }) {
 
   return (
     <div
-      className={`min-h-screen overflow-y-auto bg-cover bg-center flex flex-col justify-between items-center`}
+      className={`relative min-h-screen overflow-y-auto bg-cover bg-center flex flex-col items-center`}
       style={{
-        backgroundImage: `url(${countryMode == "NG" ? bgImgNig : bgImgCom})`,
+        backgroundImage: `url(${countryMode === "NG" ? bgImgNig : bgImgCom})`,
       }}
     >
-      
+      <div className="my-5">
-      <div className={`w-full grid grid-cols-1 xl:grid-cols-2`}>
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
+            </Link>
+          </div>
+      <div className={`h-full w-full mb-5 grid grid-cols-1 place-content-center`}>
         {/* <div 
             className={`auth-bg hidden xl: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 className="p-5 sm:p-7 flex place-content-center xl:col-start-2">
+        <div className="p-5 sm:p-7 flex place-content-center">
-          <div className="py-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 dark:bg-dark-white rounded-[0.475rem]">
+          <div className="pt-5 pb-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 dark:bg-dark-white rounded-[0.475rem]">
             <div className="w-full flex justify-center items-center">
               {children && children}
             </div>
           </div>
         </div>
       </div>
-
+      <div className='absolute left-0 right-0 bottom-0'>
-      <div className='w-full shadow-md bg-slate-50 dark:bg-dark-white'>
+        <div className='w-full shadow-md bg-slate-50 dark:bg-dark-white'>
-        <div className="w-full flex flex-col md:flex-row justify-center items-center px-10 py-2">
+          <div className="w-full flex flex-col md:flex-row justify-center items-center px-10 py-2">
-          <div className="flex justify-center items-center">
+            <div className="flex justify-center items-center">
-            <div className="flex items-center">
+              <div className="flex items-center">
-              <a
+                <a
-                href="https://www.wrenchboard.com/about-us"
+                  href="https://www.wrenchboard.com/about-us"
-                className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
-                target="_blank"
+                  target="_blank"
-                rel="noreferrer"
+                  rel="noreferrer"
-              >
+                >
-                About
+                  About
-              </a>
+                </a>
-              <a
+                <a
-                href="https://www.wrenchboard.com/service"
+                  href="https://www.wrenchboard.com/service"
-                className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
-                target="_blank"
+                  target="_blank"
-                rel="noreferrer"
+                  rel="noreferrer"
-              >
+                >
-                Services
+                  Services
-              </a>
+                </a>
-              <a
+                <a
-                href="https://www.wrenchboard.com/contact"
+                  href="https://www.wrenchboard.com/contact"
-                className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
-                target="_blank"
+                  target="_blank"
-                rel="noreferrer"
+                  rel="noreferrer"
-              >
+                >
-                Contact Us
+                  Contact Us
-              </a>
+                </a>
+              </div>
             </div>
+            <p className="text-black text-[15px] px-2 font-medium flex items-center gap-1">
+              <span className="dark:text-white">
+                &copy; {new Date().getFullYear()} -
+              </span>
+              <Link to="/" className="text-[#009ef7] ml-1">
+                WrenchBoard
+              </Link>{" "}
+            </p>
           </div>
-          <p className="text-black text-[15px] px-2 font-medium flex items-center gap-1">
-            <span className="dark:text-white">
-              &copy; {new Date().getFullYear()} -
-            </span>
-            <Link to="/" className="text-[#009ef7] ml-1">
-              WrenchBoard
-            </Link>{" "}
-          </p>
         </div>
       </div>
 

src/components/AuthPages/AuthProfile/index.jsx

@@ -1,63 +1,63 @@
-import React, { useState } from "react";
+import React from "react";
 import { Link } from "react-router-dom";
 import authProfilePic from "../../../assets/images/auth-profile-picture.png";
 import profileBanner from "../../../assets/images/profile-cover.png";
-import collections from "../../../data/collectionplan_data.json";
-import marketPlace from "../../../data/marketplace_data.json";
-import products from "../../../data/product_data.json";
 import Layout from "../../Partials/Layout";
 import ActivitiesTab from "./ActivitiesTab";
-import CollectionTab from "./CollectionTab";
+// import collections from "../../../data/collectionplan_data.json";
-import CreatedTab from "./CreatedTab";
+// import marketPlace from "../../../data/marketplace_data.json";
-import HiddenProductsTab from "./HiddenProductsTab";
+// import products from "../../../data/product_data.json";
-import OnSaleTab from "./OnSaleTab";
+// import CollectionTab from "./CollectionTab";
-import OwnTab from "./OwnTab";
+// import CreatedTab from "./CreatedTab";
+// import HiddenProductsTab from "./HiddenProductsTab";
+// import OnSaleTab from "./OnSaleTab";
+// import OwnTab from "./OwnTab";
 
 export default function AuthProfile() {
-  const onSaleProducts = marketPlace.data;
+  // const onSaleProducts = marketPlace.data;
-  const CreatedSell = marketPlace.data;
+  // const CreatedSell = marketPlace.data;
-  const CreatedBits = products.datas;
+  // const CreatedBits = products.datas;
   // const mainProducts = products.datas;
-  const ownProducts = products.datas;
+  // const ownProducts = products.datas;
-  const collectionProducts = collections.data;
+  // const collectionProducts = collections.data;
 
-  const tabs = [
+  // const tabs = [
-    {
+  //   {
-      id: 1,
+  //     id: 1,
-      name: "onsale",
+  //     name: "onsale",
-      content: "On Sale",
+  //     content: "On Sale",
-    },
+  //   },
-    {
+  //   {
-      id: 2,
+  //     id: 2,
-      name: "owned",
+  //     name: "owned",
-      content: "Owned",
+  //     content: "Owned",
-    },
+  //   },
-    {
+  //   {
-      id: 3,
+  //     id: 3,
-      name: "created",
+  //     name: "created",
-      content: "Created",
+  //     content: "Created",
-    },
+  //   },
-    {
+  //   {
-      id: 4,
+  //     id: 4,
-      name: "hidden",
+  //     name: "hidden",
-      content: "Hidden",
+  //     content: "Hidden",
-    },
+  //   },
-    {
+  //   {
-      id: 5,
+  //     id: 5,
-      name: "collection",
+  //     name: "collection",
-      content: "Collection",
+  //     content: "Collection",
-    },
+  //   },
-    {
+  //   {
-      id: 6,
+  //     id: 6,
-      name: "activity",
+  //     name: "activity",
-      content: "Activity",
+  //     content: "Activity",
-    },
+  //   },
-  ];
+  // ];
 
-  const [tab, setTab] = useState(tabs[0].name);
+  // const [tab, setTab] = useState(tabs[0].name);
-  const tabHandler = (value) => {
+  // const tabHandler = (value) => {
-    setTab(value);
+  //   setTab(value);
-  };
+  // };
   return (
     <>
       <Layout>

src/components/AuthPages/AuthRedirect/AppleRedirect.jsx

@@ -1,15 +1,15 @@
 import React, { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import usersService from '../../../services/UsersService';
+// import usersService from '../../../services/UsersService';
-import {updateUserDetails} from "../../../store/UserDetails";
+// import {updateUserDetails} from "../../../store/UserDetails";
-import { useDispatch } from "react-redux";
+// import { useDispatch } from "react-redux";
 import AuthLayout from "../AuthLayout";
 
 function AppleRedirect() {
     const location = useLocation();
     const navigate = useNavigate();
-    const userApi = new usersService();
+    // const userApi = new usersService();
-    const dispatch = useDispatch()
+    // const dispatch = useDispatch()
 
     const queryParams = new URLSearchParams(location?.search);
     const codeResponse = queryParams.get("code");
@@ -36,11 +36,11 @@ function AppleRedirect() {
       redirect_uri=https%3A//oauth2.example.com/code&
       grant_type=authorization_code
       */
-      var reqData = {
+      // var reqData = {
-        auth_type: "APPLE",
+      //   auth_type: "APPLE",
-        code: codeResponse,
+      //   code: codeResponse,
-        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+      //   redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
-      };
+      // };
     //   userApi
     //     .authStart(reqData)
     //     .then((res) => {
@@ -58,7 +58,7 @@ function AppleRedirect() {
     //       navigate('/login', {state: {error: true}})
     //       console.log(error);
     //     });
-    },[])
+    },[codeResponse, navigate])
   return (
     <AuthLayout>
     <div className='min-h-[70vh]'>Redirecting ... </div>

src/components/AuthPages/AuthRedirect/FbookRedirect.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useMemo, useEffect } from 'react';
 import { useDispatch } from "react-redux";
 import { useLocation, useNavigate } from 'react-router-dom';
 import usersService from '../../../services/UsersService';
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
 function FbookRedirect() {
     const location = useLocation();
     const navigate = useNavigate();
-    const userApi = new usersService();
+    const userApi = useMemo(()=> new usersService(),[]);
     const dispatch = useDispatch()
 
     const queryParams = new URLSearchParams(location?.search);
@@ -52,7 +52,7 @@ function FbookRedirect() {
       userApi
         .authStart(reqData)
         .then((res) => {
-          if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
+          if (res.status === 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
             localStorage.setItem("member_id", `${res.data.member_id}`);
             localStorage.setItem("uid", `${res.data.uid}`);
             localStorage.setItem("session_token", `${res.data.session}`);
@@ -66,7 +66,7 @@ function FbookRedirect() {
           navigate('/login', {state: {error: true}})
           console.log(error);
         });
-    },[])
+    },[codeResponse, userApi, dispatch, navigate])
   return (
     <AuthLayout>
     <div className='min-h-[70vh]'>Redirecting ... </div>

src/components/AuthPages/AuthRedirect/Redirect.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo } from "react";
 import { useDispatch } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import usersService from "../../../services/UsersService";
@@ -8,7 +8,7 @@ import AuthLayout from "../AuthLayout";
 function Redirect() {
   const location = useLocation();
   const navigate = useNavigate();
-  const userApi = new usersService();
+  const userApi = useMemo(()=> new usersService(),[]);
   const dispatch = useDispatch();
 
   const queryParams = new URLSearchParams(location?.search);
@@ -40,7 +40,7 @@ function Redirect() {
       .authStart(reqData)
       .then((res) => {
         if (
-          res.status == 200 &&
+          res.status === 200 &&
           res.data.internal_return >= 0 &&
           res.data.member_id &&
           res.data.uid &&
@@ -59,7 +59,7 @@ function Redirect() {
         navigate("/login", { state: { error: true } });
         console.log(error);
       });
-  }, []);
+  }, [codeResponse, userApi, dispatch, navigate]);
   return (
     <AuthLayout>
       <div className="min-h-[70vh]">Redirecting ... </div>

src/components/AuthPages/ForgotPassword/index.jsx

@@ -38,7 +38,7 @@ export default function ForgotPassword() {
   }
 
   const resetHandler = async () => {
-    if (email == "") {
+    if (email === "") {
       setMsgError("An email is required");
       return setTimeout(() => {
         setMsgError(null);

src/components/AuthPages/ForgotPassword/index2.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
-import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
+// import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
@@ -38,7 +38,7 @@ export default function ForgotPassword() {
   }
 
   const resetHandler = async () => {
-    if (email == "") {
+    if (email === "") {
       setMsgError("An email is required");
       return setTimeout(() => {
         setMsgError(null);
@@ -63,7 +63,7 @@ export default function ForgotPassword() {
       setResetLoading(true);
       try {
         const res = await userApi.StartResetPassword(reqData);
-        if (res.status === 200) {
+        if (res.status === 200 && res?.data?.internal_return >= 0) {
           setMsgSuccess(true);
           setMail("");
           setValue(false);
@@ -89,15 +89,6 @@ export default function ForgotPassword() {
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className="mb-12">
-            <Link to="#">
-              <img
-                src={WrenchBoard}
-                alt="wrenchboard"
-                className="h-10 mx-auto"
-              />
-            </Link>
-          </div>
           <div className="flex place-content-center">
             <div className="w-10/12">
             {msgSuccess == null ?

src/components/AuthPages/Login/LoginLanding.jsx

@@ -0,0 +1,113 @@
+import React, { useEffect, useState } from "react";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+
+import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
+import KidIcon from '../../../assets/images/auth/children.png'
+import ParentIcon from '../../../assets/images/auth/adult.png'
+import usersService from "../../../services/UsersService";
+import InputCom from "../../Helpers/Inputs/InputCom";
+import AuthLayout from "../AuthLayout2";
+
+import { useDispatch } from "react-redux";
+// import { updateUserDetails } from "../../../store/UserDetails";
+
+import GoogleDownload from '../../../assets/images/download/andriod.jpg'
+import IOSDownload from '../../../assets/images/download/apple.jpg'
+
+
+export default function LoginLanding() {
+  const dispatch = useDispatch();
+  const location = useLocation();
+
+  const queryParams = new URLSearchParams(location?.search);
+  // const sessionExpired = queryParams.get("sessionExpired");
+
+
+  const navigate = useNavigate();
+  const userApi = new usersService();
+
+
+  return (
+    <>
+      <AuthLayout slogan="Welcome to WrenchBoard">
+        <div className="w-full">
+          {/* <div className="mb-5">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
+            </Link>
+          </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-10/12">
+              <div className='grid grid-cols-1 sm:grid-cols-5 gap-3'>
+                {/* APP DOWNLOAD STORE */}
+                <div className="col-span-1 order-2 sm:col-span-2 sm:order-1 w-full">
+                  <div className="relative w-full h-full flex sm:flex-col justify-center gap-4">
+                    <div className="w-28 sm:w-36">
+                      <a
+                        target="_blank"
+                        rel="noreferrer"
+                        href={process.env.REACT_APP_APPLE_APP}
+                      >
+                        <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
+                      </a>
+                    </div>
+                    <div className="w-28 sm:w-36">
+                      <a
+                        target="_blank"
+                        rel="noreferrer"
+                        href={process.env.REACT_APP_ANDROID_APP}
+                      >
+                        <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
+                      </a>
+                    </div>
+                    <div className='hidden sm:block absolute top-0 bottom-0 right-0 w-1 rounded-full bg-[linear-gradient(180deg,_#94a3b8,_#0f172a,_#94a3b8)]'></div>
+                  </div>
+                </div>
+                <div className="col-span-1 order-1 sm:col-span-3 sm:order-2 title-area flex flex-col gap-5 justify-center items-center relative text-center mb-5">
+                  <h1 className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                    <span className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Log in</span> as a:
+                  </h1>
+
+                  <div className='w-full flex flex-col gap-4'>
+                    <button name='full' onClick={()=>navigate('/login/parent', {state:{loginType:'full'}})} className='w-full mx-auto flex justify-between items-center p-4 md:p-8 rounded-lg bg-[#d5ebf8] text-[#009ef7] cursor-pointer'>
+                      <div className='flex items-center gap-4'>
+                        <img className='w-12 h-auto' src={ParentIcon} alt='login key' />
+                        <p className='text-lg font-semibold'>Adult or Parent</p>
+                      </div>
+                      {/* <span>&gt;</span> */}
+                      <i className="fa-solid fa-caret-right"></i>
+                    </button>
+
+                    <button name='family' onClick={()=>navigate('/login/kid', {state:{loginType:'family'}})} className='w-full mx-auto flex justify-between items-center p-4 md:p-8 rounded-lg bg-[#f0eef1] text-[#a94ef3] cursor-pointer'>
+                      <div className='flex items-center gap-4'>
+                        <img className='w-12 h-auto' src={KidIcon} alt='login key' />
+                        <p className='text-lg font-semibold'>Kids or Teens</p>
+                      </div>
+                      {/* <span>&gt;</span> */}
+                      <i className="fa-solid fa-caret-right"></i>
+                    </button>
+                  </div>
+
+                  <div className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                    Don't have an account?{" "}
+                    <Link
+                      to="/signup"
+                      className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                    >
+                      Sign Up
+                    </Link>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </AuthLayout>
+    </>
+  );
+}

src/components/AuthPages/Login/index.jsx

@@ -17,12 +17,13 @@ import { updateUserDetails } from "../../../store/UserDetails";
 import ReCAPTCHA from "react-google-recaptcha";
 
 export default function Login() {
+  const dispatch = useDispatch();
+  const location = useLocation();
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   // const sessionExpired = queryParams.get("sessionExpired");
 
-  const dispatch = useDispatch();
-  const { state } = useLocation();
 
   const [sessionExpired, setSessionExpired] = useState(queryParams.get("sessionExpired"))
 
@@ -220,7 +221,7 @@ export default function Login() {
     let loginValue = readCookie("loginType");
     setLoginType(loginValue);
 
-    if (state?.error) {
+    if (location?.state?.error) {
       //check if the login path has an error state indicating any social handle login with error
       setMsgError("Unexpected Error, Please try again soon.");
       setTimeout(() => {

src/components/AuthPages/Login/index2.jsx

@@ -16,13 +16,17 @@ import { updateUserDetails } from "../../../store/UserDetails";
 
 import ReCAPTCHA from "react-google-recaptcha";
 
+import GoogleDownload from '../../../assets/images/download/andriod.jpg'
+import IOSDownload from '../../../assets/images/download/apple.jpg'
+
 export default function Login() {
+  const dispatch = useDispatch();
+  const location = useLocation();
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   // const sessionExpired = queryParams.get("sessionExpired");
 
-  const dispatch = useDispatch();
-  const { state } = useLocation();
 
   const [sessionExpired, setSessionExpired] = useState(
     queryParams.get("sessionExpired")
@@ -30,7 +34,7 @@ export default function Login() {
 
   const [validCaptcha, setValidCaptcha] = useState({ show: false, valid: "" }); // FOR CAPTCHA
 
-  let [loginType, setLoginType] = useState("");
+  let [loginType, setLoginType] = useState('');
 
   const [loginLoading, setLoginLoading] = useState(false);
 
@@ -196,43 +200,43 @@ export default function Login() {
   // document.cookie ="loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
   // }, []);
 
-  useLayoutEffect(() => {
+  useEffect(()=>{
-    // checks the cookie in order to set the login type before components mounts
+    if(location?.state && location?.state.loginType){
-    // if(document.cookie.includes("loginType=family")){
+      setLoginType(location?.state.loginType)
-    //   setLoginType('family')
+    }else{
-    // }else if(document.cookie.includes("loginType=full")){
+      navigate('/login', {replace: true})
-    //   setLoginType('full')
-    // }else{
-    //   setLoginType('full')
-    // }
-    function readCookie(cname) {
-      // checks the cookie in order to set the login type before components mounts
-      let name = cname + "=";
-      let decoded_cookie = decodeURIComponent(document.cookie);
-      let carr = decoded_cookie.split(";");
-      for (let i = 0; i < carr.length; i++) {
-        let c = carr[i];
-        while (c.charAt(0) == " ") {
-          c = c.substring(1);
-        }
-        if (c.indexOf(name) == 0) {
-          return c.substring(name.length, c.length);
-        }
-      }
-      return "full";
     }
-    let loginValue = readCookie("loginType");
+  },[])
-    setLoginType(loginValue);
 
-    if (state?.error) {
+  // useLayoutEffect(() => {
-      //check if the login path has an error state indicating any social handle login with error
+  //   function readCookie(cname) {
-      setMsgError("Unexpected Error, Please try again soon.");
+  //     // checks the cookie in order to set the login type before components mounts
-      setTimeout(() => {
+  //     let name = cname + "=";
-        setMsgError("");
+  //     let decoded_cookie = decodeURIComponent(document.cookie);
-        navigate("/login", { replace: true });
+  //     let carr = decoded_cookie.split(";");
-      }, 4000);
+  //     for (let i = 0; i < carr.length; i++) {
-    }
+  //       let c = carr[i];
-  }, []);
+  //       while (c.charAt(0) == " ") {
+  //         c = c.substring(1);
+  //       }
+  //       if (c.indexOf(name) == 0) {
+  //         return c.substring(name.length, c.length);
+  //       }
+  //     }
+  //     return "full";
+  //   }
+  //   let loginValue = readCookie("loginType");
+  //   setLoginType(loginValue);
+
+  //   if (state?.error) {
+  //     //check if the login path has an error state indicating any social handle login with error
+  //     setMsgError("Unexpected Error, Please try again soon.");
+  //     setTimeout(() => {
+  //       setMsgError("");
+  //       navigate("/login", { replace: true });
+  //     }, 4000);
+  //   }
+  // }, []);
 
   useEffect(() => {
     setMail("");
@@ -256,7 +260,7 @@ export default function Login() {
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className="mb-5">
+          {/* <div className="mb-5">
             <Link to="#">
               <img
                 src={WrenchBoard}
@@ -264,13 +268,13 @@ export default function Login() {
                 className="h-10 mx-auto"
               />
             </Link>
-          </div>
+          </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-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">
+                <div className="hidden 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]">
                   Sign In to WrenchBoard
                 </h1> */}
@@ -296,7 +300,7 @@ export default function Login() {
               )}
 
               {/* switch login component */}
-              <div className="ml-7 flex justify-start items-center gap-3">
+              <div className="hidden --flex-- ml-7 justify-start items-center gap-3">
                 <button
                   name="full"
                   className={`login-type-btn px-4 py-1 rounded-t-2xl ${
@@ -324,6 +328,7 @@ export default function Login() {
               {/* END  of switch login component */}
 
               {/* for login component */}
+              <h1 className='pb-2 text-center font-medium text-2xl leading-[24.375px]'>{loginType == 'full' ? 'Login' : 'Kids and Teens'}</h1>
               {
                 loginType == "full" ? (
                   //user login component
@@ -387,7 +392,7 @@ export default function Login() {
                         {msgError}
                       </div>
                     )}
-                    <div className="signin-area mb-3.5">
+                    <div className="signin-area">
                       <div className="flex justify-center">
                         <button
                           name="full"
@@ -521,48 +526,54 @@ export default function Login() {
                 )
                 // END of family login compoenent
               }
+              <div className='w-full text-center'>
+                <Link className='text-center block font-semibold text-lg pt-3 tracking-wide' to='/login'>Return</Link>
+              </div>
               {/* END of login component */}
 
               {/* APP DOWNLOAD STORE */}
-              <div className="w-full mt-4">
+              <div className="hidden w-full mt-4">
                 <div className="w-full flex justify-center items-center gap-4">
-                  <div className="w-28 lg:w-32">
+                  <div className="w-32 lg:w-48">
                     <a
-                      className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
                       rel="noreferrer"
                       href={process.env.REACT_APP_APPLE_APP}
                     >
-                      <i className="fa-brands fa-apple text-3xl"></i>
+                      {/* <i className="fa-brands fa-apple text-3xl"></i>
                       <div className="flex flex-col">
                         <span className="text-[11px]">Available on the</span>
                         <span className="text-[12px] lg:text-base">
                           App Store
                         </span>
-                      </div>
+                      </div> */}
+                      <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
-                  <div className="w-28 lg:w-32">
+                  <div className="w-32 lg:w-48">
                     <a
-                      className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
                       rel="noreferrer"
                       href={process.env.REACT_APP_ANDROID_APP}
                     >
-                      <i className="fa-brands fa-google-play text-2xl"></i>
+                      {/* <i className="fa-brands fa-google-play text-2xl"></i>
                       <div className="flex flex-col">
                         <span className="text-[11px]">Available on the</span>
                         <span className="text-[12px] lg:text-base">
                           Google Play
                         </span>
-                      </div>
+                      </div> */}
+                      <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
                 </div>
               </div>
+
               {loginType == "full" && (
                 <>
-                  <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
+                  <div className="hidden pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
                     This site is protected by a Captcha. <br />Our Privacy Policy and
                     Terms of Service apply.
                   </div>

src/components/AuthPages/Promo/Promo.jsx

@@ -107,15 +107,6 @@ export default function Promo() {
   return (
     <PromoPageLayout>
       <div className="w-full">
-        <div className="mb-5">
-          <Link to="#">
-            <img
-              src={WrenchBoard}
-              alt="wrenchboard"
-              className="h-10 mx-auto"
-            />
-          </Link>
-        </div>
         {requestStatus.loading ?
           <div className='flex flex-col justify-center items-center'>
             <LoadingSpinner height='h-40' size='8' />
@@ -178,47 +169,7 @@ export default function Promo() {
                     </button>
                   </div>
                 </div>
-
+            </div>
-                              {/* APP DOWNLOAD STORE */}
-              <div className="w-full mt-4">
-                <div className="w-full flex justify-between items-center gap-10 sm:gap-32">
-                  <div className="w-full">
-                    <a
-                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
-                      target="_blank"
-                      rel="noreferrer"
-                      href={process.env.REACT_APP_APPLE_APP}
-                    >
-                      {/* <i className="fa-brands fa-apple text-3xl"></i>
-                      <div className="flex flex-col">
-                        <span className="text-[11px]">Available on the</span>
-                        <span className="text-[12px] lg:text-base">
-                          App Store
-                        </span>
-                      </div> */}
-                      <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
-                    </a>
-                  </div>
-                  <div className="w-full">
-                    <a
-                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
-                      target="_blank"
-                      rel="noreferrer"
-                      href={process.env.REACT_APP_ANDROID_APP}
-                    >
-                      {/* <i className="fa-brands fa-google-play text-2xl"></i>
-                      <div className="flex flex-col">
-                        <span className="text-[11px]">Available on the</span>
-                        <span className="text-[12px] lg:text-base">
-                          Google Play
-                        </span>
-                      </div> */}
-                      <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
-                    </a>
-                  </div>
-                </div>
-              </div>
-              </div>
           </div>
           :
           <ErrorComponent onClick={() => navigate("/login")} />

src/components/AuthPages/SignUp/index.jsx

@@ -6,12 +6,13 @@ import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
 export default function SignUp() {
+  const location = useLocation()
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   const country = queryParams.get("cnt")?.toUpperCase();
   
-  const {pathname} = useLocation()
+  const currentPath = country ? `${location?.pathname}?cnt=${country.toLowerCase()}`:location?.pathname // Determines the new pathname is country query params exist
-  const currentPath = country ? `${pathname}?cnt=${country.toLowerCase()}`:pathname // Determines the new pathname is country query params exist
 
   const [signUpLoading, setSignUpLoading] = useState(false);
   const [checked, setValue] = useState(false);

src/components/AuthPages/SignUp/index2.jsx

@@ -5,15 +5,19 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
 
-export default function SignUp() {
+import GoogleDownload from '../../../assets/images/download/andriod.jpg'
+import IOSDownload from '../../../assets/images/download/apple.jpg'
+
+export default function SignUp({details}) {
+  const location = useLocation();
+
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
   const country = queryParams.get("cnt")?.toUpperCase();
 
-  const { pathname } = useLocation();
   const currentPath = country
-    ? `${pathname}?cnt=${country.toLowerCase()}`
+    ? `${location?.pathname}?cnt=${country.toLowerCase()}`
-    : pathname; // Determines the new pathname is country query params exist
+    : location?.pathname; // Determines the new pathname is country query params exist
 
   const [signUpLoading, setSignUpLoading] = useState(false);
   const [checked, setValue] = useState(false);
@@ -24,9 +28,9 @@ export default function SignUp() {
 
   const [formData, setFormData] = useState({
     country: country ? country : "",
-    first_name: "",
+    first_name: details ? details.first_name : "",
-    last_name: "",
+    last_name: details ? details.last_name : "",
-    email: "",
+    email: details ? details.email : "",
     password: "",
   });
 
@@ -154,15 +158,6 @@ export default function SignUp() {
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className="mb-5">
-            <Link to={currentPath}>
-              <img
-                src={WrenchBoard}
-                alt="wrenchboard"
-                className="h-10 mx-auto"
-              />
-            </Link>
-          </div>
           <div className="flex place-content-center">
             <div className="w-10/12">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
@@ -207,6 +202,7 @@ export default function SignUp() {
                       type="text"
                       value={formData.first_name}
                       inputHandler={handleInputChange}
+                      disable={details.first_name}
                     />
                   </div>
                   <div className="input-item flex-1">
@@ -218,6 +214,7 @@ export default function SignUp() {
                       type="text"
                       value={formData.last_name}
                       inputHandler={handleInputChange}
+                      disable={details.last_name}
                     />
                   </div>
                 </div>
@@ -230,6 +227,7 @@ export default function SignUp() {
                     type="email"
                     value={formData.email}
                     inputHandler={handleInputChange}
+                    disable={details.email}
                   />
                 </div>
                 <div className="input-item mb-4">
@@ -277,12 +275,12 @@ export default function SignUp() {
                     </button>
                     <span
                       onClick={rememberMe}
-                      className="cursor-default text-dark-gray dark:text-white text-[15px] group-checked:text-white transition-all duration-200 group-checked:cursor-default"
+                      className="cursor-default text-gray-400 font-medium text-[16.25px] leading-[24.375px] group-checked:text-white transition-all duration-200 group-checked:cursor-default"
                     >
                       I agree with all
                       <Link
                         href="#"
-                        className="text-base text-[#4687ba] hover:text-[#009ef7] mx-1 inline-block"
+                        className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition mx-1 inline-block"
                       >
                         terms and condition
                       </Link>
@@ -343,44 +341,6 @@ export default function SignUp() {
                     </button>
                   </div>
                 </div>
-
-                {/* APP DOWNLOAD STORE */}
-                <div className="w-full mt-4">
-                  <div className="w-full flex justify-center items-center gap-4">
-                    <div className="w-28 lg:w-32">
-                      <a
-                        className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
-                        target="_blank"
-                        href={process.env.REACT_APP_APPLE_APP}
-                        rel="noreferrer"
-                      >
-                        <i className="fa-brands fa-apple text-3xl"></i>
-                        <div className="flex flex-col">
-                          <span className="text-[11px]">Available on the</span>
-                          <span className="text-[12px] lg:text-base">
-                            App Store
-                          </span>
-                        </div>
-                      </a>
-                    </div>
-                    <div className="w-28 lg:w-32">
-                      <a
-                        className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
-                        target="_blank"
-                        href={process.env.REACT_APP_ANDROID_APP}
-                        rel="noreferrer"
-                      >
-                        <i className="fa-brands fa-google-play text-2xl"></i>
-                        <div className="flex flex-col">
-                          <span className="text-[11px]">Available on the</span>
-                          <span className="text-[12px] lg:text-base">
-                            Google Play
-                          </span>
-                        </div>
-                      </a>
-                    </div>
-                  </div>
-                </div>
               </div>
             </div>
           </div>

src/components/AuthPages/VerifyLink/index.jsx

@@ -84,7 +84,7 @@ export default function VerifyLink() {
       const verifyRes = await userApi.verifyEmail(code);
       if (verifyRes.status === 200) {
         let { data } = verifyRes;
-        console.log("TESTING VERIFY", data);
+        // console.log("TESTING VERIFY", data);
         if (
           data &&
           data.internal_return >= 0 &&

src/components/AuthPages/VerifyLink/index2.jsx

@@ -92,7 +92,7 @@ export default function VerifyLink() {
       const verifyRes = await userApi.verifyEmail(code);
       if (verifyRes.status === 200) {
         let { data } = verifyRes;
-        console.log("TESTING VERIFY", data);
+        // console.log("TESTING VERIFY", data);
         if (
           data &&
           data.internal_return >= 0 &&
@@ -137,15 +137,6 @@ export default function VerifyLink() {
           </div>
         ) : (
           <div className="w-full">
-            <div className="mb-12">
-              <Link to="#">
-                <img
-                  src={WrenchBoard}
-                  alt="wrenchboard"
-                  className="h-10 mx-auto"
-                />
-              </Link>
-            </div>
             <div className="flex place-content-center">
               <div className="w-10/12">
                 <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">

src/components/AuthPages/VerifyPassword/index2.jsx

@@ -139,15 +139,6 @@ const VerifyPassword = () => {
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className="mb-12">
-            <Link to="#">
-              <img
-                src={WrenchBoard}
-                alt="wrenchboard"
-                className="h-10 mx-auto"
-              />
-            </Link>
-          </div>
           <div className="flex place-content-center">
             {requestStatus.loading ? (
               <LoadingSpinner color="sky-blue" size="16" height="h-300px" />

src/components/AuthPages/VerifyYou/index2.jsx

@@ -8,15 +8,6 @@ export default function VerifyYou() {
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className="mb-12">
-            <Link to="#">
-              <img
-                src={WrenchBoard}
-                alt="wrenchboard"
-                className="h-10 mx-auto"
-              />
-            </Link>
-          </div>
           <div className="flex place-content-center">
             <div className="w-10/12">
               <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">

src/components/Blogs/index.jsx

@@ -1,14 +1,16 @@
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useSelector } from "react-redux";
+import { useNavigate, useLocation } from "react-router-dom";
 import usersService from "../../services/UsersService";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import CommonHead from "../UserHeader/CommonHead";
-import { useSelector } from "react-redux";
-import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function BlogItem(props) {
 
+    const location = useLocation()
+
     const {
         userDetails: { account_type },
       } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details account type
@@ -26,7 +28,7 @@ export default function BlogItem(props) {
     const queryParams = new URLSearchParams(location?.search);
     const blog_id = queryParams.get("blog_id");
     
-    // console.log('MUMU', 'meta_value', blogdata, blogdata.data.image_url)
+    // ('MUMU', 'meta_value', blogdata, blogdata.data.image_url)
 
     useEffect(()=>{
         if(!blog_id){

src/components/Cards/OfferCard.jsx

@@ -20,7 +20,7 @@ export default function OfferCard({
   let image = `${image_server}${localStorage.getItem("session_token")}/job/${datas.job_uid}`
 
   return (
-    <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
+    <div className="card-style-one flex flex-col gap-3 justify-between w-full bg-white dark:bg-dark-white p-3 rounded-2xl">
       <div className="content">
         <div className="w-full h-40">
           {/* thumbnail image/video */}
@@ -46,24 +46,24 @@ export default function OfferCard({
           </h1>
 
           <div className="w-full p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
-            <div className="grid grid-cols-1 gap-2">
+            {/* <div className="grid grid-cols-1 gap-2">
-              {/* <div className="flex flex-col justify-between items-center border-r-2">
+              <div className="flex flex-col justify-between items-center border-r-2">
                 <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
                   Task Code
                 </p>
                 <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
                   {datas.contract}
                 </p>
-              </div> */}
+              </div>
               <div className="flex flex-col justify-between items-center">
                 <p className="text-sm text-red-500 tracking-wide">Expires</p>
                 <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
                   <CountDown lastDate={datas.expire} />
                 </p>
               </div>
-            </div>
+            </div> */}
 
-            <hr className="my-2" />
+            {/* <hr className="my-2" /> */}
 
             <div className="grid grid-cols-2 gap-2">
               <div className="flex flex-col justify-between items-center border-r-2">
@@ -74,13 +74,19 @@ export default function OfferCard({
                   {thePrice}
                 </p>
               </div>
-              <div className="flex flex-col justify-between items-center">
+              {/* <div className="flex flex-col justify-between items-center">
                 <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
                   Timeline
                 </p>
                 <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
                   {`${datas.timeline_days} day(s)`}
                 </p>
+              </div> */}
+              <div className="flex flex-col justify-between items-center">
+                <p className="text-sm text-red-500 tracking-wide">Expires</p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  <CountDown lastDate={datas.expire} />
+                </p>
               </div>
             </div>
           </div>

src/components/Cards/ResourceBlogCard.jsx

@@ -23,17 +23,19 @@ export default function ProductCardStyleTwo({
   
   return (
     <div
-      className={`card-style-two w-full h-[336px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+      className={`card-style-two w-full p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
         className || ""
       }`}
     >
       <div className="flex flex-col justify-between w-full h-full">
         <div className="thumbnail-area w-full">
           <div
-            className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+            className="w-full h-[140px] p-6  rounded-lg overflow-hidden"
             style={{
               // background: `url(${`https://blog.wrenchboard.com/wp-content/uploads/${datas.meta_value}`}) 0% 0% / cover no-repeat`,
-            background: `url(${`${bg}${datas.meta_value}`}) 0% 0% / cover no-repeat`,
+              // background: `url(${`${bg}${datas.meta_value}`}) 0% 0% / cover no-repeat`,
+              background: `url(${`${bg}${datas.meta_value}`}) no-repeat`,
+              backgroundSize: '100%',
             }}
           >
             <div className="product-two-options flex justify-between mb-5 relative">
@@ -50,7 +52,7 @@ export default function ProductCardStyleTwo({
         </div>
         <div className="details-area">
           {/* title */}
-          <Link to={`/blog-page?blog_id=${datas.ID}`} className="mb-2.5" rel="noreferrer">
+          <Link to={`/blog-page?blog_id=${datas.ID}`} className="py-2 mb-2.5" rel="noreferrer">
             <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               {datas.post_title || "dummy title..."}
             </h1>

src/components/Contexts/SocketIOContext.js

@@ -67,6 +67,7 @@ export default function SocketIOContextProvider({children}) {
             let {message} = data
             if(message.action == "REFRESH_OFFER" && message.family_uid == user_uid && message.audience == "MEMBER"){  // for refreshing child account when parent assigns a job
                 dispatch(tableReload({type:'FAMILYOFFERLIST'})) // dispatches to update family pending/offer list on family side
+                dispatch(tableReload({ type: "FAMILYBANNERSLIST" })) // dispatches to update family banner list on family side
             }
             if(message.action == "REFRESH_TASK" && message.audience == "PARENT"){  // for refreshing parent account when child accepts or rejects a job
                 dispatch(tableReload({type:'PARENTFAMILYTASKLIST'})) // dispatches to update parent family task list on parent side
@@ -83,8 +84,9 @@ export default function SocketIOContextProvider({children}) {
             if(message.action == "REFRESH_OFFERS" && message.audience == "MERCHANT" && message.market_uid == user_uid){  // for refreshing job owner offer interest list when any worker sends interest
                 dispatch(tableReload({type:'OFFERINTERESTLISTRELOAD'}))
             }
-            console.log('data', data)
+            // console.log('data', data)
         });
+        // dispatch(tableReload({ type: "HOMEBANNERS" })); // RELOADS HOME BANNERS
 
     }, [socket]);
 

src/components/Dashboards/AccountDashboard.jsx

@@ -9,7 +9,7 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
 
   let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
 
-  let offersListLength = offersList?.length
+  let offersListLength = offersList?.length > 2 ? 2 : offersList?.length
 
   // getting the upper three banners for the home layout
   const getUpperBanner = bannerList?.filter((value, idx) => idx <= 2 - offersListLength);
@@ -31,8 +31,8 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
         }`}
       >
 
+        {/* for normal banner section */}
         <div className="w-full grid xxs:grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 items-center justify-center gap-2 md:gap-4">
-
           {/* OFFER LIST DISPLAY */}
           <>
             {(offersList && offersList?.length > 0) &&
@@ -44,11 +44,13 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
                 );
               
                 let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
-                return (
+                if(index < offersListLength){
-                  <div key={item.id}>
+                  return (
-                    <NewOfferCard datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
+                    <div key={item.offer_uid}>
-                  </div>
+                        <NewOfferCard datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
-                )
+                    </div>
+                  )
+                }
             })}
           </>
 
@@ -71,7 +73,30 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
             );
           })}
         </div>
-        <div className="w-full grid-cols-1 md:grid-cols-2 2xl::grid-cols-3 grid items-center justify-center gap-2 md:gap-4">
+
+
+        {/* for flat banner section */}
+        <div className="w-full grid-cols-1 md:grid-cols-2 2xl:grid-cols-3 grid items-center justify-center gap-2 md:gap-4">    
+          {/* OFFER LIST DISPLAY */}
+          {/* <>
+            {(offersList && offersList?.length > 0) &&
+              offersList.map((item, index) => {
+                let thePrice = PriceFormatter(
+                  item?.price * 0.01,
+                  item?.currency_code,
+                  item?.currency
+                );
+              
+                let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
+                if(index >= 3) {
+                    return(
+                    <div key={item.offer_uid}>
+                        <NewOfferCardFlat datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
+                    </div>
+                    )
+                }
+            })}
+          </> */}
           {getLowerBanner?.map((props, idx) => {
             let image = getImage(props);
 
@@ -160,9 +185,16 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
         <div
           className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
           style={{
-            background: `url(${image}) center / contain no-repeat`,
+            // background: `url(${image}) center / contain no-repeat`,
           }}
         >
+          {/* <img src={image} className='' /> */}
+          <div
+          className="thumbnail w-full h-full rounded-xl overflow-hidden"
+          style={{
+            background: `url(${image}) center / contain no-repeat`,
+          }}
+        ></div>
           {hidden && <div className="flex justify-center"></div>}
         </div>
         }
@@ -172,18 +204,15 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
           <h1 className="font-bold text-lg line-clamp-1 text-center">
             {datas?.title}
           </h1>
-          {/* <Link to={link_path} className="text-sm">
-            {desc}
-          </Link> */}
           <div className="card-buttons flex justify-center items-center space-x-2">
             <button
               type="button"
               onClick={() =>
-                setOfferPopout({ show: true, data: { ...datas, price, image } })
+                setOfferPopout({ show: true, data: { ...datas, image } })
               }
               className="btn-shine w-2/3 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
             >
-              Start Task
+              Start Now
             </button>
           </div>
         </div>
@@ -205,6 +234,62 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
   );
 };
 
+const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image }) => {
+  return (
+    <div className="flex flex-col shadow-md bg-red-50 dark:bg-dark-white rounded-xl dark:border-[#5356fb29] overflow-hidden">
+      <div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
+        <div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
+          <div className="px-2 flex flex-col gap-2 dark:text-white">
+            <h1 className="font-bold text-lg line-clamp-1 text-center">
+              {datas?.title}
+            </h1>
+            <div className="card-buttons flex items-center space-x-2">
+              <button
+                type="button"
+                onClick={() =>
+                  setOfferPopout({ show: true, data: { ...datas, image } })
+                }
+                className="btn-shine w-28 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+              >
+                Start Now
+              </button>
+            </div>
+          </div>
+        </div>
+        <div className='w-[150px] h-[100px]'>
+          {datas.job_type == "MEDIA" ?
+          <Suspense fallback={<p>Loading...</p>}>
+            <VideoElement videoId={datas?.media_uid} />
+          </Suspense>
+          :
+          <div
+            className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+            style={{
+              background: `url(${image}) center / contain no-repeat`,
+            }}
+          >
+            {hidden && <div className="flex justify-center"></div>}
+          </div>
+          }
+        </div>
+      </div>
+      <div className="flex justify-between w-full p-1 items-center">
+        <div className="flex gap-1 items-center">
+          <p className="text-[12px] text-red-500 tracking-wide">Expires</p>
+          <p className="text-[12px] font-semibold tracking-wide text-dark-gray dark:text-white">
+            <CountDown lastDate={datas.expire} />
+          </p>
+        </div>
+        <button className="flex items-center justify-center gap-2">
+          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
+          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
+          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
+        </button>
+      </div>
+    </div>
+  );
+};
+
 const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type, blog_id, key }) => {
   const newLinkPath = card_type == 'BLOG' ? `${link_path}?blog_id=${blog_id}` : link_path
 

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -93,7 +93,7 @@ const AssignTaskPopout = ({
   const [formState, setFormState] = useState({
     // Initialize form state with desired fields
     banner: details?.banner || "default.jpg",
-    country: details?.country ? details?.country : walletDetails.data.length == 1 ? walletDetails.data[0].country : '',
+    country: details?.country ? details?.country : walletDetails?.data?.length == 1 ? walletDetails?.data[0].country : '',
     price: details?.price || "",
     title: details?.title || "",
     description: details?.description || "",
@@ -115,7 +115,7 @@ const AssignTaskPopout = ({
     let reqData = {};
     if (taskType == "select" && assignType == 'task') {
       // RUNS HERE IF TASK TYPE IS SELECT
-      if (!Object.keys(activeTask.data).length) {
+      if (!Object.keys(activeTask.data)?.length) {
         setRequestStatus({
           loading: false,
           status: false,

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

@@ -105,7 +105,7 @@ const RelativePopout = ({
                         const isChecked = relativeSettings?.data?.filter(value => value?.family_uid == item?.family_uid)
                         const image = localStorage.getItem("session_token") ? `${familyList?.imageServer}${localStorage.getItem("session_token")}/family/${item?.family_uid}` : "";
                         return (
-                        <div key={item.family_uid || index} className="flex items-center border-b dark:border-[#5356fb29] hover:bg-gray-50">
+                        <div key={item.family_uid} className="flex items-center border-b dark:border-[#5356fb29] hover:bg-gray-50">
                             <div className='p-2 flex justify-center items-center'>
                               {relativeEditKids.loading && relativeEditKids.family_uid == item.family_uid?
                                 <LoadingSpinner size='4' color='bg-sky-500' />
@@ -122,7 +122,7 @@ const RelativePopout = ({
                                 <div className="flex space-x-2 items-center w-full">
                                     <div className="min-w-[30px] min-h-[30px] max-w-[30px] max-h-[30px] rounded-full overflow-hidden flex justify-center items-center">
                                         <img
-                                            src={image || localImgLoad(`images/icons/${banner}`)}
+                                            src={image || localImgLoad(`images/icons/family.svg`)}
                                             alt={`Avatar`}
                                             className="w-full h-full"
                                         />

src/components/FamilyAcc/FamilyTableNew.jsx

@@ -18,7 +18,10 @@ export default function FamilyTableNew() {
   const { jobListTable, pendingListTable, parentFamilyTaskList } = useSelector((state) => state.tableReload); // TABLE RELOAD TRIGGERS
 
 
-  let { pathname } = useLocation();
+  let location = useLocation();
+
+  const queryParams = new URLSearchParams(location?.search);
+  const preSelectedTab = queryParams.get("tab");
 
   // Initial state for family details
   const initialDetailState = {
@@ -65,35 +68,43 @@ export default function FamilyTableNew() {
 
   // Function to handle tab changes
   const tabHandler = (value) => {
-    setTab(value);
+    setTab(value.toLowerCase());
   };
 
   // Object that maps tab names to their corresponding components
   const tabComponents = {
-    Tasks: (
+    tasks: (
       <FamilyTasks
         familyData={familyTasks}
         action={familyAssignPopUpHandler}
       />
     ),
-    Waiting: (
+    waiting: (
       <FamilyWaitlist
         familyData={familyWaitList}
         setUpdatePage={setUpdatePage}
       />
     ),
-    Pending: (
+    pending: (
       <FamilyPending
         familyData={familyPending}
       />
     ),
   };
 
-  const defaultTabComponent = tabComponents.Tasks;
+  const defaultTabComponent = tabComponents.tasks;
 
   // Selected tab component based on the current 'tab'
   const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 
+  useEffect(()=>{ // EFFECT TO CHECK FOR PRE SELECTED TAB AND DEFAULT TO IT OR TO DEFAULT IF NOT AVALIABLE
+    if(preSelectedTab && tabs.map(item => item.name.toLowerCase()).includes(preSelectedTab.toLowerCase())){
+      setTab(preSelectedTab)
+    }else{
+      setTab(tabs[0].name)
+    }
+  },[])
+
 
   // Effect to manage active family task details
   useEffect(() => {
@@ -189,7 +200,7 @@ export default function FamilyTableNew() {
         <Suspense
           fallback={
             <div className="h-full min-h-[609px] w-full overflow-hidden flex justify-center items-center">
-              <LoadingSpinner size="16" color="sky-blue" />
+              <LoadingSpinner size="16" color="sky-blue" height='h-[30rem]' />
             </div>
           }
         >
@@ -202,7 +213,7 @@ export default function FamilyTableNew() {
                       <li
                         onClick={() => tabHandler(name)}
                         className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl relative top-[2px] ${
-                          tab === name
+                          tab.toLowerCase() === name.toLowerCase()
                             ? "text-purple border-r"
                             : "text-thin-light-gray"
                         }`}
@@ -224,7 +235,7 @@ export default function FamilyTableNew() {
                 <div className="flex-[0.9] h-full">
                   <div className="h-full relative overflow-y-auto">
                     <Suspense
-                      fallback={<LoadingSpinner size="16" color="sky-blue" />}
+                      fallback={<LoadingSpinner size="16" color="sky-blue" height='h-[30rem]' />}
                     >
                       {selectedTabComponent}
                     </Suspense>

src/components/FamilyAcc/Tabs/FamilyNewWaitlist.jsx

@@ -43,7 +43,7 @@ const FamilyNewWaitlist = ({
     setContinueTaskPopup({ show: false, data: {} });
   };
 
-  console.log("Check this >>",continueTaskPopup)
+  // console.log("Check this >>",continueTaskPopup)
 
   return (
     <div

src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx

@@ -148,18 +148,18 @@ const FamilyWaitlist = memo(
         )}
         {popUp.show && (
           <SuggestTask
-            details={popUp.data}
+            details={popUp?.data}
             onClose={closePopUp}
             continuePopupData={openContinueTaskPopup}
-            situation={popUp.show}
+            situation={popUp?.show}
           />
         )}
 
         {continueTaskPopup.show && (
           <AssignTaskPopout
-            details={continueTaskPopup.data}
+            details={continueTaskPopup?.data}
             action={closeContinueTaskPopup}
-            situation={continueTaskPopup.show}
+            situation={continueTaskPopup?.show}
             setUpdatePage={setUpdatePage}
             jobList={jobList}
             setActiveTask={setActiveTask}

src/components/FamilyAcc/Tabs/wallet/VirtualAddCardFamilyPopout.jsx

@@ -0,0 +1,600 @@
+import { useEffect, useState } from "react";
+import { Form, Formik } from "formik";
+import * as Yup from "yup";
+import { useSelector } from "react-redux";
+import ModalCom from "../../../Helpers/ModalCom";
+import LoadingSpinner from "../../../Spinners/LoadingSpinner";
+import CustomTimer from "../../../countdown/CustomTimer";
+import InputCom from '../../../Helpers/Inputs/InputCom'
+import usersService from "../../../../services/UsersService";
+
+
+const validationSchema = Yup.object().shape({
+
+  country: Yup.string()
+    .required("Required"),
+  phone_number: Yup.string()
+    .min(9, "Invalid")
+    .max(11, "Invalid")
+    .required("Required"),
+  // birthYear: Yup.string()
+  //   .required("Required"),
+  // birthMonth: Yup.string()
+  //   .required("Required"),
+  // birthDay: Yup.string()
+  //   .required("Required"),
+  address: Yup.string()
+    .min(5, "Min 3 characters")
+    .max(50, "Max 25 characters")
+    .required("Required"),
+  city: Yup.string()
+    .min(2, "Min 3 characters")
+    .max(25, "Max 25 characters")
+    .required("Required"),
+  state: Yup.string()
+    .required("Required"),
+  zipCode: Yup.string()
+    .min(1, "Min 3 characters")
+    .max(8, "Max 8 characters")
+    .required("Required"),
+  dob: Yup.string()
+    .required("Required"),
+checked: Yup.bool() // use bool instead of boolean
+    .oneOf([true], "You must accept the terms and conditions")
+});
+
+const VirtualAddCardFamilyPopout = ({ details, onClose, situation, walletItem, familyData }) => {
+    // console.log('PROPS', 'DETAILS', details, 'WALLET', walletItem, 'FAMILYDATA', familyData)
+
+  const { userDetails } = useSelector((state) => state.userDetails);
+
+  const countryCode = walletItem?.country
+
+  const userApi = new usersService()
+
+  const [requestStatus, setRequestStatus] = useState({loading: false, status:false, message: ''})
+
+  const [allCountries, setAllCountries] = useState({loading: true, data: []}) // VARIABLE TO HOLD COUNTRY LIST
+
+  const [state, setState] = useState({loading: true, data: {}}) // VARIABLE TO HOLD STATE LIST
+
+  
+  let initialValues = {
+    // initial values for formik
+    country: countryCode ? countryCode : '',
+    phone_number: '',
+    email: userDetails?.email,
+    firstname: familyData?.firstname,
+    lastname: familyData?.lastname,
+    family_uid: familyData?.uid,    
+    birthYear: '',
+    birthMonth: '',
+    birthDay: '',
+    address: '',
+    city: '',
+    // city: userDetails?.city ? userDetails.city : '',
+    state: '',
+    zipCode: '',
+    dob: '',
+    checked: false
+  };
+
+  
+  const handleSubmit = (values) => {
+    let date = new Date(values.dob)
+    const reqData = {
+      request_type: '100',
+      address: values.address,
+      city: values.city,
+      state: values.state,
+      country: values.country,
+      postal_code: values.zipCode,
+      phone_number: values.phone_number,
+      family_uid: values.family_uid,
+      // dob_day: values.birthDay,
+      // dob_month: values.birthMonth,
+      // dob_year: values.birthYear,
+      dob_day: Number(date.getDate()),
+      dob_month: Number(date.getMonth()) + 1,
+      dob_year: Number(date.getFullYear()),
+      dob: values.dob
+    }
+    // console.log('Values', reqData)
+    setRequestStatus({loading: true, status:false, message: ''})
+    userApi.walletCardFamilyRequest(reqData).then(res => {
+      if(res?.data?.internal_return < 0){
+        setRequestStatus({loading: false, status:false, message: 'Failed, try again'})
+        setTimeout(()=>{
+          setRequestStatus({loading: false, status:true, message: ''})
+        },4000)
+        return 
+      }
+      setRequestStatus({loading: false, status:true, message: 'Successful'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:true, message: ''})
+        onClose()
+      },4000)
+    }).catch(err => {
+      console.log('ERR', err)
+      setRequestStatus({loading: false, status:false, message: 'Unable to complete'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:false, message: ''})
+      },4000)
+    })
+  }
+
+  useEffect(()=>{
+      // Get Country Api
+    userApi.getSignupCountryData().then(res =>{
+    if(!res?.data?.result_list){
+      return setAllCountries({ loading: false, data: [] });
+    }
+    // if(countryCode){
+    //   return setAllCountries({ loading: false, data: res?.data?.result_list?.filter(item => item?.code == countryCode) });
+    // }
+    setAllCountries({ loading: false, data: res?.data?.result_list });
+    }).catch(err => {
+      setAllCountries({ loading: false, data: [] });
+      console.log('err', err)
+    })
+  },[])
+
+  useEffect(()=>{
+    // GET STATE API
+    setState({loading: true, data: {}})
+  userApi.getStateFromCountry({country: countryCode}).then(res =>{
+  if(!res?.data?.country_state){
+    return setState({ loading: false, data: {} });
+  }
+  setState({ loading: false, data: res?.data?.country_state});
+  }).catch(err => {
+    setState({ loading: false, data: {} });
+    console.log('err', err)
+  })
+},[initialValues.country])
+
+  return (
+    <ModalCom
+      action={onClose}
+      situation={situation}
+    >
+      <Formik
+        initialValues={initialValues}
+        validationSchema={validationSchema}
+        onSubmit={handleSubmit}
+      >
+        {(props) => (
+          <div className="logout-modal-wrapper mx-auto w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+            <Form className="w-full">
+              <div className="modal-header-con">
+                <h1 className="modal-title">
+                  {walletItem?.description}
+                </h1>
+                <button
+                  type="button"
+                  className="modal-close-btn"
+                  onClick={onClose}
+                >
+                  <svg
+                    width="36"
+                    height="36"
+                    viewBox="0 0 36 36"
+                    fill="none"
+                    className="fill-current"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                      fill=""
+                      fillOpacity="0.6"
+                    />
+                    <path
+                      d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                      fill="#"
+                      fillOpacity="0.6"
+                    />
+                  </svg>
+                </button>
+              </div>
+              <div className='p-4 w-full flex flex-col h-auto md:h-[28rem]'>
+                <div className='pb-4'>
+                  <h1 className='text-lg md:text-xl flex gap-1'><span className='font-bold'>Name:</span>{familyData.lastname} {familyData.firstname}</h1>
+                </div>
+                <div className="grid md:grid-cols-2 gap-4">
+                  {/* left part */}
+                  <div className='w-full flex flex-col gap-4'>
+                    <div className="field w-full grid md:grid-cols-5 gap-4">
+                        <div className="md:col-span-2 field w-full">
+                          <label
+                            htmlFor="country"
+                            className="job-label job-label-flex"
+                          >
+                            <span>Country</span>
+                            {props.errors.country && props.touched.country && (
+                              <span className="text-[12px] text-red-500">
+                                {props.errors.country}
+                              </span>
+                            )}
+                          </label>
+                          <select
+                            id="country"
+                            name="country"
+                            value={props.values.country}
+                            className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                            onChange={props.handleChange}
+                            disabled={countryCode ? true : false}
+                          >
+                            {allCountries.loading ?
+                              <option className="text-slate-500 text-lg" value="">
+                                Loading...
+                              </option>
+                            : allCountries.data?.length > 0 ?
+                            <>
+                              <option className="text-slate-500 text-lg" value="">
+                                Select Country
+                              </option>
+                              {allCountries.data?.map(item => (
+                                <option key={item.uid} className="text-slate-500 text-lg" value={item.code}>
+                                  {item.country}
+                                </option>
+                              ))}
+                            </>
+                            :
+                              <option className="text-slate-500 text-lg" value="">
+                                Not Found
+                              </option>
+                            }
+                          </select>
+                        </div>
+                        <div className='md:col-span-3'>
+                          <InputCom
+                          fieldClass="px-6"
+                          label="Phone Number"
+                          labelClass="tracking-wide"
+                          inputBg="bg-slate-100"
+                          inputClass="w-full input-curve lg border border-light-purple"
+                          type="text"
+                          name="phone_number"
+                          value={props.values.phone_number}
+                          inputHandler={props.handleChange}
+                          error={(props.errors.phone_number && props.touched.phone_number) && props.errors.phone_number}
+                          />
+                        </div>
+                    </div>
+                    <InputCom
+                      disable={true}
+                      fieldClass="px-6"
+                      label="Email"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="email"
+                      value={props.values.email}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.email && props.touched.email) && props.errors.email}
+                    />
+                    <div className="hidden field w-full md:grid-cols-2 gap-4">
+                      <InputCom
+                        disable={true}
+                        fieldClass="px-6"
+                        label="Firstname"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        inputClass="input-curve lg border border-light-purple"
+                        type="text"
+                        name="firstname"
+                        value={props.values.firstname}
+                        inputHandler={props.handleChange}
+                        error={(props.errors.firstname && props.touched.firstname) && props.errors.firstname}
+                      />
+                      <InputCom
+                        disable={true}
+                        fieldClass="px-6"
+                        label="Lastname"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        inputClass="input-curve lg border border-light-purple"
+                        type="text"
+                        name="lastname"
+                        value={props.values.lastname}
+                        inputHandler={props.handleChange}
+                        error={(props.errors.lastname && props.touched.lastname) && props.errors.lastname}
+                      />
+                    </div>
+
+                    {/* hidden section */}
+                    <div className="hidden field w-full flex-col gap-4">
+                        <p className='job-label'>Date of Birth</p>
+                        <div className='xxs:grid-cols-3 gap-4'>
+                          <div className="field w-full">
+                            <label
+                              htmlFor="birthDay"
+                              className="job-label job-label-flex"
+                            >
+                              <span>Day</span>
+                              {props.errors.birthDay && props.touched.birthDay && (
+                                <span className="text-[12px] text-red-500">
+                                  {props.errors.birthDay}
+                                </span>
+                              )}
+                            </label>
+                            <select
+                              id="birthDay"
+                              name="birthDay"
+                              value={props.values.birthDay}
+                              className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                              onChange={props.handleChange}
+                            >
+                              <>
+                              <option className="text-slate-500 text-lg" value=''>
+                                  select
+                              </option>
+                              {day.map(item => (
+                                <option key={item} className="text-slate-500 text-lg" value={item}>
+                                  {item}
+                                </option>
+                              ))}
+                              </>
+                            </select>
+                          </div>
+                          <div className="field w-full">
+                            <label
+                              htmlFor="birthMonth"
+                              className="job-label job-label-flex"
+                            >
+                              <span>Month</span>
+                              {props.errors.birthMonth && props.touched.birthMonth && (
+                                <span className="text-[12px] text-red-500">
+                                  {props.errors.birthMonth}
+                                </span>
+                              )}
+                            </label>
+                            <select
+                              id="birthMonth"
+                              name="birthMonth"
+                              value={props.values.birthMonth}
+                              className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                              onChange={props.handleChange}
+                            >
+                              <>
+                              <option className="text-slate-500 text-lg" value=''>
+                                  select
+                              </option>
+                              {month.map(item => (
+                                <option key={item.value} className="text-slate-500 text-lg" value={item.value}>
+                                  {item.name}
+                                </option>
+                              ))}
+                              </>
+                            </select>
+                          </div>
+                          <div className="field w-full">
+                            <label
+                              htmlFor="birthYear"
+                              className="job-label job-label-flex"
+                            >
+                              <span>Year</span>
+                              {props.errors.birthYear && props.touched.birthYear && (
+                                <span className="text-[12px] text-red-500">
+                                  {props.errors.birthYear}
+                                </span>
+                              )}
+                            </label>
+                            <select
+                              id="birthYear"
+                              name="birthYear"
+                              value={props.values.birthYear}
+                              className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                              onChange={props.handleChange}
+                            >
+                              <>
+                              <option className="text-slate-500 text-lg" value=''>
+                                  select
+                              </option>
+                              {year.map(item => (
+                                <option key={item} className="text-slate-500 text-lg" value={item}>
+                                  {item}
+                                </option>
+                              ))}
+                              </>
+                            </select>
+                          </div>
+                        </div>
+                    </div>
+
+                    <div className="field w-full grid md:grid-cols-3 gap-4">
+                      <p className='hidden md:flex w-full md:col-span-1 job-label items-center'>Date of Birth</p>
+                      <div className='w-full md:col-span-2 '>
+                        <InputCom
+                          fieldClass="px-6"
+                          label="Date of Birth"
+                          labelClass="md:hidden tracking-wide"
+                          inputBg="bg-slate-100"
+                          inputClass="input-curve lg border border-light-purple"
+                          type="date"
+                          name="dob"
+                          value={props.values.dob}
+                          inputHandler={props.handleChange}
+                          error={(props.errors.dob && props.touched.dob) && props.errors.dob}
+                          maxDate={year[0] + '-12-31'}
+                          minDate={year[year?.length - 1] + '-01-01'}
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+                  {/* right part */}
+                  <div className='w-full p-4 flex flex-col gap-4 bg-blue-200 dark:bg-slate-900 rounded-2xl'>
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Address"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="address"
+                      value={props.values.address}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.address && props.touched.address) && props.errors.address}
+                    />
+                    <InputCom
+                      fieldClass="px-6"
+                      label="City"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="city"
+                      value={props.values.city}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.city && props.touched.city) && props.errors.city}
+                    />
+                    {/* <InputCom
+                      fieldClass="px-6"
+                      label="State/Province"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="state"
+                      value={props.values.state}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.state && props.touched.state) && props.errors.state}
+                    /> */}
+
+                    <div className="field w-full grid md:grid-cols-2 gap-4">
+                      <div className="field w-full">
+                        <label
+                          htmlFor="state"
+                          className="job-label job-label-flex"
+                        >
+                          <span>State/Province</span>
+                          {props.errors.state && props.touched.state && (
+                            <span className="text-[12px] text-red-500">
+                              {props.errors.state}
+                            </span>
+                          )}
+                        </label>
+                        <select
+                          id="state"
+                          name="state"
+                          value={props.values.state}
+                          className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                          onChange={props.handleChange}
+                        >
+                          {state.loading ?
+                              <option className="text-slate-500 text-lg" value="">
+                                Loading...
+                              </option>
+                            : Object.keys(state.data)?.length > 0 ?
+                            <>
+                              <option className="text-slate-500 text-lg" value="">
+                                Select State
+                              </option>
+                              {Object.keys(state.data)?.map((item, index) => (
+                                <option key={index} className="text-slate-500 text-lg" value={item}>
+                                  {state?.data[item]}
+                                </option>
+                              ))}
+                            </>
+                            :
+                              <option className="text-slate-500 text-lg" value="">
+                                Not Found
+                              </option>
+                            }
+                        </select>
+                      </div>
+                  
+                      <InputCom
+                        fieldClass="px-6"
+                        label="Zip Code"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        inputClass="input-curve lg border border-light-purple"
+                        type="text"
+                        name="zipCode"
+                        value={props.values.zipCode}
+                        inputHandler={props.handleChange}
+                        error={(props.errors.zipCode && props.touched.zipCode) && props.errors.zipCode}
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div className='p-4 w-full job-label'>
+                <div className='flex gap-4 items-center'>
+                    <input 
+                    type='checkbox' 
+                    name="checked"
+                    className='accent-purple w-4 h-4 p-2 text-purple bg-gray-100 border-gray-300 rounded focus:ring-purple' 
+                    onChange={props.handleChange}
+                    />
+                    <p className='text-[14px] text-justify'>
+                        I agree with the <span className='text-bue-600'>cardholder </span> 
+                        terms & conditions {props.errors.checked && props.touched.checked && <span className='text-[12px] text-red-500'>{props.errors.checked}</span>}
+                    </p>
+                </div>
+              </div>
+              {requestStatus.message &&
+              <div className='px-4 my-1'>
+                <p className={`text-center text-base py-1 font-bold ${requestStatus.status ? 'bg-emerald-600 text-white' : 'bg-red-100 text-red-600'}`}>{requestStatus.message}</p>
+              </div>
+              }
+              <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                  <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                      <button
+                      type="button"
+                      onClick={onClose}
+                      className="custom-btn bg-[#f5a430] text-black text-base"
+                      >
+                      Cancel
+                      </button>
+
+                      <>
+                      {requestStatus.loading ?
+                      <LoadingSpinner size="6" color="sky-blue" />
+                      :
+                      <button
+                      type="submit"
+                      className="custom-btn btn-gradient text-base text-white"
+                      disabled={requestStatus.loading || requestStatus.status}
+                      >
+                      Continue
+                      </button>
+                      }
+                      </>
+                  </div>
+              </div>
+            </Form>
+          </div>
+        )}
+      </Formik>
+    </ModalCom>
+  );
+};
+
+export default VirtualAddCardFamilyPopout;
+
+
+
+const day = new Array(31).fill(0).map((_,i) => i+1 )
+
+const month = [
+  {value: 1, name: 'January'},
+  {value: 2, name: 'February'},
+  {value: 3, name: 'March'},
+  {value: 4, name: 'April'},
+  {value: 5, name: 'May'},
+  {value: 6, name: 'June'},
+  {value: 7, name: 'July'},
+  {value: 8, name: 'August'},
+  {value: 9, name: 'September'},
+  {value: 10, name: 'October'},
+  {value: 11, name: 'November'},
+  {value: 12, name: 'December'},
+]
+
+const date = new Date().getFullYear()
+
+const year = new Array(100).fill(0).map((_,i) =>  (date-2) - i+1 )

src/components/FamilyAcc/Tabs/wallet/Wallet.jsx

@@ -2,9 +2,32 @@ import React, { useState } from 'react'
 import { localImgLoad } from '../../../../lib'
 import { PriceFormatter } from '../../../Helpers/PriceFormatter'
 import FamilyAddFundPopout from './FamilyAddFundPopout'
+import VirtualAddCardFamilyPopout from './VirtualAddCardFamilyPopout'
 
 function Wallet({wallet, familyData, setFamilyWalletReload}) {
     const [addFundPopout, setAddFundPopout] = useState({ show: false, data: {} })
+    // console.log('WALLET', wallet.brand)
+
+    // virtual add card popout
+    const [virtualPopup, setVirtualPopup] = useState({ show: false, data: {} }); 
+
+    /*OPENS the virtual add card popout*/
+    const openVirtualPopUp = (value) => {
+      setVirtualPopup({
+        show: true,
+        data: { ...value },
+      });
+    };
+
+    /*Closes the virtual add card popout*/
+    const closeVirtualPopUp = () => {
+      setVirtualPopup({ show: false, data: {} });
+      // dispatch(tableReload({ type: "WALLETTABLE" }));
+    };
+
+  // console.log('Extra Actions', Object.keys(wallet.extra_actions))
+  let extraActions = Object.keys(wallet.extra_actions) // VARIABLE TO HOLD EXTRA ACTIONS VALUES
+
   return (
     <div className='w-full p-4 bg-[aliceblue] rounded-lg'
     // style={{
@@ -14,28 +37,39 @@ function Wallet({wallet, familyData, setFamilyWalletReload}) {
     <div className="w-full flex justify-start items-center gap-3">
       <div className="min-w-[50px] min-h-[50px] max-w-min md:max-w-[80px] max-h-min md:max-h-[80px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
         <img
-          src={localImgLoad(`images/currency/${(wallet.code).toLowerCase()}.svg`)}
+          src={wallet.icon}
           className="w-full h-full"
           alt="currency-icon"
         />
       </div>
       <div className="w-full flex flex-col">
-        <div className="w-full flex gap-2">
+        {wallet?.brand && wallet?.card_last4 ? // FOR VIRTUAL CARD NUMBER ELSE WALLET BALANCE DISPLAY
-          <p className="text-base md:text-lg text-thin-light-gray tracking-wide">
+          <div className="w-full flex flex-col gap-2">
-            Balance:
+            {/* <p className="text-base md:text-lg text-thin-light-gray tracking-wide">
-          </p>
+              Balance:
-          <p 
+            </p> */}
-            className="text-base md:text-lg font-bold text-purple tracking-wide leading-10"
+            <p className="text-base md:text-lg font-bold text-purple leading-10">
-            // className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10 xxs:scale-100 lg:scale-100 xl:scale-125"
+              {wallet.brand} <span> **** **** ***** </span> {wallet?.card_last4}
-            >
+            </p>
-            {PriceFormatter(
+          </div>
-              Number(wallet.amount) * 0.01,
+          :
-              wallet.code,
+          <div className="w-full flex gap-2">
-              wallet.country,
+            <p className="text-base md:text-lg text-thin-light-gray tracking-wide">
-              ""
+              Balance:
-            )}
+            </p>
-          </p>
+            <p 
-        </div>
+              className="text-base md:text-lg font-bold text-purple tracking-wide leading-10"
+              // className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10 xxs:scale-100 lg:scale-100 xl:scale-125"
+              >
+              {PriceFormatter(
+                Number(wallet.amount) * 0.01,
+                wallet.code,
+                wallet.country,
+                ""
+              )}
+            </p>
+          </div>
+        }
         {/* BTN */}
         <div className='mt-1 flex justify-end items-center gap-2'>
             <button
@@ -47,13 +81,28 @@ function Wallet({wallet, familyData, setFamilyWalletReload}) {
             >
                 Add Money
             </button>
-            <button
+            
-                className="w-[150px] h-[48px] rounded-full text-base text-white bg-[#4687ba] hover:bg-[#009ef7]"
+            {/* EXTRA ACTIONS BTN */}
-                name="plan"
+            {(extraActions && extraActions?.length > 0) &&
-                // onClick={onClose}
+              extraActions.map((action, index) => (
-            >
+                <div key={index}>
-                Plan Wallet
+                  <button
-            </button>
+                    onClick={() => { 
+                      action == 'ADD_VIRTUAL_CARD' ? 
+                      openVirtualPopUp({wallet})
+                      :
+                      ()=>{}
+                    }}
+                    className={`w-[150px] h-[48px] rounded-full text-base text-white bg-[#4687ba] hover:bg-[#009ef7]`}
+                  >
+                    {/* Add Card */}
+                    {wallet?.extra_actions?.[action][0]?.text}
+                  </button>
+                  {/* <WalletExtraFamilyActionBtn /> // TO BE USED lATER IF NEED BE */}
+                </div>
+              ))
+            }
+
         </div>
       </div>
     </div>
@@ -70,6 +119,17 @@ function Wallet({wallet, familyData, setFamilyWalletReload}) {
             familyData={familyData}
         />
     }
+
+    {/* VIRTUAL CARD POPOUT */}
+    {virtualPopup.show && (
+      <VirtualAddCardFamilyPopout
+        details={virtualPopup.data}
+        walletItem={wallet}
+        onClose={closeVirtualPopUp}
+        situation={virtualPopup.show}
+        familyData={familyData}
+      />
+    )}
 </div>
   )
 }

src/components/FamilyPopup/SuggestTask.jsx

@@ -19,7 +19,8 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
     setSuggestedNextStep(value);
   };
 
-  const selectedImage = details?.selectedImage || DEFAULT_IMAGE;
+  // const selectedImage = details?.selectedImage || DEFAULT_IMAGE;
+  const selectedImage = require(`../../assets/images/family/${details ? details.banner : 'default.jpg'}`);
   const initialValues = {
     title: details?.title || "",
     description: details?.description || "",

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

@@ -28,7 +28,9 @@ export default function InputCom({
   direction,
   tabIndex,
   error,
-  autoComplete="on"
+  autoComplete="on",
+  minDate='1900-01-01',
+  maxDate='2099-09-13'
 }) {
   const inputRef = useRef(null);
   // Entry Validation
@@ -90,26 +92,51 @@ export default function InputCom({
             : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa]  border"
         }`}
       >
-        <input
+        <>
-          placeholder={placeholder}
+          {type == 'date' ?
-          value={value}
+          <input
-          onChange={inputHandler}
+            placeholder={placeholder}
-          className={`input-field placeholder:text-base text-dark-gray w-full h-full ${iconName && 'pr-6'} ${
+            value={value}
-            inputBg && inputBg} tracking-wide focus:ring-0 focus:outline-none ${fieldClass}`}
+            onChange={inputHandler}
-          type={type}
+            className={`input-field placeholder:text-base text-dark-gray w-full h-full ${iconName && 'pr-6'} ${
-          id={name}
+              inputBg && inputBg} tracking-wide focus:ring-0 focus:outline-none ${fieldClass}`}
-          name={name}
+            type={type}
-          onInput={onInput}
+            id={name}
-          minLength={minLengthValidation()}
+            name={name}
-          maxLength={maxLengthValidation()}
+            onInput={onInput}
-          tabIndex={tabIndex}
+            min={minDate}
-          // pattern={inputPatterns()}
+            max={maxDate}
-          ref={inputRef}
+            tabIndex={tabIndex}
-          readOnly={disable}
+            // pattern={inputPatterns()}
-          onBlur={blurHandler}
+            ref={inputRef}
-          dir={direction}
+            readOnly={disable}
-          autoComplete={autoComplete}
+            onBlur={blurHandler}
-        />
+            dir={direction}
+            autoComplete={autoComplete}
+          />
+          :
+          <input
+            placeholder={placeholder}
+            value={value}
+            onChange={inputHandler}
+            className={`input-field placeholder:text-base text-dark-gray w-full h-full ${iconName && 'pr-6'} ${
+              inputBg && inputBg} tracking-wide focus:ring-0 focus:outline-none ${fieldClass}`}
+            type={type}
+            id={name}
+            name={name}
+            onInput={onInput}
+            minLength={minLengthValidation()}
+            maxLength={maxLengthValidation()}
+            tabIndex={tabIndex}
+            // pattern={inputPatterns()}
+            ref={inputRef}
+            readOnly={disable}
+            onBlur={blurHandler}
+            dir={direction}
+            autoComplete={autoComplete}
+          />
+          }
+        </>
         {iconName && (
           <div className="absolute right-6 bottom-3 z-10 flex gap-2">
             {iconName.split(" ").map((item, index) => (

src/components/Helpers/PriceFormatter.jsx

@@ -75,4 +75,23 @@ export const AmountTo2DP = (
 
   // return formattedNumber;
   return formattedNumber;
+};
+
+
+
+// FUNCTION TO RETURN CURRENCY SYMBOL
+export const currencySymbol = (
+  currencyName = "naira",
+  amount = "00",
+) => {
+  // Cureency Array
+  let currencyArray = [
+    {currencyName:'naira', symbol:'₦'},
+    {currencyName:'usd', symbol:'$'},
+  ]
+
+  const matchedCurrency = currencyArray.filter(item => item.currencyName.toLocaleLowerCase() == currencyName.toLocaleLowerCase())
+  const amountTo2DP = AmountTo2DP(amount)
+  // return formattedNumber;
+  return  matchedCurrency.length ? <><span>{matchedCurrency[0].symbol}</span><span>{amountTo2DP}</span></> : <><span>$</span><span>{amountTo2DP}</span></>;
 };

src/components/History/JobsCompleted.jsx

@@ -7,7 +7,8 @@ import PaginatedList from '../../components/Pagination/PaginatedList';
 
 import LoadingSpinner from '../Spinners/LoadingSpinner';
 
-import { AmountTo2DP } from '../Helpers/PriceFormatter';
+import { currencySymbol } from '../Helpers/PriceFormatter';
+import {NewDateTimeFormatter} from '../../lib/NewDateTimeFormatter'
 
 function JobsCompleted() {
 
@@ -47,7 +48,7 @@ function JobsCompleted() {
       }, [])
 
   return (
-    <div className='p-4 flex flex-col justify-between min-h-[500px]'>
+    <div className='py-4 flex flex-col justify-between min-h-[500px]'>
     {jobHistory?.loading ? 
     <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
     : jobHistory?.data?.length ?
@@ -71,12 +72,11 @@ function JobsCompleted() {
                                 <div className='flex flex-col'>
                                     <h1 className='text-lg font-bold line-clamp-1'>{item?.title}</h1>
                                     <p className='text-sm line-clamp-2'>{item?.description}</p>
+                                    <p className='text-sm line-clamp-2'>{NewDateTimeFormatter(item?.delivery_date)}</p>
                                 </div>
                             </div>
                         </td>
-                        <td className="p-4 text-right">{AmountTo2DP(item?.price*0.01)} {item?.currency}</td>
+                        <td className="p-4 flex text-right justify-end items-center">{currencySymbol(item?.currency_code, item?.price*0.01)}</td>
-                        {/* <td className="p-4">{date}</td>
-                        <td className="p-4">{item?.contract}</td> */}
                     </tr>
                 )
             }

src/components/History/RewardsTable.jsx

@@ -7,7 +7,7 @@ import PaginatedList from '../../components/Pagination/PaginatedList';
 
 import LoadingSpinner from '../Spinners/LoadingSpinner';
 
-import { AmountTo2DP } from '../Helpers/PriceFormatter';
+import { currencySymbol } from '../Helpers/PriceFormatter';
 
 
 export const RewardsTable = memo(() => {
@@ -47,7 +47,7 @@ export const RewardsTable = memo(() => {
       }, [])
 
   return (
-    <div className='p-4 flex flex-col justify-between min-h-[500px]'>
+    <div className='py-4 flex flex-col justify-between min-h-[500px] w-full overflow-x-auto'>
     {familyRewardHistory.loading ? 
     <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
     : familyRewardHistory.data.length ?
@@ -55,9 +55,9 @@ export const RewardsTable = memo(() => {
         <thead className='w-full'>
             <tr className='text-slate-600 dark:text-white'>
             <th className="p-4"></th>
-            <th className="p-4 text-right">Amount</th>
+            <th className="p-4 text-center">Amount</th>
-            <th className="p-4">Date</th>
+            <th className="p-4 text-center">Date</th>
-            <th className="p-4">Confirmation</th>
+            <th className="p-4 text-center">Confirmation</th>
             </tr>
         </thead>
         <tbody>
@@ -65,18 +65,18 @@ export const RewardsTable = memo(() => {
                 let date = new Date(item.added).toLocaleDateString()
                 return (
                     <tr key={index} className='dark:text-white dark:bg-dark-white border-y dark:border-[#5356fb29] hover:bg-gray-50 dark:hover:bg-gray-50 dark:hover:text-black transition-all duration-300'>
-                        <td className="p-4">
+                        <td className="p-4 min-w-[300px]">
-                            <div className='flex items-center gap-2'>
+                            <div className='flex w-full items-center gap-2'>
                                 <img src={item.icon} className='min-w-[60px] max-w-[60px] min-h-[60px] max-h-[60px] rounded-full bg-slate-500' alt='Reward Logo' />
-                                <div className='flex flex-col'>
+                                <div className='flex flex-col w-full'>
                                     <h1 className='text-lg font-bold'>Reward to {item.rec_firstname} {item.rec_lastname}</h1>
                                     <p className='text-sm'>{item.description}</p>
                                 </div>
                             </div>
                         </td>
-                        <td className="p-4 text-right">{AmountTo2DP(item.amount*0.01)} {item.currency}</td>
+                        <td className="p-4 text-right flex-nowrap">{currencySymbol(item.currency, item.amount*0.01)}</td>
-                        <td className="p-4">{date}</td>
+                        <td className="p-4 text-center">{date}</td>
-                        <td className="p-4">{item.confirmation}</td>
+                        <td className="p-4 text-center">{item.confirmation}</td>
                     </tr>
                 )
             }

src/components/History/index.jsx

@@ -127,7 +127,7 @@ export default function History() {
                         </div>
                     </div>
                     <div className="w-[1px] bg-[#E3E4FE] dark:bg-[#a7a9b533]  mr-10"></div>
-                    <div className="flex-1 overflow-y-auto min-h-[520px]">
+                    <div className="w-full overflow-y-auto min-h-[520px]">
                         <>
                             {/* PURCHASE SECTION */}
                             {selectedTab == 'purchases' &&

src/components/Home/FamilyDash.jsx

@@ -6,15 +6,15 @@ import FamilyActiveLSlde from "./FamilyActiveLSlde";
 import { useDispatch, useSelector } from "react-redux";
 import { tableReload } from "../../store/TableReloads";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
+import HomeModal from "./HomeModal";
 
-export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
+export default function FamilyDash() {
-  // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list);
 
   const dispatch = useDispatch();
+
+  const [firstTimeModal, setFirstTimeModal] = useState(true)
   
   const userApi = new usersService();
-
-  // const trending = MyActiveJobList;
   
   const { familyBannersList } = useSelector((state) => state.familyBannersList);
 
@@ -22,121 +22,130 @@ export default function FamilyDash({ MyActiveJobList=[], serverImg }) {
 
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  let [reloadBanner, setReloadBanner] = useState(0)
+  // let [reloadBanner, setReloadBanner] = useState(0)
 
-  useEffect(()=>{
+  // useEffect(()=>{
-    if(reloadBanner >= 2){
+  //   if(reloadBanner >= 2){
-      dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
+  //     dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS
-      setReloadBanner(0)
+  //     setReloadBanner(0)
-    }
+  //   }
-    const timer = setInterval(()=>{
+  //   const timer = setInterval(()=>{
-      setReloadBanner(prev => prev+1)
+  //     setReloadBanner(prev => prev+1)
-    },300000)
+  //   },300000)
 
-    return ()=>{
+  //   return ()=>{
-      clearInterval(timer)
+  //     clearInterval(timer)
-    }
+  //   }
-  },[reloadBanner])
+  // },[reloadBanner])
 
   return (
-    <div>
+    <>
-      <div className="home-page-wrapper">
+      <div>
-        {/* Header */}
+        <div className="home-page-wrapper">
-        <div className="text-white mb-4 min-h-[3rem] px-2 w-full flex justify-between items-center rounded-xl bg-family-header-bg">
+          {/* Header */}
-          <div className="w-full">
+          <div className="text-white mb-4 min-h-[3rem] px-2 w-full flex justify-between items-center rounded-xl bg-family-header-bg">
-            <div className="w-full flex flex-wrap gap-x-4 ">
+            <div className="w-full">
-              <p className="text-lg font-normal leading-5">Welcome</p>
+              <div className="w-full flex flex-wrap gap-x-4 ">
-              <div className="">
+                <p className="text-lg font-normal leading-5">Welcome</p>
-                <h1 className="text-lg font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
+                <div className="">
+                  <h1 className="text-lg font-normal leading-5">{`${userDetails?.firstname} ${userDetails?.lastname}`}</h1>
+                </div>
               </div>
             </div>
+            <div className="py-1 w-full text-sm text-right self-end">
+              <p className="leading-4">Last Login: {`${userDetails?.last_login.split(' ')[0]}`}</p>
+            </div>
           </div>
-          <div className="py-1 w-full text-sm text-right self-end">
-            <p className="leading-4">Last Login: {`${userDetails?.last_login.split(' ')[0]}`}</p>
-          </div>
-        </div>
 
-        {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' &&
+          {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' &&
-        <>
+          <>
-          {familyBannersList?.loading ?
+            {familyBannersList?.loading ?
-          <div className="w-full bg-white rounded-2xl">
+            <div className="w-full bg-white rounded-2xl">
-            <LoadingSpinner size='10' color='sky-blue' height='h-[20rem]' />
+              <LoadingSpinner size='10' color='sky-blue' height='h-[20rem]' />
-          </div>
-          :
-          familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 ?
-            // Loop for Family Banners
-            <div className="w-full mb-4 grid grid-cols-2 md:grid-cols-3 gap-2 md:gap-4">
-              {Object.keys(familyBannersList?.result_list).map((item, index) => {
-                let content = familyBannersList?.result_list[item]
-                // let action = item == 'recommend' ? 'familymarket' : 'mytask'
-                return (
-                  <Link key={item} to={`/${content.banner.action}`} className={`rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
-                    <div className="h-full w-full">
-                      <img className="w-full h-[10rem] object-cover rounded-t-xl" src={content.banner.image} alt='banner image' />
-                      <div className="flex flex-col justify-between">
-                        <div className="px-2 py-2 border-b border-transparent min-h-[4rem] flex flex-col gap-1">
-                          <h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
-                          <p className="text-sm text-black dark:text-white">{content.banner.description}</p>
-                        </div>
-                      </div>
-                    </div>
-                  </Link>
-                )
-              })}
             </div>
             :
-            null
+            familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 ?
-          }
+              // Loop for Family Banners
-          
+              <div className="w-full mb-4 grid grid-cols-2 md:grid-cols-3 gap-2 md:gap-4">
-          {tab_categories?.data &&
+                {Object.keys(familyBannersList?.result_list).map((item, index) => {
-          <div className="mb-4">
+                  let content = familyBannersList?.result_list[item]
-            <h1 className="my-4 text-26 font-bold text-dark-gray dark:text-white tracking-wide">Resources</h1>
+                  // let action = item == 'recommend' ? 'familymarket' : 'mytask'
-            <div className="w-full grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4">
+                  return (
-              {tab_categories.data.map((item) => {
+                    <Link key={item} to={`/${content.banner.action}`} className={`rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
-                // if(item.enabled){
+                      <div className="h-full w-full">
-                // }
+                        <img className="w-full h-[10rem] object-cover rounded-t-xl" src={content.banner.image} alt='banner image' />
-                return (
+                        <div className="flex flex-col justify-between">
-                  <Link key={item.uid} to={`/${item?.action}`} className={`group rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
+                          <div className="px-2 py-2 border-b border-transparent min-h-[4rem] flex flex-col gap-1">
-                    <div className="h-full w-full">
+                            <h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{content.banner.text}</h1>
-                      <div className="w-full h-[8rem] rounded-t-xl overflow-hidden">
+                            <p className="text-sm text-black dark:text-white">{content.banner.description}</p>
-                        <img className="w-full h-full group-hover:scale-110 object-cover transition-all duration-300" src={item?.banner} alt='banner image' />
-                      </div>
-                      <div className="flex flex-col justify-between">
-                        <div className="px-2 py-1 border-b border-transparent min-h-[2rem] flex justify-between items-center gap-1">
-                          <h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{item?.content}</h1>
-                          <div className="flex justify-center gap-1">
-                            <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
-                            <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
-                            <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
                           </div>
                         </div>
                       </div>
-                    </div>
+                    </Link>
-                  </Link>
                   )
                 })}
+              </div>
+              :
+              null
+            }
+            
+            {tab_categories?.data &&
+            <div className="mb-4">
+              <h1 className="my-4 text-26 font-bold text-dark-gray dark:text-white tracking-wide">Resources</h1>
+              <div className="w-full grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4">
+                {tab_categories.data.map((item) => {
+                  // if(item.enabled){
+                  // }
+                  return (
+                    <Link key={item.uid} to={`/${item?.action}`} className={`group rounded-xl bg-white dark:bg-dark-white shadow-md flex justify-center items-center transition-all duration-300 hover:shadow-sm`}>
+                      <div className="h-full w-full">
+                        <div className="w-full h-[8rem] rounded-t-xl overflow-hidden">
+                          <img className="w-full h-full group-hover:scale-110 object-cover transition-all duration-300" src={item?.banner} alt='banner image' />
+                        </div>
+                        <div className="flex flex-col justify-between">
+                          <div className="px-2 py-1 border-b border-transparent min-h-[2rem] flex justify-between items-center gap-1">
+                            <h1 className="text-lg text-[#083e21] dark:text-white font-bold tracking-wide">{item?.content}</h1>
+                            <div className="flex justify-center gap-1">
+                              <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
+                              <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
+                              <div className="w-1 h-1 bg-slate-400 rounded-full"></div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </Link>
+                    )
+                  })}
+              </div>
             </div>
-          </div>
+            }
+          </>
           }
-        </>
-        }
 
-        {/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
+          {/* {familyOffers?.result_list && familyOffers?.result_list.length > 0 && (
-          <MyOffersFamilyTable
+            <MyOffersFamilyTable
-            familyOffers={familyOffers?.result_list}
+              familyOffers={familyOffers?.result_list}
-            image_server={familyOffers?.session_image_server}
+              image_server={familyOffers?.session_image_server}
-            className="mb-10"
+              className="mb-10"
-          />
+            />
-        )} */}
+          )} */}
 
-        {/* {trending && trending.length > 0 && (
+          {/* {trending && trending.length > 0 && (
-          <FamilyActiveLSlde
+            <FamilyActiveLSlde
-            trending={trending}
+              trending={trending}
-            className="mb-10"
+              className="mb-10"
-            image_server={serverImg}
+              image_server={serverImg}
-          />
+            />
-        )} */}
+          )} */}
+        </div>
       </div>
-    </div>
+
+      
+      {/* last_login */}
+
+      {(!familyBannersList?.loading && firstTimeModal) &&
+        <HomeModal userDetails={userDetails} action={()=>setFirstTimeModal(prev => !prev)} situation={firstTimeModal} />
+      }
+    </>
   );
 }

src/components/Home/FullAccountDash.jsx

@@ -61,15 +61,14 @@ export default function FullAccountDash(props) {
           <AccountDashboard className="mb-4" bannerList={props.bannerList} offersList={props.offersList} imageServer={props.imageServer} />
         )}
 
-        {
+        {/* {props?.dashTypes !== "undefined" &&
-        // props?.dashTypes !== "undefined" &&
+        props.offersList?.data?.result_list?.length ? (
-        // props.offersList?.data?.result_list?.length ? (
+          <MyOffersTable
-        //   <MyOffersTable
+            MyActiveOffersList={props.offersList?.data}
-        //     MyActiveOffersList={props.offersList?.data}
+            className="mb-10"
-        //     className="mb-10"
+          />
-        //   />
+        ) 
-        // ) 
+        : 
-        // : 
         props.MyActiveJobList?.data?.length ? (
           <>
             <div className="w-full mb-5 flex justify-between items-center gap-1">
@@ -83,7 +82,7 @@ export default function FullAccountDash(props) {
               imageServer={props.offersList?.data?.session_image_server}
             />
           </>
-        ) : null}
+        ) : null} */}
       </div>
     </>
   );

src/components/Home/HomeActivities.jsx

@@ -49,11 +49,11 @@ export default function HomeActivities({ className }) {
     getRecentActivities();
   }, []);
 
-  console.log(recentActivitiesData);
+  // console.log(recentActivitiesData);
 
   return (
     <div
-      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl relative min-h-[520px] ${
+      className={`update-table w-full bg-white dark:bg-dark-white   overflow-hidden rounded-2xl relative min-h-[520px] ${
         className || ""
       }`}
     >

src/components/Home/HomeModal.jsx

@@ -0,0 +1,71 @@
+import React from 'react'
+import ModalCom from '../Helpers/ModalCom'
+import ModalBG from '../../assets/images/modalbg.png'
+
+export default function HomeModal({userDetails, action, situation}) {
+
+  const {firstname, lastname} = userDetails
+
+    const options = [
+        'Suggest Task to Parent', 'Suggest Task to Parent'
+    ]
+
+    const onSelectOption = () => {
+        action()
+    }
+
+  return (
+    <>
+      <div className=''>
+        <div className='fixed top-0 left-0 bottom-0 w-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50'></div>
+        <div className='fixed h-full z-[99999999999999] w-full lg:w-auto inset-0 flex flex-col justify-center items-center overflow-y-auto'>
+          <div className="relative w-11/12 md:w-[600px] lg:w-[992px] rounded-2xl overflow-hidden">
+            <div className='relative p-4 bg-sky-blue flex items-center'>
+              <img className='block w-2/3 max-w-lg mx-auto' src={ModalBG} alt='modal image' />
+              <div className='absolute text-white top-5 right-5'>
+                <button
+                  type="button"
+                  className="text-white"
+                  onClick={onSelectOption}
+                >
+                  <svg
+                    width="36"
+                    height="36"
+                    viewBox="0 0 36 36"
+                    fill="none"
+                    className="fill-current"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                      fill=""
+                      fillOpacity="0.6"
+                    />
+                    <path
+                      d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                      fill="#"
+                      fillOpacity="0.6"
+                    />
+                  </svg>
+                </button>
+              </div>
+            </div>
+            <div className='p-4 bg-slate-100'>
+              <div className='w-2/3 max-w-5xl mx-auto flex flex-col gap-4 tracking-wider'>
+                {/* <h1 className='text-3xl'>Welcome to <span className='font-semibold'>WrenchBoard</span></h1> */}
+                <h1 className='text-3xl'>Welcome <span className='font-semibold'>{firstname} {lastname}</span></h1>
+                <p className='text-2xl'>
+                  Here's where you can explore informative vidoes that provide valuable insight
+                  into <span className='font-semibold'>how you can connect with siblings and family and explore more on personal development</span>
+                </p>
+                <div className='self-end'>
+                  <button onClick={onSelectOption} className='bg-sky-blue px-4 py-2 text-xl text-white rounded-lg'>Done</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </>
+  )
+}

src/components/Home/index.jsx

@@ -2,93 +2,53 @@ import React, { useState, useEffect } from "react";
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
 import usersService from "../../services/UsersService";
-import { useSelector } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";
 import FamilyDash from "./FamilyDash";
 import FullAccountDash from "./FullAccountDash";
 import LoadingSpinner from '../../components/Spinners/LoadingSpinner'
+import { tableReload } from '../../store/TableReloads';
 
 export default function Home(props) {
- // console.log("PROPS IN HOME->", props);
-  const userApi = new usersService();
-  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
+  const dispatch = useDispatch()
+
+  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
+  useEffect(()=>{
-
+    if(!commonHeadBanner.loading && (!commonHeadBanner?.data || Object.keys(commonHeadBanner?.data).length < 1)){
-  const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
+      dispatch(tableReload({ type: "HOMEBANNERS" })); // reloads home banner in case it fails to load or encounters error while loading
-    try {
-      const res = await userApi.getMyActiveTaskList();
-      setMyActiveJobList({loading:false, data:res?.data?.result_list});
-      // setMyActiveJobList(res?.data?.result_list);
-    } catch (error) {
-      setMyActiveJobList({loading:false, data:[]});
-      // setMyActiveJobList([]);
-      console.log("Error getting tasks");
     }
-  };
+  },[])
-
-  // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
-  // const getHomeDate = () => {
-  //   userApi
-  //     .getHomeDate()
-  //     .then((res) => {
-  //       if (res.status != 200 || res.internal_return < 0) {
-  //         return;
-  //       }
-  //       setNextDueTask(res.data);
-  //     })
-  //     .catch((error) => {
-  //       console.log(error);
-  //     });
-  // };
-
-  // const getMyOffersList = async () => {
-  //   try {
-  //     const res = await userApi.getOffersList();
-  //     setMyOffersList({loading:false, data:res.data});
-  //   } catch (error) {
-  //     setMyOffersList({loading:false, data:[]});
-  //     console.log("Error getting offers", error);
-  //   }
-  // };
-
-  useEffect(() => {
-    if(userDetails?.account_type == 'FULL'){
-      getMyActiveJobList();
-    }
-  }, []);
 
   return (
     <Layout>
-      {Object.keys(commonHeadBanner).length < 1 ?
-      <LoadingSpinner height='h-48' size='16' />
-      :
       <div className="w-full">
+        <>
         {userDetails && userDetails?.account_type == "FAMILY" ? (
           <FamilyDash
             account={userDetails}
-            commonHeadData={props.bannerList}
-            // familyOffers={MyOffersList?.data}
-            serverImg = {userDetails?.session_image_server}
-            // MyActiveJobList={MyActiveJobList?.data}
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
-          <FullAccountDash
+          <>
-            bannerList={props.bannerList}
+              {commonHeadBanner.loading ?
-            dashTypes={props.dashTypes}
+                <LoadingSpinner height='h-48' size='16' />
-            // offersList={MyOffersList}
+                :
-            MyActiveJobList={MyActiveJobList}
+                <FullAccountDash
-            offersList={props.offersList}
+                  bannerList={commonHeadBanner?.data?.result_list}
-            imageServer={props.imageServer}
+                  dashTypes={commonHeadBanner?.data?.home_dash_type}
-          />
+                  offersList={commonHeadBanner?.data?.offers_list}
+                  imageServer={commonHeadBanner?.data?.session_image_server}
+                />
+              }
+          </>
         ) : (
           <div>
             You are not logged in or your account type is not supported.
           </div>
         )}
+        </>
       </div>
-      }
     </Layout>
   );
 }

src/components/LearnMore/LearnMore.jsx

@@ -0,0 +1,152 @@
+import React, {useState, useEffect} from "react";
+import Layout from "../Partials/Layout";
+
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+
+import TabButton from "../customTabs/TabButton";
+
+export default function LearnMore() {
+
+    const apiCall = new usersService()
+
+    const [selectedTab, setSelectedTab] = useState("topic 1");
+
+    const [tabs, setTabs] = useState(
+        [  //STATE FOR SWITCHING BETWEEN TABS
+            {
+                id: 1,
+                title: "topic 1",
+                iconName: "history",
+              },
+              {
+                id: 2,
+                title: "topic 2",
+                iconName: "history",
+              },
+              {
+                id: 3,
+                title: "topic 3",
+                iconName: "history",
+              },
+              {
+                id: 4,
+                title: "topic 4",
+                iconName: "history",
+              },
+        ]
+    )
+
+    // const tabs = [  //STATE FOR SWITCHING BETWEEN TABS
+    //     {
+    //         id: 1,
+    //         title: "topic 1",
+    //         iconName: "history",
+    //       },
+    //       {
+    //         id: 2,
+    //         title: "topic 2",
+    //         iconName: "history",
+    //       },
+    //       {
+    //         id: 3,
+    //         title: "topic 3",
+    //         iconName: "history",
+    //       },
+    //       {
+    //         id: 4,
+    //         title: "topic 4",
+    //         iconName: "history",
+    //       },
+    // ]
+
+    let [topics, setTopics] = useState({ // FOR PAYMENT HISTORY
+        loading: true,
+        data: [],
+    })
+
+    //FUNCTION TO GET LEARN MORE TOPIC
+  
+  useEffect(()=>{
+    apiCall.getLearnmoreTopics().then((res)=>{
+        if(res.data.internal_return < 0){ // success but no data
+            setTopics(prev => ({...prev, loading: false}))
+            return
+        }
+        const resData = res?.data?.result_list
+        setTopics(prev => ({...prev, loading: false, data: resData}))
+        setTabs(prev => {
+           return prev.map((item, index) => ({...item, title:resData[index].topic}))
+        })
+        setSelectedTab(resData[0].topic)
+        // console.log('RES', resData)
+    }).catch((error)=>{
+        setTopics(prev => ({...prev, loading: false}))
+    })
+  }, [])
+
+
+  return (
+    <>
+      <Layout>
+        <div className="history-wrapper w-full mb-10">
+            <div className="w-full">
+                <div className="sm:flex justify-between items-center mb-6">
+                    <div className="mb-5 sm:mb-0">
+                        <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+
+                    Learn More
+
+                        </h1>
+                    </div>
+                    <div className="slider-btns flex space-x-4">
+
+                    </div>
+                </div>
+                <div className="w-full h-full p-4 bg-white dark:bg-dark-white rounded-2xl section-shadow lg:flex lg:px-10 px-4 justify-between">
+                    <div className="content-tab-items lg:w-[230px] w-full mr-2">
+                        <div className='overflow-hidden mb-5 lg:mb-0 py-2 lg:py-8'>
+                            {(!topics.loading  && topics?.data?.length > 0) && tabs.map((item) => (
+                                <div key={item.id} className='w-full'>
+                                    <TabButton 
+                                        key={item.id}
+                                        item={item.title}
+                                        iconName={item.iconName}
+                                        selectedTab={selectedTab}
+                                        setSelectedTab={setSelectedTab}
+                                    />
+                                </div>
+                            ))}
+                        </div>
+                    </div>
+                    <div className="w-[1px] bg-[#E3E4FE] dark:bg-[#a7a9b533]  mr-10"></div>
+                    <div className="flex-1 overflow-y-auto min-h-[520px]">
+                        <>
+                            {/* TOPICS SECTION */}
+                            <div className="w-full py-2 lg:py-8">
+                                {topics.loading ? 
+                                <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
+                                :
+                                <>
+                                    {(topics?.data && topics?.data?.length > 0) ?
+                                    <div dangerouslySetInnerHTML={{
+                                        __html: topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents,
+                                      }} className='prose dark:text-white dark:bg-dark-white'
+                                    >
+                                        {/* {topics?.data?.filter(item => item.topic == selectedTab)[0]?.contents} */}
+                                    </div>
+                                    :
+                                    <p className='p-2 text-slate-500 flex flex-col grow justify-center items-center'>No Topics found</p>}
+                                </>
+                                }
+                            </div>
+                            {/* END OF TOPICS SECTION */}
+                        </>
+                    </div>
+                </div>
+            </div>
+        </div>
+      </Layout>
+    </>
+  );
+}

src/components/MarketPlace/PopUp/LockJob.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from "react";
 import usersService from "../../../services/UsersService";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import {PriceFormatter} from '../../Helpers/PriceFormatter'
 
 export default function LockJob({
   details,
@@ -40,7 +41,7 @@ export default function LockJob({
     apiCall
       .getVerifyCompletedTask({ offer_depend_uid: details?.offer_depend_uid })
       .then((res) => {
-        console.log("RES", res.data);
+        // console.log("RES", res.data);
         setCompletedTask({ loading: false, data: res?.data?.result_list });
       })
       .catch((err) => {

src/components/MarketPlace/index.jsx

@@ -1,15 +1,27 @@
-import { useSelector } from "react-redux";
+import {useEffect} from 'react'
+import { useSelector,  useDispatch} from "react-redux";
 import Layout from "../Partials/Layout";
 import CommonHead from "../UserHeader/CommonHead";
 import MainSection from "./MainSection";
 import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { tableReload } from '../../store/TableReloads';
 
 export default function MarketPlace({ commonHeadData }) {
+
+  const dispatch = useDispatch()
+
   let { jobLists } = useSelector((state) => state.jobLists);
   const marketData = jobLists?.result_list;
   const categories = jobLists?.categories;
   const image_server = jobLists?.session_image_server;
+  // console.log('Lenth', marketData?.length )
+
+  useEffect(()=>{
+    if(!jobLists.loading && (marketData?.length < 1 || !marketData)){
+      dispatch(tableReload({ type: "MARKETTABLELIST" })); // reloads market page
+    }
+  },[])
 
   return (
     <>

src/components/MyActiveJobs/ActiveJobMessage.jsx

@@ -19,8 +19,7 @@ export default function ActiveJobMessage({ activeJobMesList }) {
     // }
 
   return (
-    <div className='flex flex-col justify-between'>
+    <div className="w-full h-full max-h-[343px] overflow-y-auto">
-    <div className="w-full h-full min-h-[250px] max-h-[300px] overflow-y-auto">
         <table className="wallet-activity w-full table-auto border-collapse text-left">
             <thead className='border-b-2'>
                 <tr className='text-slate-600'>
@@ -71,9 +70,10 @@ export default function ActiveJobMessage({ activeJobMesList }) {
         </table>
     </div>
 
-    {/* PAGINATION BUTTON */}
+    // <div className='flex flex-col justify-between'>
-    {/* <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> */}
+    // PAGINATION BUTTON
-    {/* END OF PAGINATION BUTTON */}
+    // <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
-    </div>
+    // END OF PAGINATION BUTTON
+    // </div>
   )
 }

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -12,7 +12,7 @@ import IndexJobActions from "./JobActions/IndexJobActions";
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { SocketValues } from "../Contexts/SocketIOContext";
-import TabButton from "../customTabs/TabButton";
+import ManageJobTab from "../customTabs/ManageJobTab";
 import AttachFile from "../attachmentCom/AttachFile";
 
 import JobDetailPopout from "./JobDetailPopout";
@@ -390,8 +390,8 @@ function ActiveJobs(props) {
         {/* end of job details */}
       </div>
 
-      <div className="my-4 py-[20px] bg-white dark:bg-black px-4 rounded-2xl shadow-md lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
+      <div className="my-4 py-[20px] bg-white dark:bg-black px-4 rounded-2xl shadow-md grid grid-cols-1 lg:grid-cols-2 gap-3">
-        <div className="w-full lg:w-1/2 mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
+        <div className="w-full mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
           <div className="">
             <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
               Actions
@@ -408,7 +408,7 @@ function ActiveJobs(props) {
                 {/* switch button */}
                 <div className="grid grid-cols-2">
                 {tabs.map((item) => (
-                    <TabButton 
+                    <ManageJobTab 
                         key={item}
                         item={item}
                         selectedTab={selectedTab}
@@ -545,14 +545,16 @@ function ActiveJobs(props) {
         </div>
 
         {/* MESSAGE SECTION */}
-        <div className="w-full lg:w-1/2">
+        <div className="w-full flex flex-col">
-          <div className="mb-4">
+          {props.details &&
-            <AttachFile
+            <div className="mb-4">
-              data={props.details}
+              <AttachFile
-              showOnData={true}
+                data={props.details}
-              fontSize={'text-lg'}
+                showOnData={true}
-            />
+                fontSize={'text-lg'}
-          </div>
+              />
+            </div>
+          }
           <div className="flex justify-between items-center gap-5">
             <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
               <span>Message</span>
@@ -671,37 +673,46 @@ const PopModal = ({
             </svg>
           </button>
         </div>
-        <div className="job-action-modal-body w-full px-10 py-8 gap-4">
+        <div className="job-action-modal-body w-full px-10 py-2 gap-4">
-          <div className="w-full flex flex-col items-center">
+          <div className="w-full">
             {activeJobMesList.loading ? (
               <LoadingSpinner size="16" color="sky-blue" />
             ) : (
               <div className="message-table h-[500px] overflow-y-auto">
                 <table className="wallet-activity w-full table-auto border-collapse text-left">
-                  <thead className="border-b-2">
+                  {/* <thead className="border-b-0">
                     <tr className="text-slate-600">
-                      <th className="p-2"></th>
+                      <th className="p-0"></th>
                     </tr>
-                  </thead>
+                  </thead> */}
                   {activeJobMesList?.data?.length ? (
                     <tbody>
-                      {activeJobMesList?.data?.map((item, index) => (
+                      {activeJobMesList?.data?.map((item, index) => {
+                        let imageLink = `${activeJobMesList?.image}${localStorage.getItem('session_token')}/contracts/${item.msg_uid}`
+
+                        return (
                         <tr key={index} className="text-slate-500">
                           <td>
-                            <div className="msg_box">
+                            <div className={`msg_box ${item.who}`}>
                               <div className="msg_header">
                                 {item.msg_date} {item.msg_firstname}
                               </div>
-                              <span
+                              {/* <span
                                 className="p-2"
                                 dangerouslySetInnerHTML={{
                                   __html: item.message,
                                 }}
-                              ></span>
+                              ></span> */}
+                              {item.msg_type == 'FILE' ?
+                                <a href={imageLink} target="_blank" className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></a>
+                                :
+                                <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                              }
                             </div>
                           </td>
                         </tr>
-                      ))}
+                        )
+                      })}
                     </tbody>
                   ) : activeJobMesList.error ? (
                     <tbody>

src/components/MyActiveJobs/ActiveJobsMedia.jsx

@@ -10,13 +10,14 @@ import ActiveJobMessageMedia from "./ActiveJobMessageMedia";
 import IndexJobActions from "./JobActions/IndexJobActions";
 import MediaLayout from "../Partials/MediaLayout";
 
-const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
-
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { SocketValues } from "../Contexts/SocketIOContext";
 import TabButton from "../customTabs/TabButton";
 
+const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
+
+
 function ActiveJobsMedia(props) {
   let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
   

src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx

@@ -6,8 +6,14 @@ import LoadingSpinner from '../../Spinners/LoadingSpinner'
 
 import usersService from '../../../services/UsersService'
 
+import {NewDateTimeFormatter }from '../../../lib/NewDateTimeFormatter'
+
 function CurrentTaskAction({jobDetails}) {
 
+    const currTime = new Date().getTime() / (1000*60*60)
+    const minDueTime = new Date(jobDetails?.minimum_due).getTime() / (1000*60*60)
+    const canSendForReview = Number(jobDetails.strict_timeline) ? currTime >= minDueTime : true // calculation to determine when send for review button will be active
+
     const apiCall = new usersService()
     const navigate = useNavigate()
 
@@ -65,7 +71,7 @@ function CurrentTaskAction({jobDetails}) {
           <div className="h-full w-full text-sm text-left text-gray-500">
             {jobDetails.job_type == 'MEDIA' ?
             <div className="h-full flex justify-center items-center">
-                <button onClick={popUpHandler} type="button" className="btn-gradient h-full text-white p-1 lg:p-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
+                <button onClick={popUpHandler} type="button" className="btn-gradient h-full text-white px-5 py-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
                     I have completed this task
                 </button>
             </div>
@@ -78,7 +84,7 @@ function CurrentTaskAction({jobDetails}) {
                 </div>
 
                 <div className="flex justify-center items-center">
-                    <button onClick={popUpHandler} type="button" className="custom-btn btn-gradient text-white">
+                    <button onClick={popUpHandler} type="button" className="custom-btn btn-gradient px-5 py-2 text-white">
                         Send for Review
                     </button>
                 </div>
@@ -120,36 +126,57 @@ function CurrentTaskAction({jobDetails}) {
                         </button>
                     </div>
                     <div className="job-action-modal-body w-full px-10 py-8 gap-4">
-                        <div className="w-full flex flex-col items-center">
+                        <div className="w-full flex flex-col min-h-[150px] gap-8 items-center">
-                            <div className="mb-10 flex justify-center items-center gap-2">
+                            {!canSendForReview ?
-                                <input 
+                            <>
-                                    type='checkbox' 
+                                <h1 
-                                    checked={checked} 
+                                    // className='font-bold text-base tracking-wide text-dark-gray dark:text-white'
-                                    onChange={()=>{setChecked(prev => !prev)}} 
+                                    className='font-bold text-xl tracking-wide text-red-500 text-center'
-                                    className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue' 
-                                />
-                                <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>If you have completed this task</p>
-                            </div>
-
-                            <div className="mb-10 flex justify-center items-center">
-                                {reqStatus.loading ?
-                                    <LoadingSpinner color='sky-blue' size='10' />
-                                :
-                                    <button type="button" onClick={taskCompletedSubmit} className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
-                                        Send for Review & Acceptance
-                                    </button>
-                                }
-                            </div>
-
-                            {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
-                            <div className="w-full">
-                                <div
-                                    className={`relative p-4 text-center text-md font-light leading-[19.5px] text-[13px] ${reqStatus.status ? 'text-green-700':'text-[#912741]'}`}
                                 >
-                                    {reqStatus.message}
+                                    This task can be marked completed after {NewDateTimeFormatter(jobDetails?.minimum_due)}
+                                </h1>
+
+                            </>
+                            :
+                            <>
+                                <div className="flex justify-center items-center gap-2">
+                                    <input 
+                                        type='checkbox' 
+                                        checked={checked} 
+                                        onChange={()=>{setChecked(prev => !prev)}} 
+                                        className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue' 
+                                    />
+                                    <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>If you have completed this task</p>
                                 </div>
-                            </div>
+
-                            {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                                <div className="flex justify-center items-center">
+                                    {reqStatus.loading ?
+                                        <LoadingSpinner color='sky-blue' size='10' />
+                                    :
+                                        <button 
+                                            type="button" 
+                                            onClick={taskCompletedSubmit} 
+                                            className={`px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white ${!canSendForReview && 'pointer-events-none opacity-50'}`}
+                                        >
+                                            Send for Review & Acceptance
+                                        </button>
+                                    }
+                                </div>
+
+                                {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                                {reqStatus.message &&
+                                    <div className="w-full">
+                                        <div
+                                            className={`relative p-4 text-center text-md font-light leading-[19.5px] text-[13px] ${reqStatus.status ? 'text-green-700':'text-[#912741]'}`}
+                                        >
+                                            {reqStatus.message}
+                                        </div>
+                                    </div>
+                                }
+                                {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                            
+                            </>
+                            }
                         </div> 
                     </div> 
                     {/* cancel btn */}

src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx

@@ -121,7 +121,7 @@ function PastDueJobAction({jobDetails}) {
                         <button 
                             type="button" 
                             onClick={popUpHandler} 
-                            className="custom-btn btn-gradient text-base text-white"
+                            className="custom-btn btn-gradient px-5 py-2 text-base text-white"
                         >
                             Cancel or Extend Timeline
                         </button>

src/components/MyActiveJobs/JobActions/PastDueTaskAction.jsx

@@ -1,26 +1,136 @@
-import React from 'react'
+import React,{useState} from 'react'
+import ModalCom from '../../Helpers/ModalCom'
+import LoadingSpinner from '../../Spinners/LoadingSpinner'
+import { useNavigate } from 'react-router-dom'
+import usersService from '../../../services/UsersService'
+
+function PastDueTaskAction({jobDetails}) {
+
+    const apiCall = new usersService()
+    const navigate = useNavigate()
+
+    const [checked, setChecked] = useState(false)
+
+    const [extendedTime, setExtendedTime] = useState('') // VALUE OF NEW EXTENDED TIME
+
+    const [action, setAction] = useState('') // VALUE OF NEW EXTENDED TIME
+
+    const [reqStatus, setReqStatus] = useState({loading:false, status: false, message: ''})
+
+    let [popUp, setPopUp] = useState(false)
+
+    const popUpHandler = () => {
+        if(popUp){
+            setChecked(false)
+        }
+        setPopUp(prev => !prev)
+    }
+
+    // FUNCTION TO HANDLE WHEN OWNER CANCELS JOB
+    const cancelTask = () => {
+        setAction('cancel')
+        setReqStatus({loading:true, status: false, message: ''})
+
+        let reqData = { // API PAYLOADS
+            contract: jobDetails.contract,
+            contract_uid: jobDetails.contract_uid,
+            job_action: 'CANCEL_CONTRACT',
+        }
+
+        if(!checked){ // CHECKS IF CHECKBOX IS SELECTED
+            setReqStatus({loading:false, status: false, message: 'Please check the box above'})
+            return setTimeout(()=>{
+                setReqStatus({loading:false, status: false, message: ''})
+            }, 3000)
+        }
+        // API CALL TO ACCEPT COMPLETION BY OWNER
+        setReqStatus({loading:false, status: false, message: 'No api added yet'})
+        setTimeout(()=>{
+            setReqStatus({loading:false, status: false, message: ''})
+        },1000)
+        // apiCall.ownerJobAction(reqData).then((res)=>{
+        //     if(res.status != 200 || res.data.internal_return < 0){
+        //         setReqStatus({loading:false, status: false, message: 'unable to complete request. Try again'})
+        //         return
+        //     }
+        //     setReqStatus({loading:false, status: true, message: 'job cancelled successfully'})
+        //     setTimeout(()=>{ // Sets popout to false and navigates user to /my-pastdue-jobs after 3 seconds
+        //         popUpHandler()
+        //         navigate('/my-pastdue-jobs', {replace: true})
+        //     }, 3000)
+        // }).catch(err => {
+        //     setReqStatus({loading:false, status: false, message: 'Opps! Network error. Try again'})
+        // }).finally(()=>{
+        //     setTimeout(()=>{
+        //         setReqStatus({loading:false, status: false, message: ''})
+        //     }, 3000)
+        // })
+    }
+
+    // FUNCTION TO HANDLE WHEN USER/OWNER CLICKS ON EXTEND TIMELINE FOR A JOB
+    const extendTime = () => {
+        setAction('extend')
+        setReqStatus({loading:true, status: false, message: ''}) // Sets loading spinner active
+        let reqData = {
+            contract: jobDetails.contract,
+            contract_uid: jobDetails.contract_uid,
+            job_action: 'EXTEND_TIMELINE',
+            extension: Number(extendedTime)
+        }
+        if(!extendedTime){ // checks that timeline duration is selected
+            setReqStatus({loading:false, status: false, message: 'Please select timeline duration'})
+            return setTimeout(()=>{
+                setReqStatus({loading:false, status: false, message: ''})
+            }, 3000)
+        }
+
+        // API CALL EXTEND TIMELINE BY OWNER
+        setReqStatus({loading:false, status: false, message: 'No api added yet'})
+        setTimeout(()=>{
+            setReqStatus({loading:false, status: false, message: ''})
+        },1000)
+        // apiCall.ownerJobAction(reqData).then((res)=>{
+        //     if(res.status != 200 || res.data.internal_return < 0){
+        //         setReqStatus({loading:false, status: false, message: 'unable to complete request. Try again'})
+        //         return
+        //     }
+        //     setReqStatus({loading:false, status: true, message: 'Timeline extended successfully'})
+        //     setTimeout(()=>{ // Sets popout to false and navigates user to /my-pastdue-jobs after 3 seconds
+        //         popUpHandler()
+        //         navigate('/my-pastdue-jobs', {replace: true})
+        //     }, 3000)
+        // }).catch(err => {
+        //     setReqStatus({loading:false, status: false, message: 'Opps! Network error. Try again'})
+        // }).finally(()=>{
+        //     setTimeout(()=>{
+        //         setReqStatus({loading:false, status: false, message: ''})
+        //     }, 3000)
+        // })
+    }
 
-function PastDueTaskAction() {
   return (
-    <div className='job-action dark:bg-black'>
+    <div className='job-action  dark:bg-black'>
 
-        <table className="w-full text-sm text-left text-gray-500 worker-pastdue">
+        <table className="w-full text-sm text-left text-gray-500 owner-pastdue">
             <tbody>
             <tr>
                 <td>
                     <div className="flex space-x-2 items-center w-full task_action_panel">
 
-                            <div>
+                            <div className="dark:text-red-700">
                                 You have missed the allocated time
                             </div>
-                            {/*<div className="flex flex-col flex-[0.9]"> </div>*/}
                     </div>
                 </td>
             </tr>
             <tr>
                 <td>
                     <div className="flex justify-center items-center">
-                        <button type="button" className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                        <button 
+                            type="button" 
+                            onClick={popUpHandler} 
+                            className="custom-btn btn-gradient px-5 py-2 text-base text-white"
+                        >
                             Request Extension
                         </button>
                     </div>
@@ -28,6 +138,124 @@ function PastDueTaskAction() {
             </tr>
             </tbody>
         </table>
+
+        {popUp && (
+            <ModalCom action={popUpHandler} situation={popUp}>
+                <div className="logout-modal-wrapper lg:w-[460px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+                    <div className="modal-header-con">
+                        <h1 className="modal-title">
+                        Past Due Task
+                        </h1>
+                        <button
+                        type="button"
+                        className="modal-close-btn"
+                        onClick={popUpHandler}
+                        >
+                          <svg
+                                width="36"
+                                height="36"
+                                viewBox="0 0 36 36"
+                                fill="none"
+                                className="fill-current"
+                                xmlns="http://www.w3.org/2000/svg"
+                            >
+                                <path
+                                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                                fill=""
+                                fillOpacity="0.6"
+                                />
+                                <path
+                                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                                fill="#"
+                                fillOpacity="0.6"
+                                />
+                            </svg>
+                        </button>
+                    </div>
+                    <div className="relative job-action-modal-body w-full px-10 py-8 gap-4">
+                        <div className="w-full flex flex-col items-center">
+                            <div className="mb-5 flex justify-center items-center gap-2">
+                                <input 
+                                    type='checkbox' 
+                                    checked={checked} 
+                                    onChange={()=>{setChecked(prev => !prev)}} 
+                                    className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue' 
+                                />
+                                <p className='job-label'>I am ready to cancel this task</p>
+                            </div>
+
+                            <div className="mb-5 w-full flex justify-end items-center">
+                                {reqStatus.loading && action=='cancel'?
+                                    <LoadingSpinner color='sky-blue' size='10' />
+                                :
+                                    <button disabled={reqStatus.loading} onClick={cancelTask} type="button" className="custom-btn border-gradient text-base text-white">
+                                        <span className='text-gradient'>Cancel this task</span>
+                                    </button>
+                                }
+                            </div>
+
+                            {/* EXTEND TIMELINE SECTION */}
+                            <div className='w-full my-3 py-3 border-t flex flex-col items-center'>
+                                <div className='mb-5 flex items-center gap-2'>
+                                    <p className='job-label'>Extend the timeline by:</p>
+                                    <select 
+                                        onChange={({target})=>{setExtendedTime(target.value)}}
+                                        className='text-base p-2 text-dark-gray dark:text-white border border-slate-300 outline-0 rounded-full'
+                                    >
+                                        <option className='text-slate-500 text-lg' value=''>select</option>
+                                        <option className='text-slate-500 text-lg' value='2'>1 days</option>
+                                        <option className='text-slate-500 text-lg' value='3'>3 days</option>
+                                        <option className='text-slate-500 text-lg' value='5'>5 days</option>
+                                        <option className='text-slate-500 text-lg' value='7'>1 week</option>
+                                    </select>
+                                </div>
+                                {reqStatus.loading && action=='extend' ?
+                                    <LoadingSpinner color='sky-blue' size='10' />
+                                :
+                                <div className='w-full flex justify-end items-center'>
+                                    <button disabled={reqStatus.loading} type="button" onClick={extendTime} className="custom-btn btn-gradient text-base text-white">
+                                        Request Extension
+                                    </button>
+                                </div>
+}                               
+                            </div>
+
+                            {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                            <div className="w-full absolute left-0 bottom-0 text-center">
+                            {reqStatus.message != "" &&
+                                (!reqStatus.status ? (
+                                <div
+                                    className={`relative p-2 mx-2 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                >
+                                    {reqStatus.message}
+                                </div>
+                                ) : (
+                                reqStatus.status && (
+                                    <div
+                                    className={`relative p-2 mx-2 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    >
+                                    {reqStatus.message}
+                                    </div>
+                                )
+                                ))}
+                            </div>
+                            {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                        </div>
+                        
+                    </div> 
+                    {/* cancel btn */}
+                    <div className='modal-footer-wrapper flex justify-center items-center'>
+                        <button onClick={popUpHandler} type="button" 
+                            // className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white"
+                            className='custom-btn text-base bg-transparent border border-red-500 text-red-500'
+                        >
+                            Cancel Task
+                            {/* <span className='text-gradient'>Cancel</span> */}
+                        </button>
+                    </div>
+                </div>
+            </ModalCom>
+        )}
     </div>
   )
 }

src/components/MyActiveJobs/JobDetailPopout.jsx

@@ -36,7 +36,21 @@ export default function JobDetailPopout({action, situation, jobDetail}) {
                     </button>
                 </div>
                 <div className="modal-body-wrapper">
-                    <p className='w-full text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white'>{jobDetail}</p>
+                    {/* <p className='w-full text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white'>{jobDetail}</p> */}
+                    {/* <div 
+                        className='w-full text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white'
+                        dangerouslySetInnerHTML={{__html: jobDetail}}
+                    >
+                    </div> */}
+                    <textarea
+                        id="Job Delivery Details"
+                        readOnly
+                        // rows="5"
+                        className={`w-full h-full overflow-y-auto text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white`}
+                        style={{ resize: "none" }}
+                        name="job_detail"
+                        value={jobDetail}
+                    />
                 </div>
                 <div className="modal-footer-wrapper justify-end">
                     <button

src/components/MyActiveJobs/index.jsx

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

src/components/MyTasks/MyOffersTable.jsx

@@ -41,7 +41,7 @@ export default function MyOffersTable({ className, MyActiveOffersList }) {
     ],
 };
 
-  console.log("YES WE SEE OFFERS", MyActiveOffersList);
+  // console.log("YES WE SEE OFFERS", MyActiveOffersList);
   const sellSlider = useRef(null);
   //const buySlider = useRef(null);
   const prevHandler = (value) => {

src/components/MyTasks/RecentPastDueTable.jsx

@@ -0,0 +1,225 @@
+import { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import PaginatedList from "../Pagination/PaginatedList";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { useNavigate, useLocation } from "react-router-dom";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import localImgLoad from "../../lib/localImgLoad";
+
+const noTasksBg = require("../../assets/images/no-task-background.jpg");
+const noFamilyTasksBg = require("../../assets/images/family-no-task-background.jpg");
+
+export default function RecentPastDueTable({ className, recentPastDue, Account, imageServer }) {
+  let navigate = useNavigate();
+  let { pathname } = useLocation();
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentTask = recentPastDue?.data?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
+  let accountType = Account?.account_type == "FULL"
+
+  // To navigate to task
+  const [btnLoader, setBtnLoader] = useState(false);
+  const navigateMarket = () => {
+    setBtnLoader(true);
+    const timeoutId = setTimeout(() => {
+      navigate(accountType ? "/market" : "/familymarket", { replace: true });
+      setBtnLoader(false);
+    }, 2500);
+    return () => clearTimeout(timeoutId);
+  };
+
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] relative ${
+        className || ""
+      } bg-cover bg-center`}
+      style={{
+        backgroundImage: !recentPastDue?.data?.result_list?.length
+          ? `url('${accountType ? noTasksBg : noFamilyTasksBg}')`
+          : "none",
+      }}
+    >
+      {/* Adding this dark overlay in order to see the texts properly */}
+      {!recentPastDue?.data?.result_list?.length && accountType && (
+        <div className="absolute inset-0 bg-black opacity-30"></div>
+      )}
+      {recentPastDue?.loading ? 
+        <div className="w-full h-[520px] flex items-center justify-center">
+          <LoadingSpinner size="16" color="sky-blue" />
+        </div>
+      :
+      <div className="relative w-full sm:rounded-lg">
+        <div className="h-auto w-full">
+          {recentPastDue?.data?.result_list?.length > 0 ?
+            currentTask?.map((task, idx) => {
+              // find due date
+              const dueDate = task?.delivery_date.split(" ")[0];
+              let thePrice = PriceFormatter(
+                task?.price * 0.01,
+                task?.currency_code,
+                task?.currency
+              );
+              let image = `${imageServer}${localStorage.getItem('session_token')}/job/${task.origin_job_uid}`
+              return (
+                <div
+                  className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] w-full flex justify-between items-center hover:bg-gray-50"
+                  key={idx}
+                >
+                  <div className="py-4 max-w-[80%]">
+                    <div className="flex space-x-2 items-center">
+                      <div className="w-full min-w-[60px] max-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                        <img
+                          src={image}
+                          alt="data"
+                          className="w-full h-full"
+                        />
+                      </div>
+                      <div className="flex flex-col flex-[0.9]">
+                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                          {task?.title}
+                        </h1>
+                        <span className="text-base text-gray-600">
+                          {task?.description}
+                        </span>
+                        <span className="text-sm text-thin-light-gray flex flext-start gap-1">
+                          Reward:
+                          <span className="text-purple ml-1">{thePrice}</span>
+                        </span>
+                        <div className="flex flex-col sm:flex-row items-start gap-1 md:gap-4 md:items-center">
+                          <span className="text-sm text-thin-light-gray">
+                            Duration:
+                            <span className="text-purple ml-1">
+                              {Number(task?.timeline_days) === 1
+                                ? `${task?.timeline_days} day`
+                                : `${task?.timeline_days} day(s)`}
+                            </span>
+                          </span>
+                          <span className="text-sm text-thin-light-gray">
+                            Due Date:
+                            <span className="text-purple ml-1">{dueDate}</span>
+                          </span>
+                          <span className="text-sm text-thin-light-gray">
+                            Confirmation:
+                            <span className="text-purple ml-1">
+                              {task?.contract}
+                            </span>
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div className="flex justify-center items-center py-4 px-2">
+                    {accountType ?
+                      <button
+                        type="button"
+                        onClick={() => {
+                          navigate("/manage-active-job", {
+                            state: { ...task, pathname },
+                          });
+                        }}
+                        className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                      >
+                        {task.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
+                      </button>
+                      :
+                      <button
+                        type="button"
+                        onClick={() => {
+                          navigate("/manage-active-job", {
+                            state: { ...task, pathname },
+                          });
+                        }}
+                        className="w-12 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                      >
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          viewBox="0 0 11 20"
+                          id="Arrow"
+                          className="w-[0.7rem]"
+                        >
+                          <path
+                            fillRule="evenodd"
+                            d="M.366 19.708c.405.39 1.06.39 1.464 0l8.563-8.264a1.95 1.95 0 0 0 0-2.827L1.768.292A1.063 1.063 0 0 0 .314.282a.976.976 0 0 0-.011 1.425l7.894 7.617a.975.975 0 0 1 0 1.414L.366 18.295a.974.974 0 0 0 0 1.413"
+                            // fill=""
+                            className="color000000 svgShape fill-[#fff]"
+                          ></path>
+                        </svg>
+                      </button>
+                    }
+                  </div>
+                </div>
+              );
+            })
+          :
+            <div
+              className={`flex flex-col ${
+                accountType ? "items-center" : "items-end"
+              } justify-center gap-9 my-5`}
+            >
+              <div
+                className={`p-2 font-bold text-3xl ${
+                  accountType ? "text-white" : "text-sky-blue"
+                } whitespace-nowrap`}
+              >
+                You currently have {accountType ? '"0"' : "no"} Past due task
+              </div>
+              <div
+                className={`
+                  ${!accountType &&
+                  "bg-[#f0f8ff] h-[17rem] p-5 rounded-md -translate-x-20"}
+                `}
+              >
+                <button
+                  className={`${
+                    !accountType
+                      ? "w-[150px] h-20 bg-[#22b14c] text-lg font-semibold rounded-md py-2 px-4"
+                      : "w-[115px] h-11 btn-gradient rounded-full"
+                  } flex justify-center items-center text-base text-white`}
+                  onClick={navigateMarket}
+                >
+                  {btnLoader ? (
+                    <div className="signup btn-loader"></div>
+                  ) : accountType ? (
+                    "Find Task"
+                  ) : (
+                    "Suggest tasks to your parent"
+                  )}
+                </button>
+              </div>
+            </div>
+          }
+        </div>
+
+        {/* PAGINATION BUTTON */}
+        <PaginatedList
+          onClick={handlePagination}
+          prev={currentPage == 0 ? true : false}
+          next={
+            currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+            recentPastDue?.data?.result_list?.length
+              ? true
+              : false
+          }
+          data={recentPastDue?.data?.result_list}
+          start={indexOfFirstItem}
+          stop={indexOfLastItem}
+        />
+        {/* END OF PAGINATION BUTTON */}
+      </div>
+      }
+    </div>
+  );
+}

src/components/MyTasks/RecentlyPastDue.jsx

@@ -0,0 +1,76 @@
+import React, { useState } from "react";
+import Layout from "../Partials/Layout";
+import RecentPastDueTable from "./RecentPastDueTable";
+import CommonHead from "../UserHeader/CommonHead";
+import { useSelector } from "react-redux";
+import { useNavigate } from "react-router-dom";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
+
+export default function RecentlyPastDue({
+  imageServer,
+  recentPastDue,
+  commonHeadData,
+}) {
+  const { userDetails } = useSelector(
+    (state) => state?.userDetails
+  );
+
+  const navigate = useNavigate()
+
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+
+  let accountType = userDetails?.account_type == "FULL"
+
+  return (
+    <Layout>
+      {userDetails?.account_type == 'FULL' &&
+        <CommonHead commonHeadData={commonHeadData} />
+      }
+      
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+            <div className="w-full mb-5 flex justify-between items-center gap-1">
+                <CustomBreadcrumb 
+                    title = 'Past Due Tasks'
+                    breadcrumb={
+                    [
+                        { link: "/", title: "Home" },
+                        { link: "/mytask", title: "My Tasks", active: true},
+                    ]
+                    }
+                />
+                {/* } */}
+
+                {/* <div className='flex gap-4 justify-end'>
+                    <>
+                    <Link
+                        to='/mytask?tab=pastdue'
+                        className="px-4 h-10 flex justify-center items-center text-lg md:text-xl rounded-xl text-red-600"
+                    >
+                        Past Due
+                    </Link>
+
+                    {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
+                        <button
+                        type="button"
+                        onClick={() => {
+                            navigate("/familymarket");
+                        }}
+                        className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                        >
+                        More Task
+                        </button>
+                    }
+                    </>
+                </div> */}
+            </div>
+
+          <RecentPastDueTable recentPastDue={recentPastDue} Account={userDetails} imageServer={imageServer} />
+        </div>
+      </div>
+    </Layout>
+  );
+}

src/components/MyTasks/index.jsx

@@ -5,7 +5,7 @@ import CommonHead from "../UserHeader/CommonHead";
 // import TopSellerTopBuyerSliderSection from "../Home/TopSellerTopBuyerSliderSection";
 import MyOffersTable from "./MyOffersTable";
 import { useSelector } from "react-redux";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, Link } from "react-router-dom";
 import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
 
 export default function MyTasks({
@@ -26,7 +26,7 @@ export default function MyTasks({
 
   let accountType = userDetails?.account_type == "FULL"
 
-  console.log("Active something >>", MyActiveOffersList)
+  // console.log("Active something >>", MyActiveOffersList)
 
   return (
     <Layout>
@@ -37,7 +37,7 @@ export default function MyTasks({
       <div className="notification-page w-full mb-10">
         <div className="notification-wrapper w-full">
           {/* heading */}
-          <div className="sm:flex justify-between items-center mb-6">
+          <div className="sm:flex justify-between items-center hidden">
             {/* <div className="w-full mb-5 sm:mb-0 flex justify-between items-center gap-1">
               {userDetails.account_type == 'FAMILY' &&
               <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
@@ -94,18 +94,32 @@ export default function MyTasks({
                   }
                 />
               {/* } */}
+              <div className='flex gap-4 justify-end'>
+                <>
+                  <Link
+                    // onClick={() => {
+                    //   navigate(`/mytask?tab=pastdue`);
+                    // }}
+                    to='/mytask?tab=pastdue'
+                    className="px-4 h-10 flex justify-center items-center text-lg md:text-xl rounded-xl text-red-600"
+                  >
+                    Past Due
+                  </Link>
+
+                  {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
+                    <button
+                      type="button"
+                      onClick={() => {
+                        navigate("/familymarket");
+                      }}
+                      className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                    >
+                      More Task
+                    </button>
+                  }
+                </>
+              </div>
 
-              {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
-                <button
-                  type="button"
-                  onClick={() => {
-                    navigate("/familymarket");
-                  }}
-                  className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                >
-                  More Task
-                </button>
-              }
             </div>
 
           <MyJobTable ActiveJobList={ActiveJobList} Account={userDetails} imageServer={MyActiveOffersList.session_image_server} />

src/components/MyWaitingJobs/index.jsx

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

src/components/MyWallet/FamilyWalletBox.jsx

@@ -3,6 +3,7 @@ import background from "../../assets/images/bg-sky-blue.jpg";
 import { localImgLoad } from "../../lib";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import FamilyWalletRedeemOptions from "./FamilyWalletRedeemOptions";
+import {PriceFormatter} from '../Helpers/PriceFormatter'
 
 /**
  * Renders a list of wallet items or a loading spinner depending on the state of the `wallet` object.
@@ -20,7 +21,7 @@ export default function FamilyWalletBox({ wallet, payment }) {
   const handleChangeWallet = ({ target: { name } }) => {
     // FUNCTION TO SWITCH WALLET IF USER HAS MORE THAN TWO WALLETS
     const currentWalletSelected = wallet?.data?.filter(
-      (item) => item.code == name
+      (item) => item.description == name
     );
     setSelectedWallet(currentWalletSelected[0]);
     setActiveWalletBtn(name);
@@ -33,7 +34,7 @@ export default function FamilyWalletBox({ wallet, payment }) {
 
   useEffect(() => {
     setSelectedWallet(wallet.data[0]);
-    setActiveWalletBtn(wallet?.data[0]?.code);
+    setActiveWalletBtn(wallet?.data[0]?.description);
   }, [wallet]);
 
   return (
@@ -50,17 +51,17 @@ export default function FamilyWalletBox({ wallet, payment }) {
                     height="min-h-[240px]"
                   />
                 </div>
-              ) : wallet?.data.length > 0 ? (
+              ) : wallet?.data?.length > 0 ? (
                 <>
                   {wallet?.data?.length > 1 && (
                     <div className="wal-selection px-5 py-2 text-black dark:text-white flex items-center gap-2">
-                      {wallet?.data?.map((item) => (
+                      {wallet?.data?.map((item, index) => (
                         <button
                           className={`py-0.5 px-1 mb-1 rounded-lg border border-orange-500 ${
-                            activeWalletBtn == item?.code && "bg-orange-500"
+                            activeWalletBtn == item?.description && "bg-orange-500"
                           }`}
-                          key={item?.wallet_uid}
+                          key={item?.wallet_uid+index}
-                          name={item?.code}
+                          name={item?.description}
                           onClick={handleChangeWallet}
                         >
                           {item?.description}
@@ -69,30 +70,38 @@ export default function FamilyWalletBox({ wallet, payment }) {
                     </div>
                   )}
                   <div
-                    className="p-5 bg-white-opacity min-h-[240px]"
+                    className="p-5 bg-white-opacity min-h-[240px] flex justify-end items-center"
                     style={{
-                      background: `url(${background}) 0% 0% / cover no-repeat`,
+                      background: `url(${selectedWallet?.banner}) 0% 0% / cover no-repeat`,
                     }}
                   >
                     {/* image */}
-                    <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[100px] max-h-min md:max-h-[100px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
+                    {/* <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[100px] max-h-min md:max-h-[100px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
                       <img
                         src={localImgLoad(`images/currency/${image}`)}
                         className="w-full h-full"
                         alt="currency-icon"
                       />
+                    </div> */}
+                    <div className='flex flex-col justify-center'>
+                      <p className="text-base sm:text-lg text-white tracking-wide my-3 text-center">
+                        Current Balance
+                      </p>
+                      {selectedWallet?.brand && selectedWallet?.card_last4 ? // FOR VIRTUAL CARD NUMBER ELSE WALLET BALANCE DISPLAY
+                      <p className="text-2xl font-bold text-white dark:text-white leading-10">
+                        {selectedWallet.brand} <span> **** **** ***** </span> {selectedWallet?.card_last4}
+                      </p>
+                      :
+                      <p className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10">
+                        {PriceFormatter(
+                          selectedWallet?.amount / 100,
+                          selectedWallet?.code,
+                          undefined,
+                          "text-[2rem]"
+                        )}
+                      </p>
+                      }
                     </div>
-                    <p className="text-base sm:text-lg text-white opacity-[70%] tracking-wide my-3">
-                      Current Balance
-                    </p>
-                    <p className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10">
-                      {Formatter(
-                        selectedWallet?.amount / 100,
-                        selectedWallet?.code,
-                        undefined,
-                        "text-[2rem]"
-                      )}
-                    </p>
                   </div>
                 </>
               ) : (

src/components/MyWallet/FamilyWalletCon.jsx

@@ -50,7 +50,7 @@ const FamilyWalletCon = () => {
   };
 
   useEffect(() => {
-    getPaymentHistory();
+    // getPaymentHistory();
     getFamilyWalletBal()
   }, [walletTable]);
 
@@ -74,7 +74,7 @@ const FamilyWalletCon = () => {
       }>
         <FamilyWalletBox
           wallet={familyWalletBal}
-          payment={paymentHistory}
+          // payment={paymentHistory}
         />
       </Suspense>
     </Layout>

src/components/MyWallet/VirtualCardAction.jsx

@@ -0,0 +1,60 @@
+import React, { useEffect, useState } from "react";
+import usersService from "../../services/UsersService";
+import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
+import NairaWithdraw from "./Popup/NairaWithdraw";
+import ViewVirtualCardPopout from "./walletvirtual/ViewVirtualCardPopout";
+import WalletExtraActionBtn from "./WalletExtraActionBtn";
+
+function VirtualCardAction({ walletItem, payment }) {
+
+  // virtual add card popout
+  const [popup, setPopup] = useState({ show: false, name: '', data: {} }); 
+
+    /*OPENS the virtual add card popout*/
+  const openPopUp = (name, value) => {
+    setPopup({
+      show: true,
+      name: name,
+      data: { ...value },
+    });
+  };
+
+  /*Closes the virtual add card popout*/
+  const closePopUp = () => {
+    setPopup({ show: false, name: '', data: {} });
+    // dispatch(tableReload({ type: "WALLETTABLE" }));
+  };
+
+  return (
+    <div className="counters w-full flex justify-end gap-2">
+
+      {/* EXTRA ACTIONS BTN */}
+      <div className="w-1/2 flex justify-end items-center">
+        <button
+          className="logout-btn btn-gradient text-white"
+          onClick={() => {
+            openPopUp('view_card',{
+              payment: payment,
+              currency: walletItem?.description,
+            });
+          }}
+        >
+          View Card
+        </button>
+      </div>
+
+      {/* VIRTUAL CARD POPOUT */}
+      {(popup.show && popup.name=='view_card') && (
+        <ViewVirtualCardPopout
+          details={popup.data}
+          walletItem={walletItem}
+          onClose={closePopUp}
+          situation={popup.show}
+        />
+      )}
+
+    </div>
+  );
+}
+
+export default VirtualCardAction;

src/components/MyWallet/Wallet.jsx

@@ -1,11 +1,14 @@
-import React, { Suspense, lazy, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
-import { useSelector } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";
 import usersService from "../../services/UsersService";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
-const WalletBox = lazy(() => import("./WalletBox"));
+import WalletBox from "./WalletBox";
+import { tableReload } from '../../store/TableReloads';
 
 const WalletRoutes = () => {
+  const dispatch = useDispatch()
+
   const apiCall = new usersService();
   const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
   const { walletTable } = useSelector((state) => state.tableReload);
@@ -60,15 +63,19 @@ const WalletRoutes = () => {
     getPaymentHistory();
   }, [walletTable]);
 
+  useEffect(()=>{
+    if(!walletDetails.loading && walletDetails?.data?.length < 1){
+      dispatch(tableReload({ type: "WALLETTABLE" })); // reloads wallet page
+    }
+  },[])
+
   return (
     <Layout>
-      <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
         <WalletBox
           wallet={walletDetails}
           payment={paymentHistory}
           countries={allCountries.data}
         />
-      </Suspense>
     </Layout>
   );
 };

src/components/MyWallet/WalletAction.jsx

@@ -2,8 +2,28 @@ import React, { useEffect, useState } from "react";
 import usersService from "../../services/UsersService";
 import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
 import NairaWithdraw from "./Popup/NairaWithdraw";
+import VirtualAddCardPopout from "./walletvirtual/VirtualAddCardPopout";
+import WalletExtraActionBtn from "./WalletExtraActionBtn";
 
 function WalletAction({ walletItem, payment, openPopUp }) {
+
+  // virtual add card popout
+  const [virtualPopup, setVirtualPopup] = useState({ show: false, data: {} }); 
+
+    /*OPENS the virtual add card popout*/
+  const openVirtualPopUp = (value) => {
+    setVirtualPopup({
+      show: true,
+      data: { ...value },
+    });
+  };
+
+  /*Closes the virtual add card popout*/
+  const closeVirtualPopUp = () => {
+    setVirtualPopup({ show: false, data: {} });
+    // dispatch(tableReload({ type: "WALLETTABLE" }));
+  };
+
   const [showNairaWithdraw, setShowNairaWithdraw] = useState({
     show: false,
     state: {},
@@ -14,20 +34,39 @@ function WalletAction({ walletItem, payment, openPopUp }) {
     state: {},
   }); // DETERMINES WHEN CONFIRM NAIRA WITHDRAWAL POPS UP
 
+  // console.log('Extra Actions', Object.keys(walletItem.extra_actions))
+  let extraActions = Object.keys(walletItem.extra_actions) // VARIABLE TO HOLD EXTRA ACTIONS VALUES
+
   return (
     <div className="counters w-full flex justify-between gap-2">
+
+      {/* EXTRA ACTIONS BTN */}
       <div className="w-1/2 flex justify-start items-center">
-        <button
+      {(extraActions && extraActions?.length > 0) &&
-          onClick={() => {
+        extraActions.map((action, index) => (
-            setShowNairaWithdraw((prev) => ({ ...prev, show: true }));
+          <div key={index}>
-          }}
+          <button
-          className={`${
+            onClick={() => {
-            walletItem.code != "NAIRA" && "invisible"
+              action == 'SPEND_FROM_BALANCE' ? 
-          } logout-btn btn-gradient text-white`}
+              setShowNairaWithdraw((prev) => ({ ...prev, show: true })) 
-        >
+              : action == 'ADD_VIRTUAL_CARD' ? 
-          Spend
+              openVirtualPopUp({walletItem})
-        </button>
+              :
+              ()=>{}
+            }}
+            className={`${
+              walletItem?.code != "NAIRA" && ""
+            } logout-btn btn-gradient text-white`}
+          >
+            {/* Spend */}
+            {walletItem?.extra_actions?.[action][0]?.text}
+          </button>
+          {/* <WalletExtraActionBtn /> // TO BE USED lATER */}
+          </div>
+        ))
+      }
       </div>
+
       <div className="w-1/2 flex justify-end items-center">
         <button
           className="logout-btn btn-gradient text-white"
@@ -71,6 +110,17 @@ function WalletAction({ walletItem, payment, openPopUp }) {
           situation={showConfirmNairaWithdraw.show}
         />
       )}
+
+      {/* VIRTUAL CARD POPOUT */}
+      {virtualPopup.show && (
+        <VirtualAddCardPopout
+          details={virtualPopup.data}
+          walletItem={walletItem}
+          onClose={closeVirtualPopUp}
+          situation={virtualPopup.show}
+        />
+      )}
+
     </div>
   );
 }

src/components/MyWallet/WalletBox.jsx

@@ -1,7 +1,6 @@
-import { useSelector } from "react-redux";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import WalletItemCard from "./WalletItemCard";
-import WalletItemCardFamily from "./WalletItemCardFamily";
+import WalletItemCardVirtual from './walletvirtual/WalletItemCardVirtual';
 
 /**
  * Renders a list of wallet items or a loading spinner depending on the state of the `wallet` object.
@@ -9,25 +8,32 @@ import WalletItemCardFamily from "./WalletItemCardFamily";
 export default function WalletBox({ wallet, payment, countries }) {
   const { loading, data } = wallet;
 
-  const { userDetails } = useSelector((state) => state.userDetails);
+  // console.log('LOG', data[0]?.extra_actions?.SPEND_FROM_BALANCE[0])
-  const accountType = userDetails?.account_type === "FAMILY";
+
+  // const { userDetails } = useSelector((state) => state.userDetails);
+  // const accountType = userDetails?.account_type === "FAMILY";
 
   return (
     <div className="my-wallet-wrapper w-full mb-10">
       <div className="main-wrapper w-full">
-        <div className="balance-inquery w-auto grid md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-[repeat(auto-fill,_minmax(354px,_1fr))] min-[1440px]:grid-cols-[repeat(auto-fill,_minmax(415px,_1fr))] gap-5 mb-11 h-auto">
+      {/* xl:grid-cols[repeat(auto-fill,_minmax(354px,_1fr))] min-[1440px]:grid-cols-[repeat(auto-fill,_minmax(415px,_1fr))] */}
           {loading ? (
             <div className="w-full h-full flex items-center justify-center">
               <LoadingSpinner size="16" color="sky-blue" />
             </div>
           ) : (
-            data.length > 0 && data.map((item) => (
+            <div className="w-auto grid md:grid-cols-2 xxl:grid-cols-3 gap-4 md:gap-10">
-              <div key={item.wallet_uid} className="w-full md:max-w-[450px] h-full mb-10 lg:mb-0">
+            { data?.length > 0 && data.map((item, index) => (
-                <WalletItemCard walletItem={item} payment={payment} countries={countries} />
+                <div key={item.wallet_uid+index} className="w-full h-full">
-              </div>
+                  {item.country ?
-            ))
+                  <WalletItemCard walletItem={item} payment={payment} countries={countries} />
+                  :
+                  <WalletItemCardVirtual walletItem={item} payment={payment} countries={countries} />
+                  }
+                </div>
+              ))}
+          </div>
           )}
-        </div>
       </div>
     </div>
   );

src/components/MyWallet/WalletComponent/PurchasesTable.jsx

@@ -3,6 +3,8 @@ import React, {useState} from 'react'
 import PaginatedList from '../../Pagination/PaginatedList';
 import { handlePagingFunc } from '../../Pagination/HandlePagination';
 
+import { currencySymbol } from '../../Helpers/PriceFormatter';
+
 function PurchasesTable({purchase}) {
 
     const [currentPage, setCurrentPage] = useState(0);
@@ -15,7 +17,7 @@ function PurchasesTable({purchase}) {
     }
 
   return (
-    <div className='p-4 flex flex-col justify-between min-h-[500px]'>
+    <div className='py-4 flex flex-col justify-between min-h-[500px]'>
         {purchase.data.length ?
         <table className="wallet-activity w-full table-auto border-collapse text-left">
             <thead className='w-full'>
@@ -31,8 +33,8 @@ function PurchasesTable({purchase}) {
                     <td className="p-4">{item.added_date}<br />
                     <b>{item.confirmation} </b>
                     </td>
-                    <td className="p-4 text-right">{item.amount}</td>
+                    <td className="p-4 text-right">{currencySymbol(item.currency, item.amount)}</td>
-                    <td className="p-4 text-right">{item.fee}</td>
+                    <td className="p-4 text-right">{currencySymbol(item.currency, item.fee)}</td>
                 </tr>
                 ))}
             </tbody>

src/components/MyWallet/WalletComponent/RecentActivityTable.jsx

@@ -3,6 +3,8 @@ import React, { useState } from "react";
 import PaginatedList from "../../Pagination/PaginatedList";
 import { handlePagingFunc } from "../../Pagination/HandlePagination";
 
+import { currencySymbol } from '../../Helpers/PriceFormatter';
+
 function RecentActivityTable({ payment }) {
   const [currentPage, setCurrentPage] = useState(0);
   const indexOfFirstItem = Number(currentPage);
@@ -18,7 +20,7 @@ function RecentActivityTable({ payment }) {
   };
 
   return (
-    <div className="p-4 flex flex-col justify-between min-h-[500px]">
+    <div className="py-4 flex flex-col justify-between min-h-[500px]">
       {payment?.data?.length > 0 ? 
         <table className="wallet-activity w-full table-auto border-collapse text-left">
           <thead className="w-full">
@@ -38,9 +40,9 @@ function RecentActivityTable({ payment }) {
                   dangerouslySetInnerHTML={{ __html: item.recipient }}
                 ></td>
                 <td className="p-4 text-right">
-                  {item.amount}
+                  {currencySymbol(item.currency, item.amount)}
                   <br />
-                  {item.fee}
+                  {currencySymbol(item.currency, item.fee)}
                 </td>
                 <td className="p-4">{item.status}</td>
               </tr>

src/components/MyWallet/WalletComponent/ReferralTable.jsx

@@ -31,7 +31,10 @@ function ReferralTable({ history }) {
             currentReferral.map((item, index) => (
               <tr key={index} className="text-slate-500">
                 <td className="p-3">
-                  {item.added_date} / {item.firstname} {item.lastname}
+                 <div style={{flexDirection: "column"}} >
+                     <div style={{color: "blue"}}>{item.added_date} </div>
+                     <div>{item.firstname} {item.lastname}</div>
+                 </div>
                 </td>
                 <td className="p-3">{item.email}</td>
                 <td className="p-3">{item.status}</td>

src/components/MyWallet/WalletExtraActionBtn.jsx

@@ -0,0 +1,18 @@
+import React from 'react'
+
+export default function WalletExtraActionBtn() {
+  return (
+    <>
+      {/* <button
+        onClick={() => {
+          walletItem?.code == 'NAIRA' ? setShowNairaWithdraw((prev) => ({ ...prev, show: true })) : openVirtualPopUp({walletItem})
+        }}
+        className={`${
+          walletItem?.code != "NAIRA" && ""
+        } logout-btn btn-gradient text-white`}
+      >
+        {walletItem?.code == 'NAIRA' ? walletItem?.extra_actions?.SPEND_FROM_BALANCE[0]?.text : walletItem?.extra_actions?.ADD_VIRTUAL_CARD[0]?.text}
+      </button> */}
+    </>
+  )
+}

src/components/MyWallet/WalletHeader.jsx

@@ -58,16 +58,31 @@ export default function WalletHeader(props) {
                   props.myWalletList.map((value, index) => 
                   {
                     let image = value.code ? `${value.code.toLocaleLowerCase()}.svg` : 'default.png'
+
                     return(
                       <li
-                        key={index}
+                        key={value?.wallet_uid || index}
                         className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
                         onClick={onWalletClick}
                       >
+                        {value?.brand && value?.card_last4 ? // FOR VIRTUAL CARD NUMBER ELSE WALLET BALANCE DISPLAY
+                        <div className="w-full">
+                          <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
+                            <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
+                              <img src={value.icon} className="w-14 h-14" alt="currency icon" />
+                            </div>
+                            <div className="name">
+                              <p className="text-2xl font-bold text-dark-gray dark:text-white">
+                                {value.brand} <span> **** **** ***** </span> {value?.card_last4}
+                              </p>
+                            </div>
+                          </div>
+                        </div>
+                        :
                         <div className="sm:flex justify-between items-center">
                           <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
                             <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
-                              <img src={localImgLoad(`images/currency/${image}`)} className="w-14 h-14" alt="" />
+                              <img src={value.icon} className="w-14 h-14" alt="currency icon" />
                             </div>
                             <div className="name">
                               <p className="text-2xl font-bold text-dark-gray dark:text-white">
@@ -81,6 +96,7 @@ export default function WalletHeader(props) {
                             </p>
                           </div>
                         </div>
+                        }
                       </li>
                     )
                   }

src/components/MyWallet/WalletItemCard.jsx

@@ -1,11 +1,11 @@
 import React, { useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
-import background from "../../assets/images/bg-sky-blue.jpg"; //shape/balance-bg.svg";
+// import background from "../../assets/images/bg-sky-blue.jpg"; //shape/balance-bg.svg";
-import localImgLoad from "../../lib/localImgLoad";
 import { tableReload } from "../../store/TableReloads";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import CreditPopup from "./Popup/CreditPopup";
 import WalletAction from "./WalletAction";
+import VirtualCardAction from "./VirtualCardAction";
 
 /**
  * Renders a card displaying information about a wallet item.
@@ -44,25 +44,30 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
   return (
     <>
       <div
-        className="current-balance-widget w-full h-full rounded-2xl overflow-hidden flex flex-col items-center gap-4 p-4 justify-between"
+        className="current-balance-widget w-full h-full min-h-[250px] rounded-2xl overflow-hidden flex flex-col items-center gap-4 p-4 justify-between bg-[#498FC3]"
         style={{
-          background: `url(${background}) 0% 0% / cover no-repeat`,
+          background: `url(${walletItem?.banner}) 0% 0% / cover no-repeat`,
         }}
       >
-        <div className="wallet w-full flex justify-between items-start gap-3">
+        <div className="wallet w-full">
-          <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[150px] max-h-min md:max-h-[150px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
+          {/* <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[150px] max-h-min md:max-h-[150px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
             <img
               src={localImgLoad(`images/currency/${image}`)}
               className="w-full h-full"
               alt="currency-icon"
             />
-          </div>
+          </div> */}
-          <div className="balance w-full mt-2 flex justify-center">
+          <div className="balance w-full mt-2 flex justify-end">
-            <div className="">
+            <div className="flex flex-col items-center">
-              <p className="text-base sm:text-lg text-white opacity-[70%] tracking-wide mb-2 sm:mb-6">
+              <p className={`${(walletItem?.brand && walletItem?.card_last4) && 'hidden' } text-base sm:text-lg text-white tracking-wide mb-2 sm:mb-6`}>
                 Current Balance
               </p>
-              <p className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10 xxs:scale-100 lg:scale-100 xl:scale-125">
+              {walletItem?.brand && walletItem?.card_last4 ? // FOR VIRTUAL CARD NUMBER ELSE WALLET BALANCE DISPLAY
+              <p className="text-2xl font-bold text-white dark:text-white leading-10">
+                {walletItem.brand} <span> **** **** ***** </span> {walletItem?.card_last4}
+              </p>
+              :
+              <p className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10">
                 {PriceFormatter(
                   walletItem.amount * 0.01,
                   walletItem.code,
@@ -70,29 +75,48 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
                   "text-[2rem]"
                 )}
               </p>
+              }
             </div>
           </div>
         </div>
+        
+        {walletItem.escrow > 0 & (!walletItem?.brand && !walletItem?.card_last4 ) ? 
+        <div className='w-full flex justify-end'>
+          <p className="text-lg text-white tracking-wide flex justify-center items-center gap-8">
+            HOLDINGS :{" "}
+            <span className="">
+              {PriceFormatter(
+                walletItem.escrow * 0.01,
+                walletItem.code,
+                undefined,
+                "text-[1.5rem]"
+              )}
+            </span>
+          </p>
+        </div>
+        :
+        null
+        }
 
-        <p className="text-lg text-white tracking-wide flex justify-center items-center gap-8">
+        {(!walletItem?.brand || !walletItem?.card_last4) ?
-          HOLDINGS :{" "}
+        <div className='w-full'>
-          <span className="xxs:scale-100 lg:scale-100 xl:scale-125">
+          <div className="w-full h-[1px] mb-2 bg-white"></div>
-            {PriceFormatter(
+          <WalletAction
-              walletItem.escrow * 0.01,
+            walletItem={{ ...walletItem, walletCountry: currentWalletCurrency }}
-              walletItem.code,
+            payment={payment}
-              undefined,
+            openPopUp={openPopUp}
-              "text-[1.5rem]"
+          />
-            )}
+        </div>
-          </span>
+        :
-        </p>
+        <div className='w-full'>
+          <div className="w-full h-[1px] mb-2 bg-white"></div>
+          <VirtualCardAction
+            walletItem={{ ...walletItem, walletCountry: currentWalletCurrency }}
+            payment={payment}
+          />
+        </div>
+        }
 
-        <div className="w-full h-[1px] bg-white"></div>
-
-        <WalletAction
-          walletItem={{ ...walletItem, walletCountry: currentWalletCurrency }}
-          payment={payment}
-          openPopUp={openPopUp}
-        />
       </div>
 
       {creditPopup.show && (

src/components/MyWallet/walletvirtual/ViewVirtualCardPopout.jsx

@@ -0,0 +1,221 @@
+import { useEffect, useState } from "react";
+import { Form, Formik } from "formik";
+import * as Yup from "yup";
+import { useSelector } from "react-redux";
+import ModalCom from "../../Helpers/ModalCom";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import CustomTimer from "../../countdown/CustomTimer";
+import InputCom from '../../Helpers/Inputs/InputCom'
+import usersService from "../../../services/UsersService";
+
+
+const validationSchema = Yup.object().shape({
+
+  country: Yup.string()
+    .required("Required"),
+  phone_number: Yup.string()
+    .min(9, "Invalid")
+    .max(11, "Invalid")
+    .required("Required"),
+  address: Yup.string()
+    .min(5, "Min 3 characters")
+    .max(50, "Max 25 characters")
+    .required("Required"),
+  city: Yup.string()
+    .min(2, "Min 3 characters")
+    .max(25, "Max 25 characters")
+    .required("Required"),
+  state: Yup.string()
+    .required("Required"),
+  zipCode: Yup.string()
+    .min(1, "Min 3 characters")
+    .max(8, "Max 8 characters")
+    .required("Required"),
+  dob: Yup.string()
+    .required("Required"),
+  checked: Yup.bool() // use bool instead of boolean
+    .oneOf([true], "You must accept the terms and conditions")
+});
+
+const ViewVirtualCardPopout = ({ details, onClose, situation, walletItem }) => {
+
+  const { userDetails } = useSelector((state) => state.userDetails);
+
+  const countryCode = walletItem?.country
+
+  const userApi = new usersService()
+
+  const [requestStatus, setRequestStatus] = useState({loading: false, status:false, message: ''})
+  
+  let initialValues = {
+    // initial values for formik
+    country: countryCode ? countryCode : '',
+    phone_number: '',
+    email: userDetails?.email,
+    firstname: userDetails?.firstname,
+    lastname: userDetails?.lastname,
+    birthYear: '',
+    birthMonth: '',
+    birthDay: '',
+    address: '',
+    city: userDetails?.city ? userDetails.city : '',
+    state: '',
+    zipCode: '',
+    dob: '',
+    checked: false
+  };
+
+  
+  const handleSubmit = (values) => {
+    let date = new Date(values.dob)
+    const reqData = {
+      request_type: '100',
+      address: values.address,
+      city: values.city,
+      state: values.state,
+      country: values.country,
+      postal_code: values.zipCode,
+      phone_number: values.phone_number,
+      // dob_day: values.birthDay,
+      // dob_month: values.birthMonth,
+      // dob_year: values.birthYear,
+      dob_day: Number(date.getDate()),
+      dob_month: Number(date.getMonth()) + 1,
+      dob_year: Number(date.getFullYear()),
+      dob: values.dob
+    }
+    // console.log('Values', reqData)
+    setRequestStatus({loading: true, status:false, message: ''})
+    userApi.walletCardRequest(reqData).then(res => {
+      if(res?.data?.internal_return < 0){
+        setRequestStatus({loading: false, status:false, message: 'Failed, try again'})
+        setTimeout(()=>{
+          setRequestStatus({loading: false, status:true, message: ''})
+        },4000)
+        return 
+      }
+      setRequestStatus({loading: false, status:true, message: 'Successful'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:true, message: ''})
+        onClose()
+      },4000)
+    }).catch(err => {
+      console.log('ERR', err)
+      setRequestStatus({loading: false, status:false, message: 'Unable to complete'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:false, message: ''})
+      },4000)
+    })
+  }
+
+  useEffect(()=>{
+      // Get Country Api
+    console.log('ok')
+  },[])
+
+  return (
+    <ModalCom
+      action={onClose}
+      situation={situation}
+    >
+      <Formik
+        initialValues={initialValues}
+        validationSchema={validationSchema}
+        onSubmit={handleSubmit}
+      >
+        {(props) => (
+          <div className="logout-modal-wrapper mx-auto w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+            <Form className="w-full">
+              <div className="modal-header-con">
+                <h1 className="modal-title">
+                  {walletItem?.description}
+                </h1>
+                <button
+                  type="button"
+                  className="modal-close-btn"
+                  onClick={onClose}
+                >
+                  <svg
+                    width="36"
+                    height="36"
+                    viewBox="0 0 36 36"
+                    fill="none"
+                    className="fill-current"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                      fill=""
+                      fillOpacity="0.6"
+                    />
+                    <path
+                      d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                      fill="#"
+                      fillOpacity="0.6"
+                    />
+                  </svg>
+                </button>
+              </div>
+              <div className='h-[22rem]'></div>
+              {requestStatus.message &&
+              <div className='px-4 my-1'>
+                <p className={`text-center text-base py-1 font-bold ${requestStatus.status ? 'bg-emerald-600 text-white' : 'bg-red-100 text-red-600'}`}>{requestStatus.message}</p>
+              </div>
+              }
+              <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                  <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                      <button
+                      type="button"
+                      onClick={onClose}
+                      className="custom-btn bg-[#f5a430] text-black text-base"
+                      >
+                      Cancel
+                      </button>
+
+                      <>
+                      {requestStatus.loading ?
+                      <LoadingSpinner size="6" color="sky-blue" />
+                      :
+                      <button
+                      type="submit"
+                      className="custom-btn btn-gradient text-base text-white"
+                      disabled={requestStatus.loading || requestStatus.status}
+                      >
+                      Continue
+                      </button>
+                      }
+                      </>
+                  </div>
+              </div>
+            </Form>
+          </div>
+        )}
+      </Formik>
+    </ModalCom>
+  );
+};
+
+export default ViewVirtualCardPopout;
+
+
+
+const day = new Array(31).fill(0).map((_,i) => i+1 )
+
+const month = [
+  {value: 1, name: 'January'},
+  {value: 2, name: 'February'},
+  {value: 3, name: 'March'},
+  {value: 4, name: 'April'},
+  {value: 5, name: 'May'},
+  {value: 6, name: 'June'},
+  {value: 7, name: 'July'},
+  {value: 8, name: 'August'},
+  {value: 9, name: 'September'},
+  {value: 10, name: 'October'},
+  {value: 11, name: 'November'},
+  {value: 12, name: 'December'},
+]
+
+const date = new Date().getFullYear()
+
+const year = new Array(100).fill(0).map((_,i) =>  (date-2) - i+1 )

src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx

@@ -0,0 +1,617 @@
+import { useEffect, useState } from "react";
+import { Form, Formik } from "formik";
+import * as Yup from "yup";
+import { useSelector } from "react-redux";
+import ModalCom from "../../Helpers/ModalCom";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import CustomTimer from "../../countdown/CustomTimer";
+import InputCom from '../../Helpers/Inputs/InputCom'
+import usersService from "../../../services/UsersService";
+
+
+const validationSchema = Yup.object().shape({
+
+  country: Yup.string()
+    .required("Required"),
+  phone_number: Yup.string()
+    .min(9, "Invalid")
+    .max(11, "Invalid")
+    .required("Required"),
+  // birthYear: Yup.string()
+  //   .required("Required"),
+  // birthMonth: Yup.string()
+  //   .required("Required"),
+  // birthDay: Yup.string()
+  //   .required("Required"),
+  address: Yup.string()
+    .min(5, "Min 3 characters")
+    .max(50, "Max 25 characters")
+    .required("Required"),
+  city: Yup.string()
+    .min(2, "Min 3 characters")
+    .max(25, "Max 25 characters")
+    .required("Required"),
+  state: Yup.string()
+    .required("Required"),
+  zipCode: Yup.string()
+    .min(1, "Min 3 characters")
+    .max(8, "Max 8 characters")
+    .required("Required"),
+  dob: Yup.string()
+    .required("Required"),
+  checked: Yup.bool() // use bool instead of boolean
+    .oneOf([true], "You must accept the terms and conditions")
+});
+
+const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
+
+  const { userDetails } = useSelector((state) => state.userDetails);
+
+  const countryCode = walletItem?.country
+
+  const userApi = new usersService()
+
+  const [requestStatus, setRequestStatus] = useState({loading: false, status:false, message: ''})
+
+  const [allCountries, setAllCountries] = useState({loading: true, data: []}) // VARIABLE TO HOLD COUNTRY LIST
+
+  const [state, setState] = useState({loading: true, data: {}}) // VARIABLE TO HOLD STATE LIST
+
+  
+  let initialValues = {
+    // initial values for formik
+    country: countryCode ? countryCode : '',
+    phone_number: '',
+    email: userDetails?.email,
+    firstname: userDetails?.firstname,
+    lastname: userDetails?.lastname,
+    birthYear: '',
+    birthMonth: '',
+    birthDay: '',
+    address: '',
+    city: userDetails?.city ? userDetails.city : '',
+    state: '',
+    zipCode: '',
+    dob: '',
+    checked: false
+  };
+
+  
+  const handleSubmit = (values) => {
+    // const reqData1 = {
+    //   name: values.firstname + ' ' + values.firstname,
+    //   email: values.email,
+    //   phone_number: values.phone_number,
+    //   status: 'active',
+    //   type: 'individual',
+    //   individual: {
+    //     first_name: values.firstname,
+    //     last_name: values.lastname,
+    //     dob: {day: values.birthDay, month: values.birthMonth, year: values.birthYear}
+    //   },
+    //   billing:{
+    //     address : {
+    //       line1: values.address,
+    //       city: values.city,
+    //       state: values.state,
+    //       postal_code: values.zipCode,
+    //       country: values.country
+    //     }
+    //   }
+    // }
+    let date = new Date(values.dob)
+    const reqData = {
+      request_type: '100',
+      address: values.address,
+      city: values.city,
+      state: values.state,
+      country: values.country,
+      postal_code: values.zipCode,
+      phone_number: values.phone_number,
+      // dob_day: values.birthDay,
+      // dob_month: values.birthMonth,
+      // dob_year: values.birthYear,
+      dob_day: Number(date.getDate()),
+      dob_month: Number(date.getMonth()) + 1,
+      dob_year: Number(date.getFullYear()),
+      dob: values.dob
+    }
+    // console.log('Values', reqData)
+    setRequestStatus({loading: true, status:false, message: ''})
+    userApi.walletCardRequest(reqData).then(res => {
+      if(res?.data?.internal_return < 0){
+        setRequestStatus({loading: false, status:false, message: 'Failed, try again'})
+        setTimeout(()=>{
+          setRequestStatus({loading: false, status:true, message: ''})
+        },4000)
+        return 
+      }
+      setRequestStatus({loading: false, status:true, message: 'Successful'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:true, message: ''})
+        onClose()
+      },4000)
+    }).catch(err => {
+      console.log('ERR', err)
+      setRequestStatus({loading: false, status:false, message: 'Unable to complete'})
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status:false, message: ''})
+      },4000)
+    })
+  }
+
+  useEffect(()=>{
+      // Get Country Api
+    userApi.getSignupCountryData().then(res =>{
+    if(!res?.data?.result_list){
+      return setAllCountries({ loading: false, data: [] });
+    }
+    // if(countryCode){
+    //   return setAllCountries({ loading: false, data: res?.data?.result_list?.filter(item => item?.code == countryCode) });
+    // }
+    setAllCountries({ loading: false, data: res?.data?.result_list });
+    }).catch(err => {
+      setAllCountries({ loading: false, data: [] });
+      console.log('err', err)
+    })
+  },[])
+
+  useEffect(()=>{
+    // GET STATE API
+    setState({loading: true, data: {}})
+  userApi.getStateFromCountry({country: countryCode}).then(res =>{
+  if(!res?.data?.country_state){
+    return setState({ loading: false, data: {} });
+  }
+  setState({ loading: false, data: res?.data?.country_state});
+  }).catch(err => {
+    setState({ loading: false, data: {} });
+    console.log('err', err)
+  })
+},[initialValues.country])
+
+  return (
+    <ModalCom
+      action={onClose}
+      situation={situation}
+    >
+      <Formik
+        initialValues={initialValues}
+        validationSchema={validationSchema}
+        onSubmit={handleSubmit}
+      >
+        {(props) => (
+          <div className="logout-modal-wrapper mx-auto w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+            <Form className="w-full">
+              <div className="modal-header-con">
+                <h1 className="modal-title">
+                  {walletItem?.description}
+                </h1>
+                <button
+                  type="button"
+                  className="modal-close-btn"
+                  onClick={onClose}
+                >
+                  <svg
+                    width="36"
+                    height="36"
+                    viewBox="0 0 36 36"
+                    fill="none"
+                    className="fill-current"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                      fill=""
+                      fillOpacity="0.6"
+                    />
+                    <path
+                      d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                      fill="#"
+                      fillOpacity="0.6"
+                    />
+                  </svg>
+                </button>
+              </div>
+              <div className='p-4 w-full flex flex-col h-auto md:h-[28rem]'>
+                <div className='pb-4'>
+                  <h1 className='text-lg md:text-xl flex gap-1'><span className='font-bold'>Name:</span>{userDetails.lastname} {userDetails.firstname}</h1>
+                </div>
+                <div className="grid md:grid-cols-2 gap-4">
+                  {/* left part */}
+                  <div className='w-full flex flex-col gap-4'>
+                    <div className="field w-full grid md:grid-cols-5 gap-4">
+                        <div className="md:col-span-2 field w-full">
+                          <label
+                            htmlFor="country"
+                            className="job-label job-label-flex"
+                          >
+                            <span>Country</span>
+                            {props.errors.country && props.touched.country && (
+                              <span className="text-[12px] text-red-500">
+                                {props.errors.country}
+                              </span>
+                            )}
+                          </label>
+                          <select
+                            id="country"
+                            name="country"
+                            value={props.values.country}
+                            className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                            onChange={props.handleChange}
+                            disabled={countryCode ? true : false}
+                          >
+                            {allCountries.loading ?
+                              <option className="text-slate-500 text-lg" value="">
+                                Loading...
+                              </option>
+                            : allCountries.data?.length > 0 ?
+                            <>
+                              <option className="text-slate-500 text-lg" value="">
+                                Select Country
+                              </option>
+                              {allCountries.data?.map(item => (
+                                <option key={item.uid} className="text-slate-500 text-lg" value={item.code}>
+                                  {item.country}
+                                </option>
+                              ))}
+                            </>
+                            :
+                              <option className="text-slate-500 text-lg" value="">
+                                Not Found
+                              </option>
+                            }
+                          </select>
+                        </div>
+                        <div className='md:col-span-3'>
+                          <InputCom
+                          fieldClass="px-6"
+                          label="Phone Number"
+                          labelClass="tracking-wide"
+                          inputBg="bg-slate-100"
+                          inputClass="w-full input-curve lg border border-light-purple"
+                          type="text"
+                          name="phone_number"
+                          value={props.values.phone_number}
+                          inputHandler={props.handleChange}
+                          error={(props.errors.phone_number && props.touched.phone_number) && props.errors.phone_number}
+                          />
+                        </div>
+                    </div>
+                    <InputCom
+                      disable={true}
+                      fieldClass="px-6"
+                      label="Email"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="email"
+                      value={props.values.email}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.email && props.touched.email) && props.errors.email}
+                    />
+                    <div className="hidden field w-full md:grid-cols-2 gap-4">
+                      <InputCom
+                        disable={true}
+                        fieldClass="px-6"
+                        label="Firstname"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        inputClass="input-curve lg border border-light-purple"
+                        type="text"
+                        name="firstname"
+                        value={props.values.firstname}
+                        inputHandler={props.handleChange}
+                        error={(props.errors.firstname && props.touched.firstname) && props.errors.firstname}
+                      />
+                      <InputCom
+                        disable={true}
+                        fieldClass="px-6"
+                        label="Lastname"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        inputClass="input-curve lg border border-light-purple"
+                        type="text"
+                        name="lastname"
+                        value={props.values.lastname}
+                        inputHandler={props.handleChange}
+                        error={(props.errors.lastname && props.touched.lastname) && props.errors.lastname}
+                      />
+                    </div>
+
+                    {/* hidden section */}
+                    <div className="hidden field w-full flex-col gap-4">
+                        <p className='job-label'>Date of Birth</p>
+                        <div className='xxs:grid-cols-3 gap-4'>
+                          <div className="field w-full">
+                            <label
+                              htmlFor="birthDay"
+                              className="job-label job-label-flex"
+                            >
+                              <span>Day</span>
+                              {props.errors.birthDay && props.touched.birthDay && (
+                                <span className="text-[12px] text-red-500">
+                                  {props.errors.birthDay}
+                                </span>
+                              )}
+                            </label>
+                            <select
+                              id="birthDay"
+                              name="birthDay"
+                              value={props.values.birthDay}
+                              className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                              onChange={props.handleChange}
+                            >
+                              <>
+                              <option className="text-slate-500 text-lg" value=''>
+                                  select
+                              </option>
+                              {day.map(item => (
+                                <option key={item} className="text-slate-500 text-lg" value={item}>
+                                  {item}
+                                </option>
+                              ))}
+                              </>
+                            </select>
+                          </div>
+                          <div className="field w-full">
+                            <label
+                              htmlFor="birthMonth"
+                              className="job-label job-label-flex"
+                            >
+                              <span>Month</span>
+                              {props.errors.birthMonth && props.touched.birthMonth && (
+                                <span className="text-[12px] text-red-500">
+                                  {props.errors.birthMonth}
+                                </span>
+                              )}
+                            </label>
+                            <select
+                              id="birthMonth"
+                              name="birthMonth"
+                              value={props.values.birthMonth}
+                              className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                              onChange={props.handleChange}
+                            >
+                              <>
+                              <option className="text-slate-500 text-lg" value=''>
+                                  select
+                              </option>
+                              {month.map(item => (
+                                <option key={item.value} className="text-slate-500 text-lg" value={item.value}>
+                                  {item.name}
+                                </option>
+                              ))}
+                              </>
+                            </select>
+                          </div>
+                          <div className="field w-full">
+                            <label
+                              htmlFor="birthYear"
+                              className="job-label job-label-flex"
+                            >
+                              <span>Year</span>
+                              {props.errors.birthYear && props.touched.birthYear && (
+                                <span className="text-[12px] text-red-500">
+                                  {props.errors.birthYear}
+                                </span>
+                              )}
+                            </label>
+                            <select
+                              id="birthYear"
+                              name="birthYear"
+                              value={props.values.birthYear}
+                              className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                              onChange={props.handleChange}
+                            >
+                              <>
+                              <option className="text-slate-500 text-lg" value=''>
+                                  select
+                              </option>
+                              {year.map(item => (
+                                <option key={item} className="text-slate-500 text-lg" value={item}>
+                                  {item}
+                                </option>
+                              ))}
+                              </>
+                            </select>
+                          </div>
+                        </div>
+                    </div>
+
+                    <div className="field w-full grid md:grid-cols-3 gap-4">
+                      <p className='hidden md:flex w-full md:col-span-1 job-label items-center'>Date of Birth</p>
+                      <div className='w-full md:col-span-2 '>
+                        <InputCom
+                          fieldClass="px-6"
+                          label="Date of Birth"
+                          labelClass="md:hidden tracking-wide"
+                          inputBg="bg-slate-100"
+                          inputClass="input-curve lg border border-light-purple"
+                          type="date"
+                          name="dob"
+                          value={props.values.dob}
+                          inputHandler={props.handleChange}
+                          error={(props.errors.dob && props.touched.dob) && props.errors.dob}
+                          maxDate={year[0] + '-12-31'}
+                          minDate={year[year?.length - 1] + '-01-01'}
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+                  {/* right part */}
+                  <div className='w-full p-4 flex flex-col gap-4 bg-blue-200 dark:bg-slate-900 rounded-2xl'>
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Address"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="address"
+                      value={props.values.address}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.address && props.touched.address) && props.errors.address}
+                    />
+                    <InputCom
+                      fieldClass="px-6"
+                      label="City"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="city"
+                      value={props.values.city}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.city && props.touched.city) && props.errors.city}
+                    />
+                    {/* <InputCom
+                      fieldClass="px-6"
+                      label="State/Province"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="state"
+                      value={props.values.state}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.state && props.touched.state) && props.errors.state}
+                    /> */}
+
+                    <div className="field w-full grid md:grid-cols-2 gap-4">
+                      <div className="field w-full">
+                        <label
+                          htmlFor="state"
+                          className="job-label job-label-flex"
+                        >
+                          <span>State/Province</span>
+                          {props.errors.state && props.touched.state && (
+                            <span className="text-[12px] text-red-500">
+                              {props.errors.state}
+                            </span>
+                          )}
+                        </label>
+                        <select
+                          id="state"
+                          name="state"
+                          value={props.values.state}
+                          className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                          onChange={props.handleChange}
+                        >
+                          {state.loading ?
+                              <option className="text-slate-500 text-lg" value="">
+                                Loading...
+                              </option>
+                            : Object.keys(state.data)?.length > 0 ?
+                            <>
+                              <option className="text-slate-500 text-lg" value="">
+                                Select State
+                              </option>
+                              {Object.keys(state.data)?.map((item, index) => (
+                                <option key={index} className="text-slate-500 text-lg" value={item}>
+                                  {state?.data[item]}
+                                </option>
+                              ))}
+                            </>
+                            :
+                              <option className="text-slate-500 text-lg" value="">
+                                Not Found
+                              </option>
+                            }
+                        </select>
+                      </div>
+                  
+                      <InputCom
+                        fieldClass="px-6"
+                        label="Zip Code"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        inputClass="input-curve lg border border-light-purple"
+                        type="text"
+                        name="zipCode"
+                        value={props.values.zipCode}
+                        inputHandler={props.handleChange}
+                        error={(props.errors.zipCode && props.touched.zipCode) && props.errors.zipCode}
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div className='p-4 w-full job-label'>
+                <div className='flex gap-4 items-center'>
+                    <input 
+                    type='checkbox' 
+                    name="checked"
+                    className='accent-purple w-4 h-4 p-2 text-purple bg-gray-100 border-gray-300 rounded focus:ring-purple' 
+                    onChange={props.handleChange}
+                    />
+                    <p className='text-[14px] text-justify'>
+                        I agree with the <span className='text-bue-600'>cardholder </span> 
+                        terms & conditions {props.errors.checked && props.touched.checked && <span className='text-[12px] text-red-500'>{props.errors.checked}</span>}
+                    </p>
+                </div>
+              </div>
+              {requestStatus.message &&
+              <div className='px-4 my-1'>
+                <p className={`text-center text-base py-1 font-bold ${requestStatus.status ? 'bg-emerald-600 text-white' : 'bg-red-100 text-red-600'}`}>{requestStatus.message}</p>
+              </div>
+              }
+              <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+                  <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                      <button
+                      type="button"
+                      onClick={onClose}
+                      className="custom-btn bg-[#f5a430] text-black text-base"
+                      >
+                      Cancel
+                      </button>
+
+                      <>
+                      {requestStatus.loading ?
+                      <LoadingSpinner size="6" color="sky-blue" />
+                      :
+                      <button
+                      type="submit"
+                      className="custom-btn btn-gradient text-base text-white"
+                      disabled={requestStatus.loading || requestStatus.status}
+                      >
+                      Continue
+                      </button>
+                      }
+                      </>
+                  </div>
+              </div>
+            </Form>
+          </div>
+        )}
+      </Formik>
+    </ModalCom>
+  );
+};
+
+export default VirtualAddCardPopout;
+
+
+
+const day = new Array(31).fill(0).map((_,i) => i+1 )
+
+const month = [
+  {value: 1, name: 'January'},
+  {value: 2, name: 'February'},
+  {value: 3, name: 'March'},
+  {value: 4, name: 'April'},
+  {value: 5, name: 'May'},
+  {value: 6, name: 'June'},
+  {value: 7, name: 'July'},
+  {value: 8, name: 'August'},
+  {value: 9, name: 'September'},
+  {value: 10, name: 'October'},
+  {value: 11, name: 'November'},
+  {value: 12, name: 'December'},
+]
+
+const date = new Date().getFullYear()
+
+const year = new Array(100).fill(0).map((_,i) =>  (date-2) - i+1 )

src/components/MyWallet/walletvirtual/WalletActionVirtual.jsx

@@ -0,0 +1,23 @@
+import React, { useEffect, useState } from "react";
+import usersService from "../../../services/UsersService";
+
+
+function WalletActionVirtual({ walletItem, openPopUp, btnText }) {
+
+  return (
+    <div className="counters w-full flex justify-end gap-2">
+      <div className="w-1/2 flex justify-end items-center">
+        <button
+          className="logout-btn btn-gradient text-white"
+          onClick={() => {
+            openPopUp(walletItem?.description, {walletItem});
+          }}
+        >
+          {btnText}
+        </button>
+      </div>
+    </div>
+  );
+}
+
+export default WalletActionVirtual;

src/components/MyWallet/walletvirtual/WalletItemCardVirtual.jsx

@@ -0,0 +1,131 @@
+import React, { useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import localImgLoad from "../../../lib/localImgLoad";
+import { tableReload } from "../../../store/TableReloads";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import WalletActionVirtual from "./WalletActionVirtual";
+import VirtualAddCardPopout from "./VirtualAddCardPopout";
+import WrenchTokenPopout from './WrenchTokenPopout'
+import WrenchPointPopout from './WrenchPointPopout'
+
+/**
+ * Renders a card displaying information about a wallet item.
+ */
+export default function WalletItemCardVirtual({ walletItem, payment, countries }) {
+  
+  const dispatch = useDispatch();
+  const [virtualPopup, setVirtualPopup] = useState({ name: '', data: {} });
+
+  /**
+   * Opens the credit popup.
+   * @param {Object} value - The value object.
+   */
+  const openPopUp = (name, value) => {
+    setVirtualPopup({
+      name: name.toLowerCase(),
+      data: { ...value },
+    });
+  };
+
+  /**
+   * Closes the credit popup and dispatches a table reload action.
+   */
+  const closePopUp = () => {
+    setVirtualPopup({ name: false, data: {} });
+    // dispatch(tableReload({ type: "WALLETTABLE" }));
+  };
+
+  const currentWalletCurrency = countries?.filter((country) => country.code === walletItem.country);
+
+  const image = walletItem.code
+    ? `${walletItem.code.toLowerCase()}.svg`
+    : "default.png";
+
+
+  return (
+    <>
+      <div
+        className="current-balance-widget w-full h-full min-h-[250px] rounded-2xl overflow-hidden flex flex-col items-center gap-4 p-4 justify-between bg-[#498FC3]"
+        style={{
+          background: `url(${walletItem?.banner}) 0% 0% / cover no-repeat`,
+        }}
+      >
+        <div className="wallet w-full">
+          {/* <div className="min-w-[100px] min-h-[100px] max-w-min md:max-w-[150px] max-h-min md:max-h-[150px] rounded-full bg-[#e3e3e3] flex justify-center items-center">
+            <img
+              src={localImgLoad(`images/currency/${image}`)}
+              className="w-full h-full"
+              alt="currency-icon"
+            />
+          </div> */}
+          <div className="balance w-full mt-2 flex justify-end">
+            <div className="">
+              <p className="text-lg sm:text-2xl font-bold text-white tracking-wide mb-2 sm:mb-6">
+                {walletItem?.description}
+              </p>
+              {/* <p className="text-[44px] lg:text-[62px] font-bold text-white tracking-wide leading-10 xxs:scale-100 lg:scale-100 xl:scale-125">
+                {PriceFormatter(
+                  walletItem.amount * 0.01,
+                  walletItem.code,
+                  undefined,
+                  "text-[2rem]"
+                )}
+              </p> */}
+            </div>
+          </div>
+        </div>
+        
+        {/* {walletItem.escrow > 0 ? 
+          <p className="text-lg text-white tracking-wide flex justify-center items-center gap-8">
+            HOLDINGS :{" "}
+            <span className="xxs:scale-100 lg:scale-100 xl:scale-125">
+              {PriceFormatter(
+                walletItem.escrow * 0.01,
+                walletItem.code,
+                undefined,
+                "text-[1.5rem]"
+              )}
+            </span>
+          </p>
+          :
+          null
+        } */}
+        <div className='w-full'>
+            <div className="w-full h-[1px] mb-2 bg-white"></div>
+            <WalletActionVirtual
+                walletItem={walletItem}
+                openPopUp={openPopUp}
+                btnText={walletItem?.rt_action_text}
+            />
+        </div>
+      </div>
+
+      {virtualPopup.name == 'add virtual debit card' && (
+        <VirtualAddCardPopout
+          details={virtualPopup.data}
+          walletItem={walletItem}
+          onClose={closePopUp}
+          situation={virtualPopup.name}
+        />
+      )}
+      
+      {virtualPopup.name == 'wrench token' && (
+        <WrenchTokenPopout
+          details={virtualPopup.data}
+          walletItem={walletItem}
+          onClose={closePopUp}
+          situation={virtualPopup.name}
+        />
+      )}
+
+    {virtualPopup.name == 'wrench points' && (
+        <WrenchPointPopout
+          details={virtualPopup.data}
+          walletItem={walletItem}
+          onClose={closePopUp}
+          situation={virtualPopup.name}
+        />
+      )}
+    </>
+  );
+}

src/components/MyWallet/walletvirtual/WrenchPointPopout.jsx

@@ -0,0 +1,88 @@
+import { useState } from "react";
+import ModalCom from "../../Helpers/ModalCom";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import CustomTimer from "../../countdown/CustomTimer";
+
+const WrenchPointPopout = ({ details, onClose, situation, walletItem }) => {
+  const [input, setInput] = useState("");
+
+  return (
+    <ModalCom
+      action={onClose}
+      situation={situation}
+    >
+      <div className="logout-modal-wrapper w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
+            {walletItem?.description}
+          </h1>
+          <button
+            type="button"
+            className="modal-close-btn"
+            onClick={onClose}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <div className="w-full h-[32rem]">
+            {/* <div className="h-[32rem] flex items-center justify-center">
+              <div className="h-[32rem] flex flex-col items-center justify-center gap-4">
+                <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Processing payment</p>
+                <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Please do not refresh</p>
+                <LoadingSpinner size="6" color="sky-blue" height='h-20' />
+                <CustomTimer className="text-lg text-center md:text-2xl text-emerald-600 tracking-wide font-bold" />
+              </div>
+            </div> */}
+        </div>
+        <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+            <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                <button
+                type="button"
+                onClick={onClose}
+                className="custom-btn bg-[#f5a430] text-black text-base"
+                >
+                Cancel
+                </button>
+
+
+                <button
+                onClick={()=>{}}
+                className="custom-btn btn-gradient text-base text-white"
+                >
+                {/* {requestStatus.loading ? (
+                    <LoadingSpinner size="6" color="sky-blue" />
+                ) : completeNairaWithdraw.show ? (
+                    "Okay"
+                ) : completeNairaWithdraw?.state?.internal_return < 0 ? (
+                    "Cancel"
+                ) : (
+                    "Transfer"
+                )} */}
+                Continue
+                </button>
+            </div>
+        </div>
+      </div>
+    </ModalCom>
+  );
+};
+
+export default WrenchPointPopout;

src/components/MyWallet/walletvirtual/WrenchTokenPopout.jsx

@@ -0,0 +1,88 @@
+import { useState } from "react";
+import ModalCom from "../../Helpers/ModalCom";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import CustomTimer from "../../countdown/CustomTimer";
+
+const WrenchTokenPopout = ({ details, onClose, situation, walletItem }) => {
+  const [input, setInput] = useState("");
+
+  return (
+    <ModalCom
+      action={onClose}
+      situation={situation}
+    >
+      <div className="logout-modal-wrapper w-[90%] md:w-[768px] h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
+            {walletItem?.description}
+          </h1>
+          <button
+            type="button"
+            className="modal-close-btn"
+            onClick={onClose}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <div className="w-full h-[32rem]">
+            {/* <div className="h-[32rem] flex items-center justify-center">
+              <div className="h-[32rem] flex flex-col items-center justify-center gap-4">
+                <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Processing payment</p>
+                <p className="text-lg md:text-2xl text-emerald-600 tracking-wide font-bold">Please do not refresh</p>
+                <LoadingSpinner size="6" color="sky-blue" height='h-20' />
+                <CustomTimer className="text-lg text-center md:text-2xl text-emerald-600 tracking-wide font-bold" />
+              </div>
+            </div> */}
+        </div>
+        <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
+            <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+                <button
+                type="button"
+                onClick={onClose}
+                className="custom-btn bg-[#f5a430] text-black text-base"
+                >
+                Cancel
+                </button>
+
+
+                <button
+                onClick={()=>{}}
+                className="custom-btn btn-gradient text-base text-white"
+                >
+                {/* {requestStatus.loading ? (
+                    <LoadingSpinner size="6" color="sky-blue" />
+                ) : completeNairaWithdraw.show ? (
+                    "Okay"
+                ) : completeNairaWithdraw?.state?.internal_return < 0 ? (
+                    "Cancel"
+                ) : (
+                    "Transfer"
+                )} */}
+                Continue
+                </button>
+            </div>
+        </div>
+      </div>
+    </ModalCom>
+  );
+};
+
+export default WrenchTokenPopout;

src/components/OffersInterest/ManageInterestOffer.jsx

@@ -399,7 +399,8 @@ export default function ManageInterestOffer(props) {
                                 <div className='mb-4 border-b-2 flex flex-col xxs:flex-row md:flex-col justify-center items-center gap-4'>
                                     <div className='w-full flex flex-col lg:flex-row justify-center items-center gap-2'>
                                         <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Wallet:</p>
-                                        <span className="font-medium text-dark-gray dark:text-white">{ walletDetails?.loading ? 'loading...' : PriceFormatter(walletBal[0]?.amount * 0.01,props?.offerDetails?.currency_code,props?.offerDetails?.currency)}</span>
+                                        {/* <span className="font-medium text-dark-gray dark:text-white">{ walletDetails?.loading ? 'loading...' : PriceFormatter(walletBal[0]?.amount * 0.01,props?.offerDetails?.currency_code,props?.offerDetails?.currency)}</span> */}
+                                        <span className="font-medium text-dark-gray dark:text-white">{ walletBal.length > 0 ? PriceFormatter(walletBal[0]?.amount * 0.01,props?.offerDetails?.currency_code,props?.offerDetails?.currency) : 'loading...'}</span>
                                     </div>
                                     <div className='w-full flex flex-col lg:flex-row justify-center items-center gap-2'>
                                         <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Reward:</p>

src/components/Partials/Default.jsx

@@ -1,8 +1,13 @@
 import React, { useEffect, useState } from "react";
+import {useLocation} from 'react-router-dom'
 import DarkModeContext from "../Contexts/DarkModeContext";
 import axios from 'axios'
 
 function Default({ children }) {
+  const location = useLocation()
+
+  const [nocache, setNoCache] = useState(false) // holds cache/nocache value
+
   // dark mode setup
   const [theme, setTheme] = useState(null);
 
@@ -13,6 +18,10 @@ function Default({ children }) {
   const queryParams = new URLSearchParams(location?.search);
   const country = queryParams.get("cnt")?.toUpperCase();
 
+  const handleThemeSwitch = () => {
+    setTheme(theme === "dark" ? "light" : "dark");
+  };
+
   const getLocation = () => {
     if (navigator.geolocation) {
       navigator.geolocation.getCurrentPosition(
@@ -55,10 +64,6 @@ function Default({ children }) {
     }
   }, [theme]);
 
-  const handleThemeSwitch = () => {
-    setTheme(theme === "dark" ? "light" : "dark");
-  };
-
   useEffect(()=>{
     if(country){
       setCountryMode(country)
@@ -72,7 +77,7 @@ function Default({ children }) {
 
   return (
     <>
-      <DarkModeContext.Provider value={{ theme, handleThemeSwitch, countryMode }}>
+      <DarkModeContext.Provider value={{ theme, handleThemeSwitch, countryMode, nocache, setNoCache }}>
         {children && children}
       </DarkModeContext.Provider>
     </>

src/components/Partials/Header.jsx

@@ -413,7 +413,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                         </div>
                       </Link>
                     </li>
-                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                    {(userDetails && userDetails?.account_type !== "FAMILY" && Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1) && (
                       <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
                         <Link to="/yourpage" className="notifications">
                           <div className="name">

src/components/Partials/Layout.jsx

@@ -11,7 +11,7 @@ import Sidebar from "./Sidebar";
 
 export default function Layout({ children }) {
   const { userDetails } = useSelector((state) => state?.userDetails); // CHECKS FOR USER Details
-
+ 
   const { drawer } = useSelector((state) => state.drawer);
   const { userJobList } = useSelector((state) => state.userJobList);
   const dispatch = useDispatch();
@@ -22,13 +22,14 @@ export default function Layout({ children }) {
   };
   const navigate = useNavigate();
   const logOut = () => {
+    let loginType = userDetails?.account_type == 'FULL' ? 'parent' : 'kid'
     sessionStorage.clear();
     localStorage.clear();
     // toast.success("Come Back Soon", {
     //   icon: `🙂`,
     // });
 
-    navigate("/login", { replace: true });
+    navigate(`/login/${loginType}`, {state:{loginType:userDetails?.account_type.toLowerCase()}, replace:true});
   };
 
   return (

src/components/Partials/MediaHeader.jsx

@@ -457,7 +457,7 @@ export default function MediaHeader({ logoutModalHandler, sidebarHandler, backpa
                         </div>
                       </Link>
                     </li>
-                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                    {(userDetails && userDetails?.account_type !== "FAMILY" && Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1) && (
                       <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
                         <Link to="/yourpage" className="notifications">
                           <div className="name">

src/components/Partials/MobileSideBar.jsx

@@ -92,7 +92,7 @@ export default function MobileSidebar({
               {/* Using mini component reduces the bulk amount of html */}
               <ListItem
                 title={
-                  userDetails?.account_type == "FULL" ? "Dashboard" : "Home"
+                  userDetails?.account_type == "FULL" ? "Home" : "Home"
                 }
                 route="/"
                 sidebar={sidebar}

src/components/Partials/Sidebar.jsx

@@ -112,7 +112,7 @@ export default function Sidebar({
             <ul className="flex flex-col space-y-6">
               {/* Using mini component reduces the bulk amount of html */}
               <ListItem
-                title={userDetails?.account_type == "FULL" ? "Dashboard" : "Home"}
+                title={userDetails?.account_type == "FULL" ? "Home" : "Home"}
                 route="/"
                 sidebar={sidebar}
                 iconName="new-dashboard"

src/components/Referral/ReferralDisplay.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import usersService from "../../services/UsersService";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
@@ -74,7 +74,7 @@ function ReferralDisplay() {
   };
 
   //FUNCTION TO SEND REFERRAL MESSAGE
-  const sendReferralMsg = (postData) => {
+  const sendReferralMsg = (postData, helpers) => {
     apiCall
       .sendReferralMsg(postData)
       .then((res) => {
@@ -84,11 +84,17 @@ function ReferralDisplay() {
             loading: false,
             status: false,
           });
-          return;
+          setTimeout(()=>{
+            setError({ message: '', loading: false, status: false });
+          },3000)
         } else {
-          toast.success(res.data.status | "Message Sent!");
+          // toast.success(res.data.status | "Message Sent!");
-          setError({ message: "", loading: false, status: true });
+          setError({ message: res.data.status, loading: false, status: true });
+          helpers.resetForm() // resets the form data
           setRefHistoryReload((prev) => !prev);
+          setTimeout(()=>{
+            setError({ message: '', loading: false, status: true });
+          },3000)
         }
       })
       .catch((error) => {
@@ -97,13 +103,16 @@ function ReferralDisplay() {
           loading: false,
           status: false,
         });
+        setTimeout(()=>{
+          setError({ message: '', loading: false, status: false });
+        },3000)
       });
   };
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = (values, helpers) => {
     setError({ message: "", loading: true, status: false });
-    sendReferralMsg({...values}); // FUNCTION TO SEND REFERRAL MESSAGE
+    sendReferralMsg({...values}, helpers); // FUNCTION TO SEND REFERRAL MESSAGE
   };
 
   const [selectedTab, setSelectedTab] = useState("Send Referral");
@@ -228,7 +237,7 @@ function ReferralDisplay() {
 
                       <hr />
                       {error.message != "" && (
-                        <p className="text-base text-red-500 py-2">{error.message}</p>
+                        <p className={`text-base py-2 ${error.status ? 'text-emerald-500' : 'text-red-500'}`}>{error.message}</p>
                       )}
                       <div className="referral-btn flex justify-end items-center py-4">
                         {error.loading ? (
@@ -237,6 +246,7 @@ function ReferralDisplay() {
                           <button
                             type="submit"
                             className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            disabled={error.loading || error.status}
                           >
                             Send Message
                           </button>
@@ -251,9 +261,12 @@ function ReferralDisplay() {
             {selectedTab == 'Referral List' &&
               <>
                 <div className="w-full p-4">
-                  <h2 className="mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
+                  <div className='mb-2 flex flex-wrap gap-4 items-center'>
-                    Referral List
+                    <h2 className="text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
-                  </h2>
+                      Referral List
+                    </h2>
+                    <p className='text-slate-900 dark:text-white text-sm lg:text-base'>Uncompleted signup will be removed automatically after 7 days</p>
+                  </div>
                   {referralList.loading ? (
                     <LoadingSpinner size="22" color="sky-blue" />
                   ) : (

src/components/Resources/index.jsx

@@ -24,17 +24,19 @@ export default function Resources(props) {
   const ownProducts = products.datas;
   // Resource Props
   const __resources = props.MyResourceData;
+
   //debugger;
   // Collection Items
   const CreatedSell = __resources?.marketdata?.data;
-  const tab_categories = __resources?.tab_categories?.data;
+  // const tab_categories = __resources?.tab_categories?.data?.sort((a, b) => b.name.localeCompare(a.name)) // SORT REMOVED
+  const tab_categories = __resources?.tab_categories?.data
   const collectionProducts = __resources?.collectiondata?.data;
   const onSaleProducts = __resources?.marketdata?.data;
   const CreatedBits = __resources?.productdata?.datas;
   const blogItems = __resources?.blogdata?.payload;
 
-  console.log(__resources);
+  // console.log(__resources);
-  console.log("Blog data >> ", blogItems);
+  // console.log("Blog data >> ", blogItems);
 
   // My Items Data
   const [uploadedFiles, setUploadedFiles] = useState({
@@ -77,23 +79,22 @@ export default function Resources(props) {
     }
   };
 
-  useEffect(() => {
-    getUploadedFiles();
-  }, [uploadsTable]);
-
   // const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : "");
   const [tab, setTab] = useState(
     props.activeTab
       ? props.activeTab
-      : tab_categories
+      : "onsale"
-      ? tab_categories[0]?.name
-      : ""
   );
 
   const tabHandler = (value) => {
     setTab(value);
   };
 
+  useEffect(() => {
+    getUploadedFiles();
+  }, [uploadsTable]);
+
+
   // Category Components
   const tabComponents = {
     blog: <BlogTab blogdata={blogItems} />,

src/components/Resources/tabs/BlogTab.jsx

@@ -2,9 +2,10 @@ import ProductCardStyleTwo from "../../Cards/ProductCardStyleTwo";
 import DataIteration from "../../Helpers/DataIteration";
 import SearchCom from "../../Helpers/SearchCom";
 import ResourceBlogCard from "../../Cards/ResourceBlogCard";
+import NewPaginatedList from '../../../components/Pagination/NewPaginatedList'
 
 export default function BlogTab({ className, blogdata }) {
-  console.log("Blog data here>> ", blogdata);
+  // console.log("Blog data here>> ", blogdata);
   // debugger;
   return (
     <>
@@ -15,33 +16,9 @@ export default function BlogTab({ className, blogdata }) {
             <div className="sm:w-1/2 w-full sm:pr-20 pr-0 mb-5 sm:mb-0">
               <SearchCom placeholder='Search Blog Items...' />
             </div>
-            {/* filer-dropdown */}
-            <div className="flex-1 flex sm:justify-end">
-              {/*            <div className="flex space-x-1 items-center">*/}
-              {/*<span className="text-18 text-thin-light-gray">*/}
-              {/*  Recently Received*/}
-              {/*</span>*/}
-              {/*                <span>*/}
-              {/*  <svg*/}
-              {/*      width="20"*/}
-              {/*      height="10"*/}
-              {/*      viewBox="0 0 13 6"*/}
-              {/*      fill="none"*/}
-              {/*      xmlns="http://www.w3.org/2000/svg"*/}
-              {/*  >*/}
-              {/*    <path*/}
-              {/*        opacity="0.7"*/}
-              {/*        d="M12.4124 0.247421C12.3327 0.169022 12.2379 0.106794 12.1335 0.0643287C12.0291 0.0218632 11.917 0 11.8039 0C11.6908 0 11.5787 0.0218632 11.4743 0.0643287C11.3699 0.106794 11.2751 0.169022 11.1954 0.247421L7.27012 4.07837C7.19045 4.15677 7.09566 4.219 6.99122 4.26146C6.88678 4.30393 6.77476 4.32579 6.66162 4.32579C6.54848 4.32579 6.43646 4.30393 6.33202 4.26146C6.22758 4.219 6.13279 4.15677 6.05312 4.07837L2.12785 0.247421C2.04818 0.169022 1.95338 0.106794 1.84895 0.0643287C1.74451 0.0218632 1.63249 0 1.51935 0C1.40621 0 1.29419 0.0218632 1.18975 0.0643287C1.08531 0.106794 0.990517 0.169022 0.910844 0.247421C0.751218 0.404141 0.661621 0.616141 0.661621 0.837119C0.661621 1.0581 0.751218 1.2701 0.910844 1.42682L4.84468 5.26613C5.32677 5.73605 5.98027 6 6.66162 6C7.34297 6 7.99647 5.73605 8.47856 5.26613L12.4124 1.42682C12.572 1.2701 12.6616 1.0581 12.6616 0.837119C12.6616 0.616141 12.572 0.404141 12.4124 0.247421Z"*/}
-              {/*        fill="#374557"*/}
-              {/*        fillOpacity="0.6"*/}
-              {/*    />*/}
-              {/*  </svg>*/}
-              {/*</span>*/}
-              {/*            </div>*/}
-            </div>
           </div>
 
-          <div className="content-section w-full-width">
+          {/* <div className="content-section w-full-width">
             <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
               <DataIteration
                 datas={blogdata?.blogdata}
@@ -57,7 +34,42 @@ export default function BlogTab({ className, blogdata }) {
                 )}
               </DataIteration>
             </div>
+          </div> */}
+
+          {blogdata?.blogdata?.length ?
+          <NewPaginatedList
+              data={blogdata?.blogdata}
+              itemsPerPage={9}
+              filterItem=''
+              tableTitle='' 
+          >
+            {
+              ({data})=>(
+                <div className="filter-navigate-content w-full min-h-[600px]">
+                  <div
+                    className={"grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"}
+                  >
+                  {
+                    data.map((datum, index) => (
+                      <div key={index}>
+                        <ResourceBlogCard
+                          key={index}
+                          datas={datum}
+                          bg={blogdata.image_url}
+                        />
+                      </div>
+                    ))
+                  }
+                  </div>
+                </div>
+              )
+            }
+          </NewPaginatedList>
+          :
+          <div className="w-full h-[40rem] bg-white dark:bg-dark-white flex justify-center items-center">
+            No Blog Found!
           </div>
+          }
         </div>
       </div>
     </>

src/components/Resources/tabs/QuestionsTab.jsx

@@ -42,7 +42,7 @@ export default function QuestionsTab({ className, products }) {
             question: ''
         }
         apiCall.askResourcesResult().then(res => {
-            console.log(res.data.choices[0].text)
+            // console.log(res.data.choices[0].text)
             if(!res.data || res.data?.choices?.length < 1){
             setRequestStatus({loading: false, status: false, message: 'No result found!'})
             }

src/components/Settings/Tabs/ChangePasswordTab.jsx

@@ -2,7 +2,7 @@
 
 import React, { useState } from "react";
 import Icons from "../../Helpers/Icons";
-import PasswordSvg from "../PasswordSvg";
+// import PasswordSvg from "../PasswordSvg";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import usersService from "../../../services/UsersService";
 import { useNavigate } from "react-router-dom";
@@ -113,14 +113,19 @@ export default function ChangePasswordTab() {
   }
   return (
     <div className="changePasswordTab w-full">
-      <div className="w-full flex xxl:flex-row flex-col-reverse space-x-5 xxl:items-start">
+      <div className="w-full">
-        <div className="flex-1 mb-10">
+        <div className="content-heading w-full mb-8">
+          <h1 className="text-2xl font-extrabold text-black dark:text-white antialiased">
+            Reset Password
+          </h1>
+        </div>
+        <div className="w-full md:w-[calc(100%-100px)] md:ml-auto pb-10">
           <div className="input-field mb-6">
             <label
               className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5"
               htmlFor="old_password"
             >
-              Old Password <span className="text-[10px] text-red-500 italic px-2">{(inputEmpty && !inputs.old_pwd) && 'required'}</span>
+              Current Password <span className="text-[10px] text-red-500 italic px-2">{(inputEmpty && !inputs.old_pwd) && 'required'}</span>
             </label>
             <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  w-full rounded-[50px] h-[58px] overflow-hidden relative ">
               <div className="absolute left-6 bottom-[17px] z-10">
@@ -202,7 +207,7 @@ export default function ChangePasswordTab() {
               </div>
             </div>
           </div>
-          <div className="flex justify-center space-x-4 items-center">
+          <div className="flex w-full md:w-[calc(100%-128px)] md:ml-auto justify-between gap-4 items-center">
             <button
               type="button"
               className="text-light-red text-18 tracking-wide border-b dark:border-[#5356fb29]  border-light-red"
@@ -246,9 +251,9 @@ export default function ChangePasswordTab() {
             ))}
           {/* End of error or success display */}
         </div>
-        <div className="w-[440px] sm:flex hidden justify-end">
+        {/* <div className="w-[440px] sm:flex hidden justify-end">
           <PasswordSvg />
-        </div>
+        </div> */}
       </div>
     </div>
   );