Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into Market-Categories

Done!
Merge branch 'offer-interest-process' of WrenchBoard/Users-Wrench into master
2023-06-18 15:52:19 +01:00 · 2023-06-18 15:51:59 +01:00 · 2023-06-18 11:58:58 +00:00 · 2023-06-18 08:20:29 +01:00 · 2023-06-18 08:14:22 +01:00 · 2023-06-17 22:29:15 +00:00
144 changed files with 11107 additions and 5083 deletions
@@ -18,6 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"

 REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000

 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
@@ -31,5 +32,23 @@ REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 #NUMBER OF ITEMS PER PAGE
 REACT_APP_ITEM_PER_PAGE=5

+# Empty Listings
+REACT_APP_ZERO_STATE=0
+
+#REACT_APP_GOOGLE_CLIENT_ID_RET=234407841224-k5g7f67p908hqtegiokmjqt8qqf3hi2i.apps.googleusercontent.com
+
+REACT_APP_GOOGLE_CLIENT_ID=817021856543-ad9nsjgdpsu2s2jrl63j3ihrv7lbf6ma.apps.googleusercontent.com
+REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
+REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
+REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
+
+REACT_APP_FACEBOOK_CLIENT_ID=390204307987009
+REACT_APP_FACEBOOK_CLIENT_SECRET=19f778e312f2ab96d147bacb612910c2
+REACT_APP_FACEBOOK_CLIENT_SCOPE="email, public_profile"
+
+REACT_APP_MAX_FILE_SIZE=1000000
+REACT_APP_TOTAL_NUM_FILE=4
+
+
 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
@@ -18,6 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"

 REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000

 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
@@ -33,3 +34,11 @@ REACT_APP_ITEM_PER_PAGE=5

 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
+
+REACT_APP_GOOGLE_CLIENT_ID=817021856543-ad9nsjgdpsu2s2jrl63j3ihrv7lbf6ma.apps.googleusercontent.com
+REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
+REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
+REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
+
+REACT_APP_MAX_FILE_SIZE=1000000
+REACT_APP_TOTAL_NUM_FILE=4
@@ -18,6 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"

 REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000

 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
@@ -33,3 +34,13 @@ REACT_APP_ITEM_PER_PAGE=5

 #apigate.orion.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
+
+REACT_APP_GOOGLE_CLIENT_ID=817021856543-ad9nsjgdpsu2s2jrl63j3ihrv7lbf6ma.apps.googleusercontent.com
+REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
+REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
+REACT_APP_GOOGLE_REDIRECT_URL=https://users.wrenchboard.com/login/auth/
+
+DISABLE_ESLINT_PLUGIN=true
+
+REACT_APP_MAX_FILE_SIZE=1000000
+REACT_APP_TOTAL_NUM_FILE=4
@@ -8,6 +8,7 @@
      "name": "WrenchBoard-Users",
      "version": "0.2.0",
      "dependencies": {
+        "@react-oauth/google": "^0.11.0",
        "@reduxjs/toolkit": "^1.8.2",
        "@tailwindcss/line-clamp": "^0.3.1",
        "@testing-library/jest-dom": "^5.11.4",
@@ -18,15 +19,15 @@
        "chartjs": "^0.3.24",
        "cors": "^2.8.5",
        "faker": "^6.6.6",
+        "flutterwave-react-v3": "^1.3.0",
        "formik": "^2.2.9",
-        "react": "^18.0.0",
+        "react": "^18.2.0",
        "react-chartjs-2": "^4.1.0",
        "react-countup": "^6.2.0",
-        "react-dom": "^18.0.0",
-        "react-lottie": "^1.2.3",
-        "react-redux": "^8.0.2",
+        "react-dom": "^18.2.0",
+        "react-redux": "^8.0.5",
        "react-router-dom": "^6.0.2",
-        "react-scripts": "5.0.0",
+        "react-scripts": "5.0.1",
        "react-slick": "^0.29.0",
        "react-toastify": "^9.0.1",
        "redux": "^4.2.0",
@@ -3509,6 +3510,15 @@
        }
      }
    },
+    "node_modules/@react-oauth/google": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@react-oauth/google/-/google-0.11.0.tgz",
+      "integrity": "sha512-yeypwdQCcFIAo43OqVOLBfUXuxmxt3xiybfP9h3smtBW4UeFXFVQDsq+d+GlbZFo0TpONPR2+KCk/KT1/pQnvQ==",
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
    "node_modules/@reduxjs/toolkit": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.1.tgz",
@@ -5476,20 +5486,6 @@
        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
      }
    },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-    },
    "node_modules/balanced-match": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -6173,13 +6169,6 @@
      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
    },
-    "node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true
-    },
    "node_modules/core-js-compat": {
      "version": "3.27.1",
      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.1.tgz",
@@ -8307,6 +8296,26 @@
      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
    },
+    "node_modules/flutterwave-react-v3": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flutterwave-react-v3/-/flutterwave-react-v3-1.3.0.tgz",
+      "integrity": "sha512-y0dGSgxh9H/KMSDFurnoPYO3D6DSeOCZHPdLt8DnbtCkjgYgzNdqeXKvxerEaOJyitzXITsmlbzYdrEO/Lju3g==",
+      "dependencies": {
+        "axios": "^0.21.1"
+      },
+      "peerDependencies": {
+        "react": "^15.0.0 || ^18.0.0",
+        "react-dom": "^15.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/flutterwave-react-v3/node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
    "node_modules/follow-redirects": {
      "version": "1.15.2",
      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
@@ -12506,11 +12515,6 @@
        "loose-envify": "cli.js"
      }
    },
-    "node_modules/lottie-web": {
-      "version": "5.10.1",
-      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.10.1.tgz",
-      "integrity": "sha512-u17bVNf/vA3oK9Wkyb1Vpo83WUIEQwaT0GeEN0qcvaExizyJ/RjmcbjSDj0CnwQCtpGqTgYhqprCC7cTWuXMNw=="
-    },
    "node_modules/lower-case": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
@@ -15045,21 +15049,6 @@
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
-    "node_modules/react-lottie": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/react-lottie/-/react-lottie-1.2.3.tgz",
-      "integrity": "sha512-qLCERxUr8M+4mm1LU0Ruxw5Y5Fn/OmYkGfnA+JDM/dZb3oKwVAJCjwnjkj9TMHtzR2U6sMEUD3ZZ1RaHagM7kA==",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "lottie-web": "^5.1.3"
-      },
-      "engines": {
-        "npm": "^3.0.0"
-      },
-      "peerDependencies": {
-        "react": "^0.14.7 || ^15.0.0 || ^16.0.0"
-      }
-    },
    "node_modules/react-redux": {
      "version": "8.0.5",
      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz",
@@ -15142,9 +15131,9 @@
      }
    },
    "node_modules/react-scripts": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz",
-      "integrity": "sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
+      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
      "dependencies": {
        "@babel/core": "^7.16.0",
        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
@@ -15162,7 +15151,7 @@
        "dotenv": "^10.0.0",
        "dotenv-expand": "^5.1.0",
        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.0",
+        "eslint-config-react-app": "^7.0.1",
        "eslint-webpack-plugin": "^3.1.1",
        "file-loader": "^6.2.0",
        "fs-extra": "^10.0.0",
@@ -15179,7 +15168,7 @@
        "postcss-preset-env": "^7.0.1",
        "prompts": "^2.4.2",
        "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.0",
+        "react-dev-utils": "^12.0.1",
        "react-refresh": "^0.11.0",
        "resolve": "^1.20.0",
        "resolve-url-loader": "^4.0.0",
@@ -3,6 +3,7 @@
  "version": "0.2.0",
  "private": true,
  "dependencies": {
+    "@react-oauth/google": "^0.11.0",
    "@reduxjs/toolkit": "^1.8.2",
    "@tailwindcss/line-clamp": "^0.3.1",
    "@testing-library/jest-dom": "^5.11.4",
@@ -13,17 +14,19 @@
    "chartjs": "^0.3.24",
    "cors": "^2.8.5",
    "faker": "^6.6.6",
+    "flutterwave-react-v3": "^1.3.0",
    "formik": "^2.2.9",
+    "react": "^18.2.0",
    "react-chartjs-2": "^4.1.0",
    "react-countup": "^6.2.0",
-    "react-router-dom": "^6.0.2",
-    "react-slick": "^0.29.0",
-    "react-toastify": "^9.0.1",
-    "flutterwave-react-v3": "^1.3.0",
-    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-qr-code": "^2.0.11",
    "react-redux": "^8.0.5",
+    "react-router-dom": "^6.0.2",
    "react-scripts": "5.0.1",
+    "react-slick": "^0.29.0",
+    "react-to-print": "^2.14.12",
+    "react-toastify": "^9.0.1",
    "redux": "^4.2.0",
    "slick-carousel": "^1.8.1",
    "web-vitals": "^1.0.1",
@@ -53,4 +56,4 @@
      "last 1 safari version"
    ]
  }
-}
+}
@@ -34,6 +34,17 @@ import VerifyLinkPages from "./views/VerifyLinkPages";
 import MyActiveJobsPage from "./views/MyActiveJobsPage";
 import FamilyAccPage from "./views/FamilyAccPage";
 import StartJob from "./components/MyJobs/StartJob";
+import AddJobPage from "./views/AddJobPage";
+import MyPendingJobsPage from "./views/MyPendingJobsPage";
+import ManageActiveJobs from "./views/ManageActiveJobs";
+import FamilyManagePage from "./views/FamilyManagePage";
+import MyCouponPage from "./views/MyCouponPage";
+import AuthRedirect from "./views/AuthRedirect";
+import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
+import BlogPage from "./views/BlogPage";
+import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
+import OffersInterestPage from "./views/OffersInterestPage";
+import ManageInterestOfferPage from './views/ManageInterestOfferPage'

 export default function Routers() {
  return (
@@ -42,6 +53,7 @@ export default function Routers() {
        {/* guest routes */}
        <Route exact path="/login" element={<LoginPage />} />
        <Route exact path="/signup" element={<SignupPage />} />
+        <Route exact path="/login/auth" element={<AuthRedirect />} />
        <Route
          exact
          path="/forgot-password"
@@ -70,15 +82,27 @@ export default function Routers() {
          <Route exact path="/calendar" element={<CalendarPage />} />
          <Route exact path="/resources" element={<ResourcePage />} />
          <Route exact path="/my-wallet/*" element={<MyWalletPage />} />
+          <Route exact path="/my-coupon" element={<MyCouponPage />} />
          <Route exact path="/notification" element={<Notification />} />
          <Route exact path="/market-place" element={<MarketPlacePage />} />
          <Route exact path="/market" element={<MarketPlacePage />} />
          <Route exact path="/notification" element={<Notification />} />
          <Route exact path="/mytask" element={<MyTaskPage />} />
          <Route exact path="/myjobs" element={<MyJobsPage />} />
+          {/* <Route exact path="/add-job" element={<AddJobPage />} /> */}
          <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
+          <Route exact path="/my-pastdue-jobs"  element={<MyPastDueJobsPage />} />
+          <Route exact path="/my-pending-jobs"  element={<MyPendingJobsPage />} />
+          <Route exact path="/my-review-jobs"  element={<MyReviewDueJobsPage />} />
          <Route exact path="/acc-family"  element={<FamilyAccPage />} />
+          <Route exact path="/manage-family"  element={<FamilyManagePage />} />
          <Route exact path="/start-job"  element={<StartJob />} />
+          <Route exact path="/manage-active-job"  element={<ManageActiveJobs />} />
+          <Route exact path="/blog-page"  element={<BlogPage />} />
+          <Route exact path="/offer-interest"  element={<OffersInterestPage />} />
+          <Route exact path="/manage-offer"  element={<ManageInterestOfferPage />} />
+
+
          <Route
            exact
            path="/my-collection/collection-item"
@@ -12,7 +12,7 @@ export default function AllBidsSection({ className, allBids = [] }) {
        </div>
        <div className="w-full">
          <div className="grid xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 2xl:gap-8 xl:gap-5 gap-5 mb-10">
-            <DataIteration datas={allBids} startLength={0} endLength={8}>
+            <DataIteration datas={allBids} startLength={process.env.REACT_APP_ZERO_STATE} endLength={8}>
              {({ datas }) => (
                <div key={datas.id} className="item">
                  <ProductCardStyleOne datas={datas} />
@@ -0,0 +1,406 @@
+import React, { useState, useEffect } from "react";
+import { Link } from "react-router-dom";
+import InputCom from "../Helpers/Inputs/InputCom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import usersService from "../../services/UsersService";
+
+import { useSelector, useDispatch } from "react-redux";
+
+import { tableReload } from "../../store/TableReloads";
+
+import { Field, Form, Formik } from "formik";
+import * as Yup from "yup";
+
+const validationSchema = Yup.object().shape({
+  country: Yup.string()
+    .min(1, "Minimum 3 characters")
+    .max(25, "Maximum 25 characters")
+    .required("Country is required"),
+  price: Yup.number()
+    .typeError("you must specify a number")
+    .min(1, "Price must be greater than 0")
+    .required("Price is required"),
+  title: Yup.string()
+    .min(3, "Minimum 3 characters")
+    .max(100, "Maximum 25 characters")
+    .required("Title is required"),
+  description: Yup.string()
+    .min(3, "Minimum 3 characters")
+    .max(250, "Maximum 250 characters")
+    .required("Description is required"),
+  job_detail: Yup.string()
+    .min(3, "Minimum 3 characters")
+    .max(250, "Maximum 250 characters")
+    .required("Details is required"),
+  timeline_days: Yup.number()
+    .typeError("you must specify a number")
+    .min(1, "Price must be greater than 0")
+    .required("Timeline is required"),
+});
+
+function AddJob({ popUpHandler }) {
+  const ApiCall = new usersService();
+  let dispatch = useDispatch();
+
+  let { userDetails } = useSelector((state) => state.userDetails);
+
+  let [country, setCountry] = useState({
+    loading: true,
+    status: false,
+    data: [],
+  }); // To Hold the array of country getUserCountry returns
+
+  let initialValues = {
+    // initial values for formik
+    country: userDetails.country,
+    price: "",
+    title: "",
+    description: "",
+    job_detail: "",
+    timeline_days: "",
+  };
+
+  let [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+  }); // Holds state when submit button is pressed
+
+  // FUNCTION TO GET COUNTRY
+  const getUserCountry = () => {
+    setCountry((prev) => ({ ...prev, loading: true }));
+    ApiCall.getSignupCountryData()
+      .then((res) => {
+        if (res.data.internal_return < 1) {
+          setCountry({ loading: false, status: true, data: [] });
+          return;
+        }
+        setCountry({
+          loading: false,
+          status: true,
+          data: res.data.signup_country,
+        });
+      })
+      .catch((err) => {
+        setCountry({ loading: false, status: false, data: [] });
+      });
+  };
+
+  // FUNCTION TO HANDLE ADD JOB FORM
+  const handleAddJob = (values, helpers) => {
+    setRequestStatus({ loading: true, status: false, message: "" });
+    ApiCall.jobManagerCreateJob(values)
+      .then((res) => {
+        if (res.data.internal_return < 1) {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "Could not complete your request at the moment",
+          });
+          return;
+        }
+        setRequestStatus({
+          loading: false,
+          status: true,
+          message: "Job Added Successfully",
+        });
+        setTimeout(() => {
+          dispatch(tableReload({ type: "JOBTABLE" }));
+          popUpHandler();
+        }, 1000);
+      })
+      .catch((err) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "Opps! soemthing went wrong. Try Again",
+        });
+      })
+      .finally(() => {
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 5000);
+      });
+  };
+
+  useEffect(() => {
+    getUserCountry();
+  }, []);
+
+  return (
+    <div className="add-job p-5 w-full bg-white rounded-md flex flex-col justify-between">
+      <Formik
+        initialValues={initialValues}
+        validationSchema={validationSchema}
+        onSubmit={handleAddJob}
+      >
+        {(props) => {
+          return (
+            <Form>
+              <div className="flex flex-col-reverse sm:flex-row">
+                <div className="fields w-full">
+                  {/* inputs starts here */}
+                  {/* country */}
+                  <div className="xl:flex xl:space-x-7 mb-[5px]">
+                    <div className="field w-full mb-6 xl:mb-0">
+                      <label
+                        htmlFor="country"
+                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
+                      >
+                        Country
+                      </label>
+                      <select
+                        id="country"
+                        name="country"
+                        disabled
+                        value={props.values.country}
+                        className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+                        onChange={props.handleChange}
+                        onBlur={props.handleBlur}
+                      >
+                        {country.loading ? (
+                          <option className="text-slate-500 text-lg" value="">
+                            Loading...
+                          </option>
+                        ) : country.data.length ? (
+                          <>
+                            <option className="text-slate-500 text-lg" value="">
+                              Select...
+                            </option>
+                            {country.data.map((item, index) => {
+                              if (item[0] == userDetails.country) {
+                                return (
+                                  <option
+                                    key={index}
+                                    className="text-slate-500 text-lg"
+                                    value={item[0]}
+                                  >
+                                    {item[1]}
+                                  </option>
+                                );
+                              }
+                            })}
+                          </>
+                        ) : (
+                          <option className="text-slate-500 text-lg" value="">
+                            No Options Found! Try Again
+                          </option>
+                        )}
+                      </select>
+                      <div className={`${!props.errors && "invisible"} h-5`}>
+                        {props.errors.country && props.touched.country && (
+                          <p className="text-sm text-red-500">
+                            {props.errors.country}
+                          </p>
+                        )}
+                      </div>
+                    </div>
+
+                    {/* Price */}
+                    <div className="field w-full">
+                      <InputCom
+                        fieldClass="px-6 text-right"
+                        label="Price"
+                        labelClass="tracking-wide"
+                        inputBg="bg-slate-100"
+                        type="number"
+                        name="price"
+                        placeholder="0"
+                        value={props.values.price}
+                        inputHandler={props.handleChange}
+                        blurHandler={props.handleBlur}
+                      />
+                      <div className={`${!props.errors && "invisible"} h-5`}>
+                        {props.errors.price && props.touched.price && (
+                          <p className="text-sm text-red-500">
+                            {props.errors.price}
+                          </p>
+                        )}
+                      </div>
+                    </div>
+                  </div>
+
+                  {/* Title  */}
+
+                  <div className="field w-full mb-[5px]">
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Title"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      type="text"
+                      name="title"
+                      value={props.values.title}
+                      inputHandler={props.handleChange}
+                      blurHandler={props.handleBlur}
+                    />
+                    <div className={`${!props.errors && "invisible"} h-5`}>
+                      {props.errors.title && props.touched.title && (
+                        <p className="text-sm text-red-500">
+                          {props.errors.title}
+                        </p>
+                      )}
+                    </div>
+                  </div>
+
+                  {/* Description  */}
+                  <div className="field w-full mb-[5px]">
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Description"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      type="text"
+                      name="description"
+                      value={props.values.description}
+                      inputHandler={props.handleChange}
+                      blurHandler={props.handleBlur}
+                    />
+                    <div className={`${!props.errors && "invisible"} h-5`}>
+                      {props.errors.description &&
+                        props.touched.description && (
+                          <p className="text-sm text-red-500">
+                            {props.errors.description}
+                          </p>
+                        )}
+                    </div>
+                  </div>
+
+                  {/* Details */}
+                  <div className="field w-full mb-[5px]">
+                    <label
+                      htmlFor="Job Delivery Details"
+                      className='className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"'
+                    >
+                      Job Delivery Details
+                    </label>
+                    <textarea
+                      id="Job Delivery Details"
+                      rows="7"
+                      className={`input-field p-6 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-full bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+                      style={{ resize: "none" }}
+                      name="job_detail"
+                      value={props.values.job_detail}
+                      onChange={props.handleChange}
+                      onBlur={props.handleBlur}
+                    />
+                    <div className={`${!props.errors && "invisible"} h-5`}>
+                      {props.errors.job_detail && props.touched.job_detail && (
+                        <p className="text-sm text-red-500">
+                          {props.errors.job_detail}
+                        </p>
+                      )}
+                    </div>
+                  </div>
+
+                  <div className="field w-full mb-[5px]">
+                    <div className={`flex items-center justify-between mb-2.5`}>
+                      <label
+                        className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
+                        htmlFor="timeline_days"
+                      >
+                        Timeline
+                        <span className="text-green-700 text-sm tracking-wide">
+                          - Expected duration of this task
+                        </span>
+                      </label>
+                    </div>
+
+                    <Field
+                      component="select"
+                      name="timeline_days"
+                      className="input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none"
+                      value={props.values.timeline_days}
+                    >
+                      <option value="">Select Duration</option>
+                      {publicArray.map(({ name, duration }, idx) => (
+                        <option
+                          className="text-slate-500 text-lg"
+                          value={duration}
+                        >
+                          {name}
+                        </option>
+                      ))}
+                    </Field>
+                    <div className={`${!props.errors && "invisible"} h-5`}>
+                      {props.errors.timeline_days &&
+                        props.touched.timeline_days && (
+                          <p className="text-sm text-red-500">
+                            {props.errors.timeline_days}
+                          </p>
+                        )}
+                    </div>
+                  </div>
+                  {/* inputs ends here */}
+                </div>
+              </div>
+
+              {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+              <div className="content-footer w-full">
+                {/* error or success display */}
+                {requestStatus.message != "" &&
+                  (!requestStatus.status ? (
+                    <div
+                      className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                    >
+                      {requestStatus.message}
+                    </div>
+                  ) : (
+                    requestStatus.status && (
+                      <div
+                        className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                      >
+                        {requestStatus.message}
+                      </div>
+                    )
+                  ))}
+                {/* End of error or success display */}
+
+                <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                  <div className="flex items-center space-x-4 mr-9">
+                    <Link
+                      to="/myjobs"
+                      className="text-18 text-light-red tracking-wide "
+                    >
+                      <span className="border-b dark:border-[#5356fb29]  border-light-red">
+                        {" "}
+                        Cancel
+                      </span>
+                    </Link>
+
+                    {requestStatus.loading ? (
+                      <LoadingSpinner size="8" color="sky-blue" />
+                    ) : (
+                      <button
+                        type="submit"
+                        className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                        // className='w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'
+                      >
+                        Add Job
+                      </button>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </Form>
+          );
+        }}
+      </Formik>
+    </div>
+  );
+}
+
+export default AddJob;
+
+const publicArray = [
+  { duration: 1, name: "1 day" },
+  { duration: 2, name: "2 days" },
+  { duration: 3, name: "3 days" },
+  { duration: 4, name: "4 days" },
+  { duration: 5, name: "5 days" },
+  { duration: 6, name: "6 days" },
+  { duration: 7, name: "1 week" },
+  { duration: 14, name: "2 weeks" },
+  { duration: 21, name: "3 weeks" },
+  { duration: 28, name: "4 weeks" },
+];
@@ -4,7 +4,7 @@ import { Link } from "react-router-dom";
 export default function LoginLayout({ slogan, children }) {
  return (
    <div className={`layout-wrapper login`}>
-      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto sm:p-20 p-10`}>
+      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto p-2 sm:p-20`}>
        <div className="w-full h-full">
          <div className="flex-1 flex justify-center items-center">
            {children && children}
@@ -42,7 +42,7 @@ export default function CollectionTab({ className, products }) {
            <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
              <DataIteration
                datas={products}
-                startLength={0}
+                startLength={process.env.REACT_APP_ZERO_STATE}
                endLength={products.length}
              >
                {({ datas }) => (
@@ -42,7 +42,7 @@ export default function OnSaleTab({ className, products }) {
            <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
              <DataIteration
                datas={products}
-                startLength={0}
+                startLength={process.env.REACT_APP_ZERO_STATE}
                endLength={products.length}
              >
                {({ datas }) => (
@@ -42,7 +42,7 @@ export default function OwnTab({ className, products }) {
            <div className="grid xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 2xl:gap-8 xl:gap-5 gap-5 mb-10">
              <DataIteration
                datas={products}
-                startLength={0}
+                startLength={process.env.REACT_APP_ZERO_STATE}
                endLength={products.length}
              >
                {({ datas }) => (
@@ -0,0 +1,23 @@
+import React, {useState, useEffect} from 'react'
+import { useLocation, useNavigate } from 'react-router-dom'
+
+function Redirect() {
+    const location = useLocation();
+    const navigate = useNavigate();
+
+    const queryParams = new URLSearchParams(location?.search);
+    const codeResponse = queryParams.get("code");
+
+    useEffect(()=>{
+        if(!codeResponse){
+            navigate('/login', {replace: true})
+            return
+        }
+        console.log(codeResponse)
+    },[])
+  return (
+    <div>Redirecting ... </div>
+  )
+}
+
+export default Redirect
@@ -1,5 +1,6 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
+import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
 import googleLogo from "../../../assets/images/google-logo.svg";
@@ -7,6 +8,8 @@ import WrenchBoard from "../../../assets/images/wrenchboard.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
+// import { GoogleOAuthProvider } from '@react-oauth/google';
+import { googleLogout, useGoogleLogin } from "@react-oauth/google";

 import { useDispatch } from "react-redux";
 import { updateUserDetails } from "../../../store/UserDetails";
@@ -14,6 +17,8 @@ import { updateUserDetails } from "../../../store/UserDetails";
 export default function Login() {
  const dispatch = useDispatch();

+  let [loginType, setLoginType] = useState({ full: true, family: false });
+
  const [checked, setValue] = useState(false);
  const [loginLoading, setLoginLoading] = useState(false);

@@ -26,6 +31,15 @@ export default function Login() {
    setValue(!checked);
  };

+  //FUNCTION TO DETERMINE/CHANGE LOGIN COMPONENT
+  const handleLoginType = ({ target: { name } }) => {
+    if (name == "full") {
+      setLoginType({ [name]: true, family: false });
+    } else if ((name = "family")) {
+      setLoginType({ [name]: false, family: true });
+    }
+  };
+
  // email
  const [email, setMail] = useState("");
  const handleEmail = (e) => {
@@ -39,51 +53,94 @@ export default function Login() {
  const navigate = useNavigate();
  const userApi = new usersService();

-  const doLogin = async () => {
-    try {
-      if (email !== "" && password !== "") {
-        var postData = {
-          username: email,
-          password: password,
-          sessionid: "STARTING",
-        };
-        const loginResult = await userApi.logInUser(postData); // just for a test
-        //debugger;
-        // if (email === "support@mermsemr.com") {
-        if (
-          loginResult.data.status > 0 &&
-          loginResult.data.internal_return == 100 &&
-          loginResult.data.session != ""
-        ) {
-          // just for a start
-          localStorage.setItem("member_id", `${loginResult.data.member_id}`);
-          localStorage.setItem("uid", `${loginResult.data.uid}`);
-          localStorage.setItem("session_token", `${loginResult.data.session}`);
-          localStorage.setItem("session", `${loginResult.data.session}`);
-          setLoginLoading(true);
-          // userApi.getUserReminders(); //testing
-          dispatch(updateUserDetails(loginResult.data));
-          setTimeout(() => {
-            navigate("/", { replace: true });
-            setLoginLoading(false);
-          }, 2000);
-        } else {
-          // toast.error("Invalid Credential");
-          setLoginError(true);
-        }
-      } else {
-        setMsgError("Please fill in the fields");
-      }
-    } catch (error) {
-      setMsgError("An error occurred");
-    } finally {
+  // FUNCTION TO HANDLE USER LOGIN
+  const doLogin = ({ target: { name } }) => {
+    setMsgError("");
+    setLoginError(false);
+    setLoginLoading(true);
+    let postData; // Post Data for API
+    if (!email || !password) {
+      setLoginLoading(false);
+      setMsgError("Please fill all the fields");
      setTimeout(() => {
-        setLoginError(false);
-        setMsgError(null);
+        setMsgError("");
      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
+      return;
    }
+
+    if (name == "loginfull") {
+      // Post Data Info for normal Login
+      postData = {
+        username: email,
+        password: password,
+        sessionid: "STARTING",
+        login_mode: 1100,
+        action: 11025,
+      };
+    } else if (name == "loginfamily") {
+      // Post Data Info for family Login
+      postData = {
+        username: email,
+        pin: password,
+        sessionid: "20067A92714",
+        login_mode: 1105,
+        action: 11025,
+      };
+    } else {
+      setLoginLoading(false);
+      setMsgError("Invalid Login Type. Consider refreshing the page");
+      setTimeout(() => {
+        setMsgError("");
+      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
+      return;
+    }
+    userApi
+      .logInUser(postData)
+      .then((res) => {
+        if (res.status != 200 || res.data.internal_return < 0) {
+          // setMsgError("Wrong, email/password");
+          setLoginError(true);
+          setLoginLoading(false);
+          return;
+        }
+        localStorage.setItem("member_id", `${res.data.member_id}`);
+        localStorage.setItem("uid", `${res.data.uid}`);
+        localStorage.setItem("session_token", `${res.data.session}`);
+        // localStorage.setItem("session", `${res.data.session}`);
+        dispatch(updateUserDetails(res.data));
+        setTimeout(() => {
+          navigate("/", { replace: true });
+          setLoginLoading(false);
+        }, 2000);
+      })
+      .catch((error) => {
+        setMsgError("Unable to login, try again");
+        setLoginLoading(false);
+      })
+      .finally(() => {
+        setTimeout(() => {
+          setLoginError(false);
+          setMsgError("");
+          setLoginLoading(false);
+        }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
+      });
  };

+  const googleLogin = useGoogleLogin({
+    flow: 'auth-code',
+    ux_mode:'redirect',
+    redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+    onSuccess: async (codeResponse) => {
+      console.log("GOOGLE LOGIN GOOD --- ",codeResponse);
+    },
+    onError: (errorResponse) => console.log(errorResponse),
+  });
+
+  useEffect(() => {
+    setMail("");
+    setPassword("");
+  }, [loginType.full, loginType.family]);
+
  return (
    <>
      <AuthLayout slogan="Welcome to WrenchBoard">
@@ -100,9 +157,9 @@ export default function Login() {
          <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] 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="w-full">
              <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                {/* <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                  Sign In to WrenchBoard
-                </h1>
+                </h1> */}
                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
                  New Here?{" "}
                  <Link
@@ -113,80 +170,195 @@ export default function Login() {
                  </Link>
                </span>
              </div>
-              <div className="input-area">
-                <div className="input-item mb-5">
-                  <InputCom
-                    fieldClass="px-6"
-                    value={email}
-                    inputHandler={handleEmail}
-                    placeholder="support@mermsemr.com"
-                    label="Email"
-                    name="email"
-                    type="email"
-                    iconName="message"
-                  />
-                </div>

-                <div className="input-item mb-5">
-                  <InputCom
-                    fieldClass="px-6"
-                    value={password}
-                    inputHandler={handlePassword}
-                    placeholder="● ● ● ● ● ●"
-                    label="Password"
-                    name="password"
-                    type="password"
-                    iconName="password"
-                    forgotPassword
-                  />
-                </div>
-                {loginError && (
-                  <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">
-                    Invalid username or password- Please{" "}
-                    <Link to="/#" className="text-[#009ef7]">
-                      reset your password
-                    </Link>{" "}
-                    or{" "}
-                    <Link to="/signup" className="text-[#009ef7]">
-                      create a new account
-                    </Link>
+              {/* switch login component */}
+              <div className="flex justify-start items-end">
+                <button
+                  name="full"
+                  className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-r-0 border-[#4687ba] ${
+                    loginType.full && "border-r-2 h-[45px]"
+                  }`}
+                  onClick={handleLoginType}
+                >
+                  Sign in
+                </button>
+                <button
+                  name="family"
+                  className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-l-0 border-[#4687ba] ${
+                    loginType.family && "border-l-2 h-[45px]"
+                  }`}
+                  onClick={handleLoginType}
+                >
+                  Family
+                </button>
+              </div>
+
+              {/* END  of switch login component */}
+
+              {/* for login component */}
+              {
+                loginType.full ? (
+                  //user login component
+                  <div className="p-2 input-area border-2 border-[#4687ba]">
+                    <div className="input-item mb-5">
+                      <InputCom
+                        labelClass="tracking-wider"
+                        fieldClass="sm:px-6 px-2"
+                        value={email}
+                        inputHandler={handleEmail}
+                        placeholder="support@mermsemr.com"
+                        label="Email"
+                        name="email"
+                        type="email"
+                        iconName="message"
+                      />
+                    </div>
+
+                    <div className="input-item mb-5">
+                      <InputCom
+                        labelClass="tracking-wider"
+                        fieldClass="sm:px-6 px-2"
+                        value={password}
+                        inputHandler={handlePassword}
+                        placeholder="● ● ● ● ● ●"
+                        label="Password"
+                        name="password"
+                        type="password"
+                        iconName="password"
+                        forgotPassword
+                      />
+                    </div>
+                    {loginError && (
+                      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">
+                        Invalid username or password- Please{" "}
+                        <Link to="/#" className="text-[#009ef7]">
+                          reset your password
+                        </Link>{" "}
+                        or{" "}
+                        <Link to="/signup" className="text-[#009ef7]">
+                          create a new account
+                        </Link>
+                      </div>
+                    )}
+                    {msgError && (
+                      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+                        {msgError}
+                      </div>
+                    )}
+                    <div className="signin-area mb-3.5">
+                      <div className="flex justify-center">
+                        <button
+                          name="loginfull"
+                          onClick={doLogin}
+                          type="button"
+                          disabled={loginLoading}
+                          className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
+                        >
+                          {loginLoading ? (
+                            <div className="signup btn-loader"></div>
+                          ) : (
+                            <>Continue</>
+                          )}
+                        </button>
+                      </div>
+                      <div className="sm:flex sm:justify-between sm:items-center sm:space-x-2">
+                        <BrandBtn
+                          link="#"
+                          imgSrc={googleLogo}
+                          brand="Google"
+                          onClick={googleLogin}
+                        />
+                        <BrandBtn link="#" imgSrc={appleLogo} brand="Apple" />
+                      </div>
+                      <div className="sm:flex sm:justify-between sm:items-center sm:space-x-2">
+                        <BrandBtn
+                          link="#"
+                          imgSrc={facebookLogo}
+                          brand="Facebook"
+                        />
+                        <BrandBtn
+                          link="#"
+                          imgSrc={linkedInLogo}
+                          brand="LinkedIn"
+                        />
+                      </div>
+                    </div>
                  </div>
-                )}
-                {msgError && (
-                  <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
-                    {msgError}
+                ) : (
+                  // END of user login compoenent
+                  // family login compoenent
+                  <div className="p-2 input-area border-2 border-[#4687ba]">
+                    <div className="input-item mb-5">
+                      <InputCom
+                        labelClass="tracking-wider"
+                        fieldClass="px-6"
+                        value={email}
+                        inputHandler={handleEmail}
+                        placeholder="support@mermsemr.com"
+                        label="Username"
+                        name="email"
+                        type="email"
+                        iconName="message"
+                      />
+                    </div>
+
+                    <div className="input-item mb-5">
+                      <InputCom
+                        labelClass="tracking-wider"
+                        fieldClass="px-6"
+                        value={password}
+                        inputHandler={handlePassword}
+                        placeholder="● ● ● ● ● ●"
+                        label="Pin"
+                        name="password"
+                        type="password"
+                        iconName="password"
+                        // forgotPassword
+                      />
+                    </div>
+                    {loginError && (
+                      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">
+                        Invalid username or password{" "}
+                        {/* <Link to="/#" className="text-[#009ef7]">
+                        reset your password
+                      </Link>{" "}
+                      or{" "}
+                      <Link to="/signup" className="text-[#009ef7]">
+                        create a new account
+                      </Link> */}
+                      </div>
+                    )}
+                    {msgError && (
+                      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+                        {msgError}
+                      </div>
+                    )}
+                    <div className="signin-area mb-1.5">
+                      <div className="flex justify-center">
+                        <button
+                          name="loginfamily"
+                          onClick={doLogin}
+                          disabled={loginLoading}
+                          type="button"
+                          className={`btn-login  rounded-[0.475rem] text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
+                        >
+                          {loginLoading ? (
+                            <div className="signup btn-loader"></div>
+                          ) : (
+                            <>Continue</>
+                          )}
+                        </button>
+                      </div>
+                    </div>
                  </div>
-                )}
-                <div className="signin-area mb-3.5">
-                  <div className="flex justify-center">
-                    <button
-                      onClick={doLogin}
-                      type="button"
-                      className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
-                    >
-                      {loginLoading ? (
-                        <div className="signup btn-loader"></div>
-                      ) : (
-                        <span>Continue</span>
-                      )}
-                    </button>
-                  </div>
-                  <BrandBtn link="#" imgSrc={googleLogo} brand="Google" />
-                  <BrandBtn link="#" imgSrc={facebookLogo} brand="Facebook" />
-                  <BrandBtn link="#" imgSrc={appleLogo} brand="Apple" />
-                </div>
-                {/* <div className="signup-area flex justify-center">
-                <p className="sm:text-lg text-sm text-thin-light-gray font-normal">
-                  Don't have an account ?
-                  <a href="/signup" className="ml-2   text-dark-gray dark:text-white">
-                    Sign up free
-                  </a>
-                </p>
-              </div> */}
-                <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
-                  This site is protected by hCaptcha and the our Privacy Policy
-                  and Terms of Service apply.
-                </div>
+                )
+                // END of family login compoenent
+              }
+              {/* END of login component */}
+
+              <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
+                This site is protected by hCaptcha and the our Privacy Policy
+                and Terms of Service apply.
              </div>
            </div>
          </div>
@@ -196,18 +368,38 @@ export default function Login() {
  );
 }

-const BrandBtn = ({ link, imgSrc, brand }) => {
+const BrandBtn = ({ link, imgSrc, brand, onClick }) => {
+  // const doGoogle = async () => {
+  //   alert("start google");
+  // };
+
+  //  onSuccess: (codeResponse) => setUser(codeResponse),
+
+  // const doGoogle = useGoogleLogin({
+  //   onSuccess: (codeResponse) =>  console.log('Login onSuccess:', codeResponse),
+  //   onError: (error) => console.log('Login Failed:', error)
+  // });
+
+  // const doApple = async () => {
+  //   alert("start apple");
+  // };
+
+  // const doFacebook = async () => {
+  //   alert("start facebook");
+  // };
+
  return (
-    <div className="flex justify-center bottomMargin">
-      <a
-        href={link}
+    <div className="w-full sm:w-1/2 flex justify-center bottomMargin">
+      <button
+        onClick={onClick}
+        // href="#dd"
        className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 dark:bg-[#11131F]  items-center font-medium cursor-pointer"
      >
        <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
        <span className="text-lg text-thin-light-gray font-normal text-[15px]">
          Continue with {brand}
        </span>
-      </a>
+      </button>
    </div>
  );
 };
@@ -42,7 +42,7 @@ export default function CollectionTab({ className, products }) {
            <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
              <DataIteration
                datas={products}
-                startLength={0}
+                startLength={process.env.REACT_APP_ZERO_STATE}
                endLength={products.length}
              >
                {({ datas }) => (
@@ -42,7 +42,7 @@ export default function OnSaleTab({ className, products }) {
            <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
              <DataIteration
                datas={products}
-                startLength={0}
+                startLength={process.env.REACT_APP_ZERO_STATE}
                endLength={products.length}
              >
                {({ datas }) => (
@@ -42,7 +42,7 @@ export default function OwnTab({ className, products }) {
            <div className="grid xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 2xl:gap-8 xl:gap-5 gap-5 mb-10">
              <DataIteration
                datas={products}
-                startLength={0}
+                startLength={process.env.REACT_APP_ZERO_STATE}
                endLength={products.length}
              >
                {({ datas }) => (
@@ -0,0 +1,40 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+
+export default function BlogItem(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <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="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Title of this Blog Items
+                </span>
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+
+                        </div>
+                    </div>
+                   <div>
+                       Blog Items Details
+                   </div>
+                </div>
+            </div>
+        </Layout>
+    );
+}
@@ -1,127 +1,160 @@
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
-import { toast } from "react-toastify";
-import localImgLoad from "../../lib/localImgLoad";
-import Icons from "../Helpers/Icons";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
+import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";
+import usersService from "../../services/UsersService";
+import { PriceFormatter } from "../Helpers/PriceFormatter";

 export default function AvailableJobsCard({
-                                           className,
-                                           datas,
-                                           hidden = false,
-                                       }) {
-    //debugger;
-    const [addFavorite, setValue] = useState(datas.whishlisted);
-    const [options, setOption] = useState(false);
-    const favoriteHandler = () => {
-        if (!addFavorite) {
-            setValue(true);
-            toast.success("Added to Favorite List");
-        } else {
-            setValue(false);
-            toast.warn("Remove to Favorite List");
-        }
-    };
-    return (
-        <div
-            className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
-                className || ""
-            }`}
-        >
-            <div className="flex flex-col justify-between w-full h-full">
-                <Link to="/shop-details" className="mb-2.5">
-                    <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-                        {datas.title}
-                    </h1>
-                </Link>
+  className,
+  datas,
+  hidden = false,
+}) {
+  //debugger;
+  const [marketPopUp, setMarketPopUp] = useState({ show: false, data: {} });
+  const [manageInt, setManageInt] = useState(null);
+  const [imageUrl, setImageUrl] = useState("");

-                <div className="card-two-info flex justify-between items-center">
-                    <div className="owned-by flex space-x-2 items-center">
-                        <div>
-                            <p className="text-thin-light-gray text-sm leading-3">Added</p>
-                            <p className="text-base   text-dark-gray dark:text-white">
-                                {datas.offer_added}
-                            </p>
-                        </div>
-                    </div>
-                    <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
-                    <div className="created-by flex space-x-2 items-center flex-row-reverse">
-                        <div>
-                            <p className="text-thin-light-gray text-sm leading-3 text-right">
-                                Expires
-                            </p>
-                            <p className="text-base text-dark-gray dark:text-white text-right">
-                                {datas.expire}
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                <div className="thumbnail-area w-full">
-                    <div
-                        className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
-                        style={{
-                            background: `url(${localImgLoad(
-                                `images/${datas.thumbnil}`
-                            )}) 0% 0% / cover no-repeat`,
-                        }}
-                    >
-                        <div className="flex justify-center">
-                            {datas.description}
-                        </div>
+  const navigate = useNavigate();
+  const apiCall = useMemo(() => new usersService(), []);

+  const marketInterestData = useCallback(async () => {
+    let { offer_code } = datas;
+    let reqData = { offer_code };

+    try {
+      const manageInt = await apiCall.MarketInterest(reqData);
+      const manageIntRes = await manageInt?.data;
+      setManageInt(manageIntRes);
+    } catch (error) {
+      throw new Error(error);
+    }
+  }, [apiCall, datas]);

+  let thePrice = PriceFormatter(  
+    datas?.price * 0.01,
+    datas?.currency_code,
+    datas?.currency
+  );

+  useEffect(() => {
+    if (!datas) {
+      navigate("/market", { replace: true });
+    }
+    marketInterestData();
+  }, []);

-                    </div>
+  useEffect(() => {
+    const imagePath = require(`../../assets/images/${datas.thumbnil}`); // Replace with your directory path for local images
+    setImageUrl(imagePath);
+  }, []);
+  return (
+    <>
+      <div
+        className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+          className || ""
+        }`}
+      >
+        <div className="flex flex-col justify-between w-full h-full">
+          <Link to="/shop-details" className="mb-2.5">
+            <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              {datas.title}
+            </h1>
+          </Link>

-                </div>
-                <div className="details-area">
-                    <div className="product-two-options flex justify-between mb-5 relative">
-
-                        {/*      <div className="status">*/}
-                        {/*          {datas.isActive && (*/}
-                        {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
-                        {/*  Active*/}
-                        {/*</span>*/}
-                        {/*          )}*/}
-                        {/*      </div>*/}
-
-
-                        {/*<div className=" review flex space-x-2">*/}
-                        {/*    <button*/}
-                        {/*        onClick={favoriteHandler}*/}
-                        {/*        type="button"*/}
-                        {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
-                        {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
-                        {/*        }`}*/}
-                        {/*    >*/}
-                        {/*        <Icons name="star" />*/}
-                        {/*    </button>*/}
-                        {/*</div>*/}
-                    </div>
-
-                    <div className="flex justify-between">
-                        <div className="flex items-center space-x-2">
-                            <div>
-                                <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
-                                    {datas.price*0.01}{datas.currency} | {datas.timeline_days} day(s)
-                                </p>
-                                <p className="text-sm text-lighter-gray">
-                                    ( {datas.offer_code})
-                                </p>
-                            </div>
-                        </div>
-                        <div>
-                            <button
-                                type="button"
-                                className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
-                            >
-                                View
-                            </button>
-                        </div>
-                    </div>
-                </div>
+          <div className="card-two-info flex justify-between items-center">
+            <div className="owned-by flex space-x-2 items-center">
+              <div>
+                <p className="text-thin-light-gray text-sm leading-3">Added</p>
+                <p className="text-base   text-dark-gray dark:text-white">
+                  {datas.offer_added}
+                </p>
+              </div>
            </div>
+            <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+            <div className="created-by flex space-x-2 items-center flex-row-reverse">
+              <div>
+                <p className="text-thin-light-gray text-sm leading-3 text-right">
+                  Expires
+                </p>
+                <p className="text-base text-dark-gray dark:text-white text-right">
+                  {datas.expire}
+                </p>
+              </div>
+            </div>
+          </div>
+          <div className="thumbnail-area w-full">
+            <div
+              className="w-full h-[236px] p-6  rounded-xl overflow-hidden bg-center bg-cover bg-no-repeat"
+              style={{
+                backgroundImage: `url('${imageUrl}')`,
+              }}
+            >
+              <div className="flex justify-center">{datas.description}</div>
+            </div>
+          </div>
+          <div className="details-area">
+            <div className="product-two-options flex justify-between mb-5 relative">
+              {/*      <div className="status">*/}
+              {/*          {datas.isActive && (*/}
+              {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
+              {/*  Active*/}
+              {/*</span>*/}
+              {/*          )}*/}
+              {/*      </div>*/}
+
+              {/*<div className=" review flex space-x-2">*/}
+              {/*    <button*/}
+              {/*        onClick={favoriteHandler}*/}
+              {/*        type="button"*/}
+              {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
+              {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
+              {/*        }`}*/}
+              {/*    >*/}
+              {/*        <Icons name="star" />*/}
+              {/*    </button>*/}
+              {/*</div>*/}
+            </div>
+
+            <div className="flex justify-between">
+              <div className="flex items-center space-x-2">
+                <div>
+                  <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
+                    {/* {thePrice} | {datas.timeline_days} day(s) */}
+                    {thePrice}
+                  </p>
+                  <p className="text-sm text-lighter-gray">
+                    ( {datas.offer_code}) |
+                    <span className="italic ml-1">
+                      {datas.timeline_days} day(s) ago
+                    </span>
+                  </p>
+                </div>
+              </div>
+              <div>
+                <button
+                  type="button"
+                  className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                  onClick={() => {
+                    setMarketPopUp({ show: true, data: datas });
+                  }}
+                >
+                  View
+                </button>
+              </div>
+            </div>
+          </div>
        </div>
-    );
+      </div>
+      {marketPopUp.show && (
+        <MarketPopUp
+          details={datas}
+          onClose={() => {
+            setMarketPopUp({ show: false, data: {} });
+          }}
+          situation={marketPopUp.show}
+          marketInt={manageInt}
+        />
+      )}
+    </>
+  );
 }
@@ -1,26 +1,44 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
-import localImgLoad from "../../lib/localImgLoad";

 export default function HomeBannerOffersCard(props) {
-    return (
-        <Link
-            to="/my-collection/collection-item"
-            className="item w-full block group banner-630-340"
-        >
-            <div className="flex flex-col justify-between h-full">
-                <div className="content flex justify-between items-center mb-5">
-                    <div>
-                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-                            <>Ab hshsh jsjsj hshdhhdjjd</>
-                        </h1>
-                    </div>
-                    {/*<SelectBox datas={filterDatas} action={dataSetHandler} />*/}
-                </div>
-                <div className="h-[233px]">
-                    BEST IMAGE IN THE WORLLD
-                </div>
-            </div>
-        </Link>
-    );
+  const [imageUrl, setImageUrl] = useState("");
+  const link_result = "/" + props.itemData.link_path;
+
+  useEffect(() => {
+    let { banner, banner_location } = props?.itemData;
+    if (banner_location === "LOCAL") {
+      const imagePath = require(`../../assets/images/${banner}`); // Replace with your directory path for local images
+      setImageUrl(imagePath);
+    } else if (banner_location === "URL") setImageUrl(banner);
+    else return null;
+  }, []);
+
+  return (
+    <Link
+      to={link_result}
+      className="item w-full block group banner-630-340 bg-cover bg-center"
+      style={{
+        backgroundImage: `url('${imageUrl}')`,
+      }}
+    >
+      <div className="flex flex-col justify-between h-full">
+        <div className="content flex justify-between items-center mb-5">
+          <div className="siderCardHeader">
+            <h1 className="text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
+              <span className="heroSilderTitle">{props.itemData.title}</span>
+            </h1>
+          </div>
+        </div>
+        <div className="h-[233px]">
+          <div className="siderCardDescription">
+            {props.itemData.description}
+          </div>
+          <div className="siderCardButton">
+            [ {props.itemData.button_text} ]
+          </div>
+        </div>
+      </div>
+    </Link>
+  );
 }
@@ -0,0 +1,59 @@
+import React, { useState, useEffect } from "react";
+import Layout from "../Partials/Layout";
+import FamilyManageTabs from "./Tabs/FamilyManageTabs";
+import { useLocation, useNavigate } from "react-router-dom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+
+export default function FamilyManage() {
+  const [selectTab, setValue] = useState("today");
+  let [pageLoading, setPageLoading] = useState(true);
+
+  let location = useLocation();
+  let navigate = useNavigate();
+  let accountDetails = location?.state;
+  //   tab handler
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+
+  useEffect(() => {
+    if (!accountDetails) {
+      navigate("/acc-family", { replace: true });
+    } else {
+      setPageLoading(false);
+    }
+  }, []);
+
+  return (
+    <Layout>
+      {/*<CommonHead />*/}
+      {pageLoading ? (
+        <LoadingSpinner size={8} color="sky-blue" />
+      ) : (
+        <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="mb-5 sm:mb-0">
+                <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
+                  <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                  >
+                    Manage Family
+                  </span>
+                </h1>
+              </div>
+              <div className="slider-btns flex space-x-4">
+                <div
+                  onClick={() => filterHandler("today")}
+                  className="relative"
+                ></div>
+              </div>
+            </div>
+            <FamilyManageTabs accountDetails={accountDetails} />
+          </div>
+        </div>
+      )}
+    </Layout>
+  );
+}
@@ -1,93 +1,161 @@
 import React, { useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { useNavigate, useLocation, Link } from "react-router-dom";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";

-export default function FamilyTable({ className, familyList, loader }) {
+import familyImage from '../../assets/images/no-family-side.png'
+
+export default function FamilyTable({ className, familyList, loader, popUpHandler }) {
  const filterCategories = ["All Categories", "Explore", "Featured"];
-  console.log(familyList)
  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+  const navigate = useNavigate();
+  // let location = useLocation();
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentFamilyList = familyList?.slice(indexOfFirstItem, indexOfLastItem);
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
  return (
    <div
-      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
+      className={`update-table w-full h-full p-8 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] ${
        className || ""
      }`}
    >
-      <div className="relative w-full overflow-x-auto sm:rounded-lg">
-        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
-            <thead className="sticky top-0">
-            <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
-              <th className="py-4">Name</th>
-              <th className="py-4 text-center">Last Login</th>
-              <th className="py-4 text-center">No of Tasks</th>
-              <th className="py-4 text-right">Status</th>
-            </tr>
-            </thead>
-          <tbody className="overflow-y-scroll h-auto">
-            {loader ? (
-              <div className="signup btn-loader"></div>
-            ) : (
-              <>
-                {familyList?.length > 0 ? (
-                  familyList?.map(({ firstname, lastname, age }, idx) => (
-                    <tr
-                      className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29]  hover:bg-gray-50"
-                      key={idx}
-                    >
-                      <td className=" py-4">
-                        <div className="flex space-x-2 items-center">
-                          <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                            <img
-                              src={dataImage1}
-                              alt="data"
-                              className="w-full h-full"
-                            />
-                          </div>
-                          <div className="flex flex-col">
-                            <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                              {`${firstname} ${lastname} (${age})`}
-                            </h1>
-                            <span className="text-sm text-thin-light-gray">
-                              Added{" "}
-                              <span className="text-purple">10-10-2029</span>
-                            </span>
-                          </div>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            10-10-2019
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-center py-4 px-2">
-                        <div className="flex space-x-1 items-center justify-center">
-                          <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                            100
-                          </span>
-                        </div>
-                      </td>
-                      <td className="text-right py-4 px-2">
-                        <button
-                          type="button"
-                          className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+      <div className="relative w-full h-full overflow-x-auto sm:rounded-lg">
+        {loader ? (
+          <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
+            <LoadingSpinner size="16" color="sky-blue" />
+          </div>
+        ) 
+        :
+        familyList?.length > 0 ?
+          (
+            <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
+              <thead className="sticky top-0">
+                <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
+                  <th className="py-4">Name</th>
+                  <th className="py-4 text-center">Last Login</th>
+                  <th className="py-4 text-center">No of Tasks</th>
+                  <th className="py-4 text-right"></th>
+                </tr>
+              </thead>
+              <tbody className="h-full">
+                  {currentFamilyList?.map((props, idx) => {
+                      let {
+                        firstname,
+                        lastname,
+                        age,
+                        added,
+                        last_login,
+                        task_count,
+                        family_uid,
+                      } = props;
+                      let addedDate = added?.split(" ")[0];
+                      let LoginDate = last_login?.split(" ")[0];
+                      return (
+                        <tr
+                          className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                          key={family_uid}
                        >
-                          Manage
-                        </button>
-                      </td>
-                    </tr>
-                  ))
-                ) : (
-                  <tr class="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                    <td class="p-2" colspan="4">
-                      No Family Accounts Found!
-                    </td>
-                  </tr>
-                )}
-              </>
-            )}
-          </tbody>
-        </table>
+                          <td className=" py-4">
+                            <div className="flex space-x-2 items-center w-full">
+                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px]">
+                                <img
+                                  src={dataImage1}
+                                  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 whitespace-nowrap">
+                                  {`${firstname} ${lastname} (${age})`}
+                                </h1>
+                                <span className="text-sm text-thin-light-gray">
+                                  Added:{" "}
+                                  <span className="text-purple ml-1">
+                                    {addedDate}
+                                  </span>
+                                </span>
+                              </div>
+                            </div>
+                          </td>
+                          <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+                              <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                                {LoginDate}
+                              </span>
+                            </div>
+                          </td>
+                          <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+                              <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                                {task_count}
+                              </span>
+                            </div>
+                          </td>
+                          <td className="text-right py-4 px-2 flex items-center justify-center">
+                            <button
+                              onClick={() => {
+                                navigate("/manage-family", {
+                                  state: { ...props },
+                                });
+                              }}
+                              type="button"
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              Manage
+                            </button>
+                          </td>
+                        </tr>
+                      );
+                    })
+                  }
+              </tbody>
+            </table>
+          )
+          : 
+          (
+          <div className="font-bold text-center text-xl md:text-2xl lg:text-4xl text-dark-gray md:flex items-center justify-between">
+            <div className="p-2 w-full md:w-1/2">
+              <p className="mb-4 p-3 md:p-16">Add your family, assign tasks, and get the whole team engaged.</p>
+              <button
+                onClick={popUpHandler}
+                type="button"
+                className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
+              >
+                Add Family
+              </button>
+            </div>
+            <div className="p-2 w-full md:w-1/2">
+              <img className='w-full' src={familyImage} alt="Add Family" />
+            </div>
+          </div>
+          )
+        }
      </div>
+        {/* PAGINATION BUTTON */}
+        <PaginatedList
+        onClick={handlePagination}
+        prev={currentPage == 0 ? true : false}
+        next={
+          currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+          familyList?.length
+            ? true
+            : false
+        }
+        data={familyList}
+        start={indexOfFirstItem}
+        stop={indexOfLastItem}
+      />
+      {/* END OF PAGINATION BUTTON */}
    </div>
  );
 }
@@ -0,0 +1,312 @@
+import React, {
+  Suspense,
+  forwardRef,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import QRCode from "react-qr-code";
+import { useReactToPrint } from "react-to-print";
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import profile from "../../../assets/images/profile-info-profile.png";
+import FamilyTasks from "./FamilyTasks";
+
+export default function FamilyManageTabs({
+  className,
+  accountDetails,
+  listReload,
+  loader,
+}) {
+  const [details, setDetails] = useState({
+    familyDetails: {
+      loading: false,
+      data: null,
+    },
+    familyTasks: {
+      loading: false,
+      data: null,
+    },
+  });
+  const [errMsg, setErrMsg] = useState("");
+  // List of tabs
+  const tabs = [
+    {
+      id: 1,
+      name: "Tasks",
+    },
+    {
+      id: 2,
+      name: "Account",
+    },
+    {
+      id: 3,
+      name: "Profile",
+    },
+  ];
+  const [tab, setTab] = useState(tabs[0].name);
+  const tabHandler = (value) => {
+    setTab(value);
+  };
+  //   For profile uploads
+  const [profileImg, setProfileImg] = useState(profile);
+  // profile img
+  const profileImgInput = useRef(null);
+  const browseProfileImg = () => {
+    profileImgInput.current.click();
+  };
+  const profileImgChangHandler = (e) => {
+    if (e.target.value !== "") {
+      const imgReader = new FileReader();
+      imgReader.onload = (event) => {
+        setProfileImg(event.target.result);
+      };
+      imgReader.readAsDataURL(e.target.files[0]);
+    }
+  };
+
+  //   Api call
+  const apiCall = useMemo(() => new usersService(), []);
+  // function for manage family
+  const manageFamily = useCallback(async () => {
+    try {
+      setDetails({
+        familyDetails: { loading: true },
+        familyTasks: { loading: true },
+      });
+      let { family_uid } = accountDetails;
+      let reqData = { family_uid };
+
+      // the family response
+      const familyRes = await apiCall.ManageFamily(reqData);
+      const familyData = familyRes.data;
+
+      // the tasks response
+      const tasksRes = await apiCall.ManageTasks(reqData);
+      const tasksData = tasksRes.data;
+
+      // checking the internal return
+      if (familyData?.internal_return < 0 || tasksData?.internal_return < 0)
+        return;
+
+      setDetails({
+        familyDetails: { loading: false, data: familyData },
+        familyTasks: { loading: false, data: tasksData },
+      });
+    } catch (error) {
+      setDetails({
+        familyDetails: { loading: false },
+        familyTasks: { loading: false },
+      });
+      setErrMsg("An error occurred");
+      throw new Error(error);
+    }
+  }, [apiCall, accountDetails]);
+
+  useEffect(() => {
+    manageFamily();
+  }, [tab, manageFamily]);
+
+  const accountRef = useRef();
+  // to handle printing
+  const useHandlePrint = useReactToPrint({
+    content: () => accountRef.current,
+  });
+
+  return (
+    <div
+      className={`w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
+        className || ""
+      }`}
+    >
+      <div className="relative w-full overflow-x-auto sm:rounded-lg">
+        <Suspense
+          fallback={
+            <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
+              <LoadingSpinner size="16" color="sky-blue" />
+            </div>
+          }
+        >
+          <div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-4 min-h-[520px]">
+            <div className="border-r border-[#E3E4FE] dark:border-[#a7a9b533] p-6 h-full">
+              <ProfileInfo
+                profileImg={profileImg}
+                profileImgInput={profileImgInput}
+                profileImgChangHandler={profileImgChangHandler}
+                browseProfileImg={browseProfileImg}
+                accountDetails={accountDetails}
+              />
+            </div>
+            <div className="col-span-3 justify-self-end h-full w-full">
+              <div className="flex flex-col w-full">
+                <ul className="flex-[0.1] flex gap-2 items-center border-b border-b-[#FAFAF] w-full">
+                  {tabs.map(({ name, id }) => (
+                    <li
+                      onClick={() => tabHandler(name)}
+                      className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl ${
+                        tab === name
+                          ? "text-purple border-r"
+                          : " text-thin-light-gray"
+                      }`}
+                      key={id}
+                    >
+                      <h1>{name}</h1>
+                    </li>
+                  ))}
+                </ul>
+                <div className="flex-[0.9] lg:min-h-[450px] h-full">
+                  {/* Your content here */}
+                  {tabs.map(({ name, id }) => {
+                    return (
+                      <div
+                        className={`${
+                          tab === name ? "block" : "hidden"
+                        } h-full p-4 border border-[#dbd9d9] relative overflow-y-auto`}
+                        key={id}
+                      >
+                        {name === "Tasks" && (
+                          <FamilyTasks
+                            className={className}
+                            loader={details.familyTasks.loading}
+                            familyData={details.familyTasks.data}
+                          />
+                        )}
+                        {name === "Account" && (
+                          <Account
+                            familyData={details.familyDetails.data}
+                            myRef={accountRef}
+                            loader={details.familyDetails.loading}
+                            handlePrint={useHandlePrint}
+                          />
+                        )}
+                        {name === "Profile" && <Profile />}
+                      </div>
+                    );
+                  })}
+                </div>
+              </div>
+            </div>
+          </div>
+        </Suspense>
+      </div>
+    </div>
+  );
+}
+
+function ProfileInfo({
+  profileImg,
+  profileImgInput,
+  profileImgChangHandler,
+  browseProfileImg,
+  accountDetails,
+}) {
+  return (
+    <div className="flex flex-col items-center gap-6">
+      <div className="flex justify-center">
+        <div className="w-full relative">
+          <img
+            src={profileImg}
+            alt=""
+            className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
+          />
+          <input
+            ref={profileImgInput}
+            onChange={(e) => profileImgChangHandler(e)}
+            type="file"
+            className="hidden"
+          />
+          <div
+            onClick={browseProfileImg}
+            className="w-[32px] h-[32px] absolute bottom-7 sm:right-2 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
+          >
+            <svg
+              width="32"
+              height="32"
+              viewBox="0 0 32 32"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
+                fill="white"
+              />
+              <path
+                d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
+                fill="white"
+              />
+            </svg>
+          </div>
+        </div>
+      </div>
+      <div className="flex flex-col justify-center gap-3 items-center">
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.firstname}
+        </h1>
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.lastname}
+        </h1>
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.age}
+        </h1>
+      </div>
+    </div>
+  );
+}
+
+const Account = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
+  return (
+    <div
+      className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
+      ref={myRef}
+    >
+      <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
+        <div className="flex items-center justify-around h-[380px]">
+          <div className="flex flex-col">
+            <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              Username:{" "}
+              <span className="ml-2 normal-case">
+                {familyData?.username ? familyData?.username : "please wait..."}
+              </span>
+            </h2>
+            <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              Pin:{" "}
+              <span className="ml-2 normal-case">
+                {familyData?.pin ? familyData?.pin : "please wait..."}
+              </span>
+            </h2>
+          </div>
+
+          <span className="text-5xl text-gray-400 opacity-20 font-bold">
+            or
+          </span>
+
+          <div className="max-w-[200px]">
+            <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
+              Scan the code from mobile app
+            </p>
+            <QRCode
+              size={256}
+              style={{ height: "auto", maxWidth: "100%", width: "100%" }}
+              value={`https://www.google.com`}
+              viewBox={`0 0 256 256`}
+            />
+          </div>
+        </div>
+        <div className="h-[50px] w-full flex justify-center items-center">
+          <button
+            className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
+            onClick={handlePrint}
+          >
+            Print
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+});
+
+function Profile() {
+  return <>Profile</>;
+}
@@ -0,0 +1,146 @@
+import React, { useState } from "react";
+import dataImage2 from "../../../assets/images/data-table-user-2.png";
+import { useNavigate, useLocation } from "react-router-dom";
+import { handlePagingFunc } from "../../Pagination/HandlePagination";
+import PaginatedList from "../../Pagination/PaginatedList";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import Icons from "../../Helpers/Icons";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+
+export default function FamilyTasks({ familyData, className, loader }) {
+  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 = familyData?.result_list.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
+
+  return (
+    <div
+      className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[450px] overflow-hidden rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      {loader ? (
+        <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
+          <LoadingSpinner size={16} color="sky-blue" />
+        </div>
+      ) : (
+        <>
+          {" "}
+          {familyData && familyData?.result_list && (
+            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+              <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                <tbody>
+                  {
+                    <>
+                      {familyData &&
+                        familyData?.result_list &&
+                        familyData.result_list.length > 0 &&
+                        currentTask.map((value, index) => {
+                          // find due date
+                          const dueDate = value?.delivery_date.split(" ")[0];
+                          // the price
+                          let thePrice = PriceFormatter(
+                            value?.price * 0.01,
+                            value?.currency_code,
+                            value?.currency
+                          );
+                          return (
+                            <tr
+                              key={index}
+                              className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
+                            >
+                              <td className=" py-4">
+                                <div className="flex space-x-2 items-center w-full">
+                                  <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px] min-w-[60px]">
+                                    <img
+                                      src={dataImage2}
+                                      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">
+                                      {value.title}
+                                    </h1>
+                                    <div className="flex gap-4 items-center">
+                                      <span className="text-sm text-thin-light-gray">
+                                        Price:{" "}
+                                        <span className="text-purple">
+                                          {thePrice}
+                                        </span>
+                                      </span>
+                                      <span className="text-sm text-thin-light-gray">
+                                        Duration:{" "}
+                                        <span className="text-purple">
+                                          {" "}
+                                          {value.timeline_days} day(s)
+                                        </span>
+                                      </span>
+                                      <span className="text-sm text-thin-light-gray">
+                                        Due Date:{" "}
+                                        <span className="text-purple">
+                                          {" "}
+                                          {dueDate}
+                                        </span>
+                                      </span>
+                                    </div>
+                                  </div>
+                                </div>
+                              </td>
+
+                              <td className="text-right py-4 px-2">
+                                <button
+                                  type="button"
+                                  onClick={() => {
+                                    navigate("/manage-active-job", {
+                                      state: {
+                                        ...value,
+                                        pathname,
+                                        dueDate,
+                                        thePrice,
+                                      },
+                                    });
+                                  }}
+                                  className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                >
+                                  <Icons name="right-arrow" />
+                                </button>
+                              </td>
+                            </tr>
+                          );
+                        })}
+                    </>
+                  }
+                </tbody>
+              </table>
+              {/* PAGINATION BUTTON */}
+              <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage == 0 ? true : false}
+                next={
+                  currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+                  familyData?.result_list.length
+                    ? true
+                    : false
+                }
+                data={familyData?.result_list}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+              />
+              {/* END OF PAGINATION BUTTON */}
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+}
@@ -1,15 +1,14 @@
-import React, { useCallback, useEffect, useId, useMemo, useState } from "react";
-import CustomPopUp from "../Helpers/CustomPopUp";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import InputCom from "../Helpers/Inputs/InputCom";
 import Layout from "../Partials/Layout";
 import FamilyTable from "./FamilyTable";
 import SiteService from "../../services/SiteService";
+import ModalCom from "../Helpers/ModalCom";

 export default function FamilyAcc() {
  const [selectTab, setValue] = useState("today");
  const [selectedAge, setSelectedAge] = useState(undefined);
  const [familyList, setFamilyList] = useState([]);
-  const [isOpen, setIsOpen] = useState(false);
  const [loader, setLoader] = useState(false);
  const [popUp, setPopUp] = useState(false);
  const [listReload, setListReload] = useState(false);
@@ -27,7 +26,7 @@ export default function FamilyAcc() {
  let sessionId = localStorage.getItem("session_token");

  const popUpHandler = () => {
-    setPopUp(!popUp);
+    setPopUp((prev) => !prev);
  };

  //   tab handler
@@ -35,7 +34,6 @@ export default function FamilyAcc() {
    setValue(value);
  };

-  let id = useId();
  //   For the age drop down
  let startAge = 5;
  let endAge = 16;
@@ -68,13 +66,14 @@ export default function FamilyAcc() {
          lastname: last_name,
          age: selectedAge,
        };
-        console.log(reqData);
+
        let res = await apiCall.addFamily(reqData);
        const { data } = res;
+
        if (data?.internal_return > 0 && data?.status == "OK") {
          setLoader(false);
          setListReload((prev) => !prev);
-          setIsOpen(false);
+          popUpHandler()
        } else {
          setLoader(false);
          setMsgErr("Sorry, something went wrong");
@@ -95,6 +94,7 @@ export default function FamilyAcc() {
        first_name: "",
        last_name: "",
      });
+      setSelectedAge("")
    }
  };

@@ -136,32 +136,19 @@ export default function FamilyAcc() {
          {/* heading */}
          <div className="sm:flex justify-between items-center mb-6">
            <div className="mb-5 sm:mb-0">
-              <h1 className="text-26 font-bold inline-flex gap-2 text-dark-gray dark:text-white">
+              <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
                <span
                  className={`${selectTab === "today" ? "block" : "hidden"}`}
                >
                  Family Accounts
                </span>
-                <CustomPopUp
-                  name="(Add)"
-                  btn_class="text-purple"
-                  key={id}
-                  title="Add members"
-                  isOpen={isOpen}
-                  setIsOpen={setIsOpen}
-                  modalHandler={popUpHandler}
+                <button
+                  onClick={popUpHandler}
+                  type="button"
+                  className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
                >
-                  <FamilyForm
-                    value={formData}
-                    ageHandler={handleAgeSelect}
-                    ageRange={ageRange}
-                    ageValue={selectedAge}
-                    inputHandler={handleInputChange}
-                    msgErr={msgErr}
-                    onClick={addMember}
-                    loader={loader}
-                  />
-                </CustomPopUp>
+                  Add
+                </button>
              </h1>
            </div>
            <div className="slider-btns flex space-x-4">
@@ -171,9 +158,24 @@ export default function FamilyAcc() {
              ></div>
            </div>
          </div>
-          <FamilyTable familyList={familyList} loader={loader} />
+          <FamilyTable familyList={familyList} loader={loader} popUpHandler={popUpHandler} />
        </div>
      </div>
+      {popUp && (
+        <ModalCom action={popUpHandler} situation={popUp}>
+          <FamilyForm
+            popUpHandler={popUpHandler}
+            value={formData}
+            ageHandler={handleAgeSelect}
+            ageRange={ageRange}
+            ageValue={selectedAge}
+            inputHandler={handleInputChange}
+            msgErr={msgErr}
+            onClick={addMember}
+            loader={loader}
+          />
+        </ModalCom>
+      )}
    </Layout>
  );
 }
@@ -187,18 +189,31 @@ const FamilyForm = ({
  msgErr,
  loader,
  onClick,
+  popUpHandler,
 }) => {
  return (
-    <div className="w-full relative block ">
-      <form className="flex flex-col gap-4">
+    <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+      <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
+        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+          Add Members
+        </h1>
+        <button
+          type="button"
+          className="text-[#374557] dark:text-red-500"
+          onClick={popUpHandler}
+        >
+          <CloseIcon />
+        </button>
+      </div>
+      <form className="logout-modal-body w-full flex flex-col items-center px-10 py-8 gap-4">
        <InputCom
          placeholder="Firstname"
          label="First Name:"
          name="first_name"
          type="text"
-          parentClass="flex items-center gap-1"
+          parentClass="flex items-center gap-1 w-full"
          labelClass="flex-[0.2] mb-0"
-          inputClass="flex-[0.8]"
+          inputClass="flex-[0.8] input-curve lg border border-[#dce4e9]"
          fieldClass="px-2"
          value={first_name}
          inputHandler={inputHandler}
@@ -208,14 +223,14 @@ const FamilyForm = ({
          label="Last Name:"
          name="last_name"
          type="text"
-          parentClass="flex items-center gap-1"
+          parentClass="flex items-center gap-1 w-full"
          labelClass="flex-[0.2] mb-0"
-          inputClass="flex-[0.8]"
+          inputClass="flex-[0.8] input-curve lg border border-[#dce4e9]"
          fieldClass="px-2"
          value={last_name}
          inputHandler={inputHandler}
        />
-        <div className="input-com mb-7 flex gap-1 items-center">
+        <div className="input-com mb-7 flex gap-1 items-center w-full justify-between">
          {/* Age dropdown */}
          <div className="flex items-center justify-between flex-[0.3]">
            <label
@@ -225,15 +240,15 @@ const FamilyForm = ({
              Select your age:
            </label>
          </div>
-          <div className=" flex-[0.7]">
+          <div className=" flex-[0.7] max-w-[150px]">
            <select
              name="age-selection"
              id="age-selection"
-              className="input-wrapper border border-[#f5f8fa]] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent px-2"
+              className="input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[35px] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent px-4"
              onChange={ageHandler}
              value={ageValue}
            >
-              <option value={""}>Select your age</option>
+              <option value={""}>Select age</option>
              {ageRange?.length > 0 &&
                ageRange?.map((age) => (
                  <option value={age} key={age}>
@@ -248,12 +263,13 @@ const FamilyForm = ({
            {msgErr}
          </div>
        )}
-        <div className="signin-area">
+        <div className="signin-area w-full">
          <div className="flex justify-center">
            <button
              type="button"
              onClick={onClick}
-              className={`rounded-[0.475rem] text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
+              // className={`rounded-[0.475rem] text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
+              className="text-white btn-gradient text-lg tracking-wide px-6 py-2 rounded-full"
            >
              {loader ? (
                <div className="signup btn-loader"></div>
@@ -267,3 +283,25 @@ const FamilyForm = ({
    </div>
  );
 };
+
+const CloseIcon = () => (
+  <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>
+);
@@ -10,7 +10,7 @@ export default function Accordion({ datas }) {
    <>
      <div className="accordion-item overflow-hidden relative z-[1]">
        <div
-          className="accordion-title-bar flex items-center space-x-3 py-5 border-b  border-light-purple dark:border-[#5356fb29] "
+          className="accordion-title-bar flex items-center space-x-3 py-5 border-b  border-light-purple dark:border-[#5356fb29] cursor-pointer"
          onClick={accordionHandler}
        >
          <div className="accordion-title-icon relative">
@@ -36,7 +36,7 @@ export default function Accordion({ datas }) {
            <div className="w-[3px] h-auto bg-purple rounded-[28px]"></div>
            <div className="flex-1">
              <p className="text-base text-thin-light-gray tracking-wide">
-                {datas.content}
+                {datas.msg}
              </p>
            </div>
          </div>
@@ -1,80 +0,0 @@
-import React, { useEffect } from "react";
-
-const CustomPopUp = ({
-  name,
-  btn_class,
-  title,
-  children,
-  isOpen,
-  setIsOpen,
-  modalHandler,
-}) => {
-  const handleOpen = () => {
-    setIsOpen(true);
-  };
-
-  const handleClose = () => {
-    setIsOpen(false);
-  };
-
-  useEffect(() => {
-    if (modalHandler) {
-      document.body.style.overflowY = "hidden";
-    }
-    return () => {
-      document.body.style.overflowY = "unset";
-    };
-  });
-
-  return (
-    <div>
-      <button onClick={handleOpen} className={btn_class}>
-        {name}
-      </button>
-
-      {isOpen && (
-        <div className="modal-com">
-          <div
-            className={`fixed top-0 left-0 w-full lg:h-[100vh] h-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50`}
-          ></div>
-          <div className="children-element fixed lg:h-100vh h-full z-[99999999999999] w-full lg:w-auto ">
-            <div className="bg-white rounded-md p-6 shadow-lg transform transition-all duration-300 ease-in-out dark:bg-dark-white logout-modal-wrapper lg:w-[460px] lg:h-auto  max-[467px]:max-w-[26rem]">
-              <div className="w-full flex items-center justify-between lg:px-4 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
-                {title && (
-                  <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide cursor-default">
-                    {title}
-                  </h1>
-                )}
-                <button onClick={handleClose}>
-                  <CloseIcon />
-                </button>
-              </div>
-              <div className="logout-modal-body w-full flex flex-col items-center px-4 py-8">
-                {children && children}
-              </div>
-            </div>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default CustomPopUp;
-
-const CloseIcon = () => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    fill="none"
-    viewBox="0 0 24 24"
-    strokeWidth={1.5}
-    stroke="currentColor"
-    className="w-6 h-6"
-  >
-    <path
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      d="M6 18L18 6M6 6l12 12"
-    />
-  </svg>
-);
@@ -5,9 +5,8 @@ function DataIteration(props) {
  return (
    <>
      {datas &&
-        datas.length >= endLength &&
-        datas
-          .slice(startLength, endLength)
+        datas?.length >= endLength &&
+        datas?.slice(startLength, endLength)
          .map((value) => children({ datas: value }))}
    </>
  );
@@ -468,6 +468,21 @@ export default function Icons({ name }) {
        >
          <rect y="0.823242" width="20" height="2.35294" rx="1.17647" />
        </svg>
+      ) : name === "right-arrow" ? (
+        <svg
+          width="24"
+          height="24"
+          xmlns="http://www.w3.org/2000/svg"
+          // enableBackground="new 0 0 24 24"
+          viewBox="0 0 24 24"
+          className="fill-black dark:fill-white"
+          id="right-arrow"
+        >
+          <path
+            d="M15.5,11.3L9.9,5.6c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l4.9,4.9l-4.9,4.9c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.6,0.4,1,1,1
+      c0.3,0,0.5-0.1,0.7-0.3l5.7-5.7c0,0,0,0,0,0C15.9,12.3,15.9,11.7,15.5,11.3z"
+          ></path>
+        </svg>
      ) : (
        ""
      )}
@@ -19,118 +19,29 @@ export default function InputCom({
  onClick,
  disable,
  blurHandler,
+  spanTag,
+  inputBg,
+  direction
 }) {
  const inputRef = useRef(null);
  // Entry Validation
  // for Min Length:
  const minLengthValidation = () => {
-    if (inputRef && inputRef?.current && inputRef?.current?.name === "email") {
-      return 7;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "first_name"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "last_name"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "address"
-    ) {
-      return 5;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "password"
-    ) {
-      return 8;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "state"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "province"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "city"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "amount"
-    ) {
-      return 1;
-    }
+    const inputConfig = inputConfigs[inputRef?.current?.name]?.minLength;
+    return inputConfig || 0;
  };

  // for MaxLength
  const maxLengthValidation = () => {
-    if (inputRef && inputRef?.current && inputRef?.current?.name === "email") {
-      return 35;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "first_name"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "last_name"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "address"
-    ) {
-      return 49;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "password"
-    ) {
-      return 15;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "state"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "province"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "city"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "amount"
-    ) {
-      return 9;
-    }
+    const inputConfig = inputConfigs[inputRef?.current?.name]?.maxLength;
+    return inputConfig || 30;
  };
+
+  // for Patterns
+  const inputPatterns = () => {
+    const inputConfig = inputConfigs[inputRef?.current?.name]?.pattern;
+    return inputConfig || ""
+  }
  return (
    <div className={`input-com ${parentClass}`}>
      <div className={`flex items-center justify-between mb-2.5 ${labelClass}`}>
@@ -140,6 +51,11 @@ export default function InputCom({
            htmlFor={name}
          >
            {label}
+            {spanTag && (
+              <span className="text-green-700 text-sm tracking-wide">
+                {spanTag}
+              </span>
+            )}
          </label>
        )}
        {forgotPassword && (
@@ -152,21 +68,25 @@ export default function InputCom({
        )}
      </div>
      <div
-        className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[0.475rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ${inputClass}`}
+        className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ${inputClass}`}
      >
        <input
          placeholder={placeholder}
          value={value}
          onChange={inputHandler}
-          className={`input-field placeholder:text-base text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
+          className={`input-field placeholder:text-base text-dark-gray w-full h-full tracking-wide ${
+            inputBg ? inputBg : "bg-[#FAFAFA]"
+          } dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
          type={type}
          id={name}
          name={name}
          minLength={minLengthValidation()}
          maxLength={maxLengthValidation()}
+          // pattern={inputPatterns()}
          ref={inputRef}
          readOnly={disable}
          onBlur={blurHandler}
+          dir={direction}
        />
        {iconName && (
          <div className="absolute right-6 bottom-[10px] z-10">
@@ -185,3 +105,21 @@ export default function InputCom({
    </div>
  );
 }
+
+const inputConfigs = {
+  email: { minLength: 7, maxLength: 35 },
+  first_name: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  last_name: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  address: { minLength: 5, maxLength: 49, pattern: "[a-zA-Z0-9]+" },
+  password: { minLength: 8, maxLength: 15, pattern: ".{8,}" },
+  state: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  province: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  city: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  amount: { minLength: 1, maxLength: 9, pattern: "[0-9]+" },
+};
+
+/* Numbers Only: <input type="text" pattern="[0-9]*" /> strictly numbers
+Alphabets Only: <input type="text" pattern="[a-zA-Z]+" /> strictly alphabets
+Alphanumeric: <input type="text" pattern="[a-zA-Z0-9]+" /> mix
+Password: <input type="text" pattern=".{8,}" /> a minimum of 8 characters 
+*/
@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";

-export default function ModalCom({ action, children, situation, isOpen }) {
+export default function ModalCom({ action, children, situation, isOpen, className }) {
  useEffect(() => {
    if (situation) {
      document.body.style.overflowY = "hidden";
@@ -16,7 +16,7 @@ export default function ModalCom({ action, children, situation, isOpen }) {
        onClick={action || isOpen}
        className="fixed top-0 left-0 w-full lg:h-[100vh] h-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50"
      ></div>
-      <div className="children-element fixed lg:h-100vh h-full z-[99999999999999] w-full lg:w-auto ">
+      <div className={`children-element fixed lg:h-100vh h-full z-[99999999999999] w-full lg:w-auto ${className}`}>
        {children && children}
      </div>
    </div>
@@ -0,0 +1,16 @@
+export const PriceFormatter = (price, currency, currencyName) => {
+  const supportedCurrencies = ["USD", "EUR", "GBP"];
+  const symbolFormatter = supportedCurrencies.includes(currency)
+    ? currency
+    : undefined;
+
+  const formatter = new Intl.NumberFormat("en", {
+    style: symbolFormatter,
+    currencyDisplay: "symbol",
+    minimumFractionDigits: 2,
+  });
+
+  const displayCurrencyName = symbolFormatter ? "" : currencyName;
+
+  return `${formatter.format(price)} ${displayCurrencyName}`;
+};
@@ -51,8 +51,6 @@ export default function HistoryTable({ className }) {
              <td className="py-4 text-center">Value</td>
              <td className="py-4 text-center">USD</td>
              <td className="py-4 text-center">24H%</td>
-              <td className="py-4 text-center">Bits</td>
-              <td className="py-4 text-center">Time</td>
              <td className="py-4 text-right">Status</td>
            </tr>

@@ -165,16 +163,6 @@ export default function HistoryTable({ className }) {
                      -24.75 (11.5%)
                    </span>
                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-dark-gray dark:text-white font-medium">
-                      343
-                    </span>
-                  </td>
-                  <td className="text-right py-4 px-2">
-                    <span className="text-base text-thin-light-gray">
-                      2 Hours 1 min 30s
-                    </span>
-                  </td>
                  <td className="text-right py-4 px-2">
                    <button
                      type="button"
@@ -64,148 +64,160 @@ export default function History() {
      <Layout>
        <div className="history-wrapper w-full mb-10">
          <div className="main-wrapper w-full">
-            <div className="quick-counters-widget w-full mb-11">
-              <div className="grid xl:grid-cols-4 lg:grid-cols-2 grid-cols-1 gap-[30px]">
-                <HistoryAnalyticsCard
-                  title="Total Sells"
-                  numberOfCount={71}
-                  numberOfAnalyse={324.75}
-                  primaryColor="#5356FB"
-                  iconBg="rgba(83, 86, 251, 0.16)"
-                >
-                  <svg
-                    width="38"
-                    height="31"
-                    viewBox="0 0 38 31"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M33.0451 12.6481C32.5478 14.368 32.1426 16.0074 31.5716 17.5846C31.4311 17.9737 30.7496 18.4066 30.3121 18.4112C25.1937 18.471 20.0754 18.4503 14.957 18.4526C14.1995 18.4526 13.716 18.0796 13.5433 17.3543C12.7328 13.9651 11.9154 10.5759 11.1418 7.17975C10.907 6.15285 11.3744 5.51968 12.3644 5.51277C16.5365 5.48514 20.7085 5.50125 24.9842 5.50125C24.9336 7.71622 25.5368 9.6526 27.2153 11.1285C28.857 12.579 30.7979 13.0142 33.0451 12.6481Z"
-                      fill="#5356FB"
-                    />
-                    <path
-                      d="M12.4851 19.636C15.9295 19.636 19.3142 19.636 22.6988 19.636C24.9138 19.636 27.1287 19.6314 29.3437 19.6383C30.3752 19.6406 30.96 20.1034 30.9877 20.9024C31.0153 21.7428 30.412 22.2539 29.3391 22.2539C23.4747 22.2585 17.6126 22.2585 11.7483 22.2539C10.5602 22.2539 10.2309 21.9638 9.97077 20.7642C8.85637 15.6113 7.73277 10.4607 6.6391 5.30318C6.51016 4.69763 6.27301 4.35686 5.64904 4.16576C4.21921 3.72829 2.81701 3.19872 1.4056 2.70139C0.219833 2.28234 -0.219938 1.64226 0.102407 0.820278C0.420147 0.00750794 1.10858 -0.199714 2.23449 0.191705C3.98666 0.799556 5.72272 1.45345 7.49332 2.00605C8.38667 2.28464 8.81263 2.78888 9.00143 3.69145C10.0813 8.81904 11.2026 13.9374 12.3147 19.0581C12.3492 19.2101 12.4045 19.362 12.4851 19.636Z"
-                      fill="#5356FB"
-                    />
-                    <path
-                      d="M25.8048 6.28397C25.7886 3.08815 28.3789 0.490967 31.5747 0.50248C34.7061 0.511689 37.2848 3.11347 37.2802 6.26094C37.2756 9.3992 34.6877 11.9941 31.5494 12.001C28.4112 12.0079 25.8209 9.43144 25.8048 6.28397ZM33.99 3.73514C32.9516 4.84723 31.9339 5.9386 30.7251 7.23489C30.1472 6.44974 29.6798 5.81887 29.1456 5.0959C28.6092 5.6577 28.2546 6.02839 28.0243 6.27245C29.0052 7.28554 29.9423 8.25027 30.808 9.14593C32.2125 7.73682 33.6585 6.28857 35.2264 4.71599C34.9709 4.51337 34.6646 4.26931 34.3561 4.02525C34.2594 3.94466 34.1627 3.86868 33.99 3.73514Z"
-                      fill="#5356FB"
-                    />
-                    <path
-                      d="M27.9144 23.32C29.9474 23.3016 31.6052 24.8995 31.6443 26.9164C31.6835 28.9679 30.0165 30.651 27.9489 30.651C25.9296 30.651 24.2788 29.0094 24.2696 26.9993C24.2626 24.9801 25.8859 23.3384 27.9144 23.32ZM29.5767 26.974C29.5744 26.0829 28.8745 25.36 27.9949 25.3415C27.0832 25.3208 26.3233 26.0737 26.328 26.9924C26.3326 27.8743 27.044 28.6064 27.9144 28.6295C28.8261 28.6525 29.579 27.8996 29.5767 26.974Z"
-                      fill="#5356FB"
-                    />
-                    <path
-                      d="M13.0216 30.6485C10.9908 30.6324 9.36064 29 9.36524 26.9853C9.37215 24.9062 11.0184 23.2922 13.1091 23.3152C15.126 23.3382 16.7446 25.0006 16.7216 27.0245C16.6963 29.0506 15.05 30.6647 13.0216 30.6485ZM14.6724 26.9899C14.6747 26.0643 13.9195 25.3206 13.0008 25.3437C12.1351 25.3667 11.396 26.115 11.396 26.9761C11.3937 27.8395 12.1259 28.597 12.987 28.627C13.8988 28.6569 14.6701 27.9086 14.6724 26.9899Z"
-                      fill="#5356FB"
-                    />
-                  </svg>
-                </HistoryAnalyticsCard>
-                <HistoryAnalyticsCard
-                  title="Active Customer"
-                  numberOfCount="7583k+"
-                  numberOfAnalyse={324.75}
-                  primaryColor="#F539F8"
-                  iconBg="#FEEBFE"
-                >
-                  <svg
-                    width="28"
-                    height="30"
-                    viewBox="0 0 28 30"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M13.8146 13.1935C13.3126 13.0277 12.8406 12.9333 12.4216 12.7261C8.70772 10.891 5.00536 9.03523 1.29839 7.18865C1.0267 7.05281 0.817179 6.87782 0.812574 6.55317C0.80797 6.21471 1.01749 6.02591 1.303 5.88315C4.98464 4.04809 8.66628 2.20842 12.3456 0.368751C13.4048 -0.160815 14.4478 -0.100951 15.4931 0.426313C17.8577 1.61669 20.2316 2.79555 22.6008 3.97901C23.8096 4.58226 25.0161 5.18781 26.2226 5.79336C26.2916 5.82789 26.3607 5.86013 26.4321 5.89467C26.7084 6.0236 26.8995 6.22392 26.8995 6.54396C26.8995 6.86861 26.6946 7.0505 26.4229 7.18405C24.7075 8.03826 22.9945 8.89708 21.2792 9.75129C19.2991 10.7391 17.3282 11.7406 15.3365 12.7031C14.8622 12.931 14.3234 13.0323 13.8146 13.1935Z"
-                      fill="#F539F8"
-                    />
-                    <path
-                      d="M12.8602 22.8893C12.8602 24.9477 12.8625 27.0061 12.8579 29.0645C12.8556 29.7966 12.4434 30.0545 11.7688 29.7437C8.39339 28.1895 5.01567 26.64 1.64717 25.0743C0.562705 24.5701 0.0101156 23.6882 0.00551066 22.4955C-0.0036992 18.5721 0.000903485 14.6487 0.00320595 10.7253C0.00320595 9.96783 0.429164 9.68692 1.10609 10.0001C4.59662 11.6095 8.08485 13.2281 11.5777 14.8306C12.4641 15.2382 12.874 15.9013 12.8671 16.8706C12.8533 18.8784 12.8625 20.8838 12.8625 22.8916C12.8625 22.8893 12.8602 22.8893 12.8602 22.8893Z"
-                      fill="#F539F8"
-                    />
-                    <path
-                      d="M14.848 22.8313C14.848 20.8121 14.8526 18.7928 14.8457 16.7736C14.8434 15.8618 15.2602 15.2332 16.0775 14.8556C19.5911 13.2347 23.107 11.6183 26.6205 9.99971C27.2606 9.705 27.7004 9.96978 27.7004 10.6674C27.705 14.63 27.7119 18.5902 27.6958 22.5527C27.6912 23.7661 27.0695 24.6135 25.9758 25.12C23.2451 26.3817 20.5121 27.6412 17.7814 28.9006C17.1965 29.17 16.614 29.4394 16.0315 29.7088C15.2394 30.0726 14.8457 29.8262 14.8457 28.9651C14.8457 26.9205 14.8457 24.8736 14.8457 22.829C14.8457 22.8313 14.8457 22.8313 14.848 22.8313Z"
-                      fill="#F539F8"
-                    />
-                  </svg>
-                </HistoryAnalyticsCard>
-                <HistoryAnalyticsCard
-                  title="Total Prodcuts"
-                  numberOfCount="6753"
-                  numberOfAnalyse={324.75}
-                  primaryColor="#27AE60"
-                  iconBg="#E9F7EF"
-                >
-                  <svg
-                    width="31"
-                    height="31"
-                    viewBox="0 0 31 31"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M15.0808 30.1824C10.7113 30.1824 6.3438 30.1824 1.97428 30.1824C0.641347 30.1824 -0.102099 29.364 0.0113425 28.0453C0.163273 26.3032 0.380025 24.5752 0.807456 22.8736C1.18424 21.3725 1.99859 20.3536 3.48345 19.7783C5.65302 18.9355 7.84892 18.182 10.0772 17.5155C10.1805 17.4851 10.3446 17.5358 10.4398 17.6046C11.9105 18.6702 13.3772 19.7398 14.8377 20.8195C15.018 20.9532 15.1355 20.9572 15.3178 20.8215C16.7784 19.7418 18.245 18.6722 19.7157 17.6067C19.8109 17.5378 19.973 17.4831 20.0763 17.5135C22.3694 18.2002 24.6382 18.9558 26.8584 19.8633C28.1306 20.384 28.8862 21.2591 29.2549 22.5596C29.7208 24.2025 29.9477 25.8798 30.1016 27.5733C30.1239 27.8265 30.1523 28.0818 30.1584 28.337C30.1867 29.364 29.421 30.1683 28.3919 30.1804C27.4094 30.1926 26.429 30.1824 25.4465 30.1824C21.9926 30.1824 18.5367 30.1824 15.0808 30.1824Z"
-                      fill="#27AE60"
-                    />
-                    <path
-                      d="M8.44531 7.35622C8.58509 4.27912 9.72152 2.01232 12.3205 0.671285C15.3146 -0.872326 18.969 0.337039 20.6929 3.36754C21.7443 5.21501 21.8962 7.17795 21.4323 9.21382C21.0008 11.1059 20.2108 12.8338 18.967 14.3389C18.3735 15.056 17.6908 15.6739 16.846 16.0811C15.2498 16.8488 13.7629 16.5774 12.4137 15.5118C10.4366 13.952 9.39133 11.8108 8.78563 9.43057C8.59724 8.6851 8.53444 7.90722 8.44531 7.35622Z"
-                      fill="#27AE60"
-                    />
-                  </svg>
-                </HistoryAnalyticsCard>
-                <HistoryAnalyticsCard
-                  title="Close Offer"
-                  numberOfCount="745"
-                  numberOfAnalyse={-324.75}
-                  primaryColor="#EB5757"
-                  iconBg="#FDEEEE"
-                >
-                  <svg
-                    width="70"
-                    height="70"
-                    viewBox="0 0 70 70"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <circle
-                      opacity="0.1"
-                      cx="35"
-                      cy="35"
-                      r="35"
-                      fill="#EB5757"
-                    />
-                    <path
-                      d="M20.8416 32.9067C24.7077 32.9067 28.5465 32.9067 32.4127 32.9067C32.4127 38.4719 32.4127 44.0165 32.4127 49.616C32.2848 49.616 32.1637 49.616 32.0427 49.616C28.8753 49.616 25.7079 49.6183 22.5406 49.616C21.5084 49.616 20.8233 48.94 20.8233 47.9124C20.821 43.03 20.8233 38.1454 20.8233 33.263C20.8256 33.1465 20.8347 33.0346 20.8416 32.9067Z"
-                      fill="#EB5757"
-                    />
-                    <path
-                      d="M36.8789 49.6137C36.8789 44.0143 36.8789 38.4696 36.8789 32.9067C40.7154 32.9067 44.529 32.9067 48.3906 32.9067C48.3906 33.062 48.3906 33.1968 48.3906 33.3315C48.3906 38.1796 48.3906 43.0277 48.3906 47.8736C48.3906 48.9377 47.7307 49.6137 46.6802 49.6137C43.5243 49.616 40.3706 49.6137 37.2146 49.6137C37.1118 49.6137 37.0091 49.6137 36.8789 49.6137Z"
-                      fill="#EB5757"
-                    />
-                    <path
-                      d="M19.002 31.2053C19.002 30.6595 19.002 30.1434 19.002 29.6273C19.002 28.4193 18.9975 27.2089 19.002 26.0009C19.0043 25.0692 19.6734 24.359 20.5983 24.3567C24.4781 24.3453 28.358 24.3521 32.2379 24.3521C32.2836 24.3521 32.3292 24.3613 32.4046 24.3704C32.4046 26.6426 32.4046 28.9125 32.4046 31.2053C27.9515 31.2053 23.503 31.2053 19.002 31.2053Z"
-                      fill="#EB5757"
-                    />
-                    <path
-                      d="M36.875 31.217C36.875 28.9197 36.875 26.6658 36.875 24.373C37.0052 24.3662 37.1262 24.3502 37.2449 24.3502C40.9878 24.3502 44.7306 24.3479 48.4735 24.3525C49.5719 24.3547 50.2228 25.0307 50.2182 26.1337C50.2136 27.6888 50.2182 29.244 50.2159 30.7968C50.2159 30.9316 50.2159 31.0663 50.2159 31.217C45.7491 31.217 41.3303 31.217 36.875 31.217Z"
-                      fill="#EB5757"
-                    />
-                    <path
-                      d="M34.6091 21.749C35.8994 19.6001 37.6441 17.9947 39.6651 16.6565C40.8594 15.8664 42.0674 15.7385 43.2686 16.588C44.536 17.4855 45.0407 18.7483 44.7712 20.2669C44.5155 21.7033 43.6454 22.6533 42.241 23.0872C42.1017 23.1306 41.9464 23.1306 41.798 23.1306C37.1006 23.1328 32.4032 23.1214 27.7057 23.142C26.8905 23.1443 26.2145 22.8679 25.6391 22.3427C24.5384 21.3356 24.1661 20.0705 24.5475 18.641C24.9152 17.2617 25.824 16.3802 27.2376 16.0605C27.772 15.9394 28.2881 16.0011 28.7859 16.2363C30.1446 16.8826 31.2819 17.8326 32.3529 18.8693C33.2275 19.7188 34.0314 20.63 34.6091 21.749ZM34.0702 22.4158C34.0793 22.3861 34.0907 22.3564 34.0999 22.3267C33.0357 21.2078 31.903 20.171 30.526 19.4334C29.8295 19.0612 29.0805 19.1662 28.4913 19.7028C27.9798 20.1664 27.8062 20.7579 28.0209 21.3197C28.2607 21.9499 28.9161 22.4181 29.5555 22.4181C30.9371 22.4181 32.3187 22.4181 33.7003 22.4181C33.8258 22.4158 33.9492 22.4158 34.0702 22.4158ZM35.1184 22.3633C35.2166 22.3907 35.2577 22.4135 35.3011 22.4135C36.8197 22.4158 38.3383 22.4432 39.8569 22.4089C40.7681 22.3884 41.4988 21.3379 41.2727 20.4884C41.0284 19.5704 39.6559 18.8145 38.8064 19.3991C37.9752 19.97 37.1462 20.5501 36.3515 21.1689C35.9131 21.5069 35.5477 21.9408 35.1184 22.3633Z"
-                      fill="#EB5757"
-                    />
-                  </svg>
-                </HistoryAnalyticsCard>
+              <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">
+
+                  History
+
+                      </h1>
+                  </div>
+                  <div className="slider-btns flex space-x-4">
+
+                  </div>
              </div>
-            </div>
+            {/*<div className="quick-counters-widget w-full mb-11">*/}
+            {/*  <div className="grid xl:grid-cols-4 lg:grid-cols-2 grid-cols-1 gap-[30px]">*/}
+            {/*    <HistoryAnalyticsCard*/}
+            {/*      title="Total Sells"*/}
+            {/*      numberOfCount={71}*/}
+            {/*      numberOfAnalyse={324.75}*/}
+            {/*      primaryColor="#5356FB"*/}
+            {/*      iconBg="rgba(83, 86, 251, 0.16)"*/}
+            {/*    >*/}
+            {/*      <svg*/}
+            {/*        width="38"*/}
+            {/*        height="31"*/}
+            {/*        viewBox="0 0 38 31"*/}
+            {/*        fill="none"*/}
+            {/*        xmlns="http://www.w3.org/2000/svg"*/}
+            {/*      >*/}
+            {/*        <path*/}
+            {/*          d="M33.0451 12.6481C32.5478 14.368 32.1426 16.0074 31.5716 17.5846C31.4311 17.9737 30.7496 18.4066 30.3121 18.4112C25.1937 18.471 20.0754 18.4503 14.957 18.4526C14.1995 18.4526 13.716 18.0796 13.5433 17.3543C12.7328 13.9651 11.9154 10.5759 11.1418 7.17975C10.907 6.15285 11.3744 5.51968 12.3644 5.51277C16.5365 5.48514 20.7085 5.50125 24.9842 5.50125C24.9336 7.71622 25.5368 9.6526 27.2153 11.1285C28.857 12.579 30.7979 13.0142 33.0451 12.6481Z"*/}
+            {/*          fill="#5356FB"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M12.4851 19.636C15.9295 19.636 19.3142 19.636 22.6988 19.636C24.9138 19.636 27.1287 19.6314 29.3437 19.6383C30.3752 19.6406 30.96 20.1034 30.9877 20.9024C31.0153 21.7428 30.412 22.2539 29.3391 22.2539C23.4747 22.2585 17.6126 22.2585 11.7483 22.2539C10.5602 22.2539 10.2309 21.9638 9.97077 20.7642C8.85637 15.6113 7.73277 10.4607 6.6391 5.30318C6.51016 4.69763 6.27301 4.35686 5.64904 4.16576C4.21921 3.72829 2.81701 3.19872 1.4056 2.70139C0.219833 2.28234 -0.219938 1.64226 0.102407 0.820278C0.420147 0.00750794 1.10858 -0.199714 2.23449 0.191705C3.98666 0.799556 5.72272 1.45345 7.49332 2.00605C8.38667 2.28464 8.81263 2.78888 9.00143 3.69145C10.0813 8.81904 11.2026 13.9374 12.3147 19.0581C12.3492 19.2101 12.4045 19.362 12.4851 19.636Z"*/}
+            {/*          fill="#5356FB"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M25.8048 6.28397C25.7886 3.08815 28.3789 0.490967 31.5747 0.50248C34.7061 0.511689 37.2848 3.11347 37.2802 6.26094C37.2756 9.3992 34.6877 11.9941 31.5494 12.001C28.4112 12.0079 25.8209 9.43144 25.8048 6.28397ZM33.99 3.73514C32.9516 4.84723 31.9339 5.9386 30.7251 7.23489C30.1472 6.44974 29.6798 5.81887 29.1456 5.0959C28.6092 5.6577 28.2546 6.02839 28.0243 6.27245C29.0052 7.28554 29.9423 8.25027 30.808 9.14593C32.2125 7.73682 33.6585 6.28857 35.2264 4.71599C34.9709 4.51337 34.6646 4.26931 34.3561 4.02525C34.2594 3.94466 34.1627 3.86868 33.99 3.73514Z"*/}
+            {/*          fill="#5356FB"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M27.9144 23.32C29.9474 23.3016 31.6052 24.8995 31.6443 26.9164C31.6835 28.9679 30.0165 30.651 27.9489 30.651C25.9296 30.651 24.2788 29.0094 24.2696 26.9993C24.2626 24.9801 25.8859 23.3384 27.9144 23.32ZM29.5767 26.974C29.5744 26.0829 28.8745 25.36 27.9949 25.3415C27.0832 25.3208 26.3233 26.0737 26.328 26.9924C26.3326 27.8743 27.044 28.6064 27.9144 28.6295C28.8261 28.6525 29.579 27.8996 29.5767 26.974Z"*/}
+            {/*          fill="#5356FB"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M13.0216 30.6485C10.9908 30.6324 9.36064 29 9.36524 26.9853C9.37215 24.9062 11.0184 23.2922 13.1091 23.3152C15.126 23.3382 16.7446 25.0006 16.7216 27.0245C16.6963 29.0506 15.05 30.6647 13.0216 30.6485ZM14.6724 26.9899C14.6747 26.0643 13.9195 25.3206 13.0008 25.3437C12.1351 25.3667 11.396 26.115 11.396 26.9761C11.3937 27.8395 12.1259 28.597 12.987 28.627C13.8988 28.6569 14.6701 27.9086 14.6724 26.9899Z"*/}
+            {/*          fill="#5356FB"*/}
+            {/*        />*/}
+            {/*      </svg>*/}
+            {/*    </HistoryAnalyticsCard>*/}
+            {/*    <HistoryAnalyticsCard*/}
+            {/*      title="Active Customer"*/}
+            {/*      numberOfCount="7583k+"*/}
+            {/*      numberOfAnalyse={324.75}*/}
+            {/*      primaryColor="#F539F8"*/}
+            {/*      iconBg="#FEEBFE"*/}
+            {/*    >*/}
+            {/*      <svg*/}
+            {/*        width="28"*/}
+            {/*        height="30"*/}
+            {/*        viewBox="0 0 28 30"*/}
+            {/*        fill="none"*/}
+            {/*        xmlns="http://www.w3.org/2000/svg"*/}
+            {/*      >*/}
+            {/*        <path*/}
+            {/*          d="M13.8146 13.1935C13.3126 13.0277 12.8406 12.9333 12.4216 12.7261C8.70772 10.891 5.00536 9.03523 1.29839 7.18865C1.0267 7.05281 0.817179 6.87782 0.812574 6.55317C0.80797 6.21471 1.01749 6.02591 1.303 5.88315C4.98464 4.04809 8.66628 2.20842 12.3456 0.368751C13.4048 -0.160815 14.4478 -0.100951 15.4931 0.426313C17.8577 1.61669 20.2316 2.79555 22.6008 3.97901C23.8096 4.58226 25.0161 5.18781 26.2226 5.79336C26.2916 5.82789 26.3607 5.86013 26.4321 5.89467C26.7084 6.0236 26.8995 6.22392 26.8995 6.54396C26.8995 6.86861 26.6946 7.0505 26.4229 7.18405C24.7075 8.03826 22.9945 8.89708 21.2792 9.75129C19.2991 10.7391 17.3282 11.7406 15.3365 12.7031C14.8622 12.931 14.3234 13.0323 13.8146 13.1935Z"*/}
+            {/*          fill="#F539F8"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M12.8602 22.8893C12.8602 24.9477 12.8625 27.0061 12.8579 29.0645C12.8556 29.7966 12.4434 30.0545 11.7688 29.7437C8.39339 28.1895 5.01567 26.64 1.64717 25.0743C0.562705 24.5701 0.0101156 23.6882 0.00551066 22.4955C-0.0036992 18.5721 0.000903485 14.6487 0.00320595 10.7253C0.00320595 9.96783 0.429164 9.68692 1.10609 10.0001C4.59662 11.6095 8.08485 13.2281 11.5777 14.8306C12.4641 15.2382 12.874 15.9013 12.8671 16.8706C12.8533 18.8784 12.8625 20.8838 12.8625 22.8916C12.8625 22.8893 12.8602 22.8893 12.8602 22.8893Z"*/}
+            {/*          fill="#F539F8"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M14.848 22.8313C14.848 20.8121 14.8526 18.7928 14.8457 16.7736C14.8434 15.8618 15.2602 15.2332 16.0775 14.8556C19.5911 13.2347 23.107 11.6183 26.6205 9.99971C27.2606 9.705 27.7004 9.96978 27.7004 10.6674C27.705 14.63 27.7119 18.5902 27.6958 22.5527C27.6912 23.7661 27.0695 24.6135 25.9758 25.12C23.2451 26.3817 20.5121 27.6412 17.7814 28.9006C17.1965 29.17 16.614 29.4394 16.0315 29.7088C15.2394 30.0726 14.8457 29.8262 14.8457 28.9651C14.8457 26.9205 14.8457 24.8736 14.8457 22.829C14.8457 22.8313 14.8457 22.8313 14.848 22.8313Z"*/}
+            {/*          fill="#F539F8"*/}
+            {/*        />*/}
+            {/*      </svg>*/}
+            {/*    </HistoryAnalyticsCard>*/}
+            {/*    <HistoryAnalyticsCard*/}
+            {/*      title="Total Prodcuts"*/}
+            {/*      numberOfCount="6753"*/}
+            {/*      numberOfAnalyse={324.75}*/}
+            {/*      primaryColor="#27AE60"*/}
+            {/*      iconBg="#E9F7EF"*/}
+            {/*    >*/}
+            {/*      <svg*/}
+            {/*        width="31"*/}
+            {/*        height="31"*/}
+            {/*        viewBox="0 0 31 31"*/}
+            {/*        fill="none"*/}
+            {/*        xmlns="http://www.w3.org/2000/svg"*/}
+            {/*      >*/}
+            {/*        <path*/}
+            {/*          d="M15.0808 30.1824C10.7113 30.1824 6.3438 30.1824 1.97428 30.1824C0.641347 30.1824 -0.102099 29.364 0.0113425 28.0453C0.163273 26.3032 0.380025 24.5752 0.807456 22.8736C1.18424 21.3725 1.99859 20.3536 3.48345 19.7783C5.65302 18.9355 7.84892 18.182 10.0772 17.5155C10.1805 17.4851 10.3446 17.5358 10.4398 17.6046C11.9105 18.6702 13.3772 19.7398 14.8377 20.8195C15.018 20.9532 15.1355 20.9572 15.3178 20.8215C16.7784 19.7418 18.245 18.6722 19.7157 17.6067C19.8109 17.5378 19.973 17.4831 20.0763 17.5135C22.3694 18.2002 24.6382 18.9558 26.8584 19.8633C28.1306 20.384 28.8862 21.2591 29.2549 22.5596C29.7208 24.2025 29.9477 25.8798 30.1016 27.5733C30.1239 27.8265 30.1523 28.0818 30.1584 28.337C30.1867 29.364 29.421 30.1683 28.3919 30.1804C27.4094 30.1926 26.429 30.1824 25.4465 30.1824C21.9926 30.1824 18.5367 30.1824 15.0808 30.1824Z"*/}
+            {/*          fill="#27AE60"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M8.44531 7.35622C8.58509 4.27912 9.72152 2.01232 12.3205 0.671285C15.3146 -0.872326 18.969 0.337039 20.6929 3.36754C21.7443 5.21501 21.8962 7.17795 21.4323 9.21382C21.0008 11.1059 20.2108 12.8338 18.967 14.3389C18.3735 15.056 17.6908 15.6739 16.846 16.0811C15.2498 16.8488 13.7629 16.5774 12.4137 15.5118C10.4366 13.952 9.39133 11.8108 8.78563 9.43057C8.59724 8.6851 8.53444 7.90722 8.44531 7.35622Z"*/}
+            {/*          fill="#27AE60"*/}
+            {/*        />*/}
+            {/*      </svg>*/}
+            {/*    </HistoryAnalyticsCard>*/}
+            {/*    <HistoryAnalyticsCard*/}
+            {/*      title="Close Offer"*/}
+            {/*      numberOfCount="745"*/}
+            {/*      numberOfAnalyse={-324.75}*/}
+            {/*      primaryColor="#EB5757"*/}
+            {/*      iconBg="#FDEEEE"*/}
+            {/*    >*/}
+            {/*      <svg*/}
+            {/*        width="70"*/}
+            {/*        height="70"*/}
+            {/*        viewBox="0 0 70 70"*/}
+            {/*        fill="none"*/}
+            {/*        xmlns="http://www.w3.org/2000/svg"*/}
+            {/*      >*/}
+            {/*        <circle*/}
+            {/*          opacity="0.1"*/}
+            {/*          cx="35"*/}
+            {/*          cy="35"*/}
+            {/*          r="35"*/}
+            {/*          fill="#EB5757"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M20.8416 32.9067C24.7077 32.9067 28.5465 32.9067 32.4127 32.9067C32.4127 38.4719 32.4127 44.0165 32.4127 49.616C32.2848 49.616 32.1637 49.616 32.0427 49.616C28.8753 49.616 25.7079 49.6183 22.5406 49.616C21.5084 49.616 20.8233 48.94 20.8233 47.9124C20.821 43.03 20.8233 38.1454 20.8233 33.263C20.8256 33.1465 20.8347 33.0346 20.8416 32.9067Z"*/}
+            {/*          fill="#EB5757"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M36.8789 49.6137C36.8789 44.0143 36.8789 38.4696 36.8789 32.9067C40.7154 32.9067 44.529 32.9067 48.3906 32.9067C48.3906 33.062 48.3906 33.1968 48.3906 33.3315C48.3906 38.1796 48.3906 43.0277 48.3906 47.8736C48.3906 48.9377 47.7307 49.6137 46.6802 49.6137C43.5243 49.616 40.3706 49.6137 37.2146 49.6137C37.1118 49.6137 37.0091 49.6137 36.8789 49.6137Z"*/}
+            {/*          fill="#EB5757"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M19.002 31.2053C19.002 30.6595 19.002 30.1434 19.002 29.6273C19.002 28.4193 18.9975 27.2089 19.002 26.0009C19.0043 25.0692 19.6734 24.359 20.5983 24.3567C24.4781 24.3453 28.358 24.3521 32.2379 24.3521C32.2836 24.3521 32.3292 24.3613 32.4046 24.3704C32.4046 26.6426 32.4046 28.9125 32.4046 31.2053C27.9515 31.2053 23.503 31.2053 19.002 31.2053Z"*/}
+            {/*          fill="#EB5757"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M36.875 31.217C36.875 28.9197 36.875 26.6658 36.875 24.373C37.0052 24.3662 37.1262 24.3502 37.2449 24.3502C40.9878 24.3502 44.7306 24.3479 48.4735 24.3525C49.5719 24.3547 50.2228 25.0307 50.2182 26.1337C50.2136 27.6888 50.2182 29.244 50.2159 30.7968C50.2159 30.9316 50.2159 31.0663 50.2159 31.217C45.7491 31.217 41.3303 31.217 36.875 31.217Z"*/}
+            {/*          fill="#EB5757"*/}
+            {/*        />*/}
+            {/*        <path*/}
+            {/*          d="M34.6091 21.749C35.8994 19.6001 37.6441 17.9947 39.6651 16.6565C40.8594 15.8664 42.0674 15.7385 43.2686 16.588C44.536 17.4855 45.0407 18.7483 44.7712 20.2669C44.5155 21.7033 43.6454 22.6533 42.241 23.0872C42.1017 23.1306 41.9464 23.1306 41.798 23.1306C37.1006 23.1328 32.4032 23.1214 27.7057 23.142C26.8905 23.1443 26.2145 22.8679 25.6391 22.3427C24.5384 21.3356 24.1661 20.0705 24.5475 18.641C24.9152 17.2617 25.824 16.3802 27.2376 16.0605C27.772 15.9394 28.2881 16.0011 28.7859 16.2363C30.1446 16.8826 31.2819 17.8326 32.3529 18.8693C33.2275 19.7188 34.0314 20.63 34.6091 21.749ZM34.0702 22.4158C34.0793 22.3861 34.0907 22.3564 34.0999 22.3267C33.0357 21.2078 31.903 20.171 30.526 19.4334C29.8295 19.0612 29.0805 19.1662 28.4913 19.7028C27.9798 20.1664 27.8062 20.7579 28.0209 21.3197C28.2607 21.9499 28.9161 22.4181 29.5555 22.4181C30.9371 22.4181 32.3187 22.4181 33.7003 22.4181C33.8258 22.4158 33.9492 22.4158 34.0702 22.4158ZM35.1184 22.3633C35.2166 22.3907 35.2577 22.4135 35.3011 22.4135C36.8197 22.4158 38.3383 22.4432 39.8569 22.4089C40.7681 22.3884 41.4988 21.3379 41.2727 20.4884C41.0284 19.5704 39.6559 18.8145 38.8064 19.3991C37.9752 19.97 37.1462 20.5501 36.3515 21.1689C35.9131 21.5069 35.5477 21.9408 35.1184 22.3633Z"*/}
+            {/*          fill="#EB5757"*/}
+            {/*        />*/}
+            {/*      </svg>*/}
+            {/*    </HistoryAnalyticsCard>*/}
+            {/*  </div>*/}
+            {/*</div>*/}
            {/*<MarketHistorySection />*/}
            {/* <TopHxBox className="mb-11" /> */}
            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
                {/* PURCHASE SECTION */}
                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Purchases</h2>
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">Purchases</h1>
                        {purchaseHistory.loading ? 
                        <LoadingSpinner size='16' color='sky-blue' />
                        :
@@ -218,7 +230,7 @@ export default function History() {
                {/* RECENT ACTIVITY SECTION */}
                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">Recent Activity</h1>
                        {/* <p className='text-base text-slate-500 dark:text-white'>Activity Report</p> */}
                        {paymentHistory.loading ? 
                        <LoadingSpinner size='16' color='sky-blue' />
@@ -229,7 +241,7 @@ export default function History() {
                </div>
                {/* END OF RECENT ACTIVITY SECTION */}
            </div>
-            <HistoryTable />
+            {/*<HistoryTable />*/}
          </div>
        </div>
      </Layout>
@@ -0,0 +1,103 @@
+import React, { useRef } from "react";
+import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
+import Icons from "../Helpers/Icons";
+import SliderCom from "../Helpers/SliderCom";
+
+export default function FamilyActiveLSlde({ className, trending }) {
+    const settings = {
+        arrows: false,
+        slidesToShow: 4,
+        slidesToScroll: 4,
+        infinite: true,
+        responsive: [
+            {
+                breakpoint: 1025,
+                settings: {
+                    slidesToShow: 3,
+                    slidesToScroll: 3,
+                },
+            },
+            {
+                breakpoint: 769,
+                settings: {
+                    slidesToShow: 2,
+                    slidesToScroll: 2,
+                },
+            },
+            {
+                breakpoint: 619,
+                settings: {
+                    slidesToShow: 1,
+                    slidesToScroll: 1,
+                },
+            },
+        ],
+    };
+    const trendingSlider = useRef(null);
+    const prevHandler = () => {
+        trendingSlider.current.slickPrev();
+    };
+    const nextHandler = () => {
+        trendingSlider.current.slickNext();
+    };
+    return (
+        <div className={`trending-section w-full px-2 sm:px-0 ${className || ""}`}>
+            {/* heading */}
+            <div className="flex justify-between items-center mb-6">
+                <div>
+                    <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Current Tasks</h1>
+                </div>
+                <div className="slider-btns flex space-x-3">
+                    <button onClick={nextHandler} type="button">
+                        <div className="trending-slider-left-btn relative text-white w-10 h-10 flex justify-center items-center rounded-full overflow-hidden">
+                            <svg
+                                width="11"
+                                height="19"
+                                viewBox="0 0 11 19"
+                                fill="none"
+                                xmlns="http://www.w3.org/2000/svg"
+                            >
+                                <path
+                                    d="M9.09766 1.1499L1.13307 9.11449L9.09766 17.0791"
+                                    stroke="url(#paint0_linear_220_23410)"
+                                    strokeWidth="2"
+                                    strokeLinecap="round"
+                                    strokeLinejoin="round"
+                                />
+                                <defs>
+                                    <linearGradient
+                                        id="paint0_linear_220_23410"
+                                        x1="9.09766"
+                                        y1="1.1499"
+                                        x2="-4.2474"
+                                        y2="7.96749"
+                                        gradientUnits="userSpaceOnUse"
+                                    >
+                                        <stop stopColor="#F539F8" />
+                                        <stop offset="0.416763" stopColor="#C342F9" />
+                                        <stop offset="1" stopColor="#5356FB" />
+                                    </linearGradient>
+                                </defs>
+                            </svg>
+                        </div>
+                    </button>
+                    <button onClick={prevHandler} type="button">
+                        <div className="trending-slider-right-btn  primary-gradient  text-white w-10 h-10 relative flex justify-center items-center rounded-full ">
+                            <Icons name="arrows" />
+                        </div>
+                    </button>
+                </div>
+            </div>
+            {/* trending products */}
+            <div className="trending-products relative w-full">
+                <SliderCom selector={trendingSlider} settings={settings}>
+                    {trending &&
+                        trending.length > 0 &&
+                        trending.map((item) => (
+                            <ProductCardStyleOne key={item.id} datas={item} />
+                        ))}
+                </SliderCom>
+            </div>
+        </div>
+    );
+}
@@ -0,0 +1,25 @@
+import React from "react";
+import datas from "../../data/product_data.json";
+import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
+import CommonHead from "../UserHeader/CommonHead";
+import FamilyActiveLSlde from "./FamilyActiveLSlde";
+
+
+
+export default function FamilyDash(props) {
+
+    console.log("PROPS IN FAMILY DASH->",props);
+
+    const trending = datas.datas;
+    return (
+        <div>
+            <div className="home-page-wrapper">
+                <CommonHead
+                    commonHeadData={props.commonHeadData}
+                />
+                <FamilyActiveLSlde trending={trending} className="mb-10" />
+                <TopSellerTopBuyerSliderSection className="mb-10" />
+            </div>
+        </div>
+    );
+}
@@ -0,0 +1,62 @@
+import React from "react";
+import datas from "../../data/product_data.json";
+import Hero from "./Hero";
+// import HomeTaskDisplay from "./HomeTaskDisplay";
+import usersService from "../../services/UsersService";
+import { useSelector } from "react-redux";
+// import SellHistoryMarketVisitorAnalytic from './SellHistoryMarketVisitorAnalytic';
+// import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
+//import UpdateTable from "./UpdateTable";
+import HomeActivities from "./HomeActivities";
+
+export default function FullAccountDash(props) {
+  console.log("PROPS IN HOME->", props);
+
+  const trending = datas.datas;
+  const jobData = datas.datas; // api calls or cache
+
+  const userApi = new usersService();
+
+  const { userDetails } = useSelector((state) => state?.userDetails);
+
+  return (
+    <div>
+      <div className="home-page-wrapper">
+        <Hero
+          className="mb-10"
+          data={userDetails}
+          bannerList={props.bannerList}
+          nextDueTask={props.nextDueTask}
+        />
+        <HomeActivities className="mb-10" />
+        {/*<UpdateTable className="mb-10"/>*/}
+        {/*<SellHistoryMarketVisitorAnalytic className="mb-10"/>*/}
+        {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}
+
+        {/*<HomeTaskDisplay*/}
+        {/*    jobData={jobData}*/}
+        {/*    className="mb-10"*/}
+        {/*    bannerList={props.bannerList}*/}
+        {/*/>*/}
+      </div>
+    </div>
+  );
+}
+// /*
+//      <Layout>
+//             <div className="home-page-wrapper">
+//                 <Hero className="mb-10" data={userDetails} />
+//                 {/* <CreateNft />
+//         <TrendingSection trending={trending} className="mb-10" />*/}
+// <HomeTaskDisplay
+//     jobData={jobData}
+//     className="mb-10"
+//     bannerList={props.bannerList}
+// />
+{
+  /*  <SellHistoryMarketVisitorAnalytic className="mb-10"/>
+                <TopSellerTopBuyerSliderSection className="mb-10" />
+                <UpdateTable className="mb-10"/>*/
+}
+// </div>
+// </Layout>
@@ -3,15 +3,11 @@ import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
 import heroBg from "../../assets/images/hero-bg.svg";
 import heroUser from "../../assets/images/hero-user.png";
-import slider1 from "../../assets/images/slider-1.jpg";
-import slider2 from "../../assets/images/slider-2.jpg";
-import slider3 from "../../assets/images/slider-3.jpg";
 import CountDown from "../Helpers/CountDown";
-import SliderCom from "../Helpers/SliderCom";
 import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";

-export default function Hero({ className }) {
+export default function Hero({ className, bannerList, nextDueTask }) {
  const settings = {
    autoplay: true,
    dots: true,
@@ -19,23 +15,12 @@ export default function Hero({ className }) {
    infinite: true,
    swipe: true,
  };
-  const sildeData =null;
-  const [addFavorite, setValue] = useState(false);
+  const sildeData = null;
+  const { userDetails } = useSelector((state) => state?.userDetails);

-  const {userDetails} = useSelector((state) => state?.userDetails)
-  const favoriteHandler = () => {
-    if (!addFavorite) {
-      setValue(true);
-      toast.success("Added to Favorite List");
-    } else {
-      setValue(false);
-      toast.warn("Remove to Favorite List");
-    }
-  };
-
-  let loginDate = userDetails?.last_login.split(' ')[0]
-  let {firstname, lastname, email, profile_pic} = userDetails
-  let userEmail = email.split('@')[0]
+  let loginDate = userDetails?.last_login.split(" ")[0];
+  let { firstname, lastname, email, profile_pic } = userDetails;
+  let userEmail = email.split("@")[0];

  return (
    <div
@@ -55,13 +40,13 @@ export default function Hero({ className }) {
            Welcome
          </h1>
          <span className="text-[18px] font-thin tracking-wide text-white">
-            Last Login :  {loginDate}
+            Last Login : {loginDate}
          </span>
        </div>
        {/* user */}
        <div className="flex items-center space-x-3">
          <div className="w-14 h-14 flex justify-center items-center rounded-full overflow-hidden">
-            <img src={profile_pic != '' ? profile_pic : heroUser} alt="" />
+            <img src={profile_pic != "" ? profile_pic : heroUser} alt="" />
          </div>
          <div>
            <p className="text-xl tracking-wide font-bold antise text-white">
@@ -71,33 +56,35 @@ export default function Hero({ className }) {
          </div>
        </div>
        {/* countdown */}
-        <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
-          <div className="flex flex-col justify-between">
-            <p className="text-base text-white tracking-wide">Current Task</p>
-            <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-              ABCDEFGH01
-            </p>
-            <p className="text-base text-white tracking-wide">773.69 USD</p>
-          </div>
-          <div className="w-[1px] h-full bg-white-opacity"></div>
-          <div className="flex flex-col justify-between">
-            <p className="text-base text-white tracking-wide">Next due in</p>
-            <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-              <CountDown lastDate="2023-04-26 4:00:00" />
-            </p>
-            <div className="text-base text-white tracking-wide flex gap-[23px]">
-              <span>Hrs</span>
-              <span>Min</span>
-              <span>Sec</span>
+        {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length && (
+          <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
+            <div className="flex flex-col justify-between">
+              <p className="text-base text-white tracking-wide">Current Task</p>
+              <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
+                {nextDueTask.next_due.item_code}
+              </p>
+              <p className="text-base text-white tracking-wide">
+                {nextDueTask.next_due.price} Naira
+              </p>
+            </div>
+            <div className="w-[1px] h-full bg-white-opacity"></div>
+            <div className="flex flex-col justify-between">
+              <p className="text-base text-white tracking-wide">Next due in</p>
+              <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
+                {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
+                <CountDown lastDate={nextDueTask.next_due.due_date} />
+              </p>
+              <div className="text-base text-white tracking-wide flex gap-[23px]">
+                <span>Hrs</span>
+                <span>Min</span>
+                <span>Sec</span>
+              </div>
            </div>
          </div>
-        </div>
+        )}
        {/* action */}
        <div className="flex lg:space-x-3 space-x-1 items-center">
-          <Link
-            to="/mytask"
-            className="text-white text-base sm:block hidden"
-          >
+          <Link to="/mytask" className="text-white text-base sm:block hidden">
            <span className=" border-b dark:border-[#5356fb29]  border-white">
              {" "}
              View All Task(s)
@@ -105,7 +92,11 @@ export default function Hero({ className }) {
          </Link>
        </div>
      </div>
-      <HomeSliders settings={settings} sideData={sildeData}/>
+      <HomeSliders
+        settings={settings}
+        sideData={sildeData}
+        bannerList={bannerList}
+      />
    </div>
  );
 }
@@ -0,0 +1,267 @@
+import React, { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
+import dataImage3 from "../../assets/images/data-table-user-3.png";
+import dataImage4 from "../../assets/images/data-table-user-4.png";
+import SelectBox from "../Helpers/SelectBox";
+
+export default function HomeActivities({ className }) {
+    const filterCategories = ["All Categories", "Explore", "Featured"];
+    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+    return (
+        <div
+            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow relative min-h-[520px] ${
+                className || ""
+            }`}
+        >
+            <div className="header w-full sm:flex justify-between items-center mb-5">
+                <div className="flex space-x-2 items-center mb-2 sm:mb-0">
+                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+                       Recent Activities
+                    </h1>
+
+                </div>
+            </div>
+            <div className="relative w-full overflow-x-auto sm:rounded-lg">
+                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                    <tbody>
+                    {/* table heading */}
+                    {/*<tr className="text-base text-thin-light-gray whitespace-nowrap px-2 border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+                    {/*    <td className="py-4 w-[300px] block whitespace-nowrap">*/}
+                    {/*        All Product*/}
+                    {/*    </td>*/}
+                    {/*    <td className="py-4 whitespace-nowrap text-center">.</td>*/}
+                    {/*    <td className="py-4 whitespace-nowrap text-center"></td>*/}
+
+                    {/*    <td className="py-4 whitespace-nowrap text-right"></td>*/}
+                    {/*</tr>*/}
+                    <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                        <td className=" py-4">
+                            <div className="flex space-x-2 items-center">
+                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                    <img
+                                        src={dataImage1}
+                                        alt="data"
+                                        className="w-full h-full"
+                                    />
+                                </div>
+                                <div className="flex flex-col">
+                                    <h1 className="font-bold text-xl   text-dark-gray dark:text-white">
+                                        Mullican Computer Joy
+                                    </h1>
+                                    <span className="text-sm text-thin-light-gray">
+                          Owned by <span className="text-purple">Xoeyam</span>
+                        </span>
+                                </div>
+                            </div>
+                        </td>
+                        <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+                      <span>
+                        <svg
+                            width="18"
+                            height="18"
+                            viewBox="0 0 18 18"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                              d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
+                              fill="#627EEA"
+                          />
+                          <path
+                              d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
+                              fill="white"
+                              fillOpacity="0.602"
+                          />
+                          <path
+                              d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
+                              fill="white"
+                          />
+                          <path
+                              d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
+                              fill="white"
+                              fillOpacity="0.602"
+                          />
+                          <path
+                              d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
+                              fill="white"
+                          />
+                          <path
+                              d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
+                              fill="white"
+                              fillOpacity="0.2"
+                          />
+                          <path
+                              d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
+                              fill="white"
+                              fillOpacity="0.602"
+                          />
+                        </svg>
+                      </span>
+                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        7473 ETH
+                      </span>
+                            </div>
+                        </td>
+                        <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+                      <span>
+                        <svg
+                            width="16"
+                            height="16"
+                            viewBox="0 0 16 16"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                              d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
+                              fill="#59BE59"
+                          />
+                          <path
+                              d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
+                              fill="#FEFEFE"
+                          />
+                          <path
+                              d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
+                              fill="#59BE59"
+                          />
+                          <path
+                              d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
+                              fill="#59BE59"
+                          />
+                        </svg>
+                      </span>
+                                <span className="text-base text-dark-gray dark:text-white font-medium">
+                        6392.99$
+                      </span>
+                            </div>
+                        </td>
+
+                        <td className="text-right py-4">
+                            <button
+                                type="button"
+                                className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
+                            >
+                                Active
+                            </button>
+                        </td>
+                    </tr>
+                    <tr className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                        <td className=" py-4">
+                            <div className="flex space-x-2 items-center">
+                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                    <img
+                                        src={dataImage2}
+                                        alt="data"
+                                        className="w-full h-full"
+                                    />
+                                </div>
+                                <div className="flex flex-col">
+                                    <h1 className="font-bold text-xl   text-dark-gray dark:text-white">
+                                        Mullican Computer Joy
+                                    </h1>
+                                    <span className="text-sm text-thin-light-gray">
+                          Owned by <span className="text-purple">Xoeyam</span>
+                        </span>
+                                </div>
+                            </div>
+                        </td>
+                        <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+                      <span>
+                        <svg
+                            width="18"
+                            height="18"
+                            viewBox="0 0 18 18"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                              d="M9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18Z"
+                              fill="#627EEA"
+                          />
+                          <path
+                              d="M9.28125 2.25V7.23937L13.4983 9.12375L9.28125 2.25Z"
+                              fill="white"
+                              fillOpacity="0.602"
+                          />
+                          <path
+                              d="M9.28012 2.25L5.0625 9.12375L9.28012 7.23937V2.25Z"
+                              fill="white"
+                          />
+                          <path
+                              d="M9.28125 12.3582V15.7483L13.5011 9.91016L9.28125 12.3582Z"
+                              fill="white"
+                              fillOpacity="0.602"
+                          />
+                          <path
+                              d="M9.28012 15.7483V12.3576L5.0625 9.91016L9.28012 15.7483Z"
+                              fill="white"
+                          />
+                          <path
+                              d="M9.28125 11.572L13.4983 9.12348L9.28125 7.24023V11.572Z"
+                              fill="white"
+                              fillOpacity="0.2"
+                          />
+                          <path
+                              d="M5.0625 9.12348L9.28012 11.572V7.24023L5.0625 9.12348Z"
+                              fill="white"
+                              fillOpacity="0.602"
+                          />
+                        </svg>
+                      </span>
+                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        7473 ETH
+                      </span>
+                            </div>
+                        </td>
+                        <td className="text-center py-4 px-2">
+                            <div className="flex space-x-1 items-center justify-center">
+                      <span>
+                        <svg
+                            width="16"
+                            height="16"
+                            viewBox="0 0 16 16"
+                            fill="none"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                              d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
+                              fill="#59BE59"
+                          />
+                          <path
+                              d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
+                              fill="#FEFEFE"
+                          />
+                          <path
+                              d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
+                              fill="#59BE59"
+                          />
+                          <path
+                              d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
+                              fill="#59BE59"
+                          />
+                        </svg>
+                      </span>
+                                <span className="text-base text-dark-gray dark:text-white font-medium">
+                        6392.99$
+                      </span>
+                            </div>
+                        </td>
+
+                        <td className="text-right py-4">
+                            <button
+                                type="button"
+                                className="text-sm text-white bg-light-green px-2.5 py-1.5 rounded-full"
+                            >
+                                Complated
+                            </button>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    );
+}
@@ -1,32 +1,32 @@
 import SliderCom from "../Helpers/SliderCom";
-import slider1 from "../../assets/images/slider-1.jpg";
 import slider2 from "../../assets/images/slider-2.jpg";
-import slider3 from "../../assets/images/slider-3.jpg";
 import HomeBannerOffersCard from "../Cards/HomeBannerOffersCard";

-
 export default function HomeSliders(props) {
-    // debugger;
-    return (
-        <>
-            <div className="hero-slider relative 2xl:w-[600px] xl:w-[500px] lg:w-[420px] w-full mb-2 lg:mb-0 ">
-                <div className="w-full">
-                    <SliderCom settings={props.settings}>
-                        <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
-                            <img src={slider1} alt="slider" className="w-full h-full" />
-                        </div>
-                        <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
-                            <img src={slider2} alt="slider" className="w-full h-full" />
-                        </div>
-                        <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
-                            <img src={slider3} alt="slider" className="w-full h-full" />
-                        </div>
-                        <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
-                           <HomeBannerOffersCard />
-                        </div>
-                    </SliderCom>
+  // console.log("BANNER LIST IN HomeSliders->", props.bannerList);
+  // debugger;
+  return (
+    <>
+      <div className="hero-slider relative 2xl:w-[600px] xl:w-[500px] lg:w-[420px] w-full mb-2 lg:mb-0 ">
+        <div className="w-full">
+          <SliderCom settings={props.settings}>
+            {props.bannerList?.length <= 0 && (
+              <div className="item w-full h-full bg-white dark:bg-dark-white max-h-80 rounded-2xl overflow-hidden">
+                <img src={slider2} alt="slider" className="w-full h-full" />
+              </div>
+            )}
+            {props.bannerList?.length > 0 &&
+              props.bannerList.map((item, index) => (
+                <div
+                  key={index}
+                  className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden"
+                >
+                  <HomeBannerOffersCard itemData={item} />
                </div>
-            </div>
-        </>
-    );
+              ))}
+          </SliderCom>
+        </div>
+      </div>
+    </>
+  );
 }
@@ -1,40 +1,72 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
-import CreateNft from "./CreateNft";
-import Hero from "./Hero";
-import SellHistoryMarketVisitorAnalytic from "./SellHistoryMarketVisitorAnalytic";
-import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
-import TrendingSection from "./TrendingSection";
-import UpdateTable from "./UpdateTable";
-import HomeTaskDisplay from "./HomeTaskDisplay";
-import UsersService from "../../services/UsersService";
 import usersService from "../../services/UsersService";
 import { useSelector } from "react-redux";
+import FamilyDash from "./FamilyDash";
+import FullAccountDash from "./FullAccountDash";

+export default function Home(props) {
+  console.log("PROPS IN HOME->", props);

-export default function Home() {
-    const trending = datas.datas;
-    const jobData =  datas.datas; // api calls or cache
-    //getHomeDate
-    const userApi = new usersService();
-    const homeData = userApi.getHomeDate();
+  let [nextDueTask, setNextDueTask] = useState({});

-    const {userDetails} = useSelector((state) => state?.userDetails)
+  const userApi = new usersService();

-    return (
-        <Layout>
-            <div className="home-page-wrapper">
-                <Hero className="mb-10" data={userDetails} />
-                {/* <CreateNft />
-        <TrendingSection trending={trending} className="mb-10" />*/}
-                <HomeTaskDisplay
-                    jobData={jobData}
-                    className="mb-10"/>
-                {/*  <SellHistoryMarketVisitorAnalytic className="mb-10"/>
-                <TopSellerTopBuyerSliderSection className="mb-10" />
-                <UpdateTable className="mb-10"/>*/}
-            </div>
-        </Layout>
-    );
+  const { userDetails } = useSelector((state) => state?.userDetails);
+
+  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
+
+  // 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);
+      });
+  };
+
+  useEffect(() => {
+    getHomeDate();
+  }, []);
+
+  return (
+    <Layout>
+      <div className="home-page-wrapper">
+        {userDetails && userDetails?.account_type == "FAMILY" && (
+          <FamilyDash commonHeadData={props.bannerList} />
+        )}
+        {userDetails && userDetails?.account_type == "FULL" && (
+          <FullAccountDash
+            nextDueTask={nextDueTask}
+            bannerList={props.bannerList}
+          />
+        )}
+      </div>
+    </Layout>
+  );
 }
+// /*
+//      <Layout>
+//             <div className="home-page-wrapper">
+//                 <Hero className="mb-10" data={userDetails} />
+//                 {/* <CreateNft />
+//         <TrendingSection trending={trending} className="mb-10" />*/}
+// <HomeTaskDisplay
+//     jobData={jobData}
+//     className="mb-10"
+//     bannerList={props.bannerList}
+// />
+{
+  /*  <SellHistoryMarketVisitorAnalytic className="mb-10"/>
+                <TopSellerTopBuyerSliderSection className="mb-10" />
+                <UpdateTable className="mb-10"/>*/
+}
+// </div>
+// </Layout>
@@ -1,29 +1,38 @@
-import React, { useEffect, useState } from "react";
-//import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo";
+import React, { useEffect, useMemo, useState } from "react";
 import DataIteration from "../Helpers/DataIteration";
-// import SearchCom from "../Helpers/SearchCom";
-// import ActiveJobsCard from "../Cards/ActiveJobsCard";
 import AvailableJobsCard from "../Cards/AvailableJobsCard";

-export default function MainSection({ className, marketPlaceProduct }) {
-  const [tab, setTab] = useState("explore");
-  const [products, setProducts] = useState(marketPlaceProduct);
+export default function MainSection({
+  className,
+  marketPlaceProduct,
+  categories,
+}) {
+  // Creating All cart..
+  let marketCategories = useMemo(
+    () => ({ All: "All", ...categories }),
+    [categories]
+  );
+  const [tab, setTab] = useState(marketCategories.All);
+
+  // Convert to array in order to map
+  const mappedArray = Object.entries(marketCategories).map(([key, value]) => {
+    return { key, value };
+  });
+
+  const [products, setProducts] = useState([]);
  const tabHandler = (value) => {
    setTab(value);
  };
  useEffect(() => {
-    if (tab === "artist") {
-      setProducts(marketPlaceProduct.slice(0, 3));
-    } else if (tab === "market") {
-      setProducts(marketPlaceProduct.slice(0, 6));
-    } else if (tab === "shop") {
-      setProducts(marketPlaceProduct.slice(6, 9));
-    } else if (tab === "assets") {
-      setProducts(marketPlaceProduct.slice(3, 6));
-    } else {
+    if (tab === marketCategories.All) {
      setProducts(marketPlaceProduct);
+    } else {
+      const filteredProducts = marketPlaceProduct.filter((product) =>
+        product.category.includes(tab)
+      );
+      setProducts(filteredProducts);
    }
-  }, [tab, marketPlaceProduct]);
+  }, [tab, marketPlaceProduct, categories, marketCategories]);

  return (
    <div className={`market-place-section w-full ${className || ""}`}>
@@ -31,71 +40,26 @@ export default function MainSection({ className, marketPlaceProduct }) {
        <div className="filter-navigate-area lg:flex justify-between mb-8 items-center">
          <div className="tab-item lg:mb-0 mb-5">
            <div className="md:flex md:space-x-8 space-x-2">
-              <span
-                onClick={() => tabHandler("explore")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "explore"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Explore
-              </span>
-              <span
-                onClick={() => tabHandler("artist")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "artist"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Featured Artist
-              </span>
-              <span
-                onClick={() => tabHandler("market")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "market"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Open Market
-              </span>
-              <span
-                onClick={() => tabHandler("shop")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "shop"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Partner Shops
-              </span>
-              <span
-                onClick={() => tabHandler("assets")}
-                className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "assets"
-                    ? "text-pink border-pink"
-                    : " border-transparent"
-                }`}
-              >
-                Game Assets
-              </span>
+              {mappedArray.map(({ key, value }) => (
+                <span
+                  onClick={() => tabHandler(key)}
+                  className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
+                    tab === key
+                      ? "text-pink border-pink"
+                      : " border-transparent"
+                  }`}
+                >
+                  {value}
+                </span>
+              ))}
            </div>
          </div>
-
-          {/*<div className="search-item flex lg:flex-none justify-end">*/}
-          {/*  <SearchCom*/}
-          {/*    className="lg:bg-transparent"*/}
-          {/*    inputClasses="lg:bg-transparent"*/}
-          {/*  />*/}
-          {/*</div>*/}
        </div>
        <div className="filter-navigate-content w-full min-h-screen">
          <div className="grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]">
            <DataIteration
              datas={products}
-              startLength="0"
+              startLength={process.env.REACT_APP_ZERO_STATE}
              endLength={products?.length}
            >
              {({ datas }) => (
@@ -0,0 +1,290 @@
+import React, { useCallback, useMemo, useState } from "react";
+import ModalCom from "../../Helpers/ModalCom";
+import { toast } from "react-toastify";
+import { Form, Formik } from "formik";
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
+const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
+  const [marketMsg, setMarketMsg] = useState({
+    loading: false,
+    data: {},
+    state: undefined,
+  });
+  const [manageInt, setManageInt] = useState({
+    loading: false,
+    data: {},
+    state: undefined,
+    msg: "",
+  });
+
+  const [textValue, setTextValue] = useState("");
+
+  const handleInputChange = ({ target: { value } }) => {
+    setTextValue(value);
+  };
+
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const marketCalls = useCallback(
+    async (e) => {
+      try {
+        const nameOfCall = e?.target?.name;
+        const { offer_code } = details;
+        const reqData = { offer_code };
+
+        if (nameOfCall === "market-message") {
+          setMarketMsg({ loading: true });
+          if (!textValue) return;
+
+          reqData.yourmessage = textValue;
+
+          const marketMessage = await apiCall.MarketMessage(reqData);
+          const marketMessageRes = marketMessage?.data;
+
+          if (marketMessageRes?.internal_return < 0) {
+            toast.warn("Something wrong happened", {
+              autoClose: 2000,
+              hideProgressBar: true,
+            });
+            onClose();
+            return;
+          }
+
+          toast.success("Message sent", {
+            autoClose: 2500,
+            hideProgressBar: true,
+          });
+
+          setMarketMsg({ data: marketMessageRes, state: true });
+          setTimeout(() => onClose(), 2000);
+        } else {
+          setManageInt({ loading: true });
+
+          const manageInt = await apiCall.MarketInterest(reqData);
+          const manageIntRes = manageInt?.data;
+
+          if (manageIntRes?.internal_return < 0) {
+            setManageInt({
+              loading: false,
+              msg: `Error - ${manageIntRes?.status}`,
+              data: manageIntRes,
+              state: false,
+            });
+          } else {
+            setManageInt({
+              loading: false,
+              msg: manageIntRes?.status,
+              data: manageIntRes,
+              state: true,
+            });
+          }
+
+          setTimeout(() => setManageInt({ msg: "" }), 3000);
+
+          return;
+        }
+      } catch (error) {
+        throw new Error(error);
+      } finally {
+        setTimeout(() => {
+          setTextValue("");
+          setMarketMsg({ loading: false });
+        }, 2000);
+      }
+    },
+    [apiCall, details, onClose, textValue]
+  );
+
+  console.log('Checking my mangeInt',manageInt)
+
+  // let addedIntDate = marketInt?.added?.split(" ")[0];
+  let expireIntDate = marketInt?.expire?.split(" ")[0];
+
+  return (
+    <ModalCom action={onClose} situation={situation} className="edit-popup">
+      <div className="logout-modal-wrapper md:w-[750px] md:h-[700px] h-full bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px]">
+          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            {details.offer_code}
+          </h1>
+          <CloseIcon onClose={onClose} />
+        </div>
+
+        <div className="md:flex bg-white rounded-lg">
+          <div className="p-4 w-full md:w-3/4 md:border-r-1">
+            <div className="min-h-[290px]">
+              <h2 className="font-semibold text-slate-900 dark:text-black tracking-wide">
+                {details?.title}
+              </h2>
+
+              {/* INPUT SECTION */}
+              {[
+                {
+                  name: "Description",
+                  content: details.description,
+                },
+                {
+                  name: "",
+                  content: {
+                    text: `Timeline: ${details.timeline_days} day(s) -- `,
+                    bold: `Budget: ${details.price} naira`,
+                  },
+                },
+                {
+                  name: "Delivery Detail",
+                  content: details.job_description,
+                  danger: true,
+                },
+              ].map(({ name, content, danger }, idx) => (
+                <div className={`my-3 md:flex items-center`} key={idx}>
+                  <label className="w-full md:w-1/4 text-slate-900 tracking-wide font-semibold">
+                    {name}
+                  </label>
+                  <div
+                    className={`w-full md:w-3/4 text-slate-900 market-pop ${
+                      name !== "Delivery Detail"
+                        ? " h-full max-h-28 flex items-center"
+                        : " overflow-y-auto max-h-[100px]"
+                    }`}
+                  >
+                    {danger ? (
+                      <p
+                        className={``}
+                        dangerouslySetInnerHTML={{
+                          __html: danger && content?.replace(/"/g, ""),
+                        }}
+                      />
+                    ) : (
+                      <p className={`w-full md:w-3/4 text-slate-900`}>
+                        {name !== "Delivery Detail" ? (
+                          <>
+                            {typeof content !== "object" ? content : null}
+                            {typeof content === "object" && (
+                              <span className="flex items-center gap-2">
+                                {content?.text}
+                                <strong>{content?.bold}</strong>
+                              </span>
+                            )}
+                          </>
+                        ) : (
+                          ""
+                        )}
+                      </p>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+            <hr />
+            <div className="my-3 w-full flex flex-col gap-3">
+              <div className="w-full">
+                <label className="w-full text-slate-900 tracking-wide">
+                  If you have any questions about this task:
+                </label>
+                <textarea
+                  className={`p-1 w-full text-sm text-slate-900 outline-none border border-slate-300 rounded-md`}
+                  rows="5"
+                  style={{ resize: "none" }}
+                  placeholder="Enter message here ..."
+                  value={textValue}
+                  onChange={handleInputChange}
+                />
+              </div>
+              <button
+                className="self-end w-[150px] h-[52px] rounded-md text-base bg-yellow-500 text-white"
+                name="market-message"
+                onClick={marketCalls}
+              >
+                {marketMsg.loading ? (
+                  <LoadingSpinner size={5} color="white" />
+                ) : !marketMsg.state ? (
+                  "Send Message"
+                ) : (
+                  "Message Sent"
+                )}
+              </button>
+            </div>
+          </div>
+
+          <div className="w-full md:w-1/4 h-full ">
+            <div className="w-[90%] mx-auto bg-[#f1f8ff] p-4 rounded-md md:min-h-[550px] flex flex-col justify-between">
+              <div className="w-full flex flex-col justify-center py-4 gap-2">
+                <p className="w-full text-slate-900 tracking-wide my-1">
+                  Interested in the task?
+                </p>
+                <hr />
+                <button
+                  className="bg-[#57cd89] text-center text-lg font-semibold text-white py-2 px-4 rounded-md inline-flex flex-col items-center justify-center"
+                  name="market-interest"
+                  onClick={marketCalls}
+                >
+                  {" "}
+                  <span>Send</span>
+                  <span>Interest</span>
+                  <span>Request</span>
+                </button>
+                <>
+                  {manageInt.loading ? (
+                    <p className="text-sm italic">please wait...</p>
+                  ) : (
+                    <>
+                      {manageInt?.msg !== "" && (
+                        <p
+                          className={`text-sm italic ${
+                            manageInt?.state ? "text-green-500" : "text-red-500"
+                          }`}
+                        >
+                          {manageInt?.msg}
+                        </p>
+                      )}
+                    </>
+                  )}
+                </>
+              </div>
+
+              <div className="">
+                <p className="flex items-center tracking-wide">
+                  Interest: <b className="ml-1">{details.interest_count}</b>
+                </p>
+                <hr />
+                <p className="my-1">Expire: {expireIntDate}</p>
+              </div>
+            </div>
+          </div>
+          {/* END OF ACTION SECTION */}
+        </div>
+      </div>
+    </ModalCom>
+  );
+};
+
+export default MarketPopUp;
+
+const CloseIcon = ({ onClose }) => (
+  <button
+    type="button"
+    className="text-[#374557] dark:text-red-500"
+    onClick={onClose}
+  >
+    <svg
+      width="36"
+      height="36"
+      viewBox="0 0 36 36"
+      fill="none"
+      className="fill-current"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+        fill=""
+        fillOpacity="0.6"
+      />
+      <path
+        d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+        fill="#"
+        fillOpacity="0.6"
+      />
+    </svg>
+  </button>
+);
@@ -1,22 +1,23 @@
-import React from "react";
-// import products from "../../data/marketplace_data.json";
-//import CreateNft from "../Home/CreateNft";
 import Layout from "../Partials/Layout";
 import MainSection from "./MainSection";
 import CommonHead from "../UserHeader/CommonHead";
 import { useSelector } from "react-redux";

-export default function MarketPlace() {
+export default function MarketPlace({ commonHeadData }) {
  let { jobLists } = useSelector((state) => state.jobLists);
  const marketData = jobLists?.result_list;
+  const categories = jobLists?.categories;

-  // const marketProduct = products.data;
  return (
    <>
      <Layout>
-        <CommonHead />
-        <MainSection marketPlaceProduct={marketData} className="mb-10" />
+        <CommonHead commonHeadData={commonHeadData} />
+        <MainSection
+          marketPlaceProduct={marketData}
+          categories={categories}
+          className="mb-10"
+        />
      </Layout>
    </>
  );
-}
+}
@@ -0,0 +1,68 @@
+import React, { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
+import dataImage3 from "../../assets/images/data-table-user-3.png";
+import dataImage4 from "../../assets/images/data-table-user-4.png";
+import SelectBox from "../Helpers/SelectBox";
+
+import PaginatedList from "../Pagination/PaginatedList";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+
+export default function ActiveJobMessage({ activeJobMesList }) {
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentActiveJobMesList = activeJobMesList?.data?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+      handlePagingFunc(e,setCurrentPage)
+    }
+
+  return (
+    <div className='flex flex-col justify-between h-full'>
+    <table className="wallet-activity w-full table-auto border-collapse text-left">
+        <thead className='border-b-2'>
+            <tr className='text-slate-600'>
+            <th className="p-2"></th>
+            </tr>
+        </thead>
+        {activeJobMesList.data.length ?
+        (
+        <tbody>
+            {currentActiveJobMesList.map((item, index) => (
+            <tr key={index} className='text-slate-500'>
+                <td>
+                    <div className="msg_box">
+                        <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
+                        <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                    </div>
+
+                </td>
+            </tr>
+            ))}
+        </tbody>
+        )
+        :
+        activeJobMesList.error ? 
+        (
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+            </tr>
+        </tbody>
+        )
+        :
+        <tbody>
+            <tr className='text-slate-500'>
+                <td className="p-2" colSpan={4}>No Message Found!</td>
+            </tr>
+        </tbody>
+        }
+    </table>
+
+    {/* 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} />
+    {/* END OF PAGINATION BUTTON */}
+    </div>
+  )
+}
@@ -0,0 +1,678 @@
+import React, { useEffect, useState, useRef } from "react";
+import { useSelector } from "react-redux";
+import Layout from "../Partials/Layout";
+import { useNavigate } from "react-router-dom";
+import ActiveJobMessage from "./ActiveJobMessage";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import CountDown from "../Helpers/CountDown";
+import IndexJobActions from "./JobActions/IndexJobActions";
+import ModalCom from "../Helpers/ModalCom";
+import { useReactToPrint } from "react-to-print";
+
+import usersService from "../../services/UsersService";
+
+function ActiveJobs(props) {
+  const ApiCall = new usersService();
+  let navigate = useNavigate();
+
+  let { userDetails } = useSelector((state) => state.userDetails);
+
+  let [passDue, setPassDue] = useState(
+    new Date() > new Date(props.details?.delivery_date)
+  ); // STATE TO KNOW IF TASK IS PASSED DUE TIME
+
+  let [messageToSend, setMessageToSend] = useState(""); // State to hold the value of message to be sent
+
+  let [filesToSend, setFilesToSend] = useState([]); // State to hold the value of files to be sent
+
+  let [tab, setTab] = useState("message");
+
+  let [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+  });
+
+  let [popUp, setPopUp] = useState(false); // STATE FOR POPOUT MODAL
+
+  const printRef = useRef();
+  // to handle printing
+  const handlePrint = useReactToPrint({
+    content: () => printRef.current,
+  });
+
+  const popUpHandler = () => {
+    // FUNCTION TO HANDLE POPOUT
+    setPopUp((prev) => !prev);
+  };
+
+  // FUNCTION TO HANDLE MESSAGE CHANGE
+  const handleMessageChange = ({ target: { value } }) => {
+    setMessageToSend(value);
+  };
+
+  // FUNCTION TO HANDLE FILE UPlOAD CHANGE
+  const handleFileChange = ({ target: { files } }) => {
+    setRequestStatus({ loading: false, status: false, message: "" }); // State to determine error state
+
+    if (!files[0]) {
+      // IF NO FILE SELECTED RETURN
+      return;
+    }
+    if (files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "File must be <= 1mb",
+      });
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+      return;
+    }
+    if (filesToSend.length >= Number(process.env.REACT_APP_TOTAL_NUM_FILE)) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: `Total number of attachment is ${Number(
+          process.env.REACT_APP_TOTAL_NUM_FILE
+        )}`,
+      });
+      setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+      return;
+    }
+    // INCLUDE FILE IF NO ERROR
+    setFilesToSend((prev) => [...prev, files[0]]);
+  };
+
+  // FUNCTION TO CLEAR ALL TYPED MESSAGE OR FILES
+  const handleClearAll = ({ target: { name } }) => {
+    if (tab == "message") {
+      setMessageToSend("");
+    } else if (tab == "files") {
+      setFilesToSend([]);
+    } else {
+      return;
+    }
+  };
+
+  // FUNCTION TO REMOVE AND IMAGE
+  const handleRemoveImage = (imageToDelete) => {
+    setFilesToSend((prev) =>
+      prev.filter((item) => item.name != imageToDelete.name)
+    );
+  };
+
+  // FUNCTION TO SEND TASK MESSAGE
+  const sendTaskMessage = () => {
+    let reqData = {
+      message: messageToSend,
+      msg_type: "TEXT",
+      contract: props.details.contract,
+    };
+    if (!reqData.message) {
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "Message is empty",
+      });
+      return setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
+    setRequestStatus({ loading: true, status: false, message: "" });
+    ApiCall.sendTaskMessage(reqData)
+      .then((res) => {
+        if (res.status != 200 || res.data.internal_return < 0) {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "Message could not be sent, try again later",
+          });
+          return;
+        }
+        setRequestStatus({
+          loading: false,
+          status: true,
+          message: "Message Sent Successfully",
+        });
+        props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+        setMessageToSend(""); // SENDS MESSAGE TO SEND BACK TO EMPTY STRINGS
+      })
+      .catch((error) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: "Opps! something went wrong",
+        });
+      })
+      .finally(() => {
+        setTimeout(() => {
+          setRequestStatus({ loading: false, status: false, message: "" });
+        }, 5000);
+      });
+  };
+
+  // FUNCTION TO SEND FILES
+  const sendFile = async () => {
+    setRequestStatus({ loading: true, status: false, message: "" });
+
+    if (!filesToSend.length) {
+      // checks if file to send is empty
+      setRequestStatus({
+        loading: false,
+        status: false,
+        message: "No File(s) selected",
+      });
+      return setTimeout(() => {
+        setRequestStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
+
+    for (let i = 0; i <= filesToSend.length - 1; i++) {
+      // Loops through files to send array and trigger upload API call
+
+      const fileToBase64 = async () => {
+        // Converts file data to base64 string
+        try {
+          const base64String = await convertFileToBase64(filesToSend[i]);
+          return base64String;
+        } catch (error) {
+          return false;
+        }
+      };
+
+      // if(await !fileToBase64()){
+      //   return
+      // }
+
+      let reqData = {
+        file_name: filesToSend[i].name,
+        file_size: filesToSend[i].size,
+        file_type: "image/png",
+        file_data: await fileToBase64(),
+        msg_type: "FILE",
+        contract: props.details.contract,
+      };
+
+      ApiCall.sendFiles(reqData)
+        .then((res) => {
+          // if(res.status != 200 || res.data.internal_return < 0){
+          //   setRequestStatus({loading: false, status: false, message: 'Files(s) could not be sent, try again later'})
+          //   return
+          // }
+          // setRequestStatus({loading: false, status: true, message: 'File(s) Uploaded Successfully'})
+          // props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+          // setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+        })
+        .catch((error) => {
+          // setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
+        })
+        .finally(() => {
+          if (i == filesToSend.length - 1) {
+            setRequestStatus({
+              loading: false,
+              status: true,
+              message: "File(s) Uploaded Successfully",
+            });
+            setFilesToSend([]); // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+            props.reloadActiveJobList((prev) => !prev); // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+            setTimeout(() => {
+              setRequestStatus({ loading: false, status: false, message: "" });
+            }, 5000);
+          }
+        });
+    }
+  };
+
+  // FUNCTION TO CHECK IF TASK PASS DUE IS REACHED
+  let isPassedDue = () => {
+    // console.log('TESTING',new Date() > new Date(props.details?.delivery_date) )
+    if (new Date() > new Date(props.details?.delivery_date)) {
+      setPassDue(true);
+    } else {
+      setPassDue(false);
+    }
+  };
+
+  useEffect(() => {
+    if (!passDue) {
+      let passDueInterval = setInterval(() => {
+        isPassedDue();
+      }, 1000);
+      return () => {
+        clearInterval(passDueInterval);
+      };
+    }
+  }, [passDue]);
+
+  return (
+    <Layout>
+      <div className="py-[20px] bg-white dark:bg-black dark:text-white px-4 rounded-2xl shadow-md md:flex justify-between items-start gap-16">
+        {/* job title */}
+        <div className="w-full md:w-8/12">
+          <div className="w-full flex justify-start space-x-3 items-start">
+            <button
+              type="button"
+              className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
+              onClick={() =>
+                navigate(props.details.pathname, { replace: true })
+              }
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="35"
+                height="35"
+                viewBox="0 0 24 24"
+                fill="skyblue"
+              >
+                <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
+              </svg>
+            </button>
+            <h1 className="text-xl lg:text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
+              {props.details?.title && props.details.title}
+            </h1>
+          </div>
+
+          <div className="w-full my-2">
+            <p className="w-full text-base text-right text-sky-blue">
+              {props.details.job_to && props.details.job_to}
+            </p>
+            <div className="text-base text-slate-700 dark:text-white tracking-wide">
+              <p className="font-semibold text-black dark:text-white">Description: </p>
+              <p className="p-2 border border-sky-blue">
+                {props.details?.description && props.details.description}
+              </p>
+            </div>
+          </div>
+        </div>
+        {/* end of job title */}
+
+        {/* job details */}
+        <div className="w-full md:w-4/12">
+          <p className="text-base text-sky-blue">Delivery Detail</p>
+          {passDue ? (
+            <div className="my-1">
+              <p className="text-base text-slate-700">
+                <span className="font-semibold">Due: </span>
+                {props.details?.delivery_date &&
+                  props.details.delivery_date.split(" ")[0]}
+              </p>
+              <p className="py-2 text-base text-slate-700">
+                {props.details?.delivery_date &&
+                  props.details.delivery_date.split(" ")[1]}
+              </p>
+            </div>
+          ) : (
+            <div className="my-1 flex items-start gap-3">
+              <p className="font-semibold">Due: </p>
+              <div className="flex flex-col justify-between">
+                <p className="text-base text-slate-700 tracking-wide">
+                  <CountDown lastDate={props.details.delivery_date} />
+                </p>
+                <div className="text-base text-slate-700 tracking-wide flex gap-[5px]">
+                  <span>Hrs</span>
+                  <span>Min</span>
+                  <span>Sec</span>
+                </div>
+              </div>
+            </div>
+          )}
+
+          <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+            <span className="font-semibold text-black dark:text-white">Duration: </span>
+            <span className="">
+              {props.details?.timeline_days && props.details.timeline_days}{" "}
+              day(s)
+            </span>
+          </div>
+          <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+            <span className="font-semibold text-black dark:text-white">No: </span>
+            <span className="">
+              {props.details?.contract && props.details.contract}
+            </span>
+          </div>
+        </div>
+        {/* 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="w-full lg:w-1/2">
+          <div className="">
+            <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
+              Actions
+            </h1>
+            {/* <p className="my-3 py-1 text-base">
+                  Waiting for the completion message from the client before you can approve.
+                </p> */}
+            <IndexJobActions details={props.details} />
+          </div>
+
+          {/* TEXTAREA SECTION */}
+          <div className="mt-5">
+            <div className="">
+              {/* <p className="relative py-2 my-2 text-lg font-bold text-slate-600 dark:text-black border-b-2 border-slate-300 tracking-wide after:absolute after:-bottom-0.5 after:content-[''] after:w-[100px] after:h-[2px] after:bg-sky-blue after:left-0">Message(s)</p> */}
+              <div className="my-2 flex items-center border-b border-slate-300">
+                <button
+                  name="message"
+                  onClick={(e) => setTab(e.target.name)}
+                  className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
+                    tab == "message" ? "border-sky-blue" : "border-slate-300"
+                  } tracking-wide transition duration-200`}
+                >
+                  Send Message
+                </button>
+                <button
+                  name="files"
+                  onClick={(e) => setTab(e.target.name)}
+                  className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
+                    tab == "files" ? "border-sky-blue" : "border-slate-300"
+                  }  tracking-wide transition duration-200`}
+                >
+                  Send Files
+                </button>
+              </div>
+              {tab == "message" ? (
+                <textarea
+                  className="p-4 w-full h-[300px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border border-slate-300 outline-none"
+                  // rows="10"
+                  style={{ resize: "none" }}
+                  name="message"
+                  onChange={handleMessageChange}
+                  value={messageToSend}
+                />
+              ) : (
+                <div className="p-4 w-full h-[300px] text-base text-slate-600 border border-slate-300">
+                  <div className="files">
+                    <label
+                      htmlFor="file"
+                      className="h-20 btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
+                    >
+                      Select Files to Upload
+                    </label>
+                    <input
+                      type="file"
+                      id="file"
+                      accept="image/*"
+                      style={{ display: "none" }}
+                      onChange={handleFileChange}
+                    />
+                  </div>
+                  <div className="selected_file my-2">
+                    {filesToSend.length > 0 &&
+                      filesToSend.map((item, index) => (
+                        <p key={index} className="flex items-center space-x-2">
+                          <span>{item.name}</span>
+                          <button
+                            name="remove"
+                            onClick={() => handleRemoveImage(item)}
+                            className="px-2 flex justify-center items-center rounded-full border border-red-500 text-red-500"
+                          >
+                            x
+                          </button>
+                        </p>
+                      ))}
+                  </div>
+                </div>
+              )}
+            </div>
+
+            {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+            <div className="w-full">
+              {/* error or success display */}
+              {requestStatus.message != "" &&
+                (!requestStatus.status ? (
+                  <div
+                    className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                  >
+                    {requestStatus.message}
+                  </div>
+                ) : (
+                  requestStatus.status && (
+                    <div
+                      className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                    >
+                      {requestStatus.message}
+                    </div>
+                  )
+                ))}
+            </div>
+            {/* End of error or success display */}
+
+            {/* Buttons Sections */}
+            <div className="py-2 sm:flex sm:justify-end sm:items-center">
+              <div className="w-full sm:w-2/4 flex justify-between items-center space-x-2">
+                <button
+                  type="button"
+                  onClick={handleClearAll}
+                  className="border-gradient text-base tracking-wide px-4 py-3 rounded-full"
+                >
+                  <span className="text-gradient">Clear</span>
+                </button>
+                {tab == "files" ? (
+                  <button
+                    onClick={sendFile}
+                    type="button"
+                    className="btn-gradient text-base tracking-wide px-4 py-3 rounded-full flex justify-center items-center"
+                  >
+                    {requestStatus.loading ? (
+                      <LoadingSpinner size="6" color="sky-blue" />
+                    ) : (
+                      <>
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          viewBox="0 0 24 24"
+                          width="24"
+                          height="24"
+                          fill="white"
+                        >
+                          <path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z" />
+                        </svg>
+
+                        <span className="text-white">Upload Files</span>
+                      </>
+                    )}
+                  </button>
+                ) : (
+                  <button
+                    onClick={sendTaskMessage}
+                    type="button"
+                    className="btn-gradient text-base text-white tracking-wide px-4 py-3 rounded-full"
+                  >
+                    {requestStatus.loading ? (
+                      <LoadingSpinner size="6" color="sky-blue" />
+                    ) : (
+                      <span className="text-white">Send</span>
+                    )}
+                  </button>
+                )}
+              </div>
+            </div>
+            {/* end of Buttons Sections  */}
+          </div>
+          {/* END OF TEXTAREA */}
+        </div>
+
+        {/* MESSAGE SECTION */}
+        <div className="w-full lg:w-1/2">
+          <div className="flex justify-between items-center gap-5">
+            <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
+              Message
+            </p>
+            <button
+              type="button"
+              onClick={popUpHandler}
+              className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+            >
+              view all
+            </button>
+          </div>
+          {props.activeJobMesList.loading ? (
+            <LoadingSpinner size="16" color="sky-blue" />
+          ) : (
+            <ActiveJobMessage activeJobMesList={props.activeJobMesList} />
+          )}
+        </div>
+        {/* END OF MESSAGE */}
+      </div>
+
+      {/* POPOUT SECTION */}
+      {popUp && (
+        <PopModal
+          popUpHandler={popUpHandler}
+          popUp={popUp}
+          details={props.details}
+          activeJobMesList={props.activeJobMesList}
+          handlePrint={handlePrint}
+          myRef={printRef}
+        />
+      )}
+      {/* END OF POPOUT SECTION */}
+    </Layout>
+  );
+}
+
+export default ActiveJobs;
+
+function convertFileToBase64(file) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+
+    reader.onload = () => {
+      const base64String = reader.result.split(",")[1];
+      resolve(base64String);
+    };
+
+    reader.onerror = (error) => {
+      reject(error);
+    };
+
+    reader.readAsDataURL(file);
+  });
+}
+
+//POPOUT COMPONENT FUNCTION
+const PopModal = ({
+  popUpHandler,
+  popUp,
+  details,
+  activeJobMesList,
+  handlePrint,
+  myRef,
+}) => {
+  return (
+    <ModalCom action={popUpHandler} situation={popUp} className="edit-popup">
+      <div
+        ref={myRef}
+        className="message-modal-wrapper min-w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl"
+      >
+        <div className="message-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            {details?.contract}
+          </h1>
+          <button
+            type="button"
+            className="text-[#374557] dark:text-red-500"
+            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="job-action-modal-body w-full px-10 py-8 gap-4">
+          <div className="w-full flex flex-col items-center">
+            {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">
+                    <tr className="text-slate-600">
+                      <th className="p-2"></th>
+                    </tr>
+                  </thead>
+                  {activeJobMesList?.data?.length ? (
+                    <tbody>
+                      {activeJobMesList?.data?.map((item, index) => (
+                        <tr key={index} className="text-slate-500">
+                          <td>
+                            <div className="msg_box">
+                              <div className="msg_header">
+                                {item.msg_date} {item.msg_firstname}
+                              </div>
+                              <span
+                                className="p-2"
+                                dangerouslySetInnerHTML={{
+                                  __html: item.message,
+                                }}
+                              ></span>
+                            </div>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  ) : activeJobMesList.error ? (
+                    <tbody>
+                      <tr className="text-slate-500">
+                        <td className="p-2" colSpan={4}>
+                          Opps! an error occurred. Please try again!
+                        </td>
+                      </tr>
+                    </tbody>
+                  ) : (
+                    <tbody>
+                      <tr className="text-slate-500">
+                        <td className="p-2" colSpan={4}>
+                          No Message Found!
+                        </td>
+                      </tr>
+                    </tbody>
+                  )}
+                </table>
+              </div>
+            )}
+          </div>
+
+          {/* btn */}
+          <div className="flex justify-end items-center">
+            <div className="py-3 w-full lg:w-1/2 flex justify-between items-center">
+              <button
+                onClick={handlePrint}
+                type="button"
+                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+              >
+                <span className="text-white">Print</span>
+              </button>
+              <button
+                onClick={popUpHandler}
+                type="button"
+                className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white"
+              >
+                <span className="text-gradient">Cancel</span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </ModalCom>
+  );
+};
@@ -0,0 +1,33 @@
+import React from 'react'
+
+function CurrentJobAction() {
+  return (
+    <div className='job-action bg-white dark:bg-black'>
+      <p className="my-3 py-1 text-base active-owner">
+          <table className="w-full text-sm text-left text-gray-500">
+              <tbody>
+              <tr>
+                  <td>
+                      <div className="flex space-x-2 items-center w-full">
+
+                              <h1 className="text-xl text-dark-gray dark:text-white">
+                                  Waiting for the completion message from the client before you can approve.
+                              </h1>
+                              {/*<div className="flex flex-col flex-[0.9]">  </div>*/}
+                      </div>
+                  </td>
+
+                  <td className="text-right py-4 px-2">
+                      <div className="flex justify-center items-center">
+                          .
+                      </div>
+                  </td>
+              </tr>
+              </tbody>
+          </table>
+      </p>
+    </div>
+  )
+}
+
+export default CurrentJobAction
@@ -0,0 +1,182 @@
+import React, { useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import ModalCom from '../../Helpers/ModalCom'
+import LoadingSpinner from '../../Spinners/LoadingSpinner'
+
+import usersService from '../../../services/UsersService'
+
+function CurrentTaskAction({jobDetails}) {
+
+    const apiCall = new usersService()
+    const navigate = useNavigate()
+
+    const [checked, setChecked] = useState(false)
+
+    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 USER CLICKS ON SEND FOR REVIEW AND ACCEPTANCE
+    const taskCompletedSubmit = () => {
+        setReqStatus({loading:true, status: false, message: ''}) // Sets loading spinner active
+        let reqData = {
+            contract: jobDetails.contract,
+            contract_uid: jobDetails.contract_uid,
+            job_action: 'NOTIFY_COMPLETE',
+        }
+        if(!checked){ // checks that 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 MARK TASK AS COMPLETED BY WORKER
+        apiCall.workerJobAction(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: 'Task marked completed successfully'})
+            setTimeout(()=>{ // Sets popout to false and navigates user to /mytask after 3 seconds
+                popUpHandler()
+                navigate('/mytask', {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)
+        })
+    }
+
+  return (
+    <div className='job-action bg-white dark:bg-black'>
+
+          <table className="w-full text-sm text-left text-gray-500 active-worker">
+              <tbody>
+              <tr>
+                  <td>
+                      <div className="flex space-x-2 items-center w-full">
+                          <h1 className="text-xl text-dark-gray dark:text-white">
+                              I completed this task and ready for review and acceptance.
+                          </h1>
+                          {/*<div className="flex flex-col flex-[0.9]">*/}
+
+                          {/*</div>*/}
+                      </div>
+                  </td>
+              </tr>
+              <tr>
+                  <td>
+                      <div className="flex justify-center items-center">
+                          <button onClick={popUpHandler} type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                              Send of Review
+                          </button>
+                      </div>
+                  </td>
+              </tr>
+              </tbody>
+          </table>
+
+          {popUp && (
+            <ModalCom action={popUpHandler} situation={popUp}>
+                <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+                    <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+                        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+                        Confirm Completion
+                        </h1>
+                        <button
+                        type="button"
+                        className="text-[#374557] dark:text-red-500"
+                        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="job-action-modal-body w-full px-10 py-8 gap-4">
+                        <div className="w-full flex flex-col items-center">
+                            <div className="mb-10 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 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">
+                            {reqStatus.message != "" &&
+                                (!reqStatus.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]`}
+                                >
+                                    {reqStatus.message}
+                                </div>
+                                ) : (
+                                reqStatus.status && (
+                                    <div
+                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    >
+                                    {reqStatus.message}
+                                    </div>
+                                )
+                                ))}
+                            </div>
+                            {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                        </div>
+                        
+                        {/* cancel btn */}
+                        <div className='flex justify-end 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">
+                                <span className='text-gradient'>Cancel</span>
+                            </button>
+                        </div>
+                    </div> 
+                </div>
+            </ModalCom>
+        )}
+    </div>
+  )
+}
+
+export default CurrentTaskAction
@@ -0,0 +1,45 @@
+import React from 'react'
+
+import CurrentJobAction from './CurrentJobAction'
+import CurrentTaskAction from './CurrentTaskAction'
+
+import PastDueJobAction from './PastDueJobAction'
+import PastDueTaskAction from './PastDueTaskAction'
+
+import ReviewJobAction from './ReviewJobAction'
+import ReviewTaskAction from './ReviewTaskAction'
+
+function IndexJobActions({details}) { // FUNCTION TO RENDER SPECIFIC JOB ACTION DEPENDING ON OWNER STATUS & STATUS DESCRIPTION
+    let owner = details.owner_status
+    let description = details.status_description
+    switch(owner) {
+        case 'OWNER':
+            return (()=>{
+                if(description == 'ACTIVE'){
+                    return <CurrentJobAction jobDetails={details} />
+                }else if(description == 'PASTDUE'){
+                    return <PastDueJobAction jobDetails={details} />
+                }else if(description == 'REVIEW'){
+                    return <ReviewJobAction jobDetails={details} />
+                } else {
+                    return null
+                }
+            })()
+        case 'WORKER':
+            return (()=>{
+                if(description == 'ACTIVE'){
+                    return <CurrentTaskAction jobDetails={details} />
+                }else if(description == 'PASTDUE'){
+                    return <PastDueTaskAction jobDetails={details} />
+                }else if(description == 'REVIEW'){
+                    return <ReviewTaskAction jobDetails={details} />
+                } else {
+                    return null
+                }
+            })()
+        default:
+            return null
+    }
+}
+
+export default IndexJobActions
@@ -0,0 +1,246 @@
+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 PastDueJobAction({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: 'REQUEST_CANCEL',
+        }
+
+        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
+        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
+        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)
+        })
+    }
+
+  return (
+    <div className='job-action bg-white dark:bg-black'>
+
+        <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">
+
+                            <h1 className="text-xl text-dark-gray dark:text-white">
+                                Time allocated has passed
+                            </h1>
+                            {/*<div className="flex flex-col flex-[0.9]">  </div>*/}
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div className="flex justify-center items-center">
+                        <button type="button" onClick={popUpHandler} className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                            Cancel or Extend Timeline
+                        </button>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+
+        {popUp && (
+            <ModalCom action={popUpHandler} situation={popUp}>
+                <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+                    <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+                        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+                        Past Due Task
+                        </h1>
+                        <button
+                        type="button"
+                        className="text-[#374557] dark:text-red-500"
+                        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="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='font-bold text-base tracking-wide text-dark-gray dark:text-white'>I am ready to cancel this task</p>
+                            </div>
+
+                            <div className="mb-5 flex justify-center items-center">
+                                {reqStatus.loading && action=='cancel'?
+                                    <LoadingSpinner color='sky-blue' size='10' />
+                                :
+                                    <button disabled={reqStatus.loading} onClick={cancelTask} type="button" className="px-2 py-1 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
+                                        <span className='text-gradient'>Cancel this task</span>
+                                    </button>
+                                }
+                            </div>
+
+                            {/* EXTEND TIMELINE SECTION */}
+                            <div className='w-full my-3 py-3 border-y flex flex-col items-center'>
+                                <div className='mb-5 flex items-center gap-2'>
+                                    <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>Extend the timeline by:</p>
+                                    <select 
+                                        onChange={({target})=>{setExtendedTime(target.value)}}
+                                        className='text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0'
+                                    >
+                                        <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' />
+                                :
+                                <button disabled={reqStatus.loading} type="button" onClick={extendTime} className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                                    Extend Timeline
+                                </button>
+}                               
+                            </div>
+
+                            {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                            <div className="w-full">
+                            {reqStatus.message != "" &&
+                                (!reqStatus.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]`}
+                                >
+                                    {reqStatus.message}
+                                </div>
+                                ) : (
+                                reqStatus.status && (
+                                    <div
+                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    >
+                                    {reqStatus.message}
+                                    </div>
+                                )
+                                ))}
+                            </div>
+                            {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                        </div>
+                        
+                        {/* cancel btn */}
+                        <div className='flex justify-end 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">
+                                <span className='text-gradient'>Cancel</span>
+                            </button>
+                        </div>
+                    </div> 
+                </div>
+            </ModalCom>
+        )}
+    </div>
+  )
+}
+
+export default PastDueJobAction
@@ -0,0 +1,35 @@
+import React from 'react'
+
+function PastDueTaskAction() {
+  return (
+    <div className='job-action bg-white dark:bg-black'>
+
+        <table className="w-full text-sm text-left text-gray-500 worker-pastdue">
+            <tbody>
+            <tr>
+                <td>
+                    <div className="flex space-x-2 items-center w-full">
+
+                            <h1 className="text-xl text-dark-gray dark:text-white">
+                                You have missed the allocated time
+                            </h1>
+                            {/*<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-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                            Request Extension
+                        </button>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+  )
+}
+
+export default PastDueTaskAction
@@ -0,0 +1,226 @@
+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 ReviewJobAction({jobDetails}) {
+
+    const apiCall = new usersService()
+    const navigate = useNavigate()
+
+    const [checked, setChecked] = useState(false)
+
+    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 ACCEPTS COMPLETION OF JOB
+    const acceptCompletion = () => {
+        setAction('accept')
+        setReqStatus({loading:true, status: false, message: ''})
+
+        let reqData = { // API PAYLOADS
+            contract: jobDetails.contract,
+            contract_uid: jobDetails.contract_uid,
+            job_action: 'ACCEPT_COMPLETE',
+        }
+
+        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
+        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 completion accepted successfully'})
+            setTimeout(()=>{ // Sets popout to false and navigates user to /my-review-jobs after 3 seconds
+                popUpHandler()
+                navigate('/my-review-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 REJECT COMPLETION OF JOB
+    const rejectCompletion = () => {
+        setAction('reject')
+        setReqStatus({loading:true, status: false, message: ''}) // Sets loading spinner active
+        let reqData = { // API PAYLOADS
+            contract: jobDetails.contract,
+            contract_uid: jobDetails.contract_uid,
+            job_action: 'REJECT_COMPLETE',
+        }
+        // API CALL TO REJECT COMPLETION BY OWNER
+        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 completion rejected successfully'})
+            setTimeout(()=>{ // Sets popout to false and navigates user to /my-review-jobs after 3 seconds
+                popUpHandler()
+                navigate('/my-review-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)
+        })
+    }
+  return (
+    <div className='job-action bg-white dark:bg-black'>
+      <div className="my-3 py-1 text-base">
+          <table className="w-full text-sm text-left text-gray-500 review-owner">
+              <tbody>
+              <tr>
+                  <td>
+                      <div className="flex space-x-2 items-center w-full">
+
+                              <h1 className="text-xl text-dark-gray dark:text-white">
+                                  This Job is Ready for your review
+                              </h1>
+                              {/*<div className="flex flex-col flex-[0.9]"> </div>*/}
+                      </div>
+                  </td>
+              </tr>
+              <tr>
+                  <td>
+                      <div className="flex justify-center items-center">
+                          <button  type="button" onClick={popUpHandler} className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                             Reject or Accept
+                          </button>
+                      </div>
+                  </td>
+              </tr>
+              </tbody>
+          </table>
+      </div>
+
+      {popUp && (
+            <ModalCom action={popUpHandler} situation={popUp}>
+                <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+                    <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+                        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+                        Completion
+                        </h1>
+                        <button
+                        type="button"
+                        className="text-[#374557] dark:text-red-500"
+                        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="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='font-bold text-base tracking-wide text-dark-gray dark:text-white'>I am ready to accept completion</p>
+                            </div>
+
+                            <div className="mb-5 flex justify-center items-center">
+                                {reqStatus.loading && action=='accept'?
+                                    <LoadingSpinner color='sky-blue' size='10' />
+                                :
+                                    <button disabled={reqStatus.loading} onClick={acceptCompletion} type="button" className="px-2 py-1 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
+                                        <span className='text-gradient'>Accept Completion</span>
+                                    </button>
+                                }
+                            </div>
+
+                            {/* EXTEND TIMELINE SECTION */}
+                            <div className='w-full my-3 py-3 border-y flex flex-col items-center'>
+                                <div className='mb-5 flex items-center gap-2'>
+                                    <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>I am not ready to accept completion of task</p>
+                                </div>
+                                {reqStatus.loading && action=='reject' ?
+                                    <LoadingSpinner color='sky-blue' size='10' />
+                                :
+                                <button disabled={reqStatus.loading} type="button" onClick={rejectCompletion} className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                                    Reject Completion
+                                </button>
+}                               
+                            </div>
+
+                            {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                            <div className="w-full">
+                            {reqStatus.message != "" &&
+                                (!reqStatus.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]`}
+                                >
+                                    {reqStatus.message}
+                                </div>
+                                ) : (
+                                reqStatus.status && (
+                                    <div
+                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    >
+                                    {reqStatus.message}
+                                    </div>
+                                )
+                                ))}
+                            </div>
+                            {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                        </div>
+                        
+                        {/* cancel btn */}
+                        <div className='flex justify-end 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">
+                                <span className='text-gradient'>Cancel</span>
+                            </button>
+                        </div>
+                    </div> 
+                </div>
+            </ModalCom>
+        )}
+    </div>
+  )
+}
+
+export default ReviewJobAction
@@ -0,0 +1,13 @@
+import React from 'react'
+
+function ReviewTaskAction() {
+  return (
+    <div className='job-action bg-white dark:bg-black'>
+      <p className="my-3 py-1 text-base text-dark-gray dark:text-white">
+        Waiting for the completion message from the client before you can approve. Worker True & Review Job
+      </p>
+    </div>
+  )
+}
+
+export default ReviewTaskAction
@@ -1,112 +1,152 @@
 import React, { useState } from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
+import { useLocation, useNavigate } from "react-router-dom";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
-import SelectBox from "../Helpers/SelectBox";
-import ActiveJobsPopout from "../jobPopout/ActiveJobsPopout";
-
-import PaginatedList from "../Pagination/PaginatedList";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+import { PriceFormatter } from "../Helpers/PriceFormatter";

-export default function MyActiveJobTable({MyJobList, className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+export default function MyActiveJobTable({ MyJobList, className }) {
+  const navigate = useNavigate();
+  let { pathname } = useLocation();

-    let [jobPopout,setJobPopout] = useState({show:false, data:{}}) // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentActiveJobList = MyJobList?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );

-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentActiveJobList = MyJobList?.result_list?.slice(indexOfFirstItem, indexOfLastItem);
-  
-    const handlePagination = (e) => {
-        handlePagingFunc(e,setCurrentPage)
-    }
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };

-    return (
-        <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
-                className || ""
-            }`}
-        >
-            {MyJobList && MyJobList?.result_list &&
-            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                    <tbody>
-                    {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-                    {/*    <td className="py-4">All Product</td>*/}
-                    {/*    <td className="py-4 text-right">.</td>*/}
-                    {/*</tr>*/}
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+        className || ""
+      }`}
+    >
+      {MyJobList && MyJobList?.result_list && (
+        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+              {/*    <td className="py-4">All Product</td>*/}
+              {/*    <td className="py-4 text-right">.</td>*/}
+              {/*</tr>*/}

-                    {
-                        <>
-                            {MyJobList && MyJobList?.result_list &&
-                                MyJobList.result_list.length > 0 &&
-                                currentActiveJobList.map((value, index) => (
-                                    <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                                            <td className=" py-4">
-                                                <div className="flex space-x-2 items-center">
-                                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                                        <img
-                                                            src={dataImage2}
-                                                            alt="data"
-                                                            className="w-full h-full"
-                                                        />
-                                                    </div>
-                                                    <div className="flex flex-col">
-                                                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                                            {value.title}
-                                                        </h1>
-                                                        <div>
-                                                            {value.description}
-                                                        </div>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Price: <span className="text-purple">{value.price*0.01}</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Expire:   <span className="text-purple"> {value.expire}</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Send to:   <span className="text-purple"> {value.job_to}</span>
-                                                        </span>
+              {
+                <>
+                  {MyJobList &&
+                  MyJobList?.result_list &&
+                  MyJobList.result_list.length > 0 ? (
+                    currentActiveJobList.map((value, index) => {
+                      let deliveryDate = value?.delivery_date?.split(" ")[0];
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      return (
+                        <tr
+                          key={index}
+                          className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                        >
+                          <td className=" py-4">
+                            <div className="flex space-x-2 items-center w-full">
+                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px]">
+                                <img
+                                  src={dataImage2}
+                                  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">
+                                  {value.title}
+                                </h1>
+                                <div>{value.description}</div>
+                                <span className="text-sm text-thin-light-gray">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <div className="flex gap-4 items-center">
+                                  <span className="text-sm text-thin-light-gray">
+                                    Duration:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.timeline_days} day(s)
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Due:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {deliveryDate}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Sent to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to === null
+                                        ? "public"
+                                        : value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </td>

-                                                    </div>
-                                                </div>
-                                            </td>
-
-
-                                            <td className="text-right py-4 px-2">
-                                                <button
-                                                    type="button"
-                                                    onClick={()=>{setJobPopout({show:true, data:value})}}
-                                                    className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                                >
-                                                    View
-                                                </button>
-                                            </td>
-                                        </tr>
-                                ))}
-
-
-                        </>
-                    }
-                    </tbody>
-                </table>
-                {/* PAGINATION BUTTON */}
-                <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= MyJobList?.result_list.length ? true : false} data={MyJobList?.result_list} start={indexOfFirstItem} stop={indexOfLastItem} />
-                {/* END OF PAGINATION BUTTON */}
-            </div>
+                          <td className="text-right py-4 px-2">
+                            <div className="flex justify-center items-center">
+                              <button
+                                type="button"
+                                onClick={() => {
+                                  navigate("/manage-active-job", {
+                                    state: { ...value, pathname },
+                                  });
+                                }}
+                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                              >
+                                View
+                              </button>
+                            </div>
+                          </td>
+                        </tr>
+                      );
+                    })
+                  ) : (
+                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                      <td className="p-2">No Active Task!</td>
+                    </tr>
+                  )}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0 ? true : false}
+            next={
+              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+              MyJobList?.result_list.length
+                ? true
+                : false
            }
-
-            {/* Active Job Popout */}
-            {jobPopout.show &&
-                <ActiveJobsPopout details={jobPopout.data} onClose={()=>{setJobPopout({show:false, data:{}})}} situation={jobPopout.show} />
-            }
-            {/* End of Active Job Popout */}
+            data={MyJobList?.result_list}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
        </div>
-    );
+      )}
+    </div>
+  );
 }
@@ -0,0 +1,40 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyActiveJobTable from "./MyActiveJobTable";
+
+export default function MyPastDueJobs(props) {
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  return (
+    <Layout>
+      <CommonHead commonHeadData={props.commonHeadData} />
+      <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="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Pass Due Job(s)
+                </span>
+              </h1>
+            </div>
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          <MyActiveJobTable MyJobList={props.MyJobList} />
+        </div>
+      </div>
+    </Layout>
+  );
+}
@@ -0,0 +1,42 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyActiveJobTable from "./MyActiveJobTable";
+
+export default function MyReviewDueJobs(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <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="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                 Review Due Job(s)
+                </span>
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div
+                                onClick={() => filterHandler("today")}
+                                className="relative"
+                            ></div>
+                        </div>
+                    </div>
+                    <MyActiveJobTable MyJobList={props.MyJobList} />
+                </div>
+            </div>
+        </Layout>
+    );
+}
@@ -5,37 +5,37 @@ import CommonHead from "../UserHeader/CommonHead";
 import MyActiveJobTable from "./MyActiveJobTable";

 export default function MyActiveJobs(props) {
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
-    console.log("AMEYE LOC1", props.MyJobList);
-    return (
-        <Layout>
-            <CommonHead />
-            <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="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  console.log("AMEYE LOC1", props.MyJobList);
+  return (
+    <Layout>
+      <CommonHead commonHeadData={props.commonHeadData} />
+      <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="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
                >
-                  Current Job(s)
+                  Active Job(s)
                </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                            </div>
-                        </div>
-                    </div>
-                    <MyActiveJobTable MyJobList={props.MyJobList} />
-                </div>
+              </h1>
            </div>
-        </Layout>
-    );
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          <MyActiveJobTable MyJobList={props.MyJobList} />
+        </div>
+      </div>
+    </Layout>
+  );
 }
@@ -9,7 +9,7 @@ export default function MainSection({ collectionData, className }) {
        <div className="grid xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 2xl:gap-8 xl:gap-5 gap-5 mb-10">
          <DataIteration
            datas={collectionData}
-            startLength={0}
+            startLength={process.env.REACT_APP_ZERO_STATE}
            endLength={collectionData.length}
          >
            {({ datas }) => (
@@ -8,7 +8,7 @@ function MainSection({ collectionData, className }) {
      <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
        <DataIteration
          datas={collectionData}
-          startLength={0}
+          startLength={process.env.REACT_APP_ZERO_STATE}
          endLength={collectionData.length}
        >
          {({ datas }) => (
@@ -0,0 +1,155 @@
+import { useMemo, useState } from "react";
+import usersService from "../../services/UsersService";
+import { useDispatch } from "react-redux";
+import { tableReload } from "../../store/TableReloads";
+
+const CouponPopup = ({ popUpHandler, data }) => {
+  const [loader, setLoader] = useState(false);
+  const apiCall = useMemo(() => new usersService(), []);
+  const [statusMsg, setStatusMsg] = useState({
+    success: "",
+    error: "",
+  });
+
+  const dispatch = useDispatch();
+
+  const redeemCouponHandler = async () => {
+    setLoader(true);
+
+    try {
+      const { code, coupon_id } = data;
+      const reqData = { code_id: Number(coupon_id), code };
+
+      const res = await apiCall.getCouponRedeem(reqData);
+
+      if (res.data?.internal_return < 0)
+        setStatusMsg({ error: "An error occurred" });
+      else setStatusMsg({ success: res.data?.status_text });
+
+      dispatch(tableReload({ type: "COUPONTABLE" }));
+      setTimeout(() => {
+        popUpHandler();
+        setLoader(false);
+      }, 10000);
+    } catch (error) {
+      setLoader(false);
+      if (error?.status !== 200)
+        setStatusMsg({
+          error: {
+            status: true,
+            msg:
+              error?.statusText !== ""
+                ? error?.statusText
+                : "An error occurred",
+          },
+        });
+      throw new Error(error);
+    } finally {
+      setStatusMsg({
+        success: "",
+        error: "",
+      });
+    }
+  };
+
+  return (
+    <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+      <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+          Redeem Coupon
+        </h1>
+        <button
+          type="button"
+          className="text-[#374557] dark:text-red-500"
+          onClick={popUpHandler}
+        >
+          <CloseIcon />
+        </button>
+      </div>
+      <form className="logout-modal-body w-full flex flex-col items-center px-10 py-8 gap-4 border-b dark:border-[#5356fb29]  border-light-purple">
+        <div className="input-com mb-7 flex gap-1 items-center w-full">
+          {/* Coupon */}
+          <div className="flex items-center justify-between flex-[0.3]">
+            <label
+              className="input-label text-[#181c32] dark:text-white text-[15px] font-semibold"
+              htmlFor="coupon-token"
+            >
+              Coupon:
+            </label>
+          </div>
+          <div className=" flex-[0.7] max-w-[150px]">{data?.code}</div>
+        </div>
+
+        <div className="input-com mb-7 flex gap-1 items-center w-full">
+          {/* Amount */}
+          <div className="flex items-center justify-between flex-[0.3]">
+            <label
+              className="input-label text-[#181c32] dark:text-white text-[15px] font-semibold"
+              htmlFor="amount"
+            >
+              Amount:
+            </label>
+          </div>
+          <div className=" flex-[0.7] max-w-[150px]">{data?.thePrice}</div>
+        </div>
+        <div className="signin-area w-full">
+          <div className="flex justify-end">
+            <button
+              type="button"
+              onClick={redeemCouponHandler}
+              className="text-white lg:w-[167px] btn-gradient flex justify-center items-center text-lg tracking-wide px-6 py-2 rounded-full"
+            >
+              {loader ? (
+                <div className="signup btn-loader"></div>
+              ) : (
+                <span className="font-semibold tracking-wider">
+                  Redeem Now!
+                </span>
+              )}
+            </button>
+          </div>
+          {statusMsg.success && (
+            <p className="text-sm text-green-500 italic">{statusMsg.success}</p>
+          )}
+          {statusMsg.error && (
+            <p className="text-sm text-red-500 italic">{statusMsg.error}</p>
+          )}
+        </div>
+      </form>
+      <div className="signin-area w-full px-5 py-4">
+        <div className="flex justify-end">
+          <button
+            onClick={popUpHandler}
+            className="border-gradient text-lg tracking-wide px-6 py-2 rounded-full"
+          >
+            <span>Cancel</span>
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default CouponPopup;
+
+const CloseIcon = () => (
+  <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>
+);
@@ -0,0 +1,117 @@
+import React, { useEffect, useState } from "react";
+import PaginatedList from "../Pagination/PaginatedList";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import ModalCom from "../Helpers/ModalCom";
+import CouponPopup from "./CouponPopup";
+import { useNavigate } from "react-router-dom";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+function CouponTable({ coupon }) {
+  const [currentPage, setCurrentPage] = useState(0);
+  const [couponPopup, setCouponPopup] = useState({ state: false, data: null });
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentCoupon = coupon?.data?.slice(indexOfFirstItem, indexOfLastItem);
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
+  const navigate = useNavigate();
+
+  const handleCouponPopUp = () =>
+    setCouponPopup((prev) => ({ state: !prev.state }));
+
+  useEffect(() => {
+    if (!coupon) navigate("/my-coupon", { replace: true });
+  }, []);
+
+  return (
+    <div className="flex flex-col justify-between h-full">
+      <table className="wallet-activity w-full table-auto border-collapse text-left">
+        <thead className="border-b-2">
+          <tr className="text-slate-600">
+            <th className="p-2">Coupon</th>
+            <th className="p-2 text-center">Amount</th>
+            <th className="p-2"></th>
+          </tr>
+        </thead>
+        {coupon.data.length ? (
+          <tbody>
+            {currentCoupon.map((item, index) => {
+              let thePrice = PriceFormatter(
+                item?.amount * 0.01,
+                item?.currency_code,
+                item?.currency
+              );
+              return(
+              <tr key={index} className="text-slate-500">
+                <td className="p-2 cursor-default">
+                  {item.added} <br /> {item.code}
+                </td>
+                <td className="p-2 text-center cursor-default">{thePrice}</td>
+                <td className="p-2 h-20 flex items-center justify-end">
+                  <button
+                    type="button"
+                    className="btn-gradient w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
+                    onClick={() => {
+                      setCouponPopup((prev) => ({
+                        state: !prev.state,
+                        data: {...item, thePrice},
+                      }));
+                    }}
+                  >
+                    Redeem
+                  </button>
+                </td>
+              </tr>
+            )})}
+          </tbody>
+        ) : coupon.error ? (
+          <tbody>
+            <tr className="text-slate-500">
+              <td className="p-2" colSpan={4}>
+                Opps! an error occurred. Please try again!
+              </td>
+            </tr>
+          </tbody>
+        ) : (
+          <tbody>
+            <tr className="text-slate-500">
+              <td className="p-2" colSpan={4}>
+                No Purchase History Found!
+              </td>
+            </tr>
+          </tbody>
+        )}
+      </table>
+
+      {/* PAGINATION BUTTON */}
+      <PaginatedList
+        onClick={handlePagination}
+        prev={currentPage === 0 ? true : false}
+        next={
+          currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+          coupon?.data?.length
+            ? true
+            : false
+        }
+        data={coupon?.data}
+        start={indexOfFirstItem}
+        stop={indexOfLastItem}
+      />
+      {/* END OF PAGINATION BUTTON */}
+
+      {couponPopup.state && (
+        <ModalCom action={handleCouponPopUp} situation={couponPopup.state}>
+          <CouponPopup
+            data={couponPopup.data}
+            popUpHandler={handleCouponPopUp}
+          />
+        </ModalCom>
+      )}
+    </div>
+  );
+}
+export default CouponTable;
@@ -0,0 +1,74 @@
+import React, { useCallback, useEffect, useMemo, useState } from "react";
+import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import CouponTable from "./CouponTable";
+import usersService from "../../services/UsersService";
+import { useSelector } from "react-redux";
+
+export default function MyCoupons() {
+  const apiCall = useMemo(() => new usersService(), []);
+  const {couponTable} = useSelector(state => state.tableReload)
+  let [couponHistory, setCouponHistory] = useState({
+    // FOR COUPON HISTORY
+    loading: true,
+    data: [],
+    error: false,
+  });
+
+  //FUNCTION TO GET COUPON HISTORY
+  const getCouponHistory = useCallback(() => {
+    apiCall
+      .getCouponPending()
+      .then((res) => {
+        if (res.data.internal_return < 0) {
+          // success but no data
+          setCouponHistory((prev) => ({ ...prev, loading: false }));
+          return;
+        }
+        setCouponHistory((prev) => ({
+          ...prev,
+          loading: false,
+          data: res.data.result_list,
+        }));
+      })
+      .catch((error) => {
+        setCouponHistory((prev) => ({ ...prev, loading: false, error: true }));
+      });
+  }, [apiCall]);
+
+  useEffect(() => {
+    getCouponHistory();
+  }, [couponTable]);
+
+  return (
+    <>
+      <Layout>
+        <div className="my-wallet-wrapper w-full mb-10">
+          {/* heading */}
+          <div className="sm:flex justify-start items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                Coupons
+              </h1>
+            </div>
+          </div>
+          <div className="w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+            {/* COUPON SECTION */}
+            <div className="lg:w-4/4 w-full mb-10 lg:mb-0">
+              <div className="wallet w-full md:p-8 p-4 h-full max-h-[500px] min-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow coupon">
+                {couponHistory.loading ? (
+                  <div className="w-full h-full flex justify-center items-center">
+                    <LoadingSpinner size="16" color="sky-blue" />
+                  </div>
+                ) : (
+                  <CouponTable coupon={couponHistory} />
+                )}
+              </div>
+            </div>
+            {/* END OF COUPON SECTION */}
+          </div>
+        </div>
+      </Layout>
+    </>
+  );
+}
@@ -1,128 +1,264 @@
-import React, { useState } from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
 import SelectBox from "../Helpers/SelectBox";
+import DeleteJobPopout from "../jobPopout/DeleteJobPopout";
 import JobListPopout from "../jobPopout/JobListPopout";

-import PaginatedList from "../Pagination/PaginatedList";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+
+import { useSelector } from "react-redux";
+import usersService from "../../services/UsersService";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+import EditJobPopOut from "../jobPopout/EditJobPopout";
+import { PriceFormatter } from "../Helpers/PriceFormatter";

-export default function MyJobTable({MyJobList, className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+export default function MyJobTable({ MyJobList, reloadJobList, className }) {
+  const [myCountry, setCountries] = useState("");
+  const {
+    userDetails: { country },
+  } = useSelector((state) => state?.userDetails);

-    let [jobPopout,setJobPopout] = useState({show:false, data:{}}) // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+  const userApi = useMemo(() => new usersService(), []);

-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentJobList = MyJobList?.result_list?.slice(indexOfFirstItem, indexOfLastItem);
-  
-    const handlePagination = (e) => {
-        handlePagingFunc(e,setCurrentPage)
+  // Get Country Api
+  const getCountryList = useCallback(async () => {
+    const res = await userApi.getSignupCountryData();
+
+    try {
+      if (res.status === 200) {
+        const {
+          data: { signup_country },
+        } = await res;
+        let checkCountry = signup_country
+          ?.filter((item) => item[0] == country)
+          ?.map((item, idx) => item[1])
+          .join("");
+        setCountries(checkCountry);
+      }
+    } catch (error) {
+      throw new Error(error);
    }
+  }, [userApi, country]);

-    return (
-        <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
-                className || ""
-            }`}
-        >
-            <div className="header w-full flex justify-between items-center mb-5">
-                <div className="flex space-x-2 items-center">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+  useEffect(() => {
+    getCountryList();
+  }, [getCountryList]);

-                    </h1>
-                </div>
-                <SelectBox
-                    action={setCategory}
-                    datas={filterCategories}
-                    className="Update-table-dropdown"
-                    contentBodyClasses="w-auto min-w-max"
-                />
-            </div>
-            {MyJobList && MyJobList?.result_list &&
-            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-                <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                    <tbody>
-                    <tr className="text-base text-thin-light-gray border-b  default-border-b dark:border-[#5356fb29] ottom ">
-                        <td className="py-4">All Product</td>
-                        <td className="py-4 text-right">.</td>
-                    </tr>
+  const filterCategories = ["All Categories", "Explore", "Featured"];
+  const [selectedCategory, setCategory] = useState(filterCategories[0]);

-                    {selectedCategory === "All Categories" ? (
-                        <>
-                            {MyJobList && MyJobList?.result_list &&
-                                MyJobList.result_list.length > 0 &&
-                                currentJobList.map((value, index) => (
-                                    <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                                        <td className="py-4">
-                                            <div className="flex space-x-2 items-center">
-                                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                                    <img
-                                                        src={dataImage2}
-                                                        alt="data"
-                                                        className="w-full h-full"
-                                                    />
-                                                </div>
-                                                <div className="flex flex-col">
-                                                    <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                                        {value.title}
-                                                    </h1>
-                                                    <div>
-                                                        {value.description}
-                                                    </div>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Price: <span className="text-purple">{value.price*0.01}</span>
-                                                    </span>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
-                                                    </span>
-                                                </div>
-                                            </div>
-                                        </td>
+  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW

+  let [deleteJobPopout, setDeleteJobPopout] = useState({
+    show: false,
+    data: {},
+  }); // STATE TO HOLD THE VALUE OF THE ITEM DETAILS TO DELETE AND DETERMINE WHEN TO SHOW
+  const [editJob, setEditJob] = useState({ show: false, data: {} });

-                                        <td className="text-right py-4 px-2">
-                                            <button
-                                                type="button"
-                                                onClick={()=>{setJobPopout({show:true, data:value})}}
-                                                onClick={()=>{setJobPopout({show:true, data:value})}}
-                                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                            >
-                                                View
-                                            </button>
-                                        </td>
-                                    </tr>
-                                ))}
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentJobList = MyJobList?.data?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );

+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };

-                        </>
-                    ) : selectedCategory === "Explore" ? (
-                        <>
-
-                        </>
-                    ) : (
-                        <>
-
-                        </>
-                    )}
-                    </tbody>
-                </table>
-
-                {/* PAGINATION BUTTON */}
-                <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= MyJobList?.result_list?.length ? true : false} data={MyJobList?.result_list} start={indexOfFirstItem} stop={indexOfLastItem} />
-                {/* END OF PAGINATION BUTTON */}
-            </div>
-            }
-
-            {/* Job List Popout */}
-            {jobPopout.show &&
-                <JobListPopout details={jobPopout.data} onClose={()=>{setJobPopout({show:false, data:{}})}} situation={jobPopout.show} />
-            }
-            {/* End of Job List Popout */}
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+        className || ""
+      }`}
+    >
+      <div className="header w-full flex justify-between items-center mb-5">
+        <div className="flex space-x-2 items-center">
+          <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+            All Jobs
+          </h1>
        </div>
-    );
+        <SelectBox
+          action={setCategory}
+          datas={filterCategories}
+          className="Update-table-dropdown"
+          contentBodyClasses="w-auto min-w-max"
+        />
+      </div>
+      {MyJobList.loading ? (
+        <LoadingSpinner size="16" color="sky-blue" />
+      ) : (
+        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+          <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              <tr className="text-base text-thin-light-gray border-b  default-border-b dark:border-[#5356fb29] ottom ">
+                <td className="py-1">.</td>
+                <td className="py-1 text-right">.</td>
+              </tr>
+
+              {selectedCategory === "All Categories" ? (
+                <>
+                  {MyJobList &&
+                  MyJobList?.data?.result_list &&
+                  MyJobList.data?.result_list.length > 0 ? (
+                    currentJobList.map((value, index) => {
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      return(
+                      <tr
+                        key={index}
+                        className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                      >
+                        <td className="py-9">
+                          <div className="sm:flex sm:space-x-2 sm:justify-between sm:items-center job-items">
+                            <div className="flex space-x-2 items-center job-items w-full">
+                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px] max-w-[60px]">
+                                <img
+                                  src={dataImage2}
+                                  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">
+                                  {value.title}
+                                </h1>
+                                <div>{value.description}</div>
+                                <span className="text-sm text-thin-light-gray">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <span className="text-sm text-thin-light-gray">
+                                  Duration:{" "}
+                                  <span className="text-purple">
+                                    {" "}
+                                    {value.timeline_days} day(s)
+                                  </span>
+                                </span>
+                              </div>
+                            </div>
+
+                            <div className="min-w-[110px] max-w-[110px] bg-yellow-300 mx-2 rounded-md flex flex-nowrap space-x-2 justify-center items-center self-end">
+                              <button
+                                type="button"
+                                className="p-2 w-[60px] h-11"
+                                onClick={() => {
+                                  setDeleteJobPopout({
+                                    show: true,
+                                    data: value,
+                                  });
+                                }}
+                              >
+                                [Delete]
+                              </button>
+                              <span>|</span>
+                              <button
+                                type="button"
+                                className="p-2 w-[40px] h-11"
+                                onClick={() => {
+                                  setEditJob({
+                                    show: true,
+                                    data: value,
+                                  });
+                                }}
+                              >
+                                Edit
+                              </button>
+                            </div>
+                          </div>
+                        </td>
+
+                        <td className="text-right py-9 px-2">
+                          <button
+                            type="button"
+                            onClick={() => {
+                              setJobPopout({ show: true, data: value });
+                            }}
+                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                          >
+                            Manage
+                          </button>
+                        </td>
+                      </tr>
+                    )})
+                  ) : (
+                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                      <td className="p-2">No Jobs Avaliable!</td>
+                    </tr>
+                  )}
+                </>
+              ) : selectedCategory === "Explore" ? (
+                <></>
+              ) : (
+                <></>
+              )}
+            </tbody>
+          </table>
+
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0 ? true : false}
+            next={
+              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+              MyJobList?.data?.result_list?.length
+                ? true
+                : false
+            }
+            data={MyJobList?.data?.result_list}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
+        </div>
+      )}
+
+      {/* Job List Popout */}
+      {jobPopout.show && (
+        <JobListPopout
+          details={jobPopout.data}
+          onClose={() => {
+            setJobPopout({ show: false, data: {} });
+          }}
+          situation={jobPopout.show}
+        />
+      )}
+      {/* End of Job List Popout */}
+
+      {/* Delete Job Popout */}
+      {deleteJobPopout.show && (
+        <DeleteJobPopout
+          details={deleteJobPopout.data}
+          onClose={() => {
+            setDeleteJobPopout({ show: false, data: {} });
+          }}
+          reloadJobList={reloadJobList}
+          situation={deleteJobPopout.show}
+        />
+      )}
+      {/* END of Delete Job Popout */}
+
+      {editJob.show && (
+        <EditJobPopOut
+          details={editJob.data}
+          onClose={() => {
+            setEditJob({
+              show: false,
+              data: {},
+            });
+          }}
+          situation={editJob.show}
+          country={myCountry}
+        />
+      )}
+    </div>
+  );
 }
@@ -15,10 +15,6 @@ export default function StartJob(props) {
    const navigate = useNavigate()

    let [request, setRequest] = useState({loading: false, status: false, message: ''})
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };

    const handleOnclick = () => {
        setRequest({loading: true, status: false, message: ''})
@@ -42,25 +38,6 @@ export default function StartJob(props) {
            {/*<CommonHead />*/}
            <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="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
-                <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
-                >
-                  Additional Terms for Jobs Posting.
-                </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                            </div>
-                        </div>
-                    </div> */}
-
                    <div
                        className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px]`}
                    >
@@ -3,39 +3,41 @@ import { Link } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
+import AddJobPage from "../../views/AddJobPage";

 export default function MyJobs(props) {
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
-    console.log("AMEYE LOC1", props.MyJobList);
-    return (
-        <Layout>
-            <CommonHead />
-            <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="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
-                <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+  const [popUp, setPopUp] = useState(false);
+  const popUpHandler = () => {
+    setPopUp((prev) => !prev);
+  };
+
+  return (
+    <Layout>
+      <CommonHead commonHeadData={props.commonHeadData} />
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          <div className="sm:flex items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold flex items-center space-x-1  text-dark-gray dark:text-white gap-2">
+                <span>My Jobs</span>
+
+                <button
+                  className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
+                  onClick={popUpHandler}
                >
-                  My Jobs
-                </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                        </div>
-                    </div>
-                    </div>
-                    <MyJobTable MyJobList={props.MyJobList} />
-                </div>
+                  Add Job
+                </button>
+              </h1>
            </div>
-        </Layout>
-    );
-}
+          </div>
+          <MyJobTable MyJobList={props.MyJobList} />
+        </div>
+      </div>
+
+      {/* Add Job List Popout */}
+      {popUp && <AddJobPage action={popUpHandler} situation={popUp} />}
+      {/* End of Add Job List Popout */}
+    </Layout>
+  );
+}
@@ -0,0 +1,157 @@
+import React, { useState } from "react";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+import PendingJobsPopout from "../jobPopout/PendingJobsPopout";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+export default function MyPendingJobTable({ MyJobList, className }) {
+  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentActiveJobList = MyJobList?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+        className || ""
+      }`}
+    >
+      {MyJobList && MyJobList?.result_list && (
+        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+              {/*    <td className="py-4">All Product</td>*/}
+              {/*    <td className="py-4 text-right">.</td>*/}
+              {/*</tr>*/}
+
+              {
+                <>
+                  {MyJobList &&
+                  MyJobList?.result_list &&
+                  MyJobList.result_list.length > 0 ? (
+                    currentActiveJobList.map((value, index) => {
+                      let deliveryDate = value?.expire?.split(" ")[0];
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      return (
+                        <tr
+                          key={index}
+                          className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                        >
+                          <td className=" py-4">
+                            <div className="flex space-x-2 items-center w-full">
+                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px]">
+                                <img
+                                  src={dataImage2}
+                                  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">
+                                  {value.title}
+                                </h1>
+                                <div>{value.description}</div>
+                                <span className="text-sm text-thin-light-gray">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <div className="flex items-center gap-4">
+                                  <span className="text-sm text-thin-light-gray">
+                                    Duration:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.timeline_days} day(s)
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Expire:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {deliveryDate}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Sent to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </td>
+
+                          <td className="text-right py-4 px-2">
+                            <button
+                              type="button"
+                              onClick={() => {
+                                setJobPopout({ show: true, data: value });
+                              }}
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              View
+                            </button>
+                          </td>
+                        </tr>
+                      );
+                    })
+                  ) : (
+                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                      <td className="p-2">No Pending Task!</td>
+                    </tr>
+                  )}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0 ? true : false}
+            next={
+              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+              MyJobList?.result_list.length
+                ? true
+                : false
+            }
+            data={MyJobList?.result_list}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
+        </div>
+      )}
+
+      {/* Active Job Popout */}
+      {jobPopout.show && (
+        <PendingJobsPopout
+          details={jobPopout.data}
+          onClose={() => {
+            setJobPopout({ show: false, data: {} });
+          }}
+          situation={jobPopout.show}
+        />
+      )}
+      {/* End of Active Job Popout */}
+    </div>
+  );
+}
@@ -0,0 +1,43 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyPendingJobTable from "./MyPendingJobTable";
+
+export default function MyPendingJobs(props) {
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  console.log("AMEYE LOC1", props.MyJobList);
+  return (
+    <Layout>
+      <CommonHead
+          commonHeadData={props.commonHeadData}
+      />
+      <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="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Pending Job(s)
+                </span>
+              </h1>
+            </div>
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          <MyPendingJobTable MyJobList={props.MyJobList} />
+        </div>
+      </div>
+    </Layout>
+  );
+}
@@ -0,0 +1,413 @@
+import React, { useRef, useState } from "react";
+import top from "../../assets/images/top-buyer-1png.png";
+import top2 from "../../assets/images/top-buyer-2.png";
+import top3 from "../../assets/images/top-buyer-3.png";
+import top4 from "../../assets/images/top-buyer-4.png";
+import Icons from "../Helpers/Icons";
+import SliderCom from "../Helpers/SliderCom";
+
+import OfferJobPopout from "../jobPopout/OfferJobPopout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+export default function MyOffersTable({ className, MyActiveOffersList }) {
+  let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+  const settings = {
+    arrows: false,
+    dots: false,
+    infinite: MyActiveOffersList?.result_list?.length > 4,
+    autoplay: true,
+    slidesToShow: 4,
+    slidesToScroll: 1,
+    responsive: [
+      {
+        breakpoint: 426,
+        settings: {
+          slidesToShow: 2,
+          slidesToScroll: 1,
+          infinite: MyActiveOffersList?.result_list?.length > 2,
+        },
+      },
+    ],
+  };
+
+  console.log("YES WE SEE OFFERS", MyActiveOffersList);
+  const sellSlider = useRef(null);
+  //const buySlider = useRef(null);
+  const prevHandler = (value) => {
+    if (value === "sell") {
+      sellSlider.current.slickPrev();
+    }
+    // if (value === "buy") {
+    //     buySlider.current.slickPrev();
+    // }
+  };
+  const nextHandler = (value) => {
+    if (value === "sell") {
+      sellSlider.current.slickNext();
+    }
+    // if (value === "buy") {
+    //     buySlider.current.slickNext();
+    // }
+  };
+
+  if (!MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0) {
+    return ""; // want blank or no appear when no items
+  }
+
+  return (
+    <>
+      <div className={`top-seller-top-buyer-wrapper ${className || ""}`}>
+        <div className="top-seller-top-buyer-wrapper-container">
+          <div className="main-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4">
+            <div className="lg:w-2/2 w-full mb-10 lg:mb-0 sm:p-8 p-4 bg-white dark:bg-dark-white   rounded-2xl section-shadow">
+              <div className="heading flex justify-between items-center mb-4">
+                <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
+                  Offers
+                </h1>
+                <div className="slider-btns flex space-x-4">
+                  <button
+                    onClick={() => nextHandler("sell")}
+                    type="button"
+                    className="transform rotate-180 text-dark-gray dark:text-white dark:opacity-25"
+                  >
+                    <Icons name="arrows" />
+                  </button>
+                  <button
+                    onClick={() => prevHandler("sell")}
+                    type="button"
+                    className="transform rotate-180"
+                  >
+                    <div className="  text-dark-gray dark:text-white">
+                      <svg
+                        width="11"
+                        height="19"
+                        viewBox="0 0 11 19"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M9.09766 1.1499L1.13307 9.11449L9.09766 17.0791"
+                          stroke="url(#paint0_linear_220_23410)"
+                          strokeWidth="2"
+                          strokeLinecap="round"
+                          strokeLinejoin="round"
+                        />
+                        <defs>
+                          <linearGradient
+                            id="paint0_linear_220_23410"
+                            x1="9.09766"
+                            y1="1.1499"
+                            x2="-4.2474"
+                            y2="7.96749"
+                            gradientUnits="userSpaceOnUse"
+                          >
+                            <stop stopColor="#F539F8" />
+                            <stop offset="0.416763" stopColor="#C342F9" />
+                            <stop offset="1" stopColor="#5356FB" />
+                          </linearGradient>
+                        </defs>
+                      </svg>
+                    </div>
+                  </button>
+                </div>
+              </div>
+              <div className="slider-content">
+                <SliderCom settings={settings} selector={sellSlider}>
+                  {MyActiveOffersList &&
+                    MyActiveOffersList?.result_list?.length > 0 &&
+                    MyActiveOffersList?.result_list?.map((value, index) => {
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      return (
+                        <div className="item" key={index}>
+                          <div className="offer-slide-item flex flex-col justify-between items-center">
+                            {/* title */}
+                            <div className="flex justify-center">
+                              <p className="text-xl text-dark-gray dark:text-white font-bold mb-2">
+                                {value.title}
+                              </p>
+                            </div>
+                            {/* username */}
+                            <div className="flex flex-col justify-center my-1">
+                              <p className="text-xs text-thin-light-gray">
+                                {value.timeline_days} Days
+                              </p>
+                              <div className="my-2 flex space-x-1 items-center text-purple text-xs">
+                                <span>{thePrice}</span>
+                              </div>
+                            </div>
+                            <button
+                              type="button"
+                              onClick={() => {
+                                setOfferPopout({ show: true, data: value });
+                              }}
+                              className="w-20 h-11 self-center btn-gradient text-base rounded-full text-white"
+                            >
+                              Start Task
+                            </button>
+                          </div>
+                        </div>
+                      );
+                    })}
+
+                  {/*            <div className="item">*/}
+                  {/*                /!* img *!/*/}
+                  {/*                <div className="flex justify-center mb-4">*/}
+                  {/*                    <div className=" w-14 h-14 relative">*/}
+                  {/*                        <img src={top2} alt="top" className="w-full h-full" />*/}
+                  {/*                        <div className="absolute right-0 top-0">*/}
+                  {/*                            <svg*/}
+                  {/*                                width="18"*/}
+                  {/*                                height="17"*/}
+                  {/*                                viewBox="0 0 18 17"*/}
+                  {/*                                fill="none"*/}
+                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*                            >*/}
+                  {/*                                <path*/}
+                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
+                  {/*                                    fill="#3897EF"*/}
+                  {/*                                />*/}
+                  {/*                            </svg>*/}
+                  {/*                        </div>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*                /!* title *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
+                  {/*                        Brokln Simons*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* username *!/*/}
+                  {/*                <div className="flex justify-center mb-1">*/}
+                  {/*                    <p className="text-xs text-thin-light-gray">*/}
+                  {/*                        @broklinslam_75*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* items *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
+                  {/*<span>*/}
+                  {/*  <svg*/}
+                  {/*      className="fill-current"*/}
+                  {/*      width="13"*/}
+                  {/*      height="11"*/}
+                  {/*      viewBox="0 0 13 11"*/}
+                  {/*      fill="none"*/}
+                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*  >*/}
+                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
+                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
+                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
+                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
+                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
+                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
+                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
+                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
+                  {/*  </svg>*/}
+                  {/*</span>*/}
+                  {/*                        <span>3435 Items</span>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*            </div>*/}
+                  {/*            <div className="item">*/}
+                  {/*                /!* img *!/*/}
+                  {/*                <div className="flex justify-center mb-4">*/}
+                  {/*                    <div className=" w-14 h-14 relative">*/}
+                  {/*                        <img src={top3} alt="top" className="w-full h-full" />*/}
+                  {/*                        <div className="absolute right-0 top-0">*/}
+                  {/*                            <svg*/}
+                  {/*                                width="18"*/}
+                  {/*                                height="17"*/}
+                  {/*                                viewBox="0 0 18 17"*/}
+                  {/*                                fill="none"*/}
+                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*                            >*/}
+                  {/*                                <path*/}
+                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
+                  {/*                                    fill="#3897EF"*/}
+                  {/*                                />*/}
+                  {/*                            </svg>*/}
+                  {/*                        </div>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*                /!* title *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
+                  {/*                        Brokln Simons*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* username *!/*/}
+                  {/*                <div className="flex justify-center mb-1">*/}
+                  {/*                    <p className="text-xs text-thin-light-gray">*/}
+                  {/*                        @broklinslam_75*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* items *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
+                  {/*<span>*/}
+                  {/*  <svg*/}
+                  {/*      className="fill-current"*/}
+                  {/*      width="13"*/}
+                  {/*      height="11"*/}
+                  {/*      viewBox="0 0 13 11"*/}
+                  {/*      fill="none"*/}
+                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*  >*/}
+                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
+                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
+                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
+                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
+                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
+                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
+                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
+                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
+                  {/*  </svg>*/}
+                  {/*</span>*/}
+                  {/*                        <span>3435 Items</span>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*            </div>*/}
+                  {/*            <div className="item">*/}
+                  {/*                /!* img *!/*/}
+                  {/*                <div className="flex justify-center mb-4">*/}
+                  {/*                    <div className=" w-14 h-14 relative">*/}
+                  {/*                        <img src={top4} alt="top" className="w-full h-full" />*/}
+                  {/*                        <div className="absolute right-0 top-0">*/}
+                  {/*                            <svg*/}
+                  {/*                                width="18"*/}
+                  {/*                                height="17"*/}
+                  {/*                                viewBox="0 0 18 17"*/}
+                  {/*                                fill="none"*/}
+                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*                            >*/}
+                  {/*                                <path*/}
+                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
+                  {/*                                    fill="#3897EF"*/}
+                  {/*                                />*/}
+                  {/*                            </svg>*/}
+                  {/*                        </div>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*                /!* title *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
+                  {/*                        Brokln Simons*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* username *!/*/}
+                  {/*                <div className="flex justify-center mb-1">*/}
+                  {/*                    <p className="text-xs text-thin-light-gray">*/}
+                  {/*                        @broklinslam_75*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* items *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
+                  {/*<span>*/}
+                  {/*  <svg*/}
+                  {/*      className="fill-current"*/}
+                  {/*      width="13"*/}
+                  {/*      height="11"*/}
+                  {/*      viewBox="0 0 13 11"*/}
+                  {/*      fill="none"*/}
+                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*  >*/}
+                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
+                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
+                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
+                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
+                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
+                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
+                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
+                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
+                  {/*  </svg>*/}
+                  {/*</span>*/}
+                  {/*                        <span>3435 Items</span>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*            </div>*/}
+                  {/*            <div className="item">*/}
+                  {/*                /!* img *!/*/}
+                  {/*                <div className="flex justify-center mb-4">*/}
+                  {/*                    <div className=" w-14 h-14 relative">*/}
+                  {/*                        <img src={top3} alt="top" className="w-full h-full" />*/}
+                  {/*                        <div className="absolute right-0 top-0">*/}
+                  {/*                            <svg*/}
+                  {/*                                width="18"*/}
+                  {/*                                height="17"*/}
+                  {/*                                viewBox="0 0 18 17"*/}
+                  {/*                                fill="none"*/}
+                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*                            >*/}
+                  {/*                                <path*/}
+                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
+                  {/*                                    fill="#3897EF"*/}
+                  {/*                                />*/}
+                  {/*                            </svg>*/}
+                  {/*                        </div>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*                /!* title *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
+                  {/*                        Brokln Simons*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* username *!/*/}
+                  {/*                <div className="flex justify-center mb-1">*/}
+                  {/*                    <p className="text-xs text-thin-light-gray">*/}
+                  {/*                        @broklinslam_75*/}
+                  {/*                    </p>*/}
+                  {/*                </div>*/}
+                  {/*                /!* items *!/*/}
+                  {/*                <div className="flex justify-center">*/}
+                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
+                  {/*<span>*/}
+                  {/*  <svg*/}
+                  {/*      className="fill-current"*/}
+                  {/*      width="13"*/}
+                  {/*      height="11"*/}
+                  {/*      viewBox="0 0 13 11"*/}
+                  {/*      fill="none"*/}
+                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
+                  {/*  >*/}
+                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
+                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
+                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
+                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
+                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
+                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
+                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
+                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
+                  {/*  </svg>*/}
+                  {/*</span>*/}
+                  {/*                        <span>3435 Items</span>*/}
+                  {/*                    </div>*/}
+                  {/*                </div>*/}
+                  {/*            </div>*/}
+                </SliderCom>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        {/* Offer Job Popout */}
+        {offerPopout.show && (
+          <OfferJobPopout
+            details={offerPopout.data}
+            onClose={() => {
+              setOfferPopout({ show: false, data: {} });
+            }}
+            situation={offerPopout.show}
+          />
+        )}
+        {/* End of Offer Job Popout */}
+      </div>
+    </>
+  );
+}
@@ -3,38 +3,51 @@ import { Link } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
+import TopSellerTopBuyerSliderSection from "../Home/TopSellerTopBuyerSliderSection";
+import MyOffersTable from "./MyOffersTable";

-export default function MyTasks() {
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
-    return (
-        <Layout>
-            <CommonHead />
-            <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="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+export default function MyTasks({
+  MyActiveOffersList,
+  ActiveJobList,
+  commonHeadData,
+}) {
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  return (
+    <Layout>
+      <CommonHead commonHeadData={commonHeadData} />
+      <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="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
                >
                  My Tasks
                </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                        </div>
-                    </div>
-                    </div>
-                    <MyJobTable />
-                </div>
+              </h1>
            </div>
-        </Layout>
-    );
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          {MyActiveOffersList &&
+            MyActiveOffersList?.result_list?.length >= 0 && (
+              <MyOffersTable
+                MyActiveOffersList={MyActiveOffersList}
+                className="mb-10"
+              />
+            )}
+          <MyJobTable ActiveJobList={ActiveJobList} />
+        </div>
+      </div>
+    </Layout>
+  );
 }
@@ -2,6 +2,7 @@ import React, {useState} from 'react'
 import RecentActivityTable from './WalletComponent/RecentActivityTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 import { useNavigate } from 'react-router-dom'
+import InputCom from '../Helpers/Inputs/InputCom'

 function AddFund({payment}) {
   
@@ -36,49 +37,84 @@ function AddFund({payment}) {
        setInput('')
    }
    return (
-        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                    <h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>
-                    <hr />
-                   <form className='md:p-8 p-4 add-fund-info'>
-                        <div className='md:flex items-center'>
-                            <label className='w-full md:w-2/4 text-slate-600 text-lg'>Amount(Naira) <span className='text-red-500'>*</span></label>
-                            <input className='w-full md:w-2/4 p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                                value={input} 
-                                name='amount' 
-                                type="text" 
-                                placeholder='Amount' 
-                                required
-                                onChange={handleChange}
-                                />
-                        </div>
-                        {inputError && <p className='text-base text-red-500'>{inputError}</p>}
-                   </form>
-                        <hr />
-                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
-                            <button onClick={handleSubmit} className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Continue</button>
-                        </div>
+        <div>
+            {/* heading */}
+            <div className="sm:flex justify-between items-center mb-6">
+                <div className="w-full flex justify-start space-x-3 items-center">
+                    <button
+                    type="button"
+                    className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
+                    onClick={() =>
+                        navigate('/my-wallet', { replace: true })
+                    }
+                    >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="35"
+                            height="35"
+                            viewBox="0 0 24 24"
+                            fill="skyblue"
+                        >
+                            <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
+                        </svg>
+                    </button>
+                    <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
+                    Add Credit
+                    </h1>
                </div>
-                <div className="add-fund py-4 my-2 w-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                    <h2 className='md:px-8 px-4 py-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>
-                    <hr />
-                    <p className='md:px-8 px-4 py-2 text-slate-600 dark:text-white text-base lg:text-xl font-medium'>Transfer fund to WrenchBoard GTB Account 0250869867</p>
-                    <p className='md:px-8 px-4 py-2 text-slate-500 dark:text-white text-sm lg:text-base font-medium'>
-                    Make sure you add your account username in the notes part of the transfer for prompt processing. When the transfer is complete notify here <a className='text-sky-blue' href='#'>Contact us</a>
-                    </p>
+                <div className="slider-btns flex space-x-4">
+                    <div
+                        onClick={() => filterHandler("today")}
+                        className="relative"
+                    ></div>
                </div>
            </div>
-    
-            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[590px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                    <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                    {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
-                    {payment.loading ?
-                    <LoadingSpinner size='16' color='sky-blue' />
-                    :
-                    <RecentActivityTable  payment={payment}/>
-                    }
+
+            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+                    <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                        {/*<h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>*/}
+                        {/*<hr />*/}
+                        <form className='md:p-8 p-4 add-fund-info'>
+                            <div className="field w-full mb-6">
+                                <InputCom
+                                    fieldClass="px-6"
+                                    label="Amount(Naira)"
+                                    type="text"
+                                    name="amount"
+                                    placeholder="Amount"
+                                    value={input}
+                                    inputHandler={handleChange}
+                                    // blurHandler={props.handleBlur}
+                                />
+                                {inputError && <p className='text-base text-red-500'>{inputError}</p>}
+                            </div>
+                        </form>
+                        <hr />
+                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
+                            <button
+                                onClick={handleSubmit}
+                                type="button"
+                                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                                <span className="text-white">Continue</span>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full md:p-8 p-4 h-full min-h-[590px] bg-white dark:bg-dark-white rounded-2xl shadow">
+                        <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                        {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
+                        {payment.loading ?
+                            <LoadingSpinner size='16' color='sky-blue' />
+                            :
+                            <RecentActivityTable  payment={payment}/>
+                        }
+                    </div>
                </div>
            </div>
        </div>
@@ -8,13 +8,24 @@ import LoadingSpinner from '../Spinners/LoadingSpinner'
 function Balance({wallet, coupon}) {
    return (
        <div className="content-wrapper">
+            {/* heading */}
+            <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">
+                        Wallet
+                    </h1>
+                </div>
+                <div className="slider-btns flex space-x-4">
+
+                </div>
+            </div>
            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
                {/* WALLET SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                <div className="lg:w-4/4 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow min-h-[520px]">
                        <div className='flex items-baseline justify-between'>
-                            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>
-                            <p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>
+                            {/*<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>*/}
+                            {/*<p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>*/}
                        </div>
                        {/* wallet balance */}
                        {wallet.loading ?
@@ -22,27 +33,39 @@ function Balance({wallet, coupon}) {
                        :
                        wallet.data.length ?
                        wallet.data.map((item, index)=> (
-                        <div key={index} className="md:flex items-center flex-wrap my-3 border-t-2 border-slate-400">
-                            <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
-                                <div className='balance-info'>
-                                    <p className='py-2'>Currency</p>
-                                    <span className='text-base'>{item.description}</span>
-                                    <p className='text-base text-slate-500'>{item.symbol}</p>
+                        <div key={index} className="p-3 md:flex items-center flex-wrap my-3 border-t-2 border-slate-400 wallet-box">
+                                <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
+                                    <div className='balance-info bal-col1'>
+                                        <p className='py-2'></p>
+                                        <span className='text-xl text-dark-gray dark:text-white'><b>{item.description}</b></span>
+                                        <p className='text-base text-slate-500'>{item.symbol}</p>
+                                    </div>
+                                    <div className='balance-info'>
+                                        <p className='py-2'>Balance</p>
+                                        <span className='py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*0.01).toFixed(2)}</span>
+                                    </div>
+                                    <div className='balance-info'>
+                                        <p className='py-2'>Escrow</p>
+                                        <span className='py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*0.01).toFixed(2)}</span>
+                                    </div>
                                </div>
-                                <div className='balance-info'>
-                                    <p className='py-2'>balance</p>
-                                    <span className='text-sm py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*0.01).toFixed(2)}</span>
-                                </div>
-                                <div className='balance-info'>
-                                    <p className='py-2'>Escrow</p>
-                                    <span className='text-sm py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*0.01).toFixed(2)}</span>
-                                </div>
-                            </div>

-                            <div className='w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end'>
-                                <Link to='transfer-fund' className='text-base text-white px-3 py-1 bg-purple rounded-md hover:opacity-80'>Transfer</Link>
-                                <Link to='add-fund' className='text-base text-white px-3 py-1 bg-[orange] rounded-md hover:opacity-80'>Top Up</Link>
-                            </div>
+                                <div className='w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end'>
+                                    {
+                                        item.action_type != 'AC_AD_FD_ONLY' ?
+                                            <Link to='transfer-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
+                                    }
+                                    <Link to='add-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-green lg:text-xl text-lg font-bold text-white'>
+                                        <span className="">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="38"
+                                                height="38" viewBox="0 0 42 42" fill="none"><path
+                                                d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
+                                                fill="white"></path>
+                                            </svg>
+                                        </span>
+                                        <span className='text-white'>Add Credit</span>
+                                    </Link>
+                                </div>
                        </div>
                        ))
                        :
@@ -65,19 +88,25 @@ function Balance({wallet, coupon}) {
                {/* END OF WALLET SECTION */}


-                {/* COUPON SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>
-                        {coupon.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <CouponTable coupon={coupon} />
-                        }
-                    </div>
-                </div>
-                {/* END OF COUPON SECTION */}
-            </div>            
+
+            </div>
+
+            {/*<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>*/}
+
+            {/*    /!* COUPON SECTION *!/*/}
+            {/*    <div className="lg:w-3/4 w-full mb-10 lg:mb-0">*/}
+            {/*        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">*/}
+            {/*            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>*/}
+            {/*            {coupon.loading ?*/}
+            {/*                <LoadingSpinner size='16' color='sky-blue' />*/}
+            {/*                :*/}
+            {/*                <CouponTable coupon={coupon} />*/}
+            {/*            }*/}
+            {/*        </div>*/}
+            {/*    </div>*/}
+            {/*    /!* END OF COUPON SECTION *!/*/}
+
+            {/*</div>*/}
        </div>
      )
 }
@@ -129,7 +129,7 @@ function ConfirmAddFund({ payment }) {
            <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4">
              <FlutterWaveButton
                {...fwConfig}
-                className="text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md"
+                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
              />
            </div>
          </div>
@@ -137,7 +137,7 @@ function ConfirmAddFund({ payment }) {
      )}

      <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+        <div className="wallet w-full  md:p-8 p-4 h-full min-h-[600px] bg-white dark:bg-dark-white rounded-2xl shadow">
          <h2 className="text-gray-900 dark:text-white text-xl lg:text-2xl font-medium">
            Recent Activity
          </h2>
@@ -110,6 +110,7 @@ function TransferFund({ payment, wallet }) {
  useEffect(() => {
    getRecipients();
  }, []);
+  
  return (
    <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
      <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
@@ -136,21 +137,25 @@ function TransferFund({ payment, wallet }) {
                    </h2>
                  ) : wallet.error ? (
                    <h2 className="my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
-                      Opps! An Error Occured
+                      Opps! An Error Occurred
                    </h2>
                  ) : (
                    <h2 className="my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
                      No Wallet Information Found!
                    </h2>
                  )}
-                  <div className="xl:flex xl:space-x-7 mb-6">
-                    <div className="field w-full mb-6 xl:mb-0">
+                  <div className=" mb-6 gap-4 flex flex-col">
+                    <div className="field w-full">
                      <InputCom
-                        fieldClass="px-6"
-                        label="Amount"
-                        type="text"
+                        fieldClass="px-4"
+                        parentClass="flex items-center gap-1 justify-between"
+                        labelClass="flex-[0.2] mb-0"
+                        inputClass="flex-[0.8] max-w-[12rem]"
+                        label="Amount:"
+                        type="number"
                        name="amount"
                        placeholder="0"
+                        direction="rtl"
                        value={props.values.amount}
                        inputHandler={props.handleChange}
                        blurHandler={(e) => {
@@ -160,7 +165,7 @@ function TransferFund({ payment, wallet }) {
                        // onMouseLeave={(e)=>{getSendMoneyFee(e)}}
                      />
                      {props.errors.amount && props.touched.amount && (
-                        <p className="text-sm text-red-500">
+                        <p className="sm:text-sm text-[12px] text-red-500 sm:text-left text-right sm:translate-y-0 translate-y-1">
                          {props.errors.amount}
                        </p>
                      )}
@@ -168,25 +173,31 @@ function TransferFund({ payment, wallet }) {

                    <div className="field w-full">
                      <InputCom
-                        fieldClass="px-6"
-                        label="Fee"
+                        fieldClass="px-4 transfer-field"
+                        parentClass="flex items-center gap-1 justify-between"
+                        labelClass="flex-[0.2] mb-0"
+                        inputClass="flex-[0.8] transfer-field max-w-[12rem]"
+                        label="Fee:"
                        type="text"
                        name="fee"
+                        direction="rtl"
                        value={
                          sendMoneyFee.loading ? "loading" : sendMoneyFee.fee
                        }
                        disable={true}
                      />
                    </div>
-                  </div>

-                  <div className="md:flex items-center justify-end">
-                    <div className="field w-full lg:w-1/2 mb-6">
+                    <div className="field w-full mb-6">
                      <InputCom
-                        fieldClass="px-6"
-                        label="Total"
+                        fieldClass="px-4 transfer-field"
+                        parentClass="flex items-center gap-1 justify-between"
+                        labelClass="flex-[0.2] mb-0"
+                        inputClass="flex-[0.8] transfer-field max-w-[12rem]"
+                        label="Total:"
                        type="text"
                        name="total"
+                        direction="rtl"
                        value={
                          sendMoneyFee.loading ? "loading" : sendMoneyFee.total
                        }
@@ -197,87 +208,85 @@ function TransferFund({ payment, wallet }) {

                  <div className="w-full">
                    <div className="relative my-3 md:flex items-center">
-                      <div className="transfer-input w-full">
-                        <div className="flex items-center justify-start py-2">
-                          <label className="text-[#181c32] dark:text-white text-base font-semibold block mb-2.5">
-                            Recipient
-                            <span className="text-red-500 mx-2">*</span>
-                            <span
-                              title="Transfer Recipient"
-                              className={`text-white text-sm bg-slate-500 w-1 h-1 rounded-full px-3 py-1 cursor-pointer`}
-                            >
-                              !
-                            </span>
-                          </label>
-                          <Link
-                            to="add-recipient"
-                            className="mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80"
+                      <div className="transfer-input w-full flex items-start gap-1 justify-between">
+                        <label className="text-[#181c32] dark:text-white text-base font-semibold block flex-[0.2] mb-0 mt-3">
+                          Recipient:
+                        </label>
+                        <div className="flex flex-col gap-3 flex-[0.8] sm:items-start items-end">
+                          <select
+                            className="sm:w-full w-48 text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0 flex-[0.8]"
+                            value={props.values.recipientID}
+                            name="recipientID"
+                            onChange={props.handleChange}
+                            onBlur={props.handleBlur}
                          >
-                            Add New
-                          </Link>
-                        </div>
-                        <select
-                          className="w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0"
-                          value={props.values.recipientID}
-                          name="recipientID"
-                          onChange={props.handleChange}
-                          onBlur={props.handleBlur}
-                        >
-                          {recipients.loading ? (
-                            <option className="text-slate-500 text-lg" value="">
-                              Loading...
-                            </option>
-                          ) : recipients.data.length ? (
-                            <>
+                            {recipients.loading ? (
                              <option
                                className="text-slate-500 text-lg"
                                value=""
                              >
-                                Select...
+                                Loading...
                              </option>
-                              {recipients.data.map((item, index) => (
+                            ) : recipients.data.length ? (
+                              <>
                                <option
-                                  key={index}
-                                  value={item.recipient_id}
                                  className="text-slate-500 text-lg"
+                                  value=""
                                >
-                                  {item.recipient}
+                                  Select...
                                </option>
-                              ))}
-                            </>
-                          ) : recipients.error ? (
-                            <option className="text-slate-500 text-lg" value="">
-                              Could'nt Load, try again!
-                            </option>
-                          ) : (
-                            <option className="text-slate-500 text-lg" value="">
-                              No Recipient Found! Click Add to Add
-                            </option>
-                          )}
-                        </select>
+                                {recipients.data.map((item, index) => (
+                                  <option
+                                    key={index}
+                                    value={item.recipient_id}
+                                    className="text-slate-500 text-lg"
+                                  >
+                                    {item.recipient}
+                                  </option>
+                                ))}
+                              </>
+                            ) : recipients.error ? (
+                              <option
+                                className="text-slate-500 text-lg"
+                                value=""
+                              >
+                                Could'nt load, try again!
+                              </option>
+                            ) : (
+                              <option
+                                className="text-slate-500 text-lg"
+                                value=""
+                              >
+                                No Recipient Found!
+                              </option>
+                            )}
+                          </select>
+                          <div className="flex justify-end relative w-full">
+                            {props.errors.recipientID &&
+                              props.touched.recipientID && (
+                                <p className="sm:text-sm text-[12px] text-red-500 absolute sm:top-1 -top-20 sm:left-0 left-[160px]">
+                                  {props.errors.recipientID}
+                                </p>
+                              )}
+                            <Link
+                              to="add-recipient"
+                              className="mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80 max-w-[5rem]"
+                            >
+                              Add New
+                            </Link>
+                          </div>
+                        </div>
                      </div>
                    </div>
-                    {props.errors.recipientID && props.touched.recipientID && (
-                      <p className="text-sm text-red-500">
-                        {props.errors.recipientID}
-                      </p>
-                    )}
                  </div>

-                  <div className="field w-full mb-6">
-                    {/* <InputCom fieldClass="px-6"
-                                            label="Comment"
-                                            type="text"
-                                            name="comment"
-                                            value={inputs.comment}
-                                            inputHandler={handleChange}
-                                        /> */}
-                    <label className="text-[#181c32] dark:text-white text-base font-semibold block mb-2.5">
-                      Comment
+                  <div className="field w-full mb-6 flex gap-1 justify-between">
+                    <label className="text-[#181c32] dark:text-white text-base font-semibold flex flex-[0.2] mt-2.5">
+                      Comment:
                    </label>
                    <textarea
                      style={{ resize: "none" }}
-                      className="text-base px-6 text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
+                      className="text-base px-4 py-2 rounded-md min-h-[100px] sm:max-w-[550px] max-w-[250px] text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none flex-[0.8]"
                      name="comment"
                      value={props.values.comment}
                      onChange={props.handleChange}
@@ -20,9 +20,6 @@ function Wallet() {
 }


-
-
-
 const WalletRoutes = () => {
    const apiCall = new usersService()

@@ -38,18 +35,6 @@ const WalletRoutes = () => {
        error: false
    })

-    let [purchaseHistory, setPurchaseHistory] = useState({ // FOR PURCHASE HISTORY
-        loading: true,
-        data: [],
-        error: false
-    })
-
-    let [couponHistory, setCouponHistory] = useState({ // FOR COUPON HISTORY
-        loading: true,
-        data: [],
-        error: false
-    })
-
    //FUNCTION TO GET WALLET LIST
    const getWalletList = ()=>{
        apiCall.getUserWallets(null).then((res)=>{
@@ -76,38 +61,9 @@ const WalletRoutes = () => {
        })
    }

-    //FUNCTION TO GET PURCHASE HISTORY
-    const getPurchaseHistory = ()=>{
-        apiCall.getPurchaseHx().then((res)=>{
-            if(res.data.internal_return < 0){ // success but no data
-                setPurchaseHistory(prev => ({...prev, loading: false}))
-                return
-            }
-            // console.log('purchase',res.data)
-            setPurchaseHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
-        }).catch((error)=>{
-            setPurchaseHistory(prev => ({...prev, loading: false, error: true}))
-        })
-    }
-
-     //FUNCTION TO GET COUPON HISTORY
-     const getCouponHistory = ()=>{
-        apiCall.getCouponHx().then((res)=>{
-            if(res.data.internal_return < 0){ // success but no data
-                setCouponHistory(prev => ({...prev, loading: false}))
-                return
-            }
-            setCouponHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
-        }).catch((error)=>{
-            setCouponHistory(prev => ({...prev, loading: false, error: true}))
-        })
-    }
-
    useEffect(()=>{
        getWalletList()
        getPaymentHistory()
-        getPurchaseHistory()
-        getCouponHistory()
    }, [])
    return (
        <Routes>
@@ -115,7 +71,7 @@ const WalletRoutes = () => {
                <Route path='add-fund' element={<AddFund payment={paymentHistory} />} />
                <Route path='add-fund/confirm-add-fund' element={<ConfirmAddFund payment={paymentHistory} />} />
                <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} wallet={walletList} />} />
-                <Route index element={<Balance coupon={couponHistory} wallet={walletList} />} />
+                <Route index element={<Balance wallet={walletList} />} />
                <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />
                <Route path='transfer-fund/confirm-transfer' element={<ConfirmTransfer payment={paymentHistory} wallet={walletList} />} />
                <Route path='*' element={<Navigate to='/' />} />
@@ -1,66 +1,85 @@
-import React, {useState} from 'react'
+import React, { useState } from "react";

-import PaginatedList from '../../Pagination/PaginatedList'
-import { handlePagingFunc } from '../../Pagination/HandlePagination';
+import PaginatedList from "../../Pagination/PaginatedList";
+import { handlePagingFunc } from "../../Pagination/HandlePagination";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";

-function CouponTable({coupon}) {
+function CouponTable({ coupon }) {
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentCoupon = coupon?.data?.slice(indexOfFirstItem, indexOfLastItem);

-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentCoupon = coupon?.data?.slice(indexOfFirstItem, indexOfLastItem);
-  
-    const handlePagination = (e) => {
-      handlePagingFunc(e,setCurrentPage)
-    }
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };

  return (
-    <div className='flex flex-col justify-between h-full'>
-    <table className="wallet-activity w-full table-auto border-collapse text-left">
-        <thead className='border-b-2'>
-            <tr className='text-slate-600'>
+    <div className="flex flex-col justify-between h-full">
+      <table className="wallet-activity w-full table-auto border-collapse text-left">
+        <thead className="border-b-2">
+          <tr className="text-slate-600">
            <th className="p-2">Date</th>
            <th className="p-2">Description</th>
            <th className="p-2">Amount</th>
            <th className="p-2">Active</th>
-            </tr>
+          </tr>
        </thead>
-        {coupon.data.length ?
-        (
-        <tbody>
-            {currentCoupon.map((item, index) => (
-            <tr key={index} className='text-slate-500'>
-                <td className="p-2">{item.added}</td>
-                <td className="p-2">{item.code}</td>
-                <td className="p-2">{item.amount}</td>
-                <td className="p-2">{item.status}</td>
+        {coupon.data.length ? (
+          <tbody>
+            {currentCoupon.map((item, index) => {
+              let thePrice = PriceFormatter(
+                item?.price * 0.01,
+                item?.currency_code,
+                item?.currency
+              );
+              return (
+                <tr key={index} className="text-slate-500">
+                  <td className="p-2">{item.added}</td>
+                  <td className="p-2">{item.code}</td>
+                  <td className="p-2">{item.amount}</td>
+                  <td className="p-2">{item.status}</td>
+                </tr>
+              );
+            })}
+          </tbody>
+        ) : coupon.error ? (
+          <tbody>
+            <tr className="text-slate-500">
+              <td className="p-2" colSpan={4}>
+                Opps! an error occurred. Please try again!
+              </td>
            </tr>
-            ))}
-        </tbody>
-        )
-        :
-        coupon.error ? 
-        (
-        <tbody>
-            <tr className='text-slate-500'>
-                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+          </tbody>
+        ) : (
+          <tbody>
+            <tr className="text-slate-500">
+              <td className="p-2" colSpan={4}>
+                No Purchase History Found!
+              </td>
            </tr>
-        </tbody>
-        )
-        :
-        <tbody>
-            <tr className='text-slate-500'>
-                <td className="p-2" colSpan={4}>No Purchase History Found!</td>
-            </tr>
-        </tbody>
-        }
-    </table>
+          </tbody>
+        )}
+      </table>

-    {/* PAGINATION BUTTON */}
-    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= coupon?.data?.length ? true : false} data={coupon?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
-    {/* END OF PAGINATION BUTTON */}
+      {/* PAGINATION BUTTON */}
+      <PaginatedList
+        onClick={handlePagination}
+        prev={currentPage == 0 ? true : false}
+        next={
+          currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+          coupon?.data?.length
+            ? true
+            : false
+        }
+        data={coupon?.data}
+        start={indexOfFirstItem}
+        stop={indexOfLastItem}
+      />
+      {/* END OF PAGINATION BUTTON */}
    </div>
-  )
+  );
 }

-export default CouponTable
+export default CouponTable;
@@ -19,8 +19,7 @@ function PurchasesTable({purchase}) {
    <table className="wallet-activity w-full table-auto border-collapse text-left">
        <thead className='border-b-2'>
            <tr className='text-slate-600'>
-            <th className="p-2">Date</th>
-            <th className="p-2">Description</th>
+            <th className="p-4">Trx.</th>
            <th className="p-2">Amount</th>
            <th className="p-2">Fee</th>
            </tr>
@@ -30,8 +29,9 @@ function PurchasesTable({purchase}) {
        <tbody>
            {currentPurchase.map((item, index) => (
            <tr key={index} className='text-slate-500'>
-                <td className="p-2">{item.added_date}</td>
-                <td className="p-2">{item.confirmation}</td>
+                <td className="p-4">{item.added_date}<br />
+                   <b>{item.confirmation} </b>
+                </td>
                <td className="p-2">{item.amount}</td>
                <td className="p-2">{item.fee}</td>
            </tr>
@@ -20,9 +20,9 @@ function RecentActivityTable({payment}) {
        <thead className='border-b-2'>
            <tr className='text-slate-600'>
            <th className="p-2">Date</th>
-            <th className="p-2">Recipient</th>
-            <th className="p-2">Amount/Fee</th>
-            <th className="p-2">Conf/Status</th>
+                <th className="p-4">Trx.</th>
+            <th className="p-2">Amnt./Fee</th>
+            <th className="p-2">Status</th>
            </tr>
        </thead>
        {payment.data.length ?
@@ -31,8 +31,8 @@ function RecentActivityTable({payment}) {
            {currentActivity.map((item, index) => (
            <tr key={index} className='text-slate-500'>
                <td className="p-2">{item.trx_date}</td>
-                <td className="p-2" dangerouslySetInnerHTML={{__html:item.recipient}}></td>
-                <td className="p-2">{item.amount}/{item.fee}</td>
+                <td className="p-4" dangerouslySetInnerHTML={{__html:item.recipient}}></td>
+                <td className="p-2">{item.amount}<br />{item.fee}</td>
                <td className="p-2">{item.status}</td>
            </tr>
            ))}
@@ -15,7 +15,7 @@ function ReferralTable({history}) {
    }

  return (
-    <div className='flex flex-col justify-between h-full'>
+    <div className='flex flex-col justify-between min-h-[420px] overflow-x-auto'>
        <table className="referral-list w-full table-auto border-collapse text-left">
            <thead className='border-b-2'>
                <tr className='text-slate-600'>
@@ -1,4 +1,4 @@
-import {Link} from 'react-router-dom'
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import Icons from "../Helpers/Icons";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
@@ -8,180 +8,194 @@ import Accordion from "../Helpers/Accordion";

 export default function WalletHeader(props) {
  //  debugger;
-    //props.myWalletList.result_list
-    return (
-        <>
-            <div
-                className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple pr-1.5 pl-4">
-                <div
-                    onClick={() => props.handlerBalance()}
-                    className="flex items-center lg:justify-between justify-center w-full h-full"
-                >
-                <span className="lg:block hidden">
-                  <Icons name="wallet"/>
-                </span>
-                    <p className="lg:text-xl text-lg font-bold text-white">
-                        Wallet
-                    </p>
-                    <span className="lg:block hidden">
-                  <Icons name="deep-plus"/>
-                </span>
-                </div>
-                <div
-                    className={`balance-dropdown w-96 z-30 bg-white dark:bg-dark-white   absolute -left-24 rounded-lg cursor-pointer ${
-                        props.balanceDropdown ? "active" : ""
-                    }`}
-                >
-                    <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
-                        <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
-                            Wallet
-                        </h3>
+  //props.myWalletList.result_list
+  let { pathname } = useLocation();
+  let navigate = useNavigate();
+  return (
+    <>
+      <div className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple pr-1.5 pl-4">
+        <div
+          onClick={() => props.handlerBalance()}
+          className="flex items-center lg:justify-between justify-center w-full h-full"
+        >
+          <span className="lg:block hidden">
+            <Icons name="wallet" />
+          </span>
+          <p className="lg:text-xl text-lg font-bold text-white">Wallet</p>
+          <span className="lg:block hidden">
+            <Icons name="deep-plus" />
+          </span>
+        </div>
+        <div
+          className={`balance-dropdown w-96 z-30 bg-white dark:bg-dark-white   absolute -left-24 rounded-lg cursor-pointer ${
+            props.balanceDropdown ? "active" : ""
+          }`}
+        >
+          <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
+            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
+              Wallet
+            </h3>
+          </div>
+          <div className="content px-7 pb-7">
+            <ul>
+              {props.myWalletList &&
+                props.myWalletList?.result_list?.length > 0 &&
+                props.myWalletList.result_list.map((value, index) => (
+                  <li
+                    key={index}
+                    className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
+                  >
+                    <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={bank1} alt="" />
+                        </div>
+                        <div className="name">
+                          <p className="text-base text-dark-gray dark:text-white font-medium">
+                            {value.description}
+                          </p>
+                        </div>
+                      </div>
+                      <div>
+                        <p className="eth text-xl font-bold text-purple">
+                          {(value.amount * 0.01).toFixed(2)} {value.code}
+                        </p>
+                        <p className="usd text-base text-thin-light-gray text-right">
+                          {/*(773.69 USD)*/}
+                        </p>
+                      </div>
                    </div>
-                    <div className="content px-7 pb-7">
-                        <ul>
+                  </li>
+                ))}

-                            {props.myWalletList &&
-                                props.myWalletList?.result_list?.length > 0 &&
-                                props.myWalletList.result_list.map((value, index) => (
-                                    <li key={index} className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">
-                                        <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={bank1} alt=""/>
-                                                </div>
-                                                <div className="name">
-                                                    <p className="text-base text-dark-gray dark:text-white font-medium">
-                                                        {value.description}
-                                                    </p>
-                                                </div>
-                                            </div>
-                                            <div>
-                                                <p className="eth text-xl font-bold text-purple">
-                                                    {(value.amount*0.01).toFixed(2)} {value.code}
-                                                </p>
-                                                <p className="usd text-base text-thin-light-gray text-right">
-                                                    {/*(773.69 USD)*/}
-                                                </p>
-                                            </div>
-                                        </div>
-                                    </li>
-                                ))}
-
-                            {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-                            {/*    <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={bank1} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    MetaMask*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                75,320 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                            {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-                            {/*    <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={bank2} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    Coinbase Wallet*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                56,124 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                            {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-                            {/*    <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={bank3} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    Bitski*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                99,123 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                            {/*<li className="content-item py-5">*/}
-                            {/*    <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={bank4} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    WalletConnect*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                43,728 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                        </ul>
-                        <div className="add-money-btn flex justify-center items-center mt-3">
-                            {/* <button
-                                onClick={() => props.addMoneyHandler()}
+              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+              {/*    <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={bank1} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    MetaMask*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                75,320 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+              {/*    <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={bank2} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    Coinbase Wallet*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                56,124 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+              {/*    <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={bank3} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    Bitski*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                99,123 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+              {/*<li className="content-item py-5">*/}
+              {/*    <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={bank4} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    WalletConnect*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                43,728 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+            </ul>
+            <div className="add-money-btn flex justify-center items-center mt-3">
+              {/* <button
+                                onClick={() => {
+                                if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
+                                else navigate('/my-wallet', {replace: true})
+                                }}
                                type="button"
                                className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                            >
                                Manage
                            </button> */}
-                            <Link to='/my-wallet' className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">Manage</Link>
-                        </div>
-                    </div>
-                </div>
+              <Link
+                to="/my-wallet"
+                onClick={() => {
+                  if (pathname == "/my-wallet")
+                    props.setBalanceDropdown.toggle();
+                  else navigate("/my-wallet", { replace: true });
+                }}
+                className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+              >
+                Manage
+              </Link>
            </div>
-            {/*<div*/}
-            {/*    className="lg:hidden flex user-balance cursor-pointer lg:w-[252px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple">*/}
-            {/*    <div className="flex items-center lg:justify-between justify-center w-full h-full">*/}
-            {/*        <p className="lg:text-xl text-lg font-bold text-white">*/}
-            {/*            $ 234,435.34*/}
-            {/*        </p>*/}
-            {/*    </div>*/}
-            {/*</div>*/}
-            <div className="lg:hidden block"></div>
-        </>);
+          </div>
+        </div>
+      </div>
+      {/*<div*/}
+      {/*    className="lg:hidden flex user-balance cursor-pointer lg:w-[252px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple">*/}
+      {/*    <div className="flex items-center lg:justify-between justify-center w-full h-full">*/}
+      {/*        <p className="lg:text-xl text-lg font-bold text-white">*/}
+      {/*            $ 234,435.34*/}
+      {/*        </p>*/}
+      {/*    </div>*/}
+      {/*</div>*/}
+      <div className="lg:hidden block"></div>
+    </>
+  );
 }
@@ -0,0 +1,301 @@
+import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+
+import usersService from "../../services/UsersService";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import OthersInterestedTable from "./OthersInterestedTable";
+
+export default function ManageInterestOffer(props) {
+    const navigate = useNavigate()
+    const apiCall = new usersService()
+
+    let [redirectTime, setRedirectTime] = useState(5)
+
+    let [tab, setTab] = useState("info"); //message STATE FOR SWITCHING BETWEEN TABS
+
+    let [requestStatus, setRequestStatus] = useState({loading: false, status: false, message: '', processType: ''})
+
+    const messageList = {data: [1,2,3,4,5,6]} // TO BE REMOVED AND REPLACE WITH REAL MESSAGE FROM API CALL
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentMessageList = messageList?.data?.slice(indexOfFirstItem, indexOfLastItem);
+
+    const handlePagination = (e) => {
+        handlePagingFunc(e, setCurrentPage);
+    };
+
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+
+    //FUNCTION TO ACCEPT/REJECT OFFER INTEREST
+    const interestOfferProcess = ({target:{name}}) => {
+        setRequestStatus(prev => ({...prev, loading: true, processType: name}))
+        let reqData = { // API PAYLOADS
+            proc: name.toUpperCase(),
+            client_uid : props.offerDetails?.client_uid,
+            offer_code : props.offerDetails?.offer_code,
+            offer_uid: props.offerDetails?.offer_uid,
+        }
+        apiCall.offersInterestProc(reqData).then(res => {
+            if(res.status != 200 || res.data.internal_return < 0){
+                setRequestStatus({loading: false, status: false, message: 'Unable to complete request', processType: ''})
+                return
+            }
+            setInterval(() => {  // SETS REDIRECT COUNT DOWN
+                setRedirectTime(prev => prev - 1)
+            }, 1000);
+            setRequestStatus({loading: false, status: true, message: `Offer ${name}ed`, processType: ''})
+            setTimeout(()=>{
+                navigate('/offer-interest', {replace: true})
+            },5000)
+        }).catch(err => {
+            setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong. Try again', processType: ''})
+        }).finally(()=>{
+            setTimeout(()=>{
+                setRequestStatus({loading: false, status: false, message: '', processType: ''})
+            },5000)
+        })
+    }
+
+    useEffect(()=>{
+        // run API to get message to replace message array above, add reload variable as dependence array
+    },[])
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full mb-4">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-3">
+                        <div className="mb-3 sm:mb-0">
+                            <h1 className="text-26 font-bold text-dark-gray dark:text-white">
+                                <span className={`${selectTab === "today" ? "block" : "hidden"}`}>Manage Offer Interest</span>
+                            </h1>
+                        </div>
+
+                    </div>
+
+                    {/* manage offer section */}
+                    <div className="w-full p-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
+                        <div className="my-2 w-full sm:grid gap-5 grid-cols-4">
+                            {/* Detail section */}
+                            <div className="w-full mb-5 lg:mb-0 col-span-3">
+                                <div className="w-full flex justify-start space-x-3 items-center">
+                                    <button
+                                    type="button"
+                                    className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
+                                    onClick={() =>
+                                        navigate('/offer-interest', { replace: true })
+                                    }
+                                    >
+                                    <svg
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        width="35"
+                                        height="35"
+                                        viewBox="0 0 24 24"
+                                        fill="skyblue"
+                                    >
+                                        <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
+                                    </svg>
+                                    </button>
+                                    <h1 className="text-sm lg:text-xl font-bold text-sky-blue dark:text-white tracking-wide">
+                                    {props.offerDetails?.offer_code && props.offerDetails.offer_code}
+                                    </h1>
+                                </div>
+                                <h1 className="my-3 text-xl lg:text-2xl font-bold text-dark-gray dark:text-white tracking-wide border">
+                                {props.offerDetails?.title}
+                                </h1>
+
+                                <div className="w-full">
+                                    {/* switch button */}
+                                    <div className="my-1 flex items-center border-b border-slate-300">
+                                        <button
+                                        name="info"
+                                        onClick={(e) => setTab(e.target.name)}
+                                        className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
+                                            tab == "info" ? "border-sky-blue" : "border-slate-300"
+                                        } tracking-wide transition duration-200`}
+                                        >
+                                        Info
+                                        </button>
+                                        <button
+                                        name="message"
+                                        onClick={(e) => setTab(e.target.name)}
+                                        className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
+                                            tab == "message" ? "border-sky-blue" : "border-slate-300"
+                                        }  tracking-wide transition duration-200`}
+                                        >
+                                        Messages ({messageList.data.length})
+                                        </button>
+                                    </div>
+                                    {/* END OF switch button */}
+
+                                    {/* info tab */}
+                                    {tab == 'info' ?
+                                    <div className="info-details w-full border-t">
+                                        <div className="my-3 flex items-center gap-1">
+                                            <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">Name</span>
+                                            <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_name}</span>
+                                        </div>
+                                        <div className="my-3 flex items-center gap-1">
+                                            <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">Member Since</span>
+                                            <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_added}</span>
+                                        </div>
+                                        <div className="my-3 flex items-center gap-1">
+                                            <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">Jobs completed</span>
+                                            <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_jobs_completed ? props.offerDetails?.client_jobs_completed :0}</span>
+                                        </div>
+                                        <div className="my-0 md:my-3 block md:flex items-center gap-10">
+                                            <div className="my-3 md:my-0 flex items-center gap-1">
+                                                <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">Jobs active</span>
+                                                <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_jobs_active ? props.offerDetails?.client_jobs_active:0}</span>
+                                            </div>
+                                            <div className="my-3 md:my-0 flex items-center gap-1">
+                                                <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">Jobs uncompleted</span>
+                                                <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_jobs_missed ? props.offerDetails?.client_jobs_missed:0}</span>
+                                            </div>
+                                        </div>
+                                        <div className="block md:flex items-center gap-10">
+                                            <div className="my-3 md:my-0 flex items-center gap-1">
+                                                <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">% completion</span>
+                                                <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_percent_completion ? props.offerDetails?.client_percent_completion:0}</span>
+                                            </div>
+                                            <div className="flex items-center gap-1">
+                                                <span className="w-[200px] text-lg font-bold text-dark-gray dark:text-white tracking-wide">Pending Offers</span>
+                                                <span className="min-w-[100px] text-sm font-bold text-dark-gray dark:text-white tracking-wide">{props.offerDetails?.client_offers_pending ? props.offerDetails?.client_offers_pending:0}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    :
+                                    <div className="message-details w-full border-t">
+                                        <div className="my-0 w-full flex items-center gap-5">
+                                            <div className="w-3/4">
+                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">Message to dummy name</p>
+                                                <textarea rows={2} autoFocus={true} className="p-2 text-base font-bold text-dark-gray dark:text-white dark:bg-dark-gray border tracking-wide w-full resize-none rounded-md outline-none" />
+                                            </div>
+                                            <div className="w-1/4 flex flex-col justify-center items-center">
+                                                <button
+                                                    type="button"
+                                                    className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                                >
+                                                    <span className="text-white">Send</span>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        {/* message list */}
+                                        <div className="min-h-[100px] max-h-[200px] overflow-y-auto">
+                                        {currentMessageList.map((item, index)=>(
+                                            <div key={index} className="my-2 w-full flex items-center gap-1">
+                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">2023-04-06-from { }<span className="font-normal">Dummy name</span></p>
+                                                <p className="text-base font-bold text-dark-gray dark:text-white tracking-wide">I am testing message</p>
+                                            </div>
+                                        ))}
+                                        </div>
+
+                                        {/* PAGINATION BUTTON */}
+                                        <PaginatedList
+                                            onClick={handlePagination}
+                                            prev={currentPage == 0 ? true : false}
+                                            next={
+                                                currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+                                                messageList?.data?.length
+                                                    ? true
+                                                    : false
+                                            }
+                                            data={messageList?.data}
+                                            start={indexOfFirstItem}
+                                            stop={indexOfLastItem}
+                                        />
+                                        {/* END OF PAGINATION BUTTON */}
+                                    </div>
+                                    }
+                                </div>
+                            </div>
+                            {/* END OF Detail section */}
+
+                            {/* BUTTON section */}
+                            <div className="p-4 w-full min-h-full bg-sky-100 dark:bg-dark-gray col-span-1">
+                                <div className="w-full h-full">
+                                    <div className="mt-0 sm:mt-10 flex sm:flex-col justify-center items-center gap-10">
+                                        {requestStatus.loading && requestStatus.processType == 'accept' ?
+                                            <LoadingSpinner color='sky-blue' size='10' />
+                                        :    
+                                            <button
+                                                type="button"
+                                                name='accept'
+                                                disabled={requestStatus.loading}
+                                                onClick={interestOfferProcess}
+                                                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                            >
+                                            Accept
+                                            </button>
+                                        }
+
+                                        {requestStatus.loading && requestStatus.processType == 'reject' ?
+                                            <LoadingSpinner color='sky-blue' size='10' />
+                                        :
+                                            <button
+                                                type="button"
+                                                name='reject'
+                                                disabled={requestStatus.loading}
+                                                onClick={interestOfferProcess}
+                                                className="px-2 py-1 h-11 flex justify-center items-center border-gradient text-base rounded-full text-black"
+                                            >
+                                            Reject
+                                            </button>
+                                        }
+                                    </div>
+
+                                    {/* ERROR DISPLAY */}
+                                    <div className="w-full">
+                                    {/* error or success display */}
+                                    {requestStatus.message != "" && requestStatus.processType != 'sendmeassge' &&
+                                        (!requestStatus.status ? (
+                                        <div
+                                            className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                        >
+                                            {requestStatus.message}
+                                        </div>
+                                        ) : (
+                                        requestStatus.status && (
+                                            <div
+                                            className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                            >
+                                            {`${requestStatus.message} redirecting.... ${redirectTime}sec`}
+                                            </div>
+                                        )
+                                        ))}
+                                    </div>
+                                    {/* End of error or success display */}
+                                </div>
+                            </div>
+                            {/* END of BUTTON section */}
+                        </div>
+                    </div>
+                    {/* END OF manage offer section */}
+                </div>
+
+                <div className="w-full overflow-x-auto">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-3">
+                        <div className="mb-3 sm:mb-0">
+                            <h1 className="text-26 font-bold text-dark-gray dark:text-white">
+                                <span className={`${selectTab === "today" ? "block" : "hidden"}`}>Others interested in this Task</span>
+                            </h1>
+                        </div>
+                    </div>
+                    <OthersInterestedTable othersInterestedList={props.othersInterestedList} />
+                </div>
+            </div>
+        </Layout>
+    );
+}
@@ -0,0 +1,169 @@
+import React, { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { useNavigate, useLocation, Link } from "react-router-dom";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+import familyImage from '../../assets/images/no-family-side.png'
+
+export default function OffersInterestTable({offerInterestList, className}) {
+
+    const navigate = useNavigate();
+    let { pathname } = useLocation();
+    
+    const filterCategories = ["All Categories", "Explore", "Featured"];
+    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem =
+        Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentOfferInterestList = offerInterestList?.data?.slice(indexOfFirstItem, indexOfLastItem);
+
+    const handlePagination = (e) => {
+        handlePagingFunc(e, setCurrentPage);
+    };
+
+    return (
+        <div
+            className={`update-table w-full my-8 p-8 bg-white dark:bg-dark-white rounded-2xl section-shadow min-h-[520px] ${
+                className || ""
+            }`}
+        >
+            
+            {offerInterestList?.loading ? (
+                    <div className="min-h-[520px] w-full flex flex-col justify-center items-center">
+                        <LoadingSpinner size="16" color="sky-blue" />
+                    </div>
+                )
+                :
+                offerInterestList?.data?.length > 0 ?
+                    (
+                        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
+                            <thead className="sticky top-0">
+                            {/* <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
+                                <th className="py-4">Name</th>
+                                <th className="py-4 text-center">Last Login</th>
+                                <th className="py-4 text-center">No of Tasks</th>
+                                <th className="py-4 text-right"></th>
+                            </tr> */}
+                            </thead>
+                            <tbody className="h-full">
+                            {currentOfferInterestList?.map((item, index) => {
+                                return (
+                                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                                    <td className=" py-4">
+                                        <div className="flex space-x-2 items-center">
+                                            <div className="min-w-[60px] min-h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                                <img
+                                                    src={dataImage1}
+                                                    alt="data"
+                                                    className="w-full h-full"
+                                                />
+                                            </div>
+                                            <div className="flex flex-col">
+                                                <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                                    {item?.title}
+                                                </h1>
+                                                <span className="text-sm text-thin-light-gray">{item?.expire}</span>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td className="text-center py-4 px-2">
+                                        <div className="flex space-x-1 items-center justify-center">
+                                            <p className="font-bold text-x text-dark-gray dark:text-white">{item?.client_name}</p>
+                                        </div>
+                                    </td>
+                                    <td className="text-center py-4 px-2">
+                                        <div className="flex space-x-1 items-center justify-center">
+                                            {/* <span className="font-bold text-x text-dark-gray dark:text-white">{formatNumber(item?.price * 0.01)}</span> */}
+                                            <span className="font-bold text-x text-dark-gray dark:text-white">{PriceFormatter(item?.price * 0.01,item?.currency_code,item?.currency)}</span>
+                                        </div>
+                                    </td>
+            
+                                    <td className="text-right py-4">
+                                        <button
+                                            onClick={() => {
+                                                navigate("/manage-offer", {
+                                                    state: { ...item, pathname },
+                                                });
+                                            }}
+                                            type="button"
+                                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                        >
+                                            View
+                                        </button>
+                                    </td>
+                                </tr>
+                                );
+                            })
+                            }
+                            </tbody>
+                        </table>
+                    )
+                    :
+                    (
+                        <div className="font-bold text-center text-xl md:text-2xl lg:text-4xl text-dark-gray md:flex items-center justify-between">
+                            <div className="p-2 w-full md:w-1/2">
+                                <p className="mb-4 p-3 md:p-16">No Offer list avaliable.</p>
+                                <button
+                                    onClick={()=>{navigate('/market', {replace: true})}}
+                                    type="button"
+                                    className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
+                                >
+                                    Goto Market
+                                </button>
+                            </div>
+                            <div className="p-2 w-full md:w-1/2">
+                                <img className='w-full' src={familyImage && familyImage} alt="Add Family" />
+                            </div>
+                        </div>
+                    )
+            }
+        
+            {/* PAGINATION BUTTON */}
+            <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage == 0 ? true : false}
+                next={
+                    currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+                    offerInterestList?.data?.length
+                        ? true
+                        : false
+                }
+                data={offerInterestList?.data}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+            />
+            {/* END OF PAGINATION BUTTON */}
+        </div>
+    );
+}
+
+
+
+
+// Function to format number to two(2) decimal places
+// function formatNumber(number) {
+// // Convert the number to a string
+// let numStr = String(number);
+
+// // Split the string into integer and decimal parts
+// let parts = numStr.split('.');
+// let integerPart = parts[0];
+// let decimalPart = parts[1] || '';
+
+// // Add thousands separators to the integer part
+// let formattedInteger = integerPart.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+
+// // Truncate or pad the decimal part to two decimal points
+// let formattedDecimal = decimalPart.slice(0, 2).padEnd(2, '0');
+
+// // Combine the formatted integer and decimal parts
+// let formattedNumber = formattedInteger + '.' + formattedDecimal;
+
+// return formattedNumber;
+// }
@@ -0,0 +1,148 @@
+import React, { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { useNavigate, useLocation, Link } from "react-router-dom";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
+import { useDispatch } from "react-redux";
+import { tableReload } from "../../store/TableReloads";
+
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+import familyImage from '../../assets/images/no-family-side.png'
+
+export default function OthersInterestTable({othersInterestedList, className}) {
+
+    const dispatch = useDispatch()
+    const navigate = useNavigate();
+    let { pathname } = useLocation();
+    
+    const filterCategories = ["All Categories", "Explore", "Featured"];
+    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem =
+        Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentOthersInterestedList = othersInterestedList?.data?.slice(indexOfFirstItem, indexOfLastItem);
+
+    const handlePagination = (e) => {
+        handlePagingFunc(e, setCurrentPage);
+    };
+
+    return (
+        <div
+            className={`update-table w-full p-4 bg-white dark:bg-dark-white rounded-2xl section-shadow min-h-[520px] ${
+                className || ""
+            }`}
+        >
+            
+            {othersInterestedList?.loading ? (
+                    <div className="min-h-[520px] w-full flex flex-col justify-center items-center">
+                        <LoadingSpinner size="16" color="sky-blue" />
+                    </div>
+                )
+                :
+                othersInterestedList?.data?.length > 0 ?
+                    (
+                        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
+                            <thead className="sticky top-0">
+                            {/* <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
+                                <th className="py-4">Name</th>
+                                <th className="py-4 text-center">Last Login</th>
+                                <th className="py-4 text-center">No of Tasks</th>
+                                <th className="py-4 text-right"></th>
+                            </tr> */}
+                            </thead>
+                            <tbody className="h-full">
+                            {currentOthersInterestedList?.map((item, index) => {
+                                return (
+                                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                                    <td className=" py-4">
+                                        <div className="flex space-x-2 items-center">
+                                            <div className="min-w-[60px] min-h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                                <img
+                                                    src={dataImage1}
+                                                    alt="data"
+                                                    className="w-full h-full"
+                                                />
+                                            </div>
+                                            <div className="flex flex-col">
+                                                <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                                    {item?.title}
+                                                </h1>
+                                                <span className="text-sm text-thin-light-gray">{item?.expire}</span>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td className="text-center py-4 px-2">
+                                        <div className="flex space-x-1 items-center justify-center">
+                                            <p className="font-bold text-x text-dark-gray dark:text-white">{item?.client_name}</p>
+                                        </div>
+                                    </td>
+                                    <td className="text-center py-4 px-2">
+                                        <div className="flex space-x-1 items-center justify-center">
+                                            {/* <span className="font-bold text-x text-dark-gray dark:text-white">{formatNumber(item?.price * 0.01)}</span> */}
+                                            <span className="font-bold text-x text-dark-gray dark:text-white">{PriceFormatter(item?.price * 0.01,item?.currency_code,item?.currency)}</span>
+                                        </div>
+                                    </td>
+            
+                                    <td className="text-right py-4">
+                                        <button
+                                            onClick={() => {
+                                                dispatch(tableReload({type:'OTHERSINTERESTEDTABLE'}))
+                                                navigate("/manage-offer", {
+                                                    state: { ...item, pathname },
+                                                });
+                                            }}
+                                            type="button"
+                                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                        >
+                                            View
+                                        </button>
+                                    </td>
+                                </tr>
+                                );
+                            })
+                            }
+                            </tbody>
+                        </table>
+                    )
+                    :
+                    (
+                        <div className="font-bold text-center text-xl md:text-2xl lg:text-4xl text-dark-gray md:flex items-center justify-between">
+                            <div className="p-2 w-full md:w-1/2">
+                                <p className="mb-4 p-3 md:p-16">No Offer list avaliable.</p>
+                                <button
+                                    onClick={()=>{navigate('/market', {replace: true})}}
+                                    type="button"
+                                    className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
+                                >
+                                    Goto Market
+                                </button>
+                            </div>
+                            <div className="p-2 w-full md:w-1/2">
+                                <img className='w-full' src={familyImage && familyImage} alt="Add Family" />
+                            </div>
+                        </div>
+                    )
+            }
+        
+            {/* PAGINATION BUTTON */}
+            <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage == 0 ? true : false}
+                next={
+                    currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+                    othersInterestedList?.data?.length
+                        ? true
+                        : false
+                }
+                data={othersInterestedList?.data}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+            />
+            {/* END OF PAGINATION BUTTON */}
+        </div>
+    );
+}
@@ -0,0 +1,32 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import OffersInterestTable from './OffersInterestTable'
+
+export default function OffersInterest(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <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="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                                <span className={`${selectTab === "today" ? "block" : "hidden"}`}>Offer Interest</span>
+                            </h1>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <OffersInterestTable offerInterestList={props.offerInterestList} />
+        </Layout>
+    );
+}
@@ -1,54 +1,60 @@
-import React from 'react';
-import { createRoutesFromChildren } from 'react-router-dom';
-
 const PaginatedList = ({ onClick, prev, next, data, start, stop }) => {
-
-  if(data.length){
+  if (data.length > process.env.REACT_APP_ITEM_PER_PAGE) {
    return (
-      <div className='p-3 flex justify-center items-center space-x-2 border-t-2'>
+      <div className="p-3 flex justify-center items-center min-h-[70px] space-x-2 border-t-2">
        {/* Render pagination buttons */}
-          {!prev &&
-              <button
-                className={`p-2 ${prev ? 'border' : null}`}
-                name='prev'
-                onClick={onClick}
-              >
-                <>&lt;</>
-              </button>
-            }
+        {!prev && (
+          <button
+            className={`p-2 border ${
+              prev ? "border-black dark:border-white dark:text-white" : "border-transparent dark:text-white"
+            } btn-shine rounded-full h-11 w-11`}
+            name="prev"
+            onClick={onClick}
+          >
+            <>&lt;</>
+          </button>
+        )}

-            {
-              data.map((item, index)=>{
-                  if(index%process.env.REACT_APP_ITEM_PER_PAGE == 0 && index >= start && index <= stop){
-                  return (
-                    <button
-                      key={index}
-                      value={index}
-                      className={`p-2 ${index==start ? 'border' : null}`}
-                      onClick={onClick}
-                      name='page_num'
-                      disabled={index == start}
-                    >
-                      {index <= 0 ? index+1 : (index/process.env.REACT_APP_ITEM_PER_PAGE)+1}
-                    </button>
-                  )
-                }
-              })
-            }
-            
-            {!next &&
+        {data.map((item, index) => {
+          if (
+            index % process.env.REACT_APP_ITEM_PER_PAGE == 0 &&
+            index >= start &&
+            index <= stop
+          ) {
+            return (
              <button
-                className={`p-2 ${next ? 'border' : null}`}
-                name='next'
+                key={index}
+                value={index}
+                className={`p-2 border ${
+                  index === start ? "border-black dark:border-white dark:text-white" : "border-transparent dark:text-white"
+                } btn-shine rounded-full h-11 w-11`}
                onClick={onClick}
+                name="page_num"
+                disabled={index === start}
              >
-                <>&gt;</>
+                {index <= 0
+                  ? index + 1
+                  : index / process.env.REACT_APP_ITEM_PER_PAGE + 1}
              </button>
-            }
-        </div>
-    )
-  }else{
-    return null
+            );
+          }
+        })}
+
+        {!next && (
+          <button
+            className={`p-2 border ${
+              next ? "border-black dark:border-white dark:text-white" : "border-transparent dark:text-white"
+            } btn-shine rounded-full h-11 w-11`}
+            name="next"
+            onClick={onClick}
+          >
+            <>&gt;</>
+          </button>
+        )}
+      </div>
+    );
+  } else {
+    return null;
  }
 };

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, {useEffect, useState} from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
@@ -9,9 +9,12 @@ import Header from "./Header";
 import MobileSidebar from "./MobileSideBar";
 import RightSideBar from "./RightSideBar";
 import Sidebar from "./Sidebar";
+import usersService from "../../services/UsersService";
+

 export default function Layout({ children }) {
  const { drawer } = useSelector((state) => state.drawer);
+  const {userJobList} = useSelector((state) => state.userJobList)
  const dispatch = useDispatch();
  const [MobileSideBar, setMobileSidebar] = useToggle(false);
  const [logoutModal, setLogoutModal] = useState(false);
@@ -20,14 +23,38 @@ export default function Layout({ children }) {
  };
  const navigate = useNavigate();
  const logOut = () => {
-    localStorage.removeItem("email");
-    localStorage.clear();
+    localStorage.removeItem("session_token");
+    localStorage.removeItem("member_id");
+    localStorage.removeItem("uid");
+    // localStorage.clear();
    // toast.success("Come Back Soon", {
    //   icon: `🙂`,
    // });

    navigate("/login", { replace: true });
  };
+
+  //---------------------------------------
+  /* LET U DEAL WITH JOB LIST - we need to centralize this list  */
+  // const {jobListTable} = useSelector((state) => state.tableReload)
+  // const [myJobList, setMyJobList] = useState({loading: true, data:[]});
+  // const api = new usersService();
+
+  // const getMyJobList = async () => {
+  //   setMyJobList({loading: true, data:[]})
+  //   try {
+  //     const res = await api.getMyJobList();
+  //     setMyJobList({loading: false, data:res.data})
+  //     // setMyJobList(res.data);
+  //   } catch (error) {
+  //     setMyJobList({loading: false, data:[]})
+  //     console.log("Error getting mode");
+  //   }
+  // };
+  // useEffect(() => {
+  //   getMyJobList();
+  // }, [jobListTable]);
+
  return (
    <>
      <div className="nft-main-wrapper-layout">
@@ -44,6 +71,7 @@ export default function Layout({ children }) {
              logoutModalHandler={logoutModalHandler}
              sidebar={drawer}
              action={() => dispatch(drawerToggle())}
+              myJobList={userJobList}
            />
          </div>
          {MobileSideBar && (
@@ -61,6 +89,7 @@ export default function Layout({ children }) {
              logoutModalHandler={logoutModalHandler}
              sidebar={MobileSideBar}
              action={() => setMobileSidebar.toggle()}
+              myJobList={userJobList}
            />
          </div>
          {/* end sidebar */}
@@ -90,7 +119,7 @@ export default function Layout({ children }) {
      </div>
      {logoutModal && (
        <ModalCom action={logoutModalHandler} situation={logoutModal}>
-          <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white   lg:rounded-2xl">
+          <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
            <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
              <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
                Confirm
@@ -168,4 +197,4 @@ export default function Layout({ children }) {
      )}
    </>
  );
-}
+}
@@ -1,18 +1,20 @@
 import React, { useContext } from "react";
+import { useSelector } from "react-redux";
 import { NavLink } from "react-router-dom";
-import logo from "../../assets/images/wrenchboard.png"; //logo-2.svg";
-import logo3 from "../../assets/images/wrenchboard.png"; //logo-3.svg";
+import {
+  default as logo,
+  default as logo3,
+} from "../../assets/images/wrenchboard.png"; //logo-2.svg";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
-import { useSelector } from "react-redux";

-export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
+export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJobList }) {
  let { userDetails } = useSelector((state) => state.userDetails);
  const darkMode = useContext(DarkModeContext);

  let { jobLists } = useSelector((state) => state.jobLists);
  const marketData = jobLists?.result_list;
-  let noOfJobs = marketData?.length;
+  let noOfJobs = marketData?.length <= 0 ? "0" : marketData?.length;

  return (
    <div className="w-full h-full">
@@ -74,155 +76,165 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
      {/* menu and settings item */}
      <div className="menu-setting-items mb-11">
        {/* menus item */}
-        <div className="menu-item transition-all duration-300 ease-in-out mb-14">
+        <div className="menu-item transition-all duration-300 ease-in-out mb-5">
          <div className="heading mb-5 active">
            <h1 className="title text-xl font-bold text-purple">Menu</h1>
          </div>
          <div className="items">
            <ul className="flex flex-col space-y-6">
              {/* Using mini component reduces the bulk amount of html */}
-              {[
-                { name: "Dashboard", path: "/" },
-                { name: "Market", path: "/market", bubble: noOfJobs },
-                { name: "My Task(s)", path: "/mytask" },
-              ].map(({ name, path, bubble }, idx) => (
+              <ListItem
+                title="Dashboard"
+                route="/"
+                sidebar={sidebar}
+                iconName="market"
+              />
+              {userDetails && userDetails?.account_type !== "FAMILY" && (
                <ListItem
-                  key={idx}
-                  title={name}
-                  route={path}
-                  bubble={bubble}
-                  sidebar
+                  title="Market"
+                  route="/market"
+                  bubble={noOfJobs}
+                  sidebar={sidebar}
+                  iconName="market"
                />
-              ))}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/notification"*/}
-              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
-              {/*      <Icons name="notification" />*/}
-              {/*    </span>*/}
-              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
-              {/*      Messages*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*      to="/my-wallet"*/}
-              {/*      className="nav-item flex items-center justify-start space-x-3.5"*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
-              {/*      <Icons name="wallet-two" />*/}
-              {/*    </span>*/}
-              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
-              {/*       My Wallet*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/resources"*/}
-              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
-              {/*      <Icons name="star" />*/}
-              {/*    </span>*/}
-              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
-              {/*      Resources*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/history"*/}
-              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
-              {/*      <Icons name="history" />*/}
-              {/*    </span>*/}
-              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
-              {/*      History*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/referral"*/}
-              {/*    className="nav-item flex items-center justify-start space-x-3.5"*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">*/}
-              {/*      <Icons name="history" />*/}
-              {/*    </span>*/}
-              {/*    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">*/}
-              {/*    Refer a Friend*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
+              )}
+              <ListItem
+                title="My Task(s)"
+                route="/mytask"
+                sidebar={sidebar}
+                iconName="market"
+              />
            </ul>
          </div>
        </div>

-        {!userDetails.post_jobs ? 
-          <div className="setting-item">
-          <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
-            <NavLink to="/start-job" className="nav-item flex items-center justify-start space-x-3.5">
-              <span className="item-content relative group-hover:text-purple text-xl transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
-                Enable Job Post
-              </span>
-            </NavLink>
-          </div>
-        </div>
-        :
-          <div className="setting-item">
-            <div className="heading mb-5">
-              <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
-            </div>
-            <div className="items">
-              <ul className="flex flex-col space-y-6">
-                <li className="item group">
-                  <NavLink
-                    to="/myjobs"
-                    className="nav-item flex items-center justify-start space-x-3.5"
-                  >
-                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                      <Icons name="people-two" />
-                    </span>
-                    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                      My Jobs
-                    </span>
-                  </NavLink>
-                </li>
-                <li className="item group">
-                  <NavLink
-                    to="/my-active-jobs"
-                    className="nav-item flex items-center justify-start space-x-3.5"
-                  >
-                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                      <Icons name="setting" />
-                    </span>
-                    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                      Pending
-                    </span>
-                  </NavLink>
-                </li>
-                <li className="item group">
-                  <NavLink
-                    to="/my-active-jobs"
-                    className="nav-item flex items-center justify-start space-x-3.5"
-                  >
-                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                      <Icons name="setting" />
-                    </span>
-                    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                      Active Job(s)
-                    </span>
-                  </NavLink>
-                </li>
-              </ul>
-            </div>
-          </div>
-      }
+        {/* menu and settings item */}
+        {userDetails?.account_type !== "FAMILY" && (
+              <div
+                  className={`menu-item transition-all duration-300 ease-in-out ${
+                      sidebar ? "mb-5" : "mb-2"
+                  }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    Family
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <ListItem
+                        title="Family Corner"
+                        route="/acc-family"
+                        iconName="people-two"
+                        sidebar={sidebar}
+                    />
+                  </ul>
+                </div>
+              </div>
+        )}
+
+        {userDetails?.account_type !== "FAMILY" && (
+          <>
+            {!userDetails?.post_jobs ? (
+                <div
+                  className={`menu-item transition-all duration-300 ease-in-out bg-pink dark:bg-dark-white rounded-2xl p-3 ${
+                    sidebar ? "mb-5" : "mb-2 rounded-none p-0"
+                  }`}
+                >
+                  <div className="heading mb-5">
+                    <h1 className="title text-xl font-bold text-purple">
+                      Job Post
+                    </h1>
+                  </div>
+                  <div className="items">
+                    <ul className="flex flex-col space-y-6">
+                      <li className="item group">
+                        <NavLink
+                          to="/start-job"
+                          className={`nav-item flex items-center ${
+                            ((navData) => (navData.isActive ? "active" : ""),
+                            sidebar
+                              ? "justify-start space-x-3.5"
+                              : "justify-center")
+                          }`}
+                        >
+                          <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                            <Icons name="people-two" />
+                          </span>
+                          <span
+                            className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                              sidebar ? "active flex-1" : "w-0"
+                            }`}
+                          >
+                            Enable Job Post
+                          </span>
+                        </NavLink>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+            ) : myJobList?.data?.result_list?.length ? (
+              <div
+                  className={`menu-item transition-all duration-300 ease-in-out ${
+                      sidebar ? "mb-5" : "mb-2"
+                  }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    My Jobs
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    {[
+                      { name: "List", path: "/myjobs", iconName: "people-two" },
+                      {
+                        name: "Pending",
+                        path: "/my-pending-jobs",
+                        iconName: "people-two",
+                      },
+                      {
+                        name: "Active",
+                        path: "/my-active-jobs",
+                        iconName: "people-two",
+                      },
+                    ].map(({ name, path, iconName }, idx) => (
+                      <ListItem
+                        key={idx}
+                        title={name}
+                        route={path}
+                        sidebar={sidebar}
+                        iconName={iconName}
+                      />
+                    ))}
+                  </ul>
+                </div>
+              </div>
+            ) : (
+              <div
+                  className={`menu-item transition-all duration-300 ease-in-out ${
+                      sidebar ? "mb-5" : "mb-2"
+                  }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    My Jobs
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <ListItem
+                      title="Add Job"
+                      route="/add-job"
+                      iconName="people-two"
+                      sidebar={sidebar}
+                    />
+                  </ul>
+                </div>
+              </div>
+            )}
+          </>
+        )}
      </div>
      {/* signout area */}
      {sidebar ? (
@@ -317,4 +329,4 @@ const ListItem = ({ sidebar, route, title, bubble }) => {
      </NavLink>
    </li>
  );
-};
+};
@@ -1,18 +1,6 @@
 import React, { useState } from "react";
-import topCreator1 from "../../assets/images/top-creator-1.png";
-import topCreator2 from "../../assets/images/top-creator-2.png";
-import topCreator3 from "../../assets/images/top-creator-3.png";
-import topCreator4 from "../../assets/images/top-creator-4.png";
-import topCreator5 from "../../assets/images/top-creator-5.png";
-import DoughnutChart from "../Charts/DoughnutChart";
-import MiniLineChart from "../Charts/MiniLineChart";
-import Icons from "../Helpers/Icons";
-import BtcIco from "../Helpers/Icons/BtcIco";
-import EthIco from "../Helpers/Icons/EthIco";
-import LtcIco from "../Helpers/Icons/LtcIco";
-import Usdt from "../Helpers/Icons/Usdt";
-import SelectBox from "../Helpers/SelectBox";
 import { NavLink } from "react-router-dom";
+import { useSelector } from "react-redux";
 //import SideStatistics from "./SideStatistics";

 export default function RightSideBar() {
@@ -42,6 +30,9 @@ export default function RightSideBar() {
    }
    setRateStaticsDropdown(!filterRateStatics);
  };
+
+  const { userDetails } = useSelector((state) => state?.userDetails);
+
  return (
    <>
      <div className="right-sidebar-wrapper overflow-y-scroll overflow-style-none 2xl:fixed 2xl:grid-cols-none 2xl:block grid lg:grid-cols-2 grid-cols-1 xl:gap-7 gap-4 h-full 2xl:pb-96">
@@ -51,157 +42,67 @@ export default function RightSideBar() {
            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
              Quick Links
            </h3>
-            <div>
-            </div>
+            <div></div>
          </div>

          <div className="platform-list">
-            {/*<div className="item flex space-x-3 items-center mb-4">*/}
-            {/*  /!* image *!/*/}
-            {/*  <div className="w-8 h-8 rounded-full">*/}
-            {/*    <svg*/}
-            {/*        width="40"*/}
-            {/*        height="41"*/}
-            {/*        viewBox="0 0 40 41"*/}
-            {/*        fill="none"*/}
-            {/*        xmlns="http://www.w3.org/2000/svg"*/}
-            {/*    >*/}
-            {/*      <path*/}
-            {/*          d="M40 20.7556C40.0074 31.7371 31.0431 40.6838 20.0369 40.6912C8.95687 40.6838 0 31.7812 0 20.741C0 9.69341 8.92002 0.80542 20.0295 0.80542C31.08 0.80542 39.9926 9.7081 40 20.7556ZM15.4736 10.3178C15.5326 10.4206 15.5621 10.5088 15.6211 10.5749C16.2772 11.4784 16.808 12.448 17.2282 13.4763C18.6878 17.0242 18.5256 20.3957 16.174 23.5396C16.0855 23.6571 15.9307 23.7673 16.0413 23.9509C16.1445 24.1125 16.314 24.0758 16.4689 24.0758C17.0807 24.0758 17.6926 24.0831 18.3045 24.0758C18.5477 24.0684 18.6804 24.1199 18.6731 24.4063C18.6583 25.016 18.6657 25.6257 18.6731 26.2353C18.6731 26.4557 18.5993 26.5292 18.3708 26.5218C17.7663 26.5145 17.1471 26.4778 16.5426 26.5145C14.8765 26.6173 14.39 26.0591 13.7928 24.59C13.7707 24.5312 13.7486 24.4724 13.7265 24.4137C13.6602 24.1713 13.5127 24.0758 13.2473 24.0684C11.397 24.0244 9.54663 23.973 7.69628 23.8995C7.36454 23.8848 7.26871 23.9803 7.28345 24.3108C7.37191 26.0517 7.96167 27.5722 9.09694 28.9164C9.94471 29.9228 10.962 30.5618 12.2374 30.8263C13.6528 31.1127 15.0903 31.267 16.5352 31.3037C19.2186 31.3698 21.8946 31.1201 24.5853 31.098C25.8459 31.0833 26.878 30.5618 27.711 29.6069C28.3229 28.9091 28.8316 28.1452 29.355 27.3812C30.0479 26.3676 30.7409 25.2804 31.9278 24.8618C32.7313 24.5753 32.7976 24.1272 32.7313 23.4808C32.7313 23.4514 32.7313 23.4147 32.7313 23.3853C32.7682 22.9593 32.5765 22.8785 32.1858 22.9887C30.6082 23.4074 29.0306 23.804 27.453 24.2227C26.8633 24.377 26.2514 24.5532 25.8386 25.038C24.9466 26.1031 23.7892 26.5218 22.4327 26.5365C21.1353 26.5512 21.1353 26.5732 21.1353 25.2731C21.1353 24.1933 21.1353 24.1786 22.2042 24.2007C22.7792 24.2154 23.2805 24.1346 23.7154 23.7159C24.5042 22.9666 25.2046 22.1513 25.6911 21.1743C26.185 20.1754 26.3472 19.1397 26.045 18.0378C25.7059 16.7891 25.0866 15.702 24.2905 14.703C23.4427 13.6453 22.4254 12.7711 21.3859 11.9044C21.1943 11.7501 21.1279 11.5812 21.1353 11.3461C21.15 10.7218 21.1426 10.0974 21.1353 9.47305C21.1279 8.71646 20.5824 8.14352 19.8968 8.15087C19.1891 8.16556 18.6878 8.70912 18.6731 9.48039C18.6657 9.8697 18.6583 10.2664 18.6731 10.6557C18.6878 10.9421 18.5993 11.0082 18.3266 10.9274C17.6926 10.7438 17.0586 10.5675 16.4173 10.4206C16.1297 10.3545 15.8349 10.2296 15.4736 10.3178ZM8.63251 21.7179C8.86841 21.7326 9.00848 21.7473 9.14117 21.7473C10.7409 21.7473 12.3406 21.7326 13.9403 21.7546C14.5522 21.762 14.9871 21.5269 15.3262 21.0348C15.7833 20.3737 16.0781 19.6612 16.0487 18.8458C15.9749 16.936 15.5547 15.107 14.8102 13.3514C14.5964 12.8519 14.4563 12.8593 14.1688 13.2927C13.0188 15.0409 11.8614 16.7891 10.7114 18.5447C10.0405 19.5804 9.36233 20.6087 8.63251 21.7179Z"*/}
-            {/*          fill="#2481E1"*/}
-            {/*      />*/}
-            {/*      <path*/}
-            {/*          d="M15.4729 10.3178C15.8267 10.2223 16.129 10.3472 16.4165 10.4207C17.0578 10.5676 17.6918 10.7439 18.3258 10.9275C18.5986 11.0083 18.687 10.9422 18.6723 10.6557C18.6502 10.2664 18.6649 9.87709 18.6723 9.48044C18.6797 8.70917 19.181 8.15826 19.896 8.15091C20.5816 8.13622 21.1271 8.70916 21.1345 9.47309C21.1419 10.0975 21.1419 10.7218 21.1345 11.3462C21.1271 11.5886 21.2009 11.7502 21.3852 11.9044C22.4246 12.7638 23.4419 13.638 24.2897 14.703C25.0859 15.702 25.7051 16.7892 26.0442 18.0379C26.3465 19.1397 26.1843 20.1754 25.6904 21.1744C25.2038 22.1587 24.5035 22.9667 23.7147 23.7159C23.2797 24.1346 22.7711 24.208 22.2034 24.2007C21.1345 24.1787 21.1345 24.1934 21.1345 25.2731C21.1345 26.5733 21.1345 26.5512 22.432 26.5366C23.7884 26.5219 24.9458 26.1032 25.8378 25.0381C26.2506 24.5459 26.8551 24.377 27.4522 24.2227C29.0298 23.8041 30.6074 23.4074 32.185 22.9887C32.5757 22.8859 32.7674 22.9593 32.7305 23.3854C32.7305 23.4147 32.7305 23.4515 32.7305 23.4809C32.7969 24.1346 32.7305 24.5753 31.927 24.8618C30.7401 25.2878 30.0472 26.3676 29.3542 27.3813C28.8308 28.1452 28.3221 28.9091 27.7103 29.607C26.8772 30.5545 25.8452 31.0834 24.5846 31.0981C21.9012 31.1275 19.2252 31.3699 16.5344 31.3037C15.0895 31.267 13.6594 31.1128 12.2366 30.8263C10.9539 30.5692 9.94395 29.9228 9.09618 28.9165C7.96091 27.5723 7.37115 26.0518 7.28269 24.3109C7.26795 23.973 7.36378 23.8849 7.69552 23.8995C9.54587 23.9657 11.3962 24.0171 13.2466 24.0685C13.512 24.0758 13.6594 24.164 13.7257 24.4137C13.7405 24.4725 13.7626 24.5312 13.7921 24.59C14.3892 26.0591 14.8758 26.6174 16.5418 26.5145C17.1537 26.4778 17.7655 26.5145 18.3774 26.5366C18.6059 26.5439 18.6797 26.4704 18.6797 26.2501C18.6723 25.6404 18.6649 25.0307 18.6797 24.4211C18.687 24.1346 18.5617 24.0832 18.3111 24.0905C17.6992 24.0979 17.0873 24.0905 16.4755 24.0905C16.3207 24.0905 16.1511 24.1199 16.0479 23.9657C15.9299 23.782 16.0921 23.6792 16.1806 23.5543C18.5249 20.4031 18.6944 17.0389 17.2348 13.491C16.8072 12.4553 16.2838 11.4931 15.6277 10.5896C15.5687 10.5088 15.5319 10.4207 15.4729 10.3178Z"*/}
-            {/*          fill="#FEFEFE"*/}
-            {/*      />*/}
-            {/*    </svg>*/}
-            {/*  </div>*/}
-            {/*  /!* name *!/*/}
-            {/*  <div>*/}
-            {/*    <p className="text-thin-light-gray text-base font-medium">*/}
-            {/*      OpenSea*/}
-            {/*    </p>*/}
-            {/*  </div>*/}
-            {/*  /!* action *!/*/}
-            {/*</div>*/}
+            {userDetails && userDetails?.account_type !== "FAMILY" && (
+                <>
            <div className="item flex space-x-3 items-center mb-4">
              {/* image */}
              <div className="w-8 h-8 rounded-full">
-                <svg
-                    width="40"
-                    height="41"
-                    viewBox="0 0 40 41"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                >
-                  <ellipse
-                      cx="20"
-                      cy="20.5745"
-                      rx="20"
-                      ry="19.9392"
-                      fill="#FDD903"
-                  />
-                  <path
-                      d="M30.0432 20.1565C29.8181 20.2625 29.8101 20.5908 30.0328 20.7018C31.565 21.4629 32.3814 22.7261 32.4556 24.4068C32.5245 25.8708 32.4715 27.3349 32.4821 28.7989C32.4821 29.0738 32.3973 29.1636 32.1216 29.1636C30.0169 29.153 27.907 29.153 25.8023 29.1636C25.4524 29.1636 25.4471 28.9945 25.4471 28.7408C25.4524 27.5569 25.4524 26.3782 25.4471 25.1943C25.4418 23.91 24.9169 23.318 23.6287 23.3022C20.8825 23.2705 18.1417 23.2916 15.3955 23.2757C15.0615 23.2757 15.035 23.4237 15.035 23.688C15.0456 25.3476 15.0297 27.0072 15.0456 28.6668C15.0509 29.0526 14.9608 29.1742 14.5526 29.1689C12.5327 29.1478 10.5182 29.1478 8.49834 29.1689C8.09543 29.1742 8 29.0632 8 28.6668C8.0106 23.2123 8.0106 17.7578 8.0053 12.3034C8.0053 11.9757 8.03181 11.8013 8.44532 11.8013C14.1444 11.8171 19.8488 11.8066 25.5478 11.833C27.0216 11.8383 28.4901 11.9968 29.842 12.6469C31.5279 13.4609 32.3125 14.8562 32.2117 16.7748C32.1332 18.3693 31.4419 19.4977 30.0432 20.1565ZM19.6208 18.6035C20.909 18.6035 22.2026 18.6088 23.4909 18.5982C23.7877 18.5982 24.0952 18.5824 24.3868 18.5242C24.7791 18.4449 24.9965 18.186 25.0018 17.7737C25.0071 17.3509 24.8109 17.0549 24.3815 16.9809C24.0899 16.9281 23.7877 16.9016 23.4855 16.9016C21.084 16.8963 18.6771 16.8963 16.2756 16.8963C15.0191 16.8963 15.035 16.8963 15.0297 18.1701C15.0297 18.5295 15.1464 18.6088 15.4804 18.6035C16.864 18.5929 18.2424 18.6035 19.6208 18.6035Z"
-                      fill="#020200"
-                  />
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="history">
+                  <g data-name="14"><circle cx="9" cy="14" r="7" fill="#ffd54f"></circle>
+                    <path fill="#ef6c00" d="M21 9H17a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2zM21 5H3A1 1 0 0 1 3 3H21a1 1 0 0 1 0 2zM21 13H19a1 1 0 0 1 0-2h2a1 1 0 0 1 0 2zM21 17H19a1 1 0 0 1 0-2h2a1 1 0 0 1 0 2zM21 21H17a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2z"></path><path fill="#ff8f00" d="M10,10a1,1,0,0,0-2,0v3.59L6.29,15.29a1,1,0,1,0,1.41,1.41l2-2A1,1,0,0,0,10,14Z">
+                    </path>
+                  </g>
                </svg>
              </div>
              {/* name */}
              <div>
                <p className="text-thin-light-gray text-base font-medium">
-                  <NavLink
-                      to="/history">
-                    History
-                  </NavLink>
+                  <NavLink to="/history">History</NavLink>
                </p>
              </div>
              {/* action */}
            </div>
+
+                <div className="item flex space-x-3 items-center mb-4">
+                  {/* image */}
+                  <div className="w-8 h-8 rounded-full">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="add-user">
+                      <path fill="#9bcb5b" d="M12 13.4c-2 0-3.7-1.6-3.7-3.6s1.6-3.7 3.6-3.7 3.7 1.6 3.7 3.6-1.6 3.6-3.6 3.7zm0-6.2c-1.4 0-2.6 1.1-2.6 2.6 0 1.4 1.1 2.6 2.6 2.6s2.6-1.1 2.6-2.6c-.1-1.5-1.2-2.6-2.6-2.6z"></path><path fill="#9bcb5b" d="M16.6 17.9c-.3 0-.5-.2-.6-.5 0-2.2-1.8-4-4-4s-4 1.8-4 4c0 .3-.3.5-.6.5-.2 0-.4-.2-.5-.5 0-2.8 2.3-5.1 5.1-5.1s5.1 2.3 5.1 5.1c0 .3-.2.5-.5.5z"></path><path fill="#0376bc" d="M12 23.7C5.5 23.7.3 18.4.3 12 .3 5.5 5.6.3 12 .3c2.6 0 5.1.9 7.2 2.5.2.2.2.6 0 .8-.2.2-.4.2-.7.1-1.9-1.4-4.1-2.2-6.5-2.2C6.2 1.4 1.4 6.2 1.4 12S6.2 22.6 12 22.6 22.6 17.8 22.6 12c0-2.4-.8-4.6-2.2-6.5-.2-.3-.1-.6.2-.8.2-.1.5-.1.7.1 1.6 2 2.5 4.6 2.4 7.2 0 6.4-5.3 11.7-11.7 11.7z"></path><circle cx="20.2" cy="20.3" r="2.4" fill="#fff"></circle><path fill="#9bcb5b" d="M18 18.1c.6-.6 1.4-.9 2.2-.9.8 0 1.6.3 2.2.9s1 1.4.9 2.2c0 .8-.3 1.6-.9 2.2s-1.4 1-2.2.9c-.8 0-1.6-.3-2.2-.9s-1-1.4-.9-2.2c-.1-.8.3-1.7.9-2.2zm3.8 2.5V20h-1.3v-1.3h-.6V20h-1.3v.6h1.3v1.3h.6v-1.3h1.3z"></path>
+                    </svg>
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/referral">Refer a Friend</NavLink>
+                    </p>
+                  </div>
+                </div>
+
+              </>
+            )}
+
            <div className="item flex space-x-3 items-center mb-4">
              {/* image */}
              <div className="w-8 h-8 rounded-full">
-                <svg
-                    width="40"
-                    height="41"
-                    viewBox="0 0 40 41"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                >
-                  <ellipse
-                      cx="20"
-                      cy="20.4043"
-                      rx="20"
-                      ry="19.9392"
-                      fill="url(#paint0_linear_249_2794)"
-                  />
-                  <path
-                      d="M16.7403 14.4243C17.8836 14.4243 19.0272 14.4261 20.1705 14.4233C20.5666 14.4226 20.9612 14.4431 21.3489 14.5184C22.272 14.698 23.0864 15.0843 23.742 15.7545C23.8172 15.8312 23.8625 15.8401 23.9512 15.7762C24.8988 15.091 25.9527 14.6419 27.1244 14.484C27.8811 14.3821 28.6353 14.4115 29.3836 14.5947C30.3403 14.829 31.1613 15.277 31.8103 16.0013C32.413 16.674 32.7934 17.4511 32.9361 18.3386C33.054 19.0731 32.9989 19.7955 32.8499 20.5197C32.6718 21.3867 32.5167 22.2578 32.3477 23.1265C32.1933 23.92 32.0337 24.7123 31.8768 25.5054C31.7749 26.0202 31.6807 26.5367 31.5694 27.0493C31.5198 27.2772 31.3745 27.371 31.1365 27.3713C29.9446 27.3727 28.7528 27.3742 27.561 27.3745C27.2971 27.3745 27.1996 27.273 27.2463 27.0252C27.3872 26.2776 27.5365 25.5313 27.6807 24.7844C27.8136 24.095 27.9428 23.4052 28.076 22.7158C28.2148 21.9976 28.356 21.2798 28.4958 20.5616C28.5601 20.2311 28.6272 19.9038 28.5196 19.5662C28.3527 19.0422 27.8877 18.7075 27.3171 18.667C26.2023 18.5882 25.2894 19.4682 25.1459 20.415C25.0269 21.2017 24.844 21.9788 24.6918 22.7609C24.5703 23.386 24.4546 24.0126 24.3319 24.6378C24.1727 25.4483 24.0125 26.2587 23.8446 27.0674C23.8026 27.2694 23.65 27.3749 23.4365 27.3752C22.2322 27.377 21.028 27.3774 19.8237 27.3763C19.5956 27.3759 19.4854 27.2393 19.5292 27.0142C19.6609 26.3365 19.7956 25.6591 19.9278 24.9814C20.0869 24.1649 20.2446 23.3481 20.4031 22.5312C20.5549 21.7495 20.7017 20.9671 20.8604 20.1868C21.013 19.4359 20.4038 18.7124 19.6179 18.6688C18.5688 18.6102 17.6843 19.3695 17.4934 20.2162C17.3587 20.8144 17.2583 21.42 17.1415 22.0225C16.9389 23.0648 16.7359 24.1067 16.5322 25.1486C16.4114 25.7681 16.2895 26.3873 16.1683 27.0067C16.1187 27.2602 15.9832 27.3798 15.7197 27.3802C13.4145 27.3816 11.1097 27.3816 8.8045 27.3795C8.47305 27.3791 8.20621 27.1083 8.20548 26.7866C8.20475 26.471 8.48911 26.192 8.82823 26.1902C9.56414 26.186 10.3 26.1916 11.0359 26.1863C11.4995 26.1828 11.7854 25.749 11.5864 25.3581C11.5003 25.1888 11.3524 25.0904 11.1641 25.0503C11.0078 25.0169 10.8491 25.0304 10.6914 25.0301C9.77293 25.029 8.85451 25.0304 7.93645 25.0287C7.58712 25.0279 7.36408 24.893 7.27063 24.636C7.12754 24.242 7.42395 23.8444 7.87878 23.8323C8.18869 23.8241 8.49897 23.8305 8.80925 23.8305C9.95253 23.8302 11.0962 23.8312 12.2395 23.8287C12.5326 23.828 12.7702 23.6388 12.8148 23.3814C12.867 23.0807 12.7301 22.839 12.4494 22.7243C12.3493 22.6835 12.2468 22.6885 12.1442 22.6885C11.2805 22.687 10.4169 22.687 9.55318 22.6863C9.25933 22.686 9.03557 22.5749 8.91766 22.3001C8.76471 21.944 8.9998 21.5713 9.39257 21.5209C10.0653 21.4346 10.7403 21.5028 11.4138 21.4793C11.5171 21.4758 11.6207 21.4804 11.7237 21.4719C12.0642 21.4435 12.2891 21.206 12.2814 20.8886C12.2741 20.5943 12.0037 20.3351 11.6861 20.3277C11.4127 20.3213 11.1385 20.3316 10.8651 20.3231C10.5895 20.3142 10.3292 20.098 10.2884 19.8601C10.2362 19.5556 10.365 19.3056 10.633 19.1849C10.7487 19.1327 10.871 19.1402 10.9914 19.1398C11.7211 19.1367 12.4512 19.1388 13.1809 19.1342C13.5488 19.1317 13.7376 19.0099 13.8482 18.7444C13.9891 18.4064 13.6992 18.0148 13.3919 17.9829C13.1791 17.9609 12.967 17.9687 12.7549 17.9683C11.8124 17.9673 10.8699 17.9729 9.92734 17.9744C9.65539 17.9747 9.39002 17.6992 9.37468 17.4074C9.35899 17.1096 9.62181 16.8153 9.93318 16.7865C10.0117 16.7794 10.0912 16.7826 10.1701 16.7826C11.5689 16.7823 12.9677 16.783 14.3665 16.7819C14.6666 16.7816 14.8754 16.6342 14.9535 16.3754C15.0312 16.1184 14.9316 15.8546 14.702 15.7112C14.5728 15.6303 14.4264 15.625 14.28 15.6246C13.8055 15.6235 13.3313 15.6285 12.8567 15.6221C12.4822 15.6171 12.2252 15.4088 12.1876 15.0964C12.1435 14.7271 12.4253 14.4282 12.8359 14.4254C13.5963 14.4204 14.3563 14.4236 15.1167 14.4236C15.658 14.4236 16.1993 14.4236 16.7407 14.4236C16.7403 14.424 16.7403 14.424 16.7403 14.4243Z"
-                      fill="white"
-                  />
-                  <defs>
-                    <linearGradient
-                        id="paint0_linear_249_2794"
-                        x1="3"
-                        y1="16.4165"
-                        x2="26.9783"
-                        y2="26.4379"
-                        gradientUnits="userSpaceOnUse"
-                    >
-                      <stop stopColor="#E100C5" />
-                      <stop offset="1" stopColor="#FF812B" />
-                    </linearGradient>
-                  </defs>
-                </svg>
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" id="InternationalUser">
+                    <path fill="#e6e7f9" d="M38.5 31.1c2.1-1.1 3.9-2.5 5.4-4.4h-3.2c-.6 1.6-1.3 3.1-2.2 4.4zm-5.8 1.4c2-.7 3.7-2.8 4.9-5.8h-4.9v5.8zm8.8-8.6h4.2c.9-1.8 1.5-3.7 1.7-5.8h-5.1c-.1 2-.4 4-.8 5.8zm2.4-17.3c-1.5-1.8-3.3-3.3-5.4-4.4.8 1.2 1.6 2.7 2.2 4.4h3.2zm-5.3 2.9h-5.9v5.8h6.7c-.1-2.1-.4-4.1-.8-5.8zm3.7 5.8h5.1c-.2-2.1-.8-4-1.7-5.8h-4.2c.4 1.8.7 3.7.8 5.8zM32.7.8v5.8h4.9c-1.2-2.9-2.9-5.1-4.9-5.8zm6.7 17.3h-6.7v5.8h5.9c.4-1.8.7-3.8.8-5.8zM25 6.6h4.9V.8c-2 .7-3.7 2.9-4.9 5.8zm-1.8 8.7h6.7V9.5H24c-.4 1.7-.7 3.7-.8 5.8zm6.7 17.2v-5.8H25c1.2 3 2.9 5.1 4.9 5.8zM24.1 2.3c-2.1 1.1-3.9 2.5-5.4 4.4H22c.5-1.7 1.3-3.2 2.1-4.4zM24 23.9h5.9v-5.8h-6.7c.1 2 .4 4 .8 5.8z" className="colorc1e5ff svgShape"></path><path fill="#ff6699" d="M3.7 44.7c0 1.6 1.2 2.8 2.8 2.8 1.3 0 2.4-.9 2.7-2.2.3 1.3 1.4 2.2 2.7 2.2 1.5 0 2.8-1.3 2.8-2.8V30.1h3.1V18.8c0-4.2-3.3-7.5-7.4-7.5H8c-4.1 0-7.4 3.4-7.4 7.5v11.3h3.1v14.6z" className="colorff99b0 svgShape"></path><path fill="#998da0" d="M9.2 10.3c2.4 0 4.4-2.2 4.4-4.9S11.6.5 9.2.5C6.8.5 4.8 2.7 4.8 5.4s2 4.9 4.4 4.9z" className="colorffd499 svgShape"></path><path fill="#e6e7f9" d="M16.9 9.5c-.3.6-.5 1.2-.8 1.8 1.3 1 2.3 2.4 2.9 4h1.3c.1-2 .3-4 .8-5.8h-4.2zm2.9 9.3v5.1h1.4c-.4-1.8-.7-3.8-.8-5.8h-.6c-.1.2 0 .4 0 .7zm2.2 7.9h-2.2v1.2c1.3 1.3 2.7 2.4 4.4 3.2-.9-1.3-1.7-2.8-2.2-4.4z" className="colorc1e5ff svgShape"></path>
+                  </svg>
              </div>
              {/* name */}
              <div>
                <p className="text-thin-light-gray text-base font-medium">
-                  <NavLink
-                      to="/referral">Refer a Friend</NavLink>
-                </p>
-              </div>
-            </div>
-            <div className="item flex space-x-3 items-center mb-4">
-              {/* image */}
-              <div className="w-8 h-8 rounded-full">
-                <svg
-                    width="40"
-                    height="41"
-                    viewBox="0 0 40 41"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                >
-                  <ellipse
-                      cx="20"
-                      cy="20.2341"
-                      rx="20"
-                      ry="19.9392"
-                      fill="#5165FF"
-                  />
-                  <path
-                      d="M26.1647 27.2085C22.5316 27.2448 19.3317 24.2111 19.3359 20.2195C19.3402 16.4128 22.3393 13.2525 26.1704 13.2554C30.0813 13.2583 33.012 16.5264 33.0006 20.2501C32.9892 24.1456 29.8505 27.2492 26.1647 27.2085Z"
-                      fill="white"
-                  />
-                  <path
-                      d="M20.5815 27.1983C20.5217 27.2245 20.4405 27.207 20.3607 27.207C16.0039 27.2085 11.647 27.2085 7.29019 27.2085C7.25742 27.2085 7.22465 27.2099 7.1933 27.2085C7.01094 27.2026 7.00951 27.2026 7.00381 27.0076C7.00239 26.9581 7.00381 26.9086 7.00381 26.8576C7.00381 22.4395 7.00381 18.0214 7.00381 13.6033C7.00381 13.5072 6.99099 13.4082 7.01236 13.334C11.5373 17.9559 16.0566 22.5749 20.5815 27.1983Z"
-                      fill="white"
-                  />
-                </svg>
-              </div>
-              {/* name */}
-              <div>
-                <p className="text-thin-light-gray text-base font-medium">
-                  <NavLink
-                      to="/resources">
-                    Resources
-                  </NavLink>
+                  <NavLink to="/resources">Resources</NavLink>
                </p>
              </div>
            </div>
+
          </div>
        </div>
-           {/*<SideStatistics />*/}
+        {/*<SideStatistics />*/}
      </div>
    </>
  );
@@ -1,19 +1,21 @@
 import React, { useContext, useEffect } from "react";
+import { useSelector } from "react-redux";
 import { NavLink } from "react-router-dom";
-import logo from "../../assets/images/wrenchboard.png"; //logo-2.svg";
-import logo3 from "../../assets/images/wrenchboard.png"; //logo-3.svg";
+import {
+  default as logo,
+  default as logo3,
+} from "../../assets/images/wrenchboard.png";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
-import { useSelector } from "react-redux";

-export default function Sidebar({ sidebar, action, logoutModalHandler }) {
+export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList }) {
  const darkMode = useContext(DarkModeContext);

  let { userDetails } = useSelector((state) => state.userDetails);
-
+  //const jobLists =  getJobList(); // pass from upper - we need in a lot of places
  let { jobLists } = useSelector((state) => state.jobLists);
  const marketData = jobLists?.result_list;
-  let noOfJobs = marketData?.length;
+  let noOfJobs = marketData?.length <= 0 ? "0" : marketData?.length;

  useEffect(() => {
    const title = document.querySelectorAll(".menu-setting-items .heading");
@@ -26,7 +28,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
        elm.classList.remove("active");
      });
    }
-  });
+  }, [jobLists]);
  return (
    <div className="w-full h-full">
      {/* logo-area */}
@@ -93,7 +95,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
        {/* menus item */}
        <div
          className={`menu-item transition-all duration-300 ease-in-out ${
-            sidebar ? "mb-14" : ""
+            sidebar ? "mb-5" : "mb-2"
          }`}
        >
          <div className="heading mb-5">
@@ -102,264 +104,161 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
          <div className="items">
            <ul className="flex flex-col space-y-6">
              {/* Using mini component reduces the bulk amount of html */}
-              {[
-                { name: "Dashboard", path: "/" },
-                { name: "Market", path: "/market", bubble: noOfJobs },
-                { name: "My Task(s)", path: "/mytask" },
-              ].map(({ name, path, bubble }, idx) => (
+              <ListItem
+                title="Dashboard"
+                route="/"
+                sidebar={sidebar}
+                iconName="market"
+              />
+              {userDetails && userDetails?.account_type !== "FAMILY" && (
                <ListItem
-                  key={idx}
-                  title={name}
-                  route={path}
-                  bubble={bubble}
-                  sidebar
+                  title="Market"
+                  route="/market"
+                  bubble={noOfJobs}
+                  sidebar={sidebar}
+                  iconName="market"
                />
-              ))}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/notification"*/}
-              {/*    className={`nav-item flex items-center  ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="notification-setting" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*     Messages*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/my-wallet"*/}
-              {/*    className={`nav-item flex items-center  ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="wallet-two" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*     My Wallet*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/resources"*/}
-              {/*    className={`nav-item flex items-center ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="star" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*      Resources*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/history"*/}
-              {/*    className={`nav-item flex items-center ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="history" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*      History*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/referral"*/}
-              {/*    className={`nav-item flex items-center ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="history" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*      Refer a Friend*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
+              )}
+              <ListItem
+                title="My Task(s)"
+                route="/mytask"
+                sidebar={sidebar}
+                iconName="market"
+              />
            </ul>
          </div>
        </div>
-        {/*<div className="setting-item">*/}
-        {/*  <div class="heading bg-pink dark:bg-dark-white   rounded-2xl p-6 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">*/}
-        {/*    <NavLink to="/acc-family">*/}
-        {/*      <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">*/}
-        {/*        Family Account*/}
-        {/*      </span>*/}
-        {/*    </NavLink>*/}
-        {/*  </div>*/}
-        {/*</div>*/}
-
-        <div className="setting-item">
-          <div className="heading mb-5 bg-dark-blue   rounded-2xl p-2 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border">
-            <NavLink to="/acc-family">
-               <h1 className="title text-xl font-bold text-purple">Family Corner</h1>
-            </NavLink>
-          </div>
-        </div>
-
-        {!userDetails.post_jobs ? 
-        <div className="setting-item">
-          <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
-            <NavLink to="/start-job">
-              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
-                Enable Job Post
-              </span>
-            </NavLink>
-          </div>
-        </div>
-        :
-        <div className="setting-item">
-          <div className="heading mb-5">
-            <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
-          </div>
-          <div className="items">
-            <ul className="flex flex-col space-y-6">
-              <li className="item group">
-                <NavLink
-                  to="/myjobs"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="people-two" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    List
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/my-active-jobs"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="people-two" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Pending
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/my-active-jobs"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="people-two" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Active
-                  </span>
-                </NavLink>
-              </li>
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/profile"*/}
-              {/*    className={`nav-item flex items-center ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="people-two" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*      My Profile*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-              {/*<li className="item group">*/}
-              {/*  <NavLink*/}
-              {/*    to="/settings"*/}
-              {/*    className={`nav-item flex items-center ${*/}
-              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-              {/*    }`}*/}
-              {/*  >*/}
-              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-              {/*      <Icons name="setting" />*/}
-              {/*    </span>*/}
-              {/*    <span*/}
-              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-              {/*        sidebar ? "active flex-1" : "w-0"*/}
-              {/*      }`}*/}
-              {/*    >*/}
-              {/*      Settings*/}
-              {/*    </span>*/}
-              {/*  </NavLink>*/}
-              {/*</li>*/}
-            </ul>
-          </div>
-        </div>
-        }

+        {/* menu and settings item */}
+        {userDetails?.account_type !== "FAMILY" && (
+            <div
+              className={`menu-item transition-all duration-300 ease-in-out ${
+                sidebar ? "my-5" : ""
+              }`}
+            >
+              <div className="heading mb-5">
+                <h1 className="title text-xl font-bold text-purple">
+                  Family
+                </h1>
+              </div>
+              <div className="items">
+                <ul className="flex flex-col space-y-6">
+                  <ListItem
+                    title="Family Corner"
+                    route="/acc-family"
+                    iconName="people-two"
+                    sidebar={sidebar}
+                  />
+                </ul>
+              </div>
+            </div>
+        )}
+        {userDetails?.account_type !== "FAMILY" && (
+          <>
+            {!userDetails?.post_jobs ? (
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out bg-pink dark:bg-dark-white rounded-2xl p-3 ${
+                  sidebar ? "mb-5" : "mb-2 rounded-none p-0"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    Job Post
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <li className="item group">
+                      <NavLink
+                        to="/start-job"
+                        className={`nav-item flex items-center ${
+                          ((navData) => (navData.isActive ? "active" : ""),
+                          sidebar
+                            ? "justify-start space-x-3.5"
+                            : "justify-center")
+                        }`}
+                      >
+                        <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                          <Icons name="people-two" />
+                        </span>
+                        <span
+                          className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                            sidebar ? "active flex-1" : "w-0"
+                          }`}
+                        >
+                          Enable Job Post
+                        </span>
+                      </NavLink>
+                    </li>
+                  </ul>
+                </div>
+              </div>
+            ) : myJobList?.data?.result_list?.length ? (
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    My Jobs
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    {[
+                      {
+                        name: "List",
+                        path: "/myjobs",
+                        iconName: "people-two",
+                      },
+                      {
+                        name: "Pending",
+                        path: "/my-pending-jobs",
+                        iconName: "people-two",
+                      },
+                      {
+                        name: "Active",
+                        path: "/my-active-jobs",
+                        iconName: "people-two",
+                      },
+                    ].map(({ name, path, iconName }, idx) => (
+                      <ListItem
+                        key={idx}
+                        title={name}
+                        route={path}
+                        sidebar={sidebar}
+                        iconName={iconName}
+                      />
+                    ))}
+                  </ul>
+                </div>
+              </div>
+            ) : (
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    My Jobs
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <ListItem
+                      title="Add Job"
+                      route="/add-job"
+                      iconName="people-two"
+                      sidebar={sidebar}
+                    />
+                  </ul>
+                </div>
+              </div>
+            )}
+          </>
+        )}
      </div>
      {/* signout area */}
      {sidebar ? (
@@ -426,9 +325,9 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
  );
 }

-const ListItem = ({ sidebar, route, title, bubble }) => {
+const ListItem = ({ sidebar, route, title, bubble, iconName }) => {
  return (
-    <li className="item group">
+    <li className={`item group`}>
      <NavLink
        to={route}
        className={`nav-item flex items-center  ${
@@ -437,7 +336,7 @@ const ListItem = ({ sidebar, route, title, bubble }) => {
        }`}
      >
        <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-          <Icons name="market" />
+          <Icons name={iconName} />
        </span>
        <span
          className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
@@ -116,10 +116,21 @@ function ReferralDisplay() {
  }, [refHistoryReload]);

  return (
-    <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-      <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-        <div className="referral w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
-          <h2 className="text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
+    <div className="content-wrapper w-full lg:flex xl:space-x-8  bottomMargin">
+      <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+        <div className="sm:flex justify-between items-center mb-6">
+          <div className="mb-5 sm:mb-0">
+            <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
+                <span>
+                 Refer a Friend
+                </span>
+            </h1>
+          </div>
+
+        </div>
+
+        <div className="referral w-full  md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
+          <h2 className="mb-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
            Send Referral
          </h2>
          <Formik
@@ -129,42 +140,44 @@ function ReferralDisplay() {
          >
            {(props) => (
              <Form className="referral-info">
-                {/* Firstname */}
-                <div className="field w-full mb-6">
-                  <InputCom
-                    fieldClass="px-6"
-                    label="Firstname"
-                    type="text"
-                    name="firstname"
-                    placeholder="Firstname"
-                    value={props.values.firstname}
-                    inputHandler={props.handleChange}
-                    blurHandler={props.handleBlur}
-                  />
-                  {props.errors.firstname && props.touched.firstname && (
-                    <p className="text-sm text-red-500">
-                      {props.errors.firstname}
-                    </p>
-                  )}
-                </div>
+                <div className="block md:mb-6 md:flex gap-10">
+                  {/* Firstname */}
+                  <div className="field w-full mb-6 md:mb-0">
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Firstname"
+                      type="text"
+                      name="firstname"
+                      placeholder="Firstname"
+                      value={props.values.firstname}
+                      inputHandler={props.handleChange}
+                      blurHandler={props.handleBlur}
+                    />
+                    {props.errors.firstname && props.touched.firstname && (
+                      <p className="text-sm text-red-500">
+                        {props.errors.firstname}
+                      </p>
+                    )}
+                  </div>

-                {/* Lastname */}
-                <div className="field w-full mb-6">
-                  <InputCom
-                    fieldClass="px-6"
-                    label="Lastname"
-                    type="text"
-                    name="lastname"
-                    placeholder="Lastname"
-                    value={props.values.lastname}
-                    inputHandler={props.handleChange}
-                    blurHandler={props.handleBlur}
-                  />
-                  {props.errors.lastname && props.touched.lastname && (
-                    <p className="text-sm text-red-500">
-                      {props.errors.lastname}
-                    </p>
-                  )}
+                  {/* Lastname */}
+                  <div className="field w-full mb-6 md:mb-0">
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Lastname"
+                      type="text"
+                      name="lastname"
+                      placeholder="Lastname"
+                      value={props.values.lastname}
+                      inputHandler={props.handleChange}
+                      blurHandler={props.handleBlur}
+                    />
+                    {props.errors.lastname && props.touched.lastname && (
+                      <p className="text-sm text-red-500">
+                        {props.errors.lastname}
+                      </p>
+                    )}
+                  </div>
                </div>

                <div className="field w-full mb-6">
@@ -193,8 +206,7 @@ function ReferralDisplay() {
                  ) : (
                    <button
                      type="submit"
-                      className="text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md"
-                    >
+                      className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"                    >
                      Send Message
                    </button>
                  )}
@@ -203,20 +215,20 @@ function ReferralDisplay() {
            )}
          </Formik>
        </div>
-      </div>

-      <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-        <div className="referral w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+        <div className="w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
          <h2 className="mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
            Referral List
          </h2>
          {referralList.loading ? (
-            <LoadingSpinner size="32" color="sky-blue" />
+              <LoadingSpinner size="32" color="sky-blue" />
          ) : (
-            <ReferralTable history={referralList} />
+              <ReferralTable history={referralList} />
          )}
        </div>
      </div>
+
+
    </div>
  );
 }
--- a/Show More
+++ b/Show More