.

added suspense to familymanagetabs
2023-05-31 10:54:08 +01:00 · 2023-05-31 10:35:08 +01:00 · 2023-05-31 09:39:54 +01:00 · 2023-05-31 05:59:45 +01:00 · 2023-05-31 05:53:57 +01:00 · 2023-05-31 05:53:31 +01:00
33 changed files with 1393 additions and 536 deletions
@@ -14,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",
@@ -54,4 +56,4 @@
      "last 1 safari version"
    ]
  }
-}
+}
@@ -4,9 +4,11 @@ import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import usersService from "../../services/UsersService";

-import { useSelector } from "react-redux";
+import { useSelector, useDispatch } from "react-redux";

-import { Form, Formik } from "formik";
+import { tableReload } from '../../store/TableReloads'
+
+import { Field, Form, Formik } from "formik";
 import * as Yup from "yup";

 const validationSchema = Yup.object().shape({
@@ -36,21 +38,13 @@ const validationSchema = Yup.object().shape({
    .required("Timeline is required"),
 });

-// let initialValues = {
-//   // initial values for formik
-//   country: "NG",
-//   price: 0,
-//   title: "",
-//   description: "",
-//   job_detail: "",
-//   timeline_days: "",
-// };
-
 function AddJob() {
  const ApiCall = new usersService();
  const navigate = useNavigate();

-  let {userDetails} = useSelector((state)=> state.userDetails)
+  let dispatch = useDispatch()
+
+  let { userDetails } = useSelector((state) => state.userDetails);

  let [pageLoading, setPageLoading] = useState(true); // State used for knowing when the page is mounting

@@ -115,6 +109,7 @@ function AddJob() {
          message: "Job Added Successfully",
        });
        setTimeout(() => {
+          dispatch(tableReload({type:'JOBTABLE'}))
          navigate("/myjobs", { replace: true });
        }, 1000);
      })
@@ -199,7 +194,7 @@ function AddJob() {
                              Select...
                            </option>
                            {country.data.map((item, index) => {
-                              if(item[0] == userDetails.country){
+                              if (item[0] == userDetails.country) {
                                return (
                                  <option
                                    key={index}
@@ -208,7 +203,7 @@ function AddJob() {
                                  >
                                    {item[1]}
                                  </option>
-                                )
+                                );
                              }
                            })}
                          </>
@@ -316,19 +311,34 @@ function AddJob() {
                  </div>

                  <div className="field w-full mb-6">
-                    <InputCom
-                      fieldClass="px-6"
-                      label="Timeline"
-                      labelClass="tracking-wide"
-                      inputBg="bg-slate-100"
-                      type="text"
+                    <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"
-                      spanTag=" - Expected duration of this task"
-                      // placeholder="Please Enter Detail Description of Job"
+                      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}
-                      inputHandler={props.handleChange}
-                      blurHandler={props.handleBlur}
-                    />
+                    >
+                      <option value="">Select Duration</option>
+                      {publicArray.map(({ name, duration }, idx) => (
+                        <option
+                          className="text-slate-500 text-lg"
+                          value={duration}
+                        >
+                          {name}
+                        </option>
+                      ))}
+                    </Field>
                    {props.errors.timeline_days &&
                      props.touched.timeline_days && (
                        <p className="text-sm text-red-500">
@@ -396,3 +406,16 @@ function AddJob() {
 }

 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" },
+];
@@ -3,24 +3,31 @@ import { Link } from "react-router-dom";
 import localImgLoad from "../../lib/localImgLoad";

 export default function HomeBannerOffersCard(props) {
-    console.log("HomeBannerOffersCard->",props.itemData)
+    console.log("HomeBannerOffersCard-> ##->",props)
+    const link_result = "/" + props.itemData.link_path;
    return (
        <Link
-            to="/my-collection/collection-item"
+            to={link_result}
            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">
+                    <div className="siderCardHeader">
+                        <h1 className="text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
                            <>{props.itemData.title}</>
                        </h1>
                    </div>
                    {/*<SelectBox datas={filterDatas} action={dataSetHandler} />*/}
                </div>
                <div className="h-[233px]">
-                    {props.itemData.description}
+                    <div className="siderCardDescription">
+                       {props.itemData.description}
+                    </div>
+                    <div className="siderCardButton">
+                        [BUTTON HERE]
+                    </div>
                </div>
+
            </div>
        </Link>
    );
@@ -4,11 +4,15 @@ import React, {
  useMemo,
  useRef,
  useState,
+  forwardRef,
+  Suspense,
 } from "react";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import profile from "../../assets/images/profile-info-profile.png";
 import usersService from "../../services/UsersService";
 import FamilyTasks from "./FamilyTasks";
+import QRCode from "react-qr-code";
+import { useReactToPrint } from "react-to-print";

 export default function FamilyManageTabs({
  className,
@@ -34,7 +38,6 @@ export default function FamilyManageTabs({
    },
  ];
  const [tab, setTab] = useState(tabs[0].name);
-  const [manageLoader, setManageLoader] = useState(false);
  const tabHandler = (value) => {
    setTab(value);
  };
@@ -58,7 +61,6 @@ export default function FamilyManageTabs({
  const apiCall = useMemo(() => new usersService(), []);
  // function for manage family
  const familyManageHandler = useCallback(async () => {
-    setManageLoader(true);
    try {
      let { family_uid } = accountDetails;
      let reqData = { family_uid };
@@ -66,7 +68,6 @@ export default function FamilyManageTabs({
      let { data } = await res;
      if (data?.internal_return < 0) return;
      setFamilyDetails(data);
-      setManageLoader(false);
    } catch (error) {
      setErrMsg("An error occurred");
      throw new Error(error);
@@ -77,6 +78,12 @@ export default function FamilyManageTabs({
    familyManageHandler();
  }, [tab]);

+  const accountRef = useRef();
+  // to handle printing
+  const useHandlePrint = useReactToPrint({
+    content: () => accountRef.current,
+  });
+
  return (
    <div
      className={`update-table w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
@@ -84,11 +91,13 @@ export default function FamilyManageTabs({
      }`}
    >
      <div className="relative w-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>
-        ) : (
+        <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
@@ -99,7 +108,7 @@ export default function FamilyManageTabs({
                accountDetails={accountDetails}
              />
            </div>
-            <div className="col-span-3 p-6 h-full w-full">
+            <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 }) => (
@@ -126,17 +135,17 @@ export default function FamilyManageTabs({
                        } h-full p-4 border border-[#dbd9d9]`}
                        key={id}
                      >
-                        {manageLoader ? (
-                          <LoadingSpinner size="8" color="sky-blue" />
-                        ) : (
-                          <>
-                            {name === "Tasks" && <FamilyTasks className={className} loader={loader}/>}
-                            {name === "Account" && (
-                              <Account familyDetails={familyDetails} />
-                            )}
-                            {name === "Profile" && <Profile />}
-                          </>
+                        {name === "Tasks" && (
+                          <FamilyTasks className={className} loader={loader} />
                        )}
+                        {name === "Account" && (
+                          <Account
+                            familyDetails={familyDetails}
+                            myRef={accountRef}
+                            handlePrint={useHandlePrint}
+                          />
+                        )}
+                        {name === "Profile" && <Profile />}
                      </div>
                    );
                  })}
@@ -144,7 +153,7 @@ export default function FamilyManageTabs({
              </div>
            </div>
          </div>
-        )}
+        </Suspense>
      </div>
    </div>
  );
@@ -211,20 +220,59 @@ function ProfileInfo({
  );
 }

-function Account({ familyDetails }) {
+const Account = forwardRef(({ familyDetails, myRef, handlePrint }) => {
  return (
-    <div className="w-full lg:min-h-[400px] h-full flex items-center justify-center">
-      <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">{familyDetails?.username}</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">{familyDetails?.pin}</span>
-        </h2>
+    <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">
+                {familyDetails?.username
+                  ? familyDetails?.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">
+                {familyDetails?.pin ? familyDetails?.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</>;
@@ -1,31 +1,127 @@
 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 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 FamilyTasks({ className }) {
+    const filterCategories = ["All Categories", "Explore", "Featured"];
+    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+    let data = ['1', '2', '3', '4', '5', '6'] // to be replaced later by result 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 currentTask = data.slice(indexOfFirstItem, indexOfLastItem);
+
+    const handlePagination = (e) => {
+        handlePagingFunc(e,setCurrentPage)
+    }

-export default function FamilyTasks({ className, loader }) {
    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 p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
                className || ""
            }`}
        >
-            <div className="relative w-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>
-                ) : (
-                    <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
-
-                        <tr>
-                            <td> Yes This are my tasks </td>
+            {data.length &&
+                <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+                    <table className="table-auto 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-center">Value</td>
+                            <td className="py-4 text-center">USD</td>
+                            <td className="py-4 text-right">Status</td>
                        </tr>
+                        {
+                            currentTask.map((item,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={dataImage3}
+                                    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 className="text-base text-dark-gray dark:text-white font-medium">
+                                        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 px-2">
+                                    <button
+                                    type="button"
+                                    className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
+                                    >
+                                    Active
+                                    </button>
+                                    </td>
+                                </tr>
+                            ))
+                        }

+                        </tbody>
                    </table>
-                )}
-            </div>
+
+                    {/* PAGINATION BUTTON */}
+                    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= data.length ? true : false} data={data} start={indexOfFirstItem} stop={indexOfLastItem} />
+                    {/* END OF PAGINATION BUTTON */}
+                </div>
+            }
        </div>
    );
 }
@@ -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' />
@@ -19,9 +19,9 @@ export default function HomeSliders(props) {
                        <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">*/}
+                        {/*    <img src={slider3} alt="slider" className="w-full h-full" />*/}
+                        {/*</div>*/}
                        {props.bannerList.map((item, index) => (
                            <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
                                <HomeBannerOffersCard
@@ -59,7 +59,7 @@ function ActiveJobs(props) {
              <div className="w-full flex justify-start space-x-3 items-center">
                <button
                  type="button"
-                  className="text-[#374557] border border-sky-blue p-1 rounded-full"
+                  className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
                  onClick={() => navigate(props.details.pathname, {replace: true})}
                >
                  <svg
@@ -44,7 +44,6 @@ export default function MyJobs(props) {
          </div>
          <MyJobTable
              MyJobList={props.MyJobList}
-              reloadJobList={props.reloadJobList}
          />
        </div>
      </div>
@@ -8,40 +8,40 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";

 import {useNavigate, useLocation} from 'react-router-dom'

-export default function MyJobTable({ className }) {
+export default function MyJobTable({ className, ActiveJobList }) {
  let navigate = useNavigate()
  let {pathname} = useLocation()

-  const [tasksData, setTasksData] = useState(null);
-  const [loader, setLoader] = useState(true);
+  // const [tasksData, setTasksData] = useState(null);
+  // const [loader, setLoader] = useState(false);

-  let apiCall = useMemo(() => new usersService(), []);
+  // let apiCall = useMemo(() => new usersService(), []);

-  const displayTasks = useCallback(async () => {
-    try {
-      const res = await apiCall.getMyActiveTaskList();
-      let {
-        data: { result_list },
-        internal_return,
-        statusText,
-      } = await res;
-      if (internal_return < 0 || statusText !== "OK") return;
-      setTasksData(result_list);
-      setLoader(false);
-    } catch (error) {
-      throw new Error(error);
-    }
-  }, [apiCall]);
+  // const displayTasks = useCallback(async () => {
+  //   try {
+  //     const res = await apiCall.getMyActiveTaskList();
+  //     let {
+  //       data: { result_list },
+  //       internal_return,
+  //       statusText,
+  //     } = await res;
+  //     if (internal_return < 0 || statusText !== "OK") return;
+  //     setTasksData(result_list);
+  //     setLoader(false);
+  //   } catch (error) {
+  //     throw new Error(error);
+  //   }
+  // }, [apiCall]);

-  useEffect(() => {
-    displayTasks();
-  }, []);
+  // useEffect(() => {
+  //   displayTasks();
+  // }, []);

  const [currentPage, setCurrentPage] = useState(0);
  const indexOfFirstItem = Number(currentPage);
  const indexOfLastItem =
    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
-  const currentTask = tasksData?.slice(indexOfFirstItem, indexOfLastItem);
+  const currentTask = ActiveJobList?.data?.slice(indexOfFirstItem, indexOfLastItem);

  const handlePagination = (e) => {
    handlePagingFunc(e, setCurrentPage);
@@ -53,22 +53,22 @@ export default function MyJobTable({ className }) {
        className || ""
      }`}
    >
-      {loader ? (
+      {ActiveJobList.loading ? (
        <div className="w-full h-[500px] flex items-center justify-center">
          <LoadingSpinner size="16" color="sky-blue" />
        </div>
      ) : (
-        <div className="relative w-full overflow-x-auto sm:rounded-lg">
-          <div className="overflow-y-auto h-auto w-full">
-            {tasksData?.length > 0 ? (
+        <div className="relative w-full sm:rounded-lg">
+          <div className="h-auto w-full">
+            {ActiveJobList?.data?.length > 0 ? (
              currentTask?.map((task, idx) => (
                <div
                  className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] w-full flex justify-between items-center hover:bg-gray-50"
                  key={idx}
                >
-                  <div className=" py-4">
+                  <div className="py-4 max-w-[80%]">
                    <div className="flex space-x-2 items-center">
-                      <div className="w-full min-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                      <div className="w-full min-w-[60px] max-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
                        <img
                          src={dataImage1}
                          alt="data"
@@ -76,7 +76,7 @@ export default function MyJobTable({ className }) {
                        />
                      </div>
                      <div className="flex flex-col flex-[0.9]">
-                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
                          {task?.title}
                        </h1>
                        <span className="text-base text-gray-600">
@@ -112,7 +112,7 @@ export default function MyJobTable({ className }) {
                    </div>
                  </div>

-                  <div className="text-right py-4 px-2">
+                  <div className="flex justify-center items-center py-4 px-2">
                    <button
                      type="button"
                      onClick={() => {
@@ -127,13 +127,23 @@ export default function MyJobTable({ className }) {
                  </div>
                </div>
              ))
-            ) : (
-              <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                <td className="p-2" colSpan="4">
+            ) 
+            : 
+            (
+            ActiveJobList.status ?
+              <div className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                <div className="p-2">
                  No Tasks!
-                </td>
-              </tr>
-            )}
+                </div>
+              </div>
+            :
+            <div className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+              <p className="p-2">
+                Error Occurred! Unable to display Tasks!
+              </p>
+            </div>
+            )
+            }
          </div>

          {/* PAGINATION BUTTON */}
@@ -142,11 +152,11 @@ export default function MyJobTable({ className }) {
            prev={currentPage == 0 ? true : false}
            next={
              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-              tasksData?.length
+              ActiveJobList?.data?.length
                ? true
                : false
            }
-            data={tasksData}
+            data={ActiveJobList?.data}
            start={indexOfFirstItem}
            stop={indexOfLastItem}
          />
@@ -1,4 +1,4 @@
-import React, { useRef } from "react";
+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";
@@ -6,12 +6,16 @@ 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";
+

 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: true,
+        infinite: MyActiveOffersList?.result_list?.length > 4,
        autoplay: true,
        slidesToShow: 4,
        slidesToScroll: 1,
@@ -21,6 +25,7 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
                settings: {
                    slidesToShow: 2,
                    slidesToScroll: 1,
+                    infinite: MyActiveOffersList?.result_list?.length > 2,
                },
            },
        ],
@@ -45,6 +50,11 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
        //     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 || ""}`}>
@@ -104,32 +114,49 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
                            </div>
                            <div className="slider-content">
                                <SliderCom settings={settings} selector={sellSlider}>
-                                    {MyActiveOffersList &&
-                                        MyActiveOffersList?.result_list?.length > 0 &&
-                                        MyActiveOffersList.result_list.map((value, index) => (
-
-                                            <div className="item">
-
-                                                {/* title */}
-                                                <div className="flex justify-center">
-                                                    <p className="text-base font-bold   text-dark-gray dark:text-white">
-                                                        {value.title}
-                                                    </p>
-                                                </div>
-                                                {/* username */}
-                                                <div className="flex justify-center mb-1">
-                                                    <p className="text-xs text-thin-light-gray">
-                                                        {value.timeline_days} Days
-                                                    </p>
-                                                </div>
-                                                {/* items */}
-                                                <div className="flex justify-center">
-                                                    <div className="flex space-x-1 items-center text-purple text-xs">
-                                                        <span>{value.price*0.01} {value.currency}</span>
+                                {
+                                    MyActiveOffersList && MyActiveOffersList?.result_list?.length > 0 &&
+                                    MyActiveOffersList?.result_list?.map((value, index) => (
+                                            <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>{value.price*0.01} {value.currency}</span>
+                                                        </div>
+                                                    </div>
+                                                    {/* items */}
+                                                    {/* <div className="flex justify-center">
+                                                        <div className="flex space-x-1 items-center text-purple text-xs">
+                                                            <span>{value.price*0.01} {value.currency}</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 *!/*/}
@@ -372,6 +399,19 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
                        </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>
        </>
    );
@@ -6,7 +6,11 @@ import CommonHead from "../UserHeader/CommonHead";
 import TopSellerTopBuyerSliderSection from "../Home/TopSellerTopBuyerSliderSection";
 import MyOffersTable from "./MyOffersTable";

-export default function MyTasks({MyActiveOffersList, commonHeadData}) {
+export default function MyTasks({
+  MyActiveOffersList,
+  ActiveJobList,
+  commonHeadData,
+}) {
  const [selectTab, setValue] = useState("today");
  const filterHandler = (value) => {
    setValue(value);
@@ -34,10 +38,14 @@ export default function MyTasks({MyActiveOffersList, commonHeadData}) {
              ></div>
            </div>
          </div>
-          <MyOffersTable
-              MyActiveOffersList={MyActiveOffersList}
-              className="mb-10" />
-          <MyJobTable />
+          {MyActiveOffersList &&
+            MyActiveOffersList?.result_list?.length >= 0 && (
+              <MyOffersTable
+                MyActiveOffersList={MyActiveOffersList}
+                className="mb-10"
+              />
+            )}
+          <MyJobTable ActiveJobList={ActiveJobList} />
        </div>
      </div>
    </Layout>
@@ -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>
            ))}
@@ -14,6 +14,7 @@ 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);
@@ -35,29 +36,24 @@ export default function Layout({ children }) {

  //---------------------------------------
  /* 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 {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]);
-  // const getJobList = ()=>{
-  //   let  jobLists  = useSelector((state) => state.jobLists);
-  //   return jobLists;
-  // }
-  //---------------------------------------
+  // 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 (
    <>
@@ -75,6 +71,7 @@ export default function Layout({ children }) {
              logoutModalHandler={logoutModalHandler}
              sidebar={drawer}
              action={() => dispatch(drawerToggle())}
+              myJobList={userJobList}
            />
          </div>
          {MobileSideBar && (
@@ -92,6 +89,7 @@ export default function Layout({ children }) {
              logoutModalHandler={logoutModalHandler}
              sidebar={MobileSideBar}
              action={() => setMobileSidebar.toggle()}
+              myJobList={userJobList}
            />
          </div>
          {/* end sidebar */}
@@ -8,7 +8,7 @@ import {
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";

-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);

@@ -108,6 +108,35 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
          </div>
        </div>

+        {/* menu and settings item */}
+        {userDetails?.account_type !== "FAMILY" && (
+
+            <div className="menu-setting-items mb-11">
+              {/* menus item */}
+              <div
+                  className={`menu-item transition-all duration-300 ease-in-out ${
+                      sidebar ? "mb-14" : ""
+                  }`}
+              >
+                <div className="items">
+                  <div className="heading mb-5">
+                    <h1 className="title text-xl font-bold text-purple">
+                      Family
+                    </h1>
+                  </div>
+                  <ul className="flex flex-col space-y-6">
+                    <ListItem
+                        title="Family Corner"
+                        route="/acc-family"
+                        iconName="people-two"
+                        sidebar={sidebar}
+                    />
+                  </ul>
+                </div>
+              </div>
+            </div>
+        )}
+
        {userDetails?.account_type !== "FAMILY" && (
          <>
            {!userDetails?.post_jobs ? (
@@ -151,7 +180,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                  </div>
                </div>
              </div>
-            ) : jobLists?.result_list?.length ? (
+            ) : myJobList?.data?.result_list?.length ? (
              <div className="setting-item">
                <div className="heading mb-5">
                  <h1 className="title text-xl font-bold text-purple">
@@ -184,7 +213,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                  </ul>
                </div>
              </div>
-            ) : (
+            ) : !myJobList?.loading && (
              <div className="setting-item">
                <div className="heading mb-5">
                  <h1 className="title text-xl font-bold text-purple">
@@ -46,6 +46,8 @@ export default function RightSideBar() {
          </div>

          <div className="platform-list">
+            {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">
@@ -77,8 +79,7 @@ export default function RightSideBar() {
              </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">
@@ -122,42 +123,45 @@ export default function RightSideBar() {
                    </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>
-                    </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>
+                </p>
+              </div>
+            </div>
+
          </div>
        </div>
        {/*<SideStatistics />*/}
@@ -4,15 +4,14 @@ import { NavLink } from "react-router-dom";
 import {
  default as logo,
  default as logo3,
-} from "../../assets/images/wrenchboard.png"; //logo-2.svg";
+} from "../../assets/images/wrenchboard.png";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";

-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);
-  console.log('user-details for job',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;
@@ -200,7 +199,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                  </div>
                </div>
              </div>
-            ) : jobLists?.result_list?.length ? (
+            ) : myJobList?.data?.result_list?.length ? (
              <>
                <div className="setting-item">
                  <div className="heading mb-5">
@@ -239,7 +238,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                  </div>
                </div>
              </>
-            ) : (
+            ) : !myJobList?.loading && (
              <div className="setting-item">
                <div className="heading mb-5">
                  <h1 className="title text-xl font-bold text-purple">
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import ModalCom from "../Helpers/ModalCom";
-import { Form, Formik } from "formik";
+import { Field, Form, Formik } from "formik";
 import * as Yup from "yup";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
@@ -245,20 +245,34 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => {
                    </div>

                    <div className="field w-full mb-6">
-                      <InputCom
-                        fieldClass="px-6"
-                        label="Timeline"
-                        labelClass="tracking-wide"
-                        inputBg="bg-slate-100"
-                        inputClass=" input-curve lg border border-[#dce4e9]"
-                        type="text"
-                        name="timeline_days"
-                        spanTag=" - Expected duration of this task"
-                        // placeholder="Please Enter Detail Description of Job"
-                        value={props.values.timeline_days}
-                        inputHandler={props.handleChange}
-                        blurHandler={props.handleBlur}
-                      />
+                    <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>
                      {props.errors.timeline_days &&
                        props.touched.timeline_days && (
                          <p className="text-sm text-red-500">
@@ -316,3 +330,16 @@ const EditJobPopOut = ({ details, onClose, situation, country }) => {
 };

 export default EditJobPopOut;
+
+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" },
+];
@@ -1,12 +1,14 @@
-import React, { useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import Detail from "./popoutcomponent/Detail";
 import ModalCom from "../Helpers/ModalCom";
 import InputCom from "../Helpers/Inputs/InputCom/index";
-import { Form, Formik, Field } from "formik";
+import SiteService from "../../services/SiteService";
+import { Form, Formik, Field, ErrorMessage } from "formik";
 import * as Yup from "yup";
+import LoadingSpinner from "../Spinners/LoadingSpinner";

 const validationSchema = Yup.object().shape({
-  family: Yup.string().required("Please assign a family"),
+  family: Yup.string().required("This is required "),
  public: Yup.string(),
  individual: Yup.string()
    .email("Invalid email format")
@@ -19,26 +21,154 @@ const validationSchema = Yup.object().shape({
 });

 function JobListPopout({ details, onClose, situation }) {
-  let initialValues = {
-    family: [],
-    public: "",
-    individual: "",
-    group: "",
-  };
+  const [familyList, setFamilyList] = useState([]);
+  let [loader, setLoader] = useState({
+    member: false,
+    jobFields: {
+      family: false,
+      public: false,
+      individual: false,
+      group: false,
+    },
+  });

-  let [inputs, setInputs] = useState({
+  const apiCall = useMemo(() => new SiteService(), []);
+
+  // member listing
+  const memberList = useCallback(async () => {
+    setLoader({ member: true, jobFields: false });
+    try {
+      let reqData = {
+        limit: 20,
+        offset: 0,
+        action: 22010,
+      };
+
+      let res = await apiCall.familyListings(reqData);
+      const { data } = res;
+      if (data?.internal_return >= 0 && data?.status == "OK") {
+        let { result_list } = data;
+        setFamilyList(result_list);
+        setLoader({ member: false, jobFields: false });
+      } else return;
+    } catch (error) {
+      setLoader({ member: false, jobFields: false });
+      throw new Error(error);
+    }
+  }, [apiCall]);
+
+  useEffect(() => {
+    memberList();
+  }, [memberList]);
+
+  let initialValues = {
    family: "",
    public: "",
    individual: "",
    group: "",
+  };
+
+  let [textArea, setTextArea] = useState(details?.job_detail);
+  const [errMsg, setErrMsg] = useState({
+    deliveryDetail: "",
+    jobFields: {
+      family: "",
+      public: "",
+      individual: "",
+      group: "",
+    },
  });

-  const handleInputChange = ({ target: { name, value } }) => {
-    setInputs((prev) => ({ ...prev, [name]: value }));
+  const handleInputChange = ({ target: { value } }) => {
+    setTextArea(value);
+  };
+
+  const errorHandler = ({ target: { name } }) => {
+    try {
+      if (name === "family")
+        setErrMsg({ jobFields: { family: "please select a family member" } });
+      else if (name === "public")
+        setErrMsg({ jobFields: { public: "please select duration" } });
+      else if (name === "individual")
+        setErrMsg({ jobFields: { individual: "please enter email" } });
+      else if (name === "group")
+        setErrMsg({ jobFields: { group: "please select a family member" } });
+    } finally {
+      setTimeout(() => {
+        setErrMsg({ jobFields: "" });
+      }, 3000);
+    }
+  };
+
+  const jobFieldHandler = async (values, helpers) => {
+    let { job_id, job_uid } = details;
+
+    if (!textArea) {
+      setErrMsg({ deliveryDetail: "delivery detail is required!" });
+      return;
+    }
+
+    let jobReq = {
+      job_id,
+      job_uid,
+      job_description: textArea,
+    };
+    let reqData;
+
+    // for family input
+    if (values?.family !== "") {
+      reqData = {
+        ...jobReq,
+        family_uid: values?.family,
+        action: 13025,
+        assign_mode: 110011,
+      };
+      setLoader({ jobFields: { family: true } });
+    } else if (values?.public !== "") {
+      // for public input
+      reqData = {
+        ...jobReq,
+        duration: Number(values?.public),
+        action: 13025,
+        assign_mode: 110022,
+      };
+      setLoader({ jobFields: { public: true } });
+    } else if (values?.individual !== "") {
+      // for individual input
+      reqData = {
+        ...jobReq,
+        email: values?.individual,
+        action: 13025,
+        assign_mode: 110033,
+      };
+      setLoader({ jobFields: { individual: true } });
+    } else if (values?.group !== "") {
+      // for group input
+      reqData = {
+        ...jobReq,
+        email: values?.individual,
+        action: 13025,
+        assign_mode: 110033,
+      };
+      setLoader({ jobFields: { group: true } });
+    } else {
+      return;
+    }
+
+    try {
+      const res = await apiCall.assignJobTask(reqData);
+      let { data } = await res;
+      setLoader({ jobFields: false });
+      onClose();
+      throw new Response(data);
+    } catch (error) {
+      setLoader({ jobFields: false });
+      throw new Error(error);
+    }
  };

  return (
-    <ModalCom action={onClose} situation={situation} className="edit-popup">
+    <ModalCom action={onClose} situation={situation} className="job-popup">
      <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
          <h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
@@ -104,11 +234,11 @@ function JobListPopout({ details, onClose, situation }) {
              <textarea
                className={`p-1 w-full text-sm text-slate-900 outline-none border border-slate-300 rounded-md`}
                rows="5"
-                name="details"
                style={{ resize: "none" }}
-                value={details.job_detail}
+                value={textArea}
                onChange={handleInputChange}
              />
+              <p>{errMsg.deliveryDetail}</p>
            </div>
          </div>

@@ -116,50 +246,123 @@ function JobListPopout({ details, onClose, situation }) {
          <div className="p-4 w-full md:w-2/4 h-full">
            <Formik
              initialValues={initialValues}
-              validationSchema={validationSchema}
+              validationSchema={validationSchema.fields.family}
+              onSubmit={jobFieldHandler}
            >
              {(props) => {
                return (
-                  <>
+                  <Form className="mb-4">
                    {/* Assign to Family */}
                    <JobFieldInput
                      label="Assign to family"
-                      select
+                      select={true}
                      inputName="family"
-                      value={props?.family}
+                      value={props?.values.family}
+                      data={familyList}
                      btnText="Assign to family"
-                      optionText="family"
+                      optionText="Select Family"
+                      loader={loader?.jobFields.family}
+                      errorHandler={errorHandler}
                    />
+                    <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                      {" "}
+                      {props?.values.family === "" && (
+                        <span>{errMsg.jobFields.family}</span>
+                      )}
+                    </p>{" "}
+                  </Form>
+                );
+              }}
+            </Formik>

+            <Formik
+              initialValues={initialValues}
+              validationSchema={validationSchema.fields.public}
+              onSubmit={jobFieldHandler}
+            >
+              {(props) => {
+                return (
+                  <Form className="mb-4">
                    {/* Offer this job to public input */}
                    <JobFieldInput
                      label="Offer this job to public"
-                      select
+                      select={true}
                      inputName="public"
-                      value={props?.public}
+                      value={props?.values.public}
+                      data={publicArray}
                      btnText="Show Task to Public"
-                      optionText="Public"
+                      optionText="Select Duration"
+                      loader={loader?.jobFields.public}
+                      errorHandler={errorHandler}
                    />
+                    <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                      {" "}
+                      {props?.values.public === "" && (
+                        <span>{errMsg.jobFields.public}</span>
+                      )}
+                    </p>{" "}
+                  </Form>
+                );
+              }}
+            </Formik>

+            <Formik
+              initialValues={initialValues}
+              validationSchema={validationSchema.fields.individual}
+              onSubmit={jobFieldHandler}
+            >
+              {(props) => {
+                return (
+                  <Form className="mb-4">
                    {/* Offer this job to individual input */}
                    <JobFieldInput
                      label="Offer this job to individual"
-                      input
+                      input={true}
                      inputName="individual"
-                      value={props?.individual}
+                      value={props?.values.individual}
+                      placeholder="enter email of individual"
+                      inputHandler={props?.handleChange}
                      btnText="Send Offer to Individual"
+                      loader={loader?.jobFields.individual}
+                      errorHandler={errorHandler}
                    />
+                    <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                      {" "}
+                      {props?.values.individual === "" && (
+                        <span>{errMsg.jobFields.individual}</span>
+                      )}
+                    </p>{" "}
+                  </Form>
+                );
+              }}
+            </Formik>

+            <Formik
+              initialValues={initialValues}
+              validationSchema={validationSchema.fields.group}
+              onSubmit={jobFieldHandler}
+            >
+              {(props) => {
+                return (
+                  <Form className="mb-4">
                    {/* Offer this job to your group input */}
                    <JobFieldInput
                      label="Offer this job to your Group"
-                      select
+                      select={true}
                      inputName="group"
-                      value={props?.group}
+                      value={props?.values.group}
                      btnText="Send Order to Group"
                      optionText="Group"
+                      loader={loader?.jobFields.group}
+                      errorHandler={errorHandler}
                    />
-                  </>
+                    <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
+                      {" "}
+                      {props?.values.group === "" && (
+                        <span>{errMsg.jobFields.group}</span>
+                      )}
+                    </p>
+                  </Form>
                );
              }}
            </Formik>
@@ -178,64 +381,109 @@ const JobFieldInput = ({
  inputHandler,
  inputName,
  inputClass,
+  placeholder,
  input,
  select,
  label,
  labelClass,
  btnText,
  parentClass,
-  optionText
-}) => (
-  <div className="field w-full p-3 mb-6 bg-red-50 rounded-md">
-    {select && (
-      <>
-        <div className={`input-com ${parentClass}`}>
-          <div
-            className={`flex items-center justify-start mb-2.5 ${labelClass}`}
-          >
-            {label && (
-              <label
-                className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block tracking-wide"
-                htmlFor={inputName}
-              >
-                {label}
-              </label>
-            )}
-          </div>
-          <div
-            className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[1rem] 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}`}
-          >
-            <Field
-              component="select"
-              name={inputName}
-              className={`input-field placeholder:text-base text-dark-gray w-full h-full bg-white outline-none px-2`}
+  optionText,
+  errorHandler,
+  loader,
+  data,
+}) => {
+  return (
+    <div className="field w-full p-3 mb-2 bg-red-50 rounded-md">
+      {select && (
+        <>
+          <div className={`input-com ${parentClass}`}>
+            <div
+              className={`flex items-center justify-start mb-2.5 ${labelClass}`}
            >
-              <option value="">{optionText}</option>
-              {value && <option value={value}></option>}
-            </Field>
+              {label && (
+                <label
+                  className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block tracking-wide"
+                  htmlFor={inputName}
+                >
+                  {label}
+                </label>
+              )}
+            </div>
+            <div
+              className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[1rem] 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}`}
+            >
+              <Field
+                component="select"
+                name={inputName}
+                className={`input-field placeholder:text-base text-dark-gray w-full h-full bg-white outline-none px-2`}
+                value={value}
+              >
+                <option value="">{optionText}</option>
+                {Array.isArray(data) &&
+                  data?.map((item, idx) => (
+                    <React.Fragment key={idx}>
+                      {inputName === "family" && item?.last_login !== "" && (
+                        <option value={item?.family_uid} key={idx}>
+                          {`${item?.firstname} ${item?.lastname}`}
+                        </option>
+                      )}
+                      {inputName === "public" && (
+                        <option value={item?.duration} key={idx}>
+                          {item?.name}
+                        </option>
+                      )}
+                      {inputName === "group" && (
+                        <option value={item?.family_uid} key={idx}>
+                          {item?.firstname}
+                        </option>
+                      )}
+                    </React.Fragment>
+                  ))}
+              </Field>
+            </div>
          </div>
-        </div>
-      </>
-    )}
+        </>
+      )}

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

 .edit-popup{
  top: 75px;
+}
+
+.job-popup{
+  top: 55px;
 }
@@ -5,6 +5,7 @@ import LoadingSpinner from "../components/Spinners/LoadingSpinner";
 import { useDispatch, useSelector } from "react-redux";
 import { updateUserDetails } from "../store/UserDetails";
 import { updateJobs } from "../store/jobLists";
+import { updateUserJobList } from "../store/userJobList";

 const AuthRoute = ({ redirectPath = "/login", children }) => {
  const apiCall = useMemo(() => new usersService(), []);
@@ -12,6 +13,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
  const [lastActivityTime, setLastActivityTime] = useState(Date.now());
  const [isLogin, setIsLogin] = useState({ loading: true, status: false });
  const navigate = useNavigate();
+
+  const {jobListTable} = useSelector((state) => state.tableReload)
  
  useEffect(() => {
    //Removing Data stored at localStorage after session expires
@@ -73,6 +76,23 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
    }
  }, []);

+  useEffect(()=>{
+    const getMyJobList = async () => {
+      dispatch(updateUserJobList({loading: true, data:[]}))
+      try {
+        const res = await apiCall.getMyJobList();
+        // setMyJobList({loading: false, data:res.data})
+        // setMyJobList(res.data);
+        dispatch(updateUserJobList({loading: false, data:res.data}))
+      } catch (error) {
+        dispatch(updateUserJobList({loading: false, data:[]}))
+        // setMyJobList({loading: false, data:[]})
+        console.log("Error getting mode");
+      }
+    };
+    getMyJobList()
+  },[jobListTable])
+
  useEffect(() => {
    // Getting market data
    const getMarketActiveJobList = async () => {
@@ -33,7 +33,23 @@ class SiteService {
    }

    familyListings(reqData) {
-        return this.postAuxEnd('/familylist', reqData)
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+           ...reqData
+          };
+        return this.postAuxEnd('/familylist', postData)
+    }
+
+    assignJobTask(reqData) {
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+           ...reqData
+          };
+        return this.postAuxEnd('/assigntask', postData)
    }

    //----------------------------------------  -----
@@ -532,6 +532,18 @@ class usersService {
    return this.postAuxEnd("/verifysignuplink", reqData);
  }

+  // END POINT FOR OFFER RESPONSE (i.e TO ACCEPT, REJECT, CANCEL, ETC OFFER)
+  offersResponse(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 15012,
+      ...reqData,
+    };
+    return this.postAuxEnd("/offersresponse", postData);
+  }
+
  /*
    - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
    - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)
@@ -2,7 +2,8 @@ import { createSlice } from "@reduxjs/toolkit";

 const initialState = {
  jobListTable: false,
-  pendingListTable: false
+  pendingListTable: false,
+  myTaskTable: false
 };

 export const tableReloadSlice = createSlice({
@@ -17,6 +18,9 @@ export const tableReloadSlice = createSlice({
        case 'PENDINGTABLE' :
          state.pendingListTable = !state.pendingListTable;
          return
+        case 'MYTASKTABLE' :
+          state.myTaskTable = !state.myTaskTable;
+          return
        default:
          return state
      }
@@ -4,12 +4,14 @@ import drawerReducer from "./drawer";
 import userDetailReducer from "./UserDetails";
 import jobReducer from "./jobLists";
 import tableReloadReducer from "./TableReloads";
+import userJobListReducer from './userJobList'

 export default configureStore({
  reducer: {
    drawer: drawerReducer,
    userDetails: userDetailReducer,
    jobLists: jobReducer,
-    tableReload: tableReloadReducer
+    tableReload: tableReloadReducer,
+    userJobList: userJobListReducer
  },
 });
@@ -0,0 +1,20 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  userJobList: {loading: true, data: []}
+};
+
+export const userSlice = createSlice({
+  name: "userJobList",
+  initialState,
+  reducers: {
+    updateUserJobList: (state,action) => {
+      state.userJobList = {...action.payload}
+    },
+  },
+});
+
+// Action creators are generated for each case reducer function
+export const { updateUserJobList } = userSlice.actions;
+
+export default userSlice.reducer;
@@ -12,32 +12,33 @@ export default function MyJobsPage() {
    return 0;
  };

-  const { jobListTable } = useSelector((state) => state.tableReload);
-
+  const {userJobList} = useSelector((state) => state.userJobList)
+  
+  // const { jobListTable } = useSelector((state) => state.tableReload);
  // const userApi = new usersService();
  // const activeJobList  = userApi.getMyJobList();
-  const [MyJobList, setMyJobList] = useState({ loading: true, data: [] });
-  const api = new usersService();
+  // 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]);
+  // 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]);

  // debugger;
  return (
    <>
-      <MyJobs MyJobList={MyJobList} commonHeadData={commonHeadData} />
+      <MyJobs MyJobList={userJobList} commonHeadData={commonHeadData} />
    </>
  );
 }
@@ -1,44 +1,59 @@
-import React, { useContext,useState, useEffect } from "react";
+import React, { useContext, useState, useEffect } from "react";
 import MyTasks from "../components/MyTasks";
-import UsersService from "../services/UsersService";
+// import UsersService from "../services/UsersService";
 import usersService from "../services/UsersService";

+import { useSelector } from "react-redux";
+
 export default function MyTaskPage() {
+  const { myTaskTable } = useSelector((state) => state.tableReload);

-    const [MyActiveJobList, setMyActiveJobList] = useState([]);
-    const [MyActiveOffersList, setMyActiveOffersList] = useState([]);
-    const api = new usersService();
-    const commonHeadData =()=>{
-        console.log("COMMON HEAD DATA ----------------=====---------------------");
+  const [MyActiveJobList, setMyActiveJobList] = useState({
+    loading: true,
+    status: false,
+    data: [],
+  });
+  const [MyActiveOffersList, setMyActiveOffersList] = useState([]);
+  const api = new usersService();
+  const commonHeadData = () => {
+    console.log("COMMON HEAD DATA ----------------=====---------------------");
    return 0;
+  };
+  const getMyActiveJobList = async () => {
+    setMyActiveJobList({ loading: true, status: false, data: [] });
+    try {
+      const res = await api.getMyActiveTaskList();
+      setMyActiveJobList({
+        loading: false,
+        status: true,
+        data: res.data.result_list,
+      });
+    } catch (error) {
+      setMyActiveJobList({ loading: false, status: false, data: [] });
+      console.log("Error getting tasks");
    }
-    const getMyActiveJobList = async () => {
-        try {
-            const res = await api.getMyActiveTaskList();
-            setMyActiveJobList(res.data);
-        } catch (error) {
-            console.log("Error getting tasks");
-        }
-    };
-    const getMyActiveOffersList = async () => {
-        try {
-            const res = await api.getOffersList();
-            setMyActiveOffersList(res.data);
-        } catch (error) {
-            console.log("Error getting offers");
-        }
-    };
-    useEffect(() => {
-        getMyActiveJobList();
-        getMyActiveOffersList();
-    }, []);
+  };
+  const getMyActiveOffersList = async () => {
+    // setMyActiveOffersList({loading: true, status:false, data:[]});
+    try {
+      const res = await api.getOffersList();
+      setMyActiveOffersList(res.data);
+    } catch (error) {
+      // setMyActiveOffersList({loading: false, status:false, data:[]});
+      console.log("Error getting offers");
+    }
+  };
+  useEffect(() => {
+    getMyActiveJobList();
+    getMyActiveOffersList();
+  }, [myTaskTable]);

-    //debugger;
-    return (
-        <>
-            <MyTasks ActiveJobList={MyActiveJobList}
-                     MyActiveOffersList={MyActiveOffersList}
-                     commonHeadData={commonHeadData}/>
-        </>
-    );
+  //debugger;
+  return (
+    <MyTasks
+      ActiveJobList={MyActiveJobList}
+      MyActiveOffersList={MyActiveOffersList}
+      commonHeadData={commonHeadData}
+    />
+  );
 }
Author	SHA1	Message	Date
Ebube	9139f637cf	.	2023-05-31 10:54:08 +01:00
Ebube	16401cc3a2	.	2023-05-31 10:35:08 +01:00
Ebube	ced9c523ad	added suspense to familymanagetabs	2023-05-31 09:39:54 +01:00
Ebube	759269cd74	.	2023-05-31 05:59:45 +01:00
Ebube	fb27a0d156	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into enable-and-active-jobs	2023-05-31 05:53:57 +01:00
Ebube	03da0e211b	added qr code and print function	2023-05-31 05:53:31 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	c00d702a6b	slider styles	2023-05-30 20:47:26 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	206f292dd9	slider cards	2023-05-30 20:14:48 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	abb2329795	package added	2023-05-30 12:09:28 -04:00
ameye	a92a9f961d	Merge branch 'sliderCom-fix' of WrenchBoard/Users-Wrench into master	2023-05-30 14:07:54 +00:00
victorAnumudu	f90a6e6687	fixed width added to back btn	2023-05-30 14:37:27 +01:00
victorAnumudu	b44c039bbf	fixed width added to back btn	2023-05-30 14:36:34 +01:00
victorAnumudu	09e0661e48	sliderCom item repeat fix	2023-05-30 14:28:57 +01:00
ameye	af2c2d66a3	Merge branch 'myjoblist-moved' of WrenchBoard/Users-Wrench into master	2023-05-30 10:35:45 +00:00
victorAnumudu	b2bfa6cd54	moved user joblist into it's own slice, to avoid unneccessary side menu display recalculation	2023-05-30 07:29:57 +01:00
ameye	577212eb19	Merge branch 'enable-and-active-jobs' of WrenchBoard/Users-Wrench into master	2023-05-30 02:34:59 +00:00
Ebube	f5bf5997d6	addded email fix	2023-05-30 02:20:58 +01:00
Ebube	42c3676bcf	.	2023-05-30 02:11:51 +01:00
Ebube	9c00badcf6	.	2023-05-30 01:42:36 +01:00
Ebube	85899a72d2	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into enable-and-active-jobs	2023-05-29 23:59:18 +01:00
Ebube	9cd3ef273b	.	2023-05-29 23:58:55 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	918575d802	Family member task layout	2023-05-29 18:23:57 -04:00
ameye	f2070ae31d	Merge branch 'correct-sidemenu-display' of WrenchBoard/Users-Wrench into master	2023-05-29 22:02:45 +00:00
victorAnumudu	4d9f0adf0c	side menu display bug fixed	2023-05-29 22:41:29 +01:00
ameye	e9271e649f	Merge branch 'offerlist-display' of WrenchBoard/Users-Wrench into master	2023-05-29 20:00:37 +00:00
victorAnumudu	f4e5ba1586	reverted offerlist to display only when there is offer	2023-05-29 20:53:17 +01:00
ameye	3ee01736db	Merge branch 'button-name-display' of WrenchBoard/Users-Wrench into master	2023-05-29 19:39:36 +00:00
victorAnumudu	b7b09fca66	button style changed	2023-05-29 20:36:42 +01:00
victorAnumudu	d1e9c21dbb	Button display name changed	2023-05-29 20:03:13 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	6ceb771005	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench	2023-05-29 14:57:40 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	7d3d5eb8c2	Hx page	2023-05-29 14:56:56 -04:00
ameye	6c39686ee2	Merge branch 'cancel-btn-bug' of WrenchBoard/Users-Wrench into master	2023-05-29 18:52:47 +00:00
victorAnumudu	02d29023d9	made cancel btn to close the popout modal	2023-05-29 19:50:49 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	da24c8a535	History tabnles	2023-05-29 14:47:08 -04:00
ameye	6dbd080f29	Merge branch 'enable-and-active-jobs' of WrenchBoard/Users-Wrench into master	2023-05-29 18:25:27 +00:00
Ebube	97501c6f59	.	2023-05-29 19:11:10 +01:00
Ebube	4a95dec4b8	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into enable-and-active-jobs	2023-05-29 18:36:43 +01:00
Ebube	fe0cd191bc	.	2023-05-29 18:36:01 +01:00
ameye	708e9f601a	Merge branch 'btn-center' of WrenchBoard/Users-Wrench into master	2023-05-29 17:05:01 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	9f01a8e5e4	fix family resouce menu	2023-05-29 12:33:33 -04:00
victorAnumudu	3ee7e1fb84	Centralized button and removed horinzontal scroll	2023-05-29 17:05:40 +01:00
ameye	4186422e6a	Merge branch 'accept_reject-offer' of WrenchBoard/Users-Wrench into master	2023-05-29 11:41:28 +00:00
victorAnumudu	2155954ba3	active task list table reloads on accept or reject of offer job	2023-05-29 12:36:34 +01:00
ameye	a18b05a11e	Merge branch 'accept_reject-offer' of WrenchBoard/Users-Wrench into master	2023-05-29 10:35:17 +00:00
victorAnumudu	604b0523fa	implemented family user able to accept, reject or cancel job	2023-05-29 09:03:02 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	5e90bbd577	Offer table	2023-05-28 22:05:24 -04:00
ameye	00fce5ee60	Merge branch 'enable-and-active-jobs' of WrenchBoard/Users-Wrench into master	2023-05-29 00:25:27 +00:00
Ebube	f3c2ab7923	.	2023-05-29 01:20:46 +01:00
Ebube	6b535ecd57	.	2023-05-29 01:16:30 +01:00
ameye	b16a8aeef7	Merge branch 'enable-and-active-jobs' of WrenchBoard/Users-Wrench into master	2023-05-28 23:42:24 +00:00
Ebube	1a7e6324eb	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into enable-and-active-jobs	2023-05-29 00:39:57 +01:00
Ebube	f3f85e4d6c	.	2023-05-29 00:33:53 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	e09b6f07ec	Family on mobile menu	2023-05-28 16:41:56 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	c9cc47ce8e	offer table	2023-05-28 15:24:45 -04:00
tokslaw	1c4b998d35	Merge branch 'offer-job-popout' of WrenchBoard/Users-Wrench into master	2023-05-27 20:10:37 +00:00
victorAnumudu	dfd601abc2	offer job popout added	2023-05-27 20:20:14 +01:00
ameye	f5b063234b	Merge branch 'enable-and-active-jobs' of WrenchBoard/Users-Wrench into master	2023-05-27 12:45:35 +00:00
Ebube	6e4cea82b9	.	2023-05-27 13:33:15 +01:00
ameye	69876c6592	Merge branch 'google-login-console-phase' of WrenchBoard/Users-Wrench into master	2023-05-27 10:33:44 +00:00