added error message object

Merge branch 'my-page-link' of WrenchBoard/Users-Wrench into master
removed my page link from header nav
2024-03-26 12:51:59 +01:00 · 2024-03-25 16:46:49 +00:00 · 2024-03-25 17:17:08 +01:00 · 2024-03-25 14:25:14 +00:00 · 2024-03-25 15:23:37 +01:00 · 2024-03-25 11:47:25 +00:00
44 changed files with 859 additions and 233 deletions
@@ -114,4 +114,7 @@ REACT_APP_SHOW_NEW_FAMILY_DASH=1
 REACT_APP_SHOW_ACCOUNT_DASH=1

 # Displays the slider banners
-REACT_APP_SHOW_SLIDER_BANNERS=0
+REACT_APP_SHOW_SLIDER_BANNERS=0
+
+# FOR MEDIA LINK
+REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com '
@@ -82,4 +82,7 @@ REACT_APP_SHOW_NEW_FAMILY_DASH=1
 REACT_APP_SHOW_ACCOUNT_DASH=1

 # Displays the slider banners
-REACT_APP_SHOW_SLIDER_BANNERS=0
+REACT_APP_SHOW_SLIDER_BANNERS=0
+
+# FOR MEDIA LINK
+REACT_APP_MEDIA_LINK='https://dev-media.wrenchboard.com '
@@ -88,4 +88,7 @@ REACT_APP_SHOW_NEW_FAMILY_DASH=1
 REACT_APP_SHOW_ACCOUNT_DASH=1

 # Displays the slider banners
-REACT_APP_SHOW_SLIDER_BANNERS=0
+REACT_APP_SHOW_SLIDER_BANNERS=0
+
+# FOR MEDIA LINK
+REACT_APP_MEDIA_LINK='https://media.wrenchboard.com '
@@ -21,5 +21,14 @@
  "emmet.triggerExpansionOnTab": true,
  "emmet.includeLanguages": {
    "javascript": "javascriptreact"
-  }
+  },
+  "cSpell.words": [
+    "completesignuplink",
+    "MOBILEUSER",
+    "MYFILES",
+    "mynotifications",
+    "PASSWORDRESET",
+    "TRANSFERSTART",
+    "WRENCHBOARD"
+  ]
 }
@@ -34,7 +34,7 @@ export default function SocketIOContextProvider({children}) {

    const marketUpdate = (message, room) => {
        if(message && room){
-            socket.emit("marketjob_addded", { message, room });
+            socket.emit("marketjob_added", { message, room });
        }
    };

@@ -44,6 +44,12 @@ export default function SocketIOContextProvider({children}) {
        }
    };

+    const sendJobInterestToOwner = (message, room) => {
+        if(message && room){
+            socket.emit("marketjob", { message:{...message}, room });
+        }
+    };
+
    useEffect(() => {
        socket.on("receive_message", (data) => {
            // setSocketMsgReceived(data.message);
@@ -65,8 +71,21 @@ export default function SocketIOContextProvider({children}) {
            if(message.action == "REFRESH_TASK" && message.audience == "PARENT"){  // for refreshing parent account when child accepts or rejects a job
                dispatch(tableReload({type:'PARENTFAMILYTASKLIST'})) // dispatches to update parent family task list on parent side
            }
+            if(message.action == "REFRESH_WALLET" && message.family_uid == user_uid && message.audience == "MEMBER"){  // for refreshing child wallet account when parent sends money to kid
+                dispatch(tableReload({type:'WALLETTABLE'})) // dispatches to update wallet balance on family side
+            }
            // console.log('DATA', data)
        });
+
+        socket.on("marketjob_actions", (data) => { // Triggers refresh on owner side, when somebody sends/shows interest in a job 
+            let user_uid = userDetails.account_type == 'FULL' ? userDetails.uid : sessionStorage.getItem('family_uid') // gets user UID
+            let {message} = data
+            if(message.action == "REFRESH_OFFERS" && message.audience == "MERCHANT" && message.market_uid == user_uid){  // for refreshing job owner offer interest list when any worker sends interest
+                dispatch(tableReload({type:'OFFERINTERESTLISTRELOAD'}))
+            }
+            console.log('data', data)
+        });
+
    }, [socket]);

    let values = {
@@ -76,6 +95,7 @@ export default function SocketIOContextProvider({children}) {
        setSocketMsgReceived,
        marketUpdate,
        parentAssignJobToKid,
+        sendJobInterestToOwner,
        socketMsgReceived,
        // room,
        // setRoom,
@@ -29,14 +29,15 @@ const AccountDashboard = ({ className, bannerList }) => {
            props;

          return (
-            <TopBanner
-              btn={short_button_text}
-              image={image}
-              title={short_title}
-              desc={short_description}
-              link_path={link_path}
-              key={idx}
-            />
+            <div key={idx}>
+              <TopBanner
+                btn={short_button_text}
+                image={image}
+                title={short_title}
+                desc={short_description}
+                link_path={link_path}
+              />
+            </div>
          );
        })}
      </div>
@@ -48,14 +49,15 @@ const AccountDashboard = ({ className, bannerList }) => {
            props;

          return (
-            <LowerBanner
-              btn={short_button_text}
-              image={image}
-              title={short_title}
-              desc={short_description}
-              link_path={link_path}
-              key={idx}
-            />
+            <div key={idx}>
+              <LowerBanner
+                btn={short_button_text}
+                image={image}
+                title={short_title}
+                desc={short_description}
+                link_path={link_path}
+              />
+            </div>
          );
        })}
      </div>
@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import FamilyManageTabs from "./FamilyManageTabs";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";

 export default function FamilyManage() {
  const [selectTab, setValue] = useState("today");
@@ -34,7 +35,7 @@ export default function FamilyManage() {
        <div className="notification-page w-full mb-10">
          <div className="notification-wrapper w-full">
            {/* heading */}
-            <div className="sm:flex justify-between items-center mb-6">
+            {/* <div className="sm:flex justify-between items-center mb-6">
              <div className="mb-5 sm:mb-0">
                <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
                  <span
@@ -50,6 +51,40 @@ export default function FamilyManage() {
                  className="relative"
                ></div>
              </div>
+            </div> */}
+            <div className="w-full mb-5 flex justify-between items-center">
+              <div className="">
+                  <CustomBreadcrumb 
+                  title = {'Manage Family'}
+                  breadcrumb={
+                      [
+                      { link: "/", title: "Home" },
+                      { link: "/manage-family", title: "Manage Family", active: true},
+                      ]
+                  }
+                  />
+              </div>
+              <Link
+                className="item-content relative text-[18px] transition-all duration-300 ease-in-out bg-[#76a5df] text-white font-medium dark:text-white h-12 px-2 flex items-center gap-2 rounded-md shadow-sm justify-center cursor-pointer dark:bg-[linear-gradient(134.38deg,#f539f8_0%,#c342f9_43.55%,#5356fb_104.51%)]"
+                to="/acc-family"
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  strokeWidth={1.5}
+                  stroke="currentColor"
+                  className="w-4 h-4"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18"
+                  />
+                </svg>
+
+              <span>Family</span>
+            </Link>
            </div>
            <FamilyManageTabs accountDetails={accountDetails} />
          </div>
@@ -9,6 +9,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import Detail from "../../jobPopout/popoutcomponent/Detail";
 import { NewTasks } from "./forms";
 import { SocketValues } from "../../Contexts/SocketIOContext";
+import { errorMsg } from "../../../lib/errorMsg";

 const AssignTaskPopout = ({
  action,
@@ -172,10 +173,13 @@ const AssignTaskPopout = ({
      .assignFamilyTask(reqData)
      .then((res) => {
        if (res.status != 200 || res.data.internal_return < 0) {
+
+          let error = errorMsg[res?.data?.error_msg] || ''
+
          setRequestStatus({
            loading: false,
            status: false,
-            message: "failed to assign task",
+            message: error? error : "failed to assign task",
          });

          return setTimeout(() => {
@@ -187,7 +191,7 @@ const AssignTaskPopout = ({
          setRequestStatus({
            loading: false,
            status: true,
-            message: "action successful",
+            message: "Task Assigned successfully",
          });

          setUpdatePage(prev => !prev); // Updates family task page by calling the useeffect hook
@@ -300,7 +304,7 @@ const AssignTaskPopout = ({
          ) : (
            <>
              <div
-                className={`job-action-modal-body w-full md:grid ${
+                className={`job-action-modal-body w-full min-h-[450px] max-h-[450px] overflow-y-auto md:grid ${
                  taskType !== "new" ? "md:grid-cols-2" : "md:grid-cols-1"
                }`}
              >
@@ -315,7 +319,7 @@ const AssignTaskPopout = ({
                        checked={taskType == "select"}
                        onChange={switchTaskType}
                      />
-                      <span>Select Task</span>
+                      <span className="text-lg tracking-wide font-semibold">Previous Task</span>
                    </div>
                    <div className="flex items-center gap-2 text-sky-blue text-base">
                      <input
@@ -326,12 +330,12 @@ const AssignTaskPopout = ({
                        checked={taskType == "new"}
                        onChange={switchTaskType}
                      />
-                      <span>New Task</span>
+                      <span className="text-lg tracking-wide font-semibold">New Task</span>
                    </div>
                  </div>
                  {/* Task Type === select */}
                  {taskType == "select" && (
-                    <div className="p-4 w-full h-[400px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
+                    <div className="p-4 w-full h-[380px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
                      {familyTask?.data?.length ? (
                        familyTask?.data?.map((item, index) => (
                          <div
@@ -364,7 +368,7 @@ const AssignTaskPopout = ({
                    </div>
                  )}
                  {taskType == "new" && (
-                    <div className="p-4 w-full h-[400px]">
+                    <div className="p-4 w-full">
                      <NewTasks
                        formState={formState}
                        setFormState={setFormState}
@@ -382,17 +386,25 @@ const AssignTaskPopout = ({
                          <p className="text-lg font-bold text-dark-gray dark:text-white tracking-wide border-b-2">
                            {activeTask?.data?.title}
                          </p>
-                          <div className="my-3">
+                          {/* <div className="my-3">
                            <Detail
                              label="Description"
                              value={activeTask?.data?.description}
                            />
+                          </div> */}
+                          <div className="my-3 w-full">
+                            <label className="job-label">
+                              Description
+                            </label>
+                            <p className="p-1 text-sm text-slate-900 dark:text-white">
+                              {activeTask?.data?.description}
+                            </p>
                          </div>
                          <div className="grid grid-cols-2">
                            <div className="w-full">
                              <div className="my-3 w-full flex items-center gap-1">
                                <label className="job-label">
-                                  Price
+                                  Reward
                                </label>
                                <p className="p-1 text-sm text-slate-900 dark:text-white">
                                  {PriceFormatter(
@@ -453,7 +465,7 @@ const AssignTaskPopout = ({
              </div>

              {/* BTN */}
-              <div className="py-2 px-4 border-t-2 flex justify-between items-center">
+              <div className="modal-footer-wrapper">
                {/* error or success display */}
                <div className="w-auto h-auto flex items-center">
                  {requestStatus.message != "" &&
@@ -480,7 +492,7 @@ const AssignTaskPopout = ({
                    disabled={requestStatus.loading}
                    onClick={action}
                    type="button"
-                    className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white cursor-pointer"
+                    className="custom-btn border-gradient"
                  >
                    <span className="text-gradient">Close</span>
                  </button>
@@ -492,7 +504,7 @@ const AssignTaskPopout = ({
                        type="button"
                        disabled={requestStatus.loading}
                        onClick={assignFamilyTask}
-                        className="px-1 w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white cursor-pointer"
+                        className="custom-btn btn-gradient text-white"
                      >
                        Assign
                      </button>
@@ -49,11 +49,91 @@ export default function NewTasks({ formState, setFormState }) {

  return (
    <form className="w-full flex justify-between items-start">
-      <div className="flex flex-col gap-3 max-w-[77%]">
+      <div className="w-full block sm:grid grid-cols-3 gap-2">
+        
+        <div className="w-full flex flex-col gap-2 col-span-2">
+          {/* Title  */}
+          <div className="field w-full">
+            <label htmlFor="title" className="job-label">Title</label>
+            <InputCom
+              fieldClass="px-6"
+              // label="Title"
+              // labelClass="tracking-wide"
+              inputBg="bg-slate-100"
+              type="text"
+              name="title"
+              value={formState.title}
+              inputHandler={handleInputChange}
+              //   blurHandler={props.handleBlur}
+              //   error={props.errors.title && props.touched.title && props.errors.title}
+            />
+          </div>
+
+          {/* Description  */}
+          {/* <div className="field w-full mb-[5px]">
+            <label htmlFor="description" className="job-label">Description</label>
+            <InputCom
+              fieldClass="px-6"
+              // label="Description"
+              // labelClass="tracking-wide"
+              inputBg="bg-slate-100"
+              type="text"
+              name="description"
+              value={formState.description}
+              inputHandler={handleInputChange}
+              //   blurHandler={props.handleBlur}
+              //   error={props.errors.description && props.touched.description && props.errors.description}
+            />
+          </div> */}
+          <div className="field flex flex-col sm:flex-row w-full gap-2">
+            <div className="w-full">
+              <label
+                htmlFor="description"
+                className='job-label'
+              >
+                Description
+              </label>
+              <textarea
+                id="description"
+                rows="5"
+                className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+                style={{ resize: "none" }}
+                name="description"
+                value={formState.description}
+                onChange={handleInputChange}
+                // onBlur={props.handleBlur}
+              />
+            </div>
+          </div>
+
+          {/* Details */}
+          <div className="field flex flex-col sm:flex-row w-full gap-2">
+            <div className="w-full">
+              <label
+                htmlFor="Job Delivery Details"
+                className='job-label'
+              >
+                Job Delivery Details
+                {/* {props.errors.job_detail && props.touched.job_detail && <span className="text-[12px] text-red-500">{props.errors.job_detail}</span>} */}
+              </label>
+              <textarea
+                id="Job Delivery Details"
+                rows="5"
+                className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+                style={{ resize: "none" }}
+                name="job_detail"
+                value={formState.job_detail}
+                onChange={handleInputChange}
+                // onBlur={props.handleBlur}
+              />
+            </div>
+          </div>
+        </div>
+
        {/* inputs starts here */}
-        <div className="grid md:grid-cols-3 grid-cols-1 gap-6 mb-[5px]">
+        <div className="w-full flex flex-col gap-2">
          {/* Currency */}
-          <div className="field w-full mb-6 xl:mb-0">
+          <div className="field w-full">
            <label
              htmlFor="country"
              className="job-label"
@@ -65,7 +145,7 @@ export default function NewTasks({ formState, setFormState }) {
              id="country"
              name="country"
              value={formState.country}
-              className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
+              className={`input-field w-full h-[42px] flex items-center px-2 mt-2 rounded-full placeholder:text-base text-dark-gray dark:text-white bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
              onChange={handleInputChange}
              // onBlur={props.handleBlur}
            >
@@ -115,7 +195,7 @@ export default function NewTasks({ formState, setFormState }) {
          </div>

          {/* Duration */}
-          <div className="field w-full mb-6 xl:mb-0">
+          <div className="field w-full">
            <label
              htmlFor="timeline_days"
              className="job-label"
@@ -127,7 +207,7 @@ export default function NewTasks({ formState, setFormState }) {
              id="timeline_days"
              name="timeline_days"
              value={formState.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`}
+              className={`input-field w-full h-[42px] flex items-center px-2 mt-2 rounded-full placeholder:text-base text-dark-gray dark:text-white bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
              onChange={handleInputChange}
              // onBlur={props.handleBlur}
            >
@@ -138,6 +218,7 @@ export default function NewTasks({ formState, setFormState }) {
                  </option>
                  {publicArray.map(({ name, duration }, idx) => (
                    <option
+                      key={idx}
                      className="text-slate-500 text-[13.975px]"
                      value={duration}
                    >
@@ -148,74 +229,19 @@ export default function NewTasks({ formState, setFormState }) {
              )}
            </select>
          </div>
-        </div>

-        {/* Title  */}
-        <div className="field w-full mb-[5px]">
-          <label htmlFor="title" className="job-label">Title</label>
-          <InputCom
-            fieldClass="px-6"
-            // label="Title"
-            // labelClass="tracking-wide"
-            inputBg="bg-slate-100"
-            type="text"
-            name="title"
-            value={formState.title}
-            inputHandler={handleInputChange}
-            //   blurHandler={props.handleBlur}
-            //   error={props.errors.title && props.touched.title && props.errors.title}
-          />
-        </div>
-
-        {/* Description  */}
-        <div className="field w-full mb-[5px]">
-          <label htmlFor="description" className="job-label">Description</label>
-          <InputCom
-            fieldClass="px-6"
-            // label="Description"
-            // labelClass="tracking-wide"
-            inputBg="bg-slate-100"
-            type="text"
-            name="description"
-            value={formState.description}
-            inputHandler={handleInputChange}
-            //   blurHandler={props.handleBlur}
-            //   error={props.errors.description && props.touched.description && props.errors.description}
-          />
-        </div>
-
-        {/* Details */}
-        <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
+          {/* Banner Image */}
          <div className="w-full">
-            <label
-              htmlFor="Job Delivery Details"
-              className='job-label'
-            >
-              Job Delivery Details
-              {/* {props.errors.job_detail && props.touched.job_detail && <span className="text-[12px] text-red-500">{props.errors.job_detail}</span>} */}
-            </label>
-            <textarea
-              id="Job Delivery Details"
-              rows="5"
-              className={`input-field px-3 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
-              style={{ resize: "none" }}
-              name="job_detail"
-              value={formState.job_detail}
-              onChange={handleInputChange}
-              // onBlur={props.handleBlur}
-            />
+            <div className="h-32 w-full">
+              <img
+                src={selectImage}
+                alt="task_banner_img"
+                className="w-full h-full object-contain"
+              />
+            </div>
          </div>
        </div>
-      </div>
-      {/* Banner Image */}
-      <div className="max-w-[20%] w-full">
-        <div className="h-32 w-full">
-          <img
-            src={selectImage}
-            alt="task_banner_img"
-            className="w-full h-full object-contain"
-          />
-        </div>
+
      </div>
    </form>
  );
@@ -15,8 +15,10 @@ function FamilyWallet({familyData}) {

  useEffect(()=>{
    setFamilyWallet({loading:true, data: []})
-    apiUrl.getFamilyWallet({family_uid:familyData?.uid}).then(res => {
+    apiUrl.getKidWallets({family_uid:familyData?.uid}).then(res => {
      setFamilyWallet({loading:false, data: res?.data?.result_list || []})
+      console.log('familyData', familyData, res?.data?.result_list)
+
    }).catch(error => {
      setFamilyWallet({loading:false, data: []})
    })
@@ -9,8 +9,9 @@ import usersService from "../../../../services/UsersService";
 import LoadingSpinner from "../../../Spinners/LoadingSpinner";
 import { PriceFormatter } from "../../../Helpers/PriceFormatter";
 import { tableReload } from "../../../../store/TableReloads";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { apiConst } from "../../../../lib/apiConst";
+import { SocketValues } from "../../../Contexts/SocketIOContext";

 const validationSchema = Yup.object().shape({
  // amount: Yup.string()
@@ -30,6 +31,11 @@ const validationSchema = Yup.object().shape({
 });

 function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
+
+  const {userDetails} = useSelector((state) => state?.userDetails); // Gets User Detail
+
+  const { parentAssignJobToKid } = SocketValues() // socket emit event from FULL account
+
  const dispatch = useDispatch();

  const apiUrl = new usersService();
@@ -54,6 +60,7 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
  };
  // FUNCTION TO PERFORM FAMILY TRANSFER
  const handleAddFund = (values) => {
+
    setRequestStatus({ loading: true, status: false, message: "" });

    let senderBal = startTransfer?.data?.origing_current_balance || ""; // SENDER'S ACCOUNT BALANCE
@@ -132,6 +139,17 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
          status: true,
          message: "Transfer Successful",
        });
+
+        //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT
+        // message, room
+        let socketMsg = {
+          "audience": "MEMBER",
+          "action": "REFRESH_WALLET",
+          "family_uid": reqData.family_uid,
+        }
+        let socketRoom = `FAMILY-${userDetails.uid}`
+        parentAssignJobToKid(socketMsg, socketRoom) //SENDS MESSAGE TO SOCKET TO UPDATE CHILD ACCOUNT
+
        setTimeout(() => {
          setRequestStatus({ loading: false, status: false, message: "" });
          dispatch(tableReload({ type: "WALLETTABLE" })); // UPDATES PARENT WALLET ACCOUNT
@@ -170,13 +188,13 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
  return (
    <ModalCom action={action} situation={situation}>
      <div className="relative logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
            Add Fund
          </h1>
          <button
            type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
            onClick={action}
          >
            <svg
@@ -271,7 +289,7 @@ function FamilyAddFundPopout({ action, situation, wallet, familyData }) {
                      <div className="field w-full mb-[0.5rem]">
                        <div className="w-full">
                          <label
-                            htmlFor="Job Delivery Details"
+                            htmlFor="job-label"
                            className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold flex items-center gap-1"
                          >
                            Comment
@@ -248,13 +248,13 @@ const FamilyForm = ({
 }) => {
  return (
    <div className="logout-modal-wrapper w-11/12 lg:w-[460px] 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:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
-        <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+      <div className="modal-header-con">
+        <h1 className="modal-title">
          Add Members
        </h1>
        <button
          type="button"
-          className="text-[#374557] dark:text-red-500"
+          className="modal-close-btn"
          onClick={popUpHandler}
        >
          <CloseIcon />
@@ -267,8 +267,8 @@ const FamilyForm = ({
          name="first_name"
          type="text"
          parentClass="flex items-center gap-1 w-full"
-          labelClass="flex-[0.2] mb-0"
-          inputClass="flex-[0.8] input-curve lg border border-[#dce4e9]"
+          labelClass="flex-[0.4] mb-0"
+          inputClass="flex-[0.6] input-curve lg border border-[#dce4e9]"
          fieldClass="px-2"
          value={first_name}
          inputHandler={inputHandler}
@@ -279,8 +279,8 @@ const FamilyForm = ({
          name="last_name"
          type="text"
          parentClass="flex items-center gap-1 w-full"
-          labelClass="flex-[0.2] mb-0"
-          inputClass="flex-[0.8] input-curve lg border border-[#dce4e9]"
+          labelClass="flex-[0.4] mb-0"
+          inputClass="flex-[0.6] input-curve lg border border-[#dce4e9]"
          fieldClass="px-2"
          value={last_name}
          inputHandler={inputHandler}
@@ -289,7 +289,7 @@ const FamilyForm = ({
          {/* Age dropdown */}
          <div className="">
            <label
-              className="input-label text-[#181c32] dark:text-white text-[15px] font-semibold"
+              className="job-label"
              htmlFor="age-selection"
            >
              Birthday: (Year/Month)
@@ -7,7 +7,7 @@ function DataIteration(props) {
      {datas &&
        datas?.length >= endLength &&
        datas?.slice(startLength, endLength)
-          .map((value) => children({ datas: value }))}
+          .map((value, index) => children({ datas: value, index }))}
    </>
  );
 }
@@ -89,13 +89,13 @@ export default function AddGroup({ action, situation, setUpdateList }) {
  return (
    <ModalCom action={action} situation={situation}>
      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
            Add Group
          </h1>
          <button
            type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
            onClick={action}
          >
            <svg
@@ -139,9 +139,9 @@ export default function AddGroup({ action, situation, setUpdateList }) {
            <button
              onClick={action}
              type="button"
-              className="text-base text-light-red tracking-wide "
+              className="w-[152px] h-[46px] flex justify-center items-center rounded-full text-base text-light-red tracking-wide border border-light-red"
            >
-              <span className="border-b dark:border-[#5356fb29]  border-light-red">
+              <span className="">
                Cancel
              </span>
            </button>
@@ -21,13 +21,13 @@ export default function DeleteMember({action, situation, details}) {
        situation={situation}
    >
      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
            Remove Member
          </h1>
          <button
            type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
            onClick={action}
          >
            <svg
@@ -24,12 +24,6 @@ export default function MemberList({

  const handleFieldsChange = ({ target: { name, value } }) => {
    setFields((prev) => ({ ...prev, [name]: value }));
-    // let error = requestState?.errors?.indexOf(name) //// checks if the input field was in error array and removes it when the input changes
-    // if(error >= 0){
-    //   let oldErrorArr = requestState.errors
-    //   let newErrorArr = oldErrorArr.splice(error, 1)
-    //   setRequestState(prev => ({...prev, errors:oldErrorArr}))
-    // }

    if (value == "") {
      setRequestState({
@@ -89,6 +83,63 @@ export default function MemberList({
    // return
    // }

+    if(fields.firstname.length > 25){ // checks if firstname length is more than 25
+      setRequestState({
+        loading: false,
+        status: false,
+        message: "Firstname must not be more than 25 characters",
+        data: [],
+        errors: [],
+      });
+      return setTimeout(() => {
+        setRequestState({
+          loading: false,
+          status: false,
+          message: "",
+          data: [],
+          errors: [],
+        });
+      }, 3000);
+    }
+
+    if(fields.lastname.length > 25){ // checks if lastname length is more than 25
+      setRequestState({
+        loading: false,
+        status: false,
+        message: "Lastname must not be more than 25 characters",
+        data: [],
+        errors: [],
+      });
+      return setTimeout(() => {
+        setRequestState({
+          loading: false,
+          status: false,
+          message: "",
+          data: [],
+          errors: [],
+        });
+      }, 3000);
+    }
+
+    if(fields.email.length > 45){ // checks if email length is more than 45
+      setRequestState({
+        loading: false,
+        status: false,
+        message: "Email must not be more than 45 characters",
+        data: [],
+        errors: [],
+      });
+      return setTimeout(() => {
+        setRequestState({
+          loading: false,
+          status: false,
+          message: "",
+          data: [],
+          errors: [],
+        });
+      }, 3000);
+    }
+
    //checks if email is a valid email address
    let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
    if (!EmailValidator(fields.email)) {
@@ -201,7 +252,7 @@ export default function MemberList({
              {selectedGroup?.name}
            </h1>
            <div className="w-full flex flex-col-reverse lg:flex-col">
-              <div className="py-3 w-full">
+              <div className="relative py-3 w-full">
                <div className="relative grid grid-cols-1 sm:grid-cols-2 gap-2 place-content-center">
                  <div className="input-item">
                    <InputCom
@@ -229,13 +280,15 @@ export default function MemberList({
                      // iconName="message"
                    />
                  </div>
-                  <div className="input-item w-full">
+                </div>
+                <div className="sm:flex gap-2 items-center">
+                  <div className="input-item my-2 w-full sm:w-9/12">
                    <InputCom
                      labelClass="tracking-wider"
                      fieldClass="sm:px-6 px-2"
                      value={fields.email}
                      inputHandler={handleFieldsChange}
-                      inputClass="xl:w-[16rem] 2xl:w-full"
+                      inputClass=""
                      placeholder="Email"
                      // label="Email"
                      name="email"
@@ -243,7 +296,7 @@ export default function MemberList({
                      // iconName="message"
                    />
                  </div>
-                  <div className="flex justify-end items-end">
+                  <div className="flex justify-end items-end w-full sm:w-3/12">
                    {requestState.loading ? (
                      <LoadingSpinner size="8" color="sky-blue" />
                    ) : (
@@ -266,10 +319,11 @@ export default function MemberList({
                      </button>
                    )}
                  </div>
-
+                </div>
+                <div className="absolute top-full w-full my-1 text-center">
                  {!requestState.loading && requestState.message && (
                    <p
-                      className={`text-lg absolute -bottom-7 left-0 ${
+                      className={`text-base ${
                        requestState.status ? "text-green-500" : "text-red-500"
                      }`}
                    >
@@ -4,6 +4,8 @@ import ListView from "../../assets/images/list-view.png";
 import AvailableJobsCard from "../Cards/AvailableJobsCard";
 import DataIteration from "../Helpers/DataIteration";
 import SelectBox from "../Helpers/SelectBox";
+import NewPaginatedList from "../Pagination/NewPaginatedList";
+import InfiniteScroll from "../infiniteScroll/InfiniteScroll";

 export default function MainSection({
  className,
@@ -95,7 +97,9 @@ export default function MainSection({
          </div>
          {/* end of contentDisplay toggler */}
        </div>
-        <div className="filter-navigate-content w-full min-h-screen">
+
+        {/* OLD MARKET JOB LISTING */}
+        {/* <div className="filter-navigate-content w-full min-h-screen">
          <div
            className={
              contentDisplay == "grid"
@@ -108,8 +112,8 @@ export default function MainSection({
              startLength={process.env.REACT_APP_ZERO_STATE}
              endLength={products?.length}
            >
-              {({ datas }) => (
-                <div key={datas.job_uid}>
+              {({ datas, index }) => (
+                <div key={datas.job_uid+index}>
                  <AvailableJobsCard
                    contentDisplay={contentDisplay}
                    image_server={image_server}
@@ -119,7 +123,78 @@ export default function MainSection({
              )}
            </DataIteration>
          </div>
+        </div> */}
+        {/* END OF OLD MARKET JOB LISTING */}
+
+        {products?.length ?
+        <NewPaginatedList
+            data={products}
+            itemsPerPage={9}
+            filterItem=''
+            tableTitle='' 
+        >
+          {
+            ({data})=>(
+              <div className="filter-navigate-content w-full min-h-[600px]">
+                <div
+                  className={
+                    contentDisplay == "grid"
+                      ? "grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"
+                      : "w-full"
+                  }
+                >
+                {
+                  data.map((datum, index) => (
+                    <div key={datum.job_uid+index}>
+                      <AvailableJobsCard
+                        contentDisplay={contentDisplay}
+                        image_server={image_server}
+                        datas={datum}
+                      />
+                    </div>
+                  ))
+                }
+                </div>
+              </div>
+            )
+          }
+        </NewPaginatedList>
+        // <InfiniteScroll
+        // allData={products}
+        // addItemBy={3}
+        // intialItemsToShow={9}
+        // >
+        //   {
+        //     ({dataToShow})=>(
+        //       <div className="filter-navigate-content w-full min-h-[600px]">
+        //         <div
+        //           className={
+        //             contentDisplay == "grid"
+        //               ? "grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"
+        //               : "w-full"
+        //           }
+        //         >
+        //         {
+        //           dataToShow.map((datum, index) => (
+        //             <div key={datum.job_uid+index}>
+        //               <AvailableJobsCard
+        //                 contentDisplay={contentDisplay}
+        //                 image_server={image_server}
+        //                 datas={datum}
+        //               />
+        //             </div>
+        //           ))
+        //         }
+        //         </div>
+        //       </div>
+        //     )
+        //   }
+        // </InfiniteScroll>
+        :
+        <div className="w-full h-[40rem] bg-white dark:bg-dark-white flex justify-center items-center">
+          No Jobs Found!
        </div>
+        }
      </div>
    </div>
  );
@@ -1,11 +1,27 @@
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
 import ModalCom from "../../Helpers/ModalCom";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { SocketValues } from "../../Contexts/SocketIOContext";

 const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
+
+  let {sendJobInterestToOwner} = SocketValues() // function to emit job interest request
+  const emitOfferInterest = () => {
+    let message = {
+      "audience": "MERCHANT", 
+      "action": "REFRESH_OFFERS",
+      "offer_code": details?.offer_code,
+      "offer_uid": details?.offer_uid,
+      "job_uid": details?.job_uid,
+      "market_uid": details?.market_uid
+    }
+    let room = `INTEREST-${details?.market_uid}`
+    sendJobInterestToOwner(message, room)
+  }
+
  const [textValue, setTextValue] = useState("");
  const [errMsg, setErrMsg] = useState({
    market: false,
@@ -88,7 +104,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
            state: true,
          });
        }
-
+        emitOfferInterest() // FUNCTIONS TO EMIT EVENT INDICATING SOMEONE SENDS AN INTEREST IN YOUR JOB
        setTimeout(() => setManageInt({ msg: "" }), 3000);
      } catch (error) {
        throw new Error(error);
@@ -118,9 +134,9 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {

  return (
    <ModalCom action={onClose} situation={situation}>
-      <div className="logout-modal-wrapper w-11/12 md:w-[650px] md:h-[580px] h-full bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px]">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+      <div className="w-11/12 md:w-[650px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
            {details.offer_code}
          </h1>
          <CloseIcon onClose={onClose} />
@@ -128,7 +144,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {

        <div className="md:flex bg-white dark:bg-dark-white text-slate-900 dark:text-white rounded-lg">
          <div className="p-4 w-full md:w-[75%] md:border-r-1">
-            <div className="max-h-[240px] h-full">
+            <div className="min-h-[240px]">
              <h2 className="font-semibold text-slate-900 dark:text-white tracking-wide">
                {details?.title}
              </h2>
@@ -153,7 +169,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                },
              ].map(({ name, content, danger }, idx) => (
                <div className={`my-3 md:flex items-center`} key={idx}>
-                  <label className="w-full md:w-[19%] tracking-wide font-semibold whitespace-pre-wrap">
+                  <label className="job-label w-full md:w-[19%]">
                    {name}
                  </label>
                  <div
@@ -198,7 +214,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
            <hr />
            <div className="w-full flex flex-col gap-3">
              <div className="w-full">
-                <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+                <label className="job-label w-full">
                  If you have any questions about this task:
                </label>
                <textarea
@@ -218,7 +234,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                  {errMsg.market && "Something went wrong"}
                </span>
                <button
-                  className="self-end w-[150px] h-[48px] rounded-full text-base bg-yellow-500 text-white"
+                  className="custom-btn self-end bg-yellow-500 text-white"
                  name="market-message"
                  onClick={MarketDetail}
                >
@@ -235,7 +251,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
          <div className="w-full md:w-[23%] h-full flex flex-col">
            <div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] px-4 rounded-md md:min-h-[420px] flex flex-col justify-between">
              <div className="w-full flex flex-col justify-center pb-4 gap-2">
-                <p className="w-full text-slate-900 tracking-wide my-1 font-semibold">
+                <p className="job-label w-full">
                  Interested in the task?
                </p>
                <hr />
@@ -270,33 +286,39 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {

              <div className="text-slate-900">
                <p className="flex items-center tracking-wide">
-                  Interest: <b className="ml-1">{details.interest_count}</b>
+                  <span className="job-label">Interest: </span> <b className="ml-1">{details.interest_count}</b>
                </p>
                <hr />
-                <p className="my-1">Expire: {details.expire}</p>
+                <p className="my-1 flex flex-col">
+                  <span className="job-label">Expire: </span> 
+                  <span> {new Date(details.expire).toLocaleString()} </span>
+                </p>
              </div>
            </div>
-            <button
-              className="self-center w-[150px] mt-2 h-[48px] rounded-full text-base bg-transparent border border-red-500 text-red-500 mx-auto"
-              name="cancel"
-              onClick={onClose}
-            >
-              Cancel
-            </button>
          </div>
          {/* END OF ACTION SECTION */}
        </div>
+        <div className="modal-footer-wrapper">
+          <button
+            className="custom-btn bg-transparent border border-red-500 text-red-500 ml-auto"
+            name="cancel"
+            onClick={onClose}
+          >
+            Cancel
+          </button>
+        </div>
      </div>
    </ModalCom>
  );
 };

+
 export default MarketPopUp;

 const CloseIcon = ({ onClose }) => (
  <button
    type="button"
-    className="text-[#374557] dark:text-red-500"
+    className="modal-close-btn"
    onClick={onClose}
  >
    <svg
@@ -3,6 +3,7 @@ import Layout from "../Partials/Layout";
 import CommonHead from "../UserHeader/CommonHead";
 import MainSection from "./MainSection";
 import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
+import LoadingSpinner from "../Spinners/LoadingSpinner";

 export default function MarketPlace({ commonHeadData }) {
  let { jobLists } = useSelector((state) => state.jobLists);
@@ -25,12 +26,18 @@ export default function MarketPlace({ commonHeadData }) {
            }
            />
        </div>
+        {jobLists.loading ?
+        <div className="w-full flex justify-center items-center bg-white dark:bg-dark-white">
+          <LoadingSpinner size='20' height='h-[40rem]' />
+        </div>
+        :
        <MainSection
          marketPlaceProduct={marketData}
          categories={categories}
          image_server={image_server}
          className="mb-10"
        />
+        }
      </Layout>
    </>
  );
@@ -546,13 +546,13 @@ function ActiveJobs(props) {

        {/* MESSAGE SECTION */}
        <div className="w-full lg:w-1/2">
-          <div className="flex justify-between items-center gap-5">
-            <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2">
+          <div className="flex justify-between items-center gap-5 justify-between">
+            <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
              <span>Message</span>
              <button
              type="button"
              onClick={popUpHandler}
-              className="text-[12px] tracking-wider text-emerald-600 dark:text-emerald-300"
+              className="text-[12px] tracking-wider text-gray-400 dark:text-slate-400"
            >
              View all
            </button>
@@ -4,6 +4,7 @@ import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
 import AddJobPage from "../../views/AddJobPage";
+import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";

 export default function MyJobs(props) {
  let { state } = useLocation();
@@ -32,8 +33,8 @@ export default function MyJobs(props) {
      <div className="notification-page w-full mb-10">
        <div className="notification-wrapper w-full">
          {/* heading */}
-          <div className="sm:flex items-center mb-6">
-            <div className="mb-5 sm:mb-0">
+          <div className="sm:flex items-center mb-2">
+            <div className="w-full">
              <h1 className="text-26 font-bold flex items-center space-x-1  text-dark-gray dark:text-white gap-2">
                <span>My Jobs</span>

@@ -46,6 +47,17 @@ export default function MyJobs(props) {
              </h1>
            </div>
          </div>
+          <div className="mb-5">
+              <CustomBreadcrumb 
+              // title = 'My Jobs'
+              breadcrumb={
+                  [
+                  { link: "/", title: "Home" },
+                  { link: "/myjobs", title: "My Jobs", active: true},
+                  ]
+              }
+              />
+          </div>
          <MyJobTable MyJobList={props.MyJobList} />
        </div>
      </div>
@@ -9,6 +9,9 @@ const FamilyWalletBox = lazy(() => import("./FamilyWalletBox"));
 const FamilyWalletCon = () => {
  const apiCall = new usersService();
  // const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE
+
+  const {userDetails} = useSelector((state) => state?.userDetails); // GETS USER INFO
+
  const { walletTable } = useSelector((state) => state.tableReload);

  const [paymentHistory, setPaymentHistory] = useState({
@@ -23,7 +26,7 @@ const FamilyWalletCon = () => {

  const getFamilyWalletBal = () => {
    setFamilyWalletBal({loading:true, data: []})
-    apiCall.getFamilyWallet({family_uid: localStorage.getItem("uid")}).then(res => {
+    apiCall.getFamilyWallet({family_uid: userDetails.uid}).then(res => {
      setFamilyWalletBal({loading:false, data: res?.data?.result_list})
    }).catch(error => {
      setFamilyWalletBal({loading:false, data: []})
@@ -28,6 +28,7 @@ export default function OffersInterestTable({offerInterestList, className}) {
        handlePagingFunc(e, setCurrentPage);
    };

+    let imgServer = offerInterestList?.imgServer // FOR RENDERING IMAGE FROM SERVER
    return (
        <div
            className={`update-table w-full my-8 p-8 bg-white dark:bg-dark-white rounded-2xl section-shadow min-h-[520px] ${
@@ -54,14 +55,19 @@ export default function OffersInterestTable({offerInterestList, className}) {
                            </thead>
                            <tbody className="h-full">
                            {currentOfferInterestList?.map((item, index) => {
-                                let image = item.banner ? item.banner : 'default.jpg'
+                                // let image = item.banner ? item.banner : 'default.jpg'
+                                const image = localStorage.getItem("session_token")
+                                ? `${imgServer}${localStorage.getItem("session_token")}/job/${
+                                    item.job_uid
+                                  }`
+                                : "";
                                return (
                                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
                                    <td className=" py-4">
                                        <div className="flex space-x-2 items-center">
-                                            <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                                            <div className="min-w-[60px] max-w-[60px] min-h-[60px] max-h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                                <img
-                                                    src={localImgLoad(`images/taskbanners/${image}`)}
+                                                    src={`${image}`}
                                                    alt="data"
                                                    className="w-full h-full rounded-full"
                                                />
@@ -90,7 +96,7 @@ export default function OffersInterestTable({offerInterestList, className}) {
                                        <button
                                            onClick={() => {
                                                navigate("/manage-offer", {
-                                                    state: { ...item, pathname },
+                                                    state: { ...item, pathname, jobImage:image },
                                                });
                                            }}
                                            type="button"
@@ -56,13 +56,18 @@ export default function OthersInterestTable({othersInterestedList, className}) {
                            </thead>
                            <tbody className="h-full">
                            {currentOthersInterestedList?.map((item, index) => {
+                                const image = localStorage.getItem("session_token")
+                                ? `${othersInterestedList.imageServer}${localStorage.getItem("session_token")}/job/${
+                                    item.job_uid
+                                  }`
+                                : "";
                                return (
                                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
                                    <td className=" py-4">
                                        <div className="flex space-x-2 items-center">
                                            <div className="min-w-[60px] min-h-[60px] rounded-full overflow-hidden flex justify-center items-center">
                                                <img
-                                                    src={dataImage1}
+                                                    src={image}
                                                    alt="data"
                                                    className="w-full h-full"
                                                />
@@ -9,6 +9,7 @@ export default function OffersInterest(props) {
    const filterHandler = (value) => {
        setValue(value);
    };
+    
    return (
        <Layout>
            <CommonHead
@@ -0,0 +1,124 @@
+import { useEffect, useState } from "react";
+
+const data1 = [];
+
+export default function NewPaginatedList({
+  data = data1,
+  itemsPerPage = 5,
+  filterItem,
+  tableTitle,
+  children,
+}) {
+  const [searchTerm, setSearchTerm] = useState("");
+  const [filteredData, setFilteredData] = useState(data);
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const [newData, setNewData] = useState([]);
+
+  const numberOfSelection = itemsPerPage;
+
+  const handlePrev = () => {
+    if (currentPage != 0) {
+      setCurrentPage((prev) => prev - numberOfSelection);
+    }
+  };
+  const handleNext = () => {
+    if (currentPage < data.length) {
+      setCurrentPage((prev) => prev + numberOfSelection);
+    }
+  };
+
+  const handleSearch = ({ target: { value } }, name) => {
+    setSearchTerm(value);
+    let newFilteredData = data.filter((item) =>
+      item[name].toLowerCase().startsWith(value.toLowerCase())
+    );
+    setFilteredData(newFilteredData);
+    setCurrentPage(0);
+  };
+
+  useEffect(() => {
+    setNewData(
+      filteredData?.slice(currentPage, numberOfSelection + currentPage)
+    );
+  }, [currentPage, filteredData]);
+
+  useEffect(()=>{
+    setCurrentPage(0)
+  },[itemsPerPage])
+
+  return (
+    <div className="w-full">
+      <h1 className="text-2xl mb-5 font-semibold">{tableTitle}</h1>
+
+      {data.length > 0 && filterItem && (
+        <div className="mb-10 flex justify-end items-center gap-2">
+          {filterItem.map((item, index) => (
+            <label
+              key={index}
+              className="flex flex-col sm:flex-row items-center gap-2 text-slate-600 dark:text-slate-100 transition-all duration-500"
+            >
+              Search by {item[0].toUpperCase() + item.slice(1)}
+              <input
+                name={item}
+                type="text"
+                className="py-1 px-2 text-sm min-w-[100px] text-black dark:text-white bg-white dark:bg-slate-800 rounded-full border-0 outline-none ring-1 ring-slate-300 dark:ring-white transition-all duration-500"
+                value={searchTerm}
+                onChange={(e) => {
+                  handleSearch(e, item);
+                }}
+              />
+            </label>
+          ))}
+        </div>
+      )}
+
+      {children({ data: newData })}
+
+      {/* show prev and next button if data exist */}
+      {data.length > 0 && (
+        <div className="mt-10 w-full flex gap-4 justify-center items-center">
+        <button
+          onClick={handlePrev}
+          className={`w-12 h-12 rounded-full flex justify-center items-center transition-all duration-300 ${
+            currentPage == 0
+              ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400 pointer-events-none"
+              : "text-slate-600 border-slate-600 dark:text-white dark:border-white"
+          }`}
+        >
+          &lt;
+        </button>
+
+        {data.length && data.map((item, index)=>{
+          if(index%itemsPerPage == 0 && index >= currentPage && index <= currentPage+itemsPerPage){
+            return (
+              <button
+                key={index}
+                onClick={handleNext}
+                className={`w-12 h-12 rounded-full flex justify-center items-center border transition-all duration-300 ${
+                  currentPage != index
+                    ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400"
+                    : "text-slate-600 border-slate-600 dark:text-white dark:border-white pointer-events-none"
+                }`}
+              >
+                {index/itemsPerPage +1}
+              </button>
+            )
+          }
+        })}
+
+        <button
+          onClick={handleNext}
+          className={`w-12 h-12 rounded-full flex justify-center items-center transition-all duration-300 ${
+            currentPage + numberOfSelection >= data.length
+              ? "text-slate-400 border-slate-400 dark:text-slate-400 dark:border-slate-400 pointer-events-none"
+              : "text-slate-600 border-slate-600 dark:text-white dark:border-white"
+          }`}
+        >
+          &gt;
+        </button>
+      </div>
+      )}
+    </div>
+  );
+}
@@ -238,7 +238,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
            {/* balance */}

            {/* My Page Button */}
-            {userDetails.account_type === "FULL" ? <PageButton /> : null}
+            {/* {userDetails.account_type === "FULL" ? <PageButton /> : null} */}

            {/*<div className="lg:hidden block"></div>*/}
            <WalletHeader
@@ -85,11 +85,11 @@ export default function Layout({ children }) {
      {logoutModal && (
        <ModalCom action={logoutModalHandler} situation={logoutModal}>
          <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl">
-            <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
-              <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            <div className="modal-header-con">
+              <h1 className="modal-title">
                Confirm
              </h1>
-              <button type="button" className="text-[#374557] dark:text-red-500" onClick={logoutModalHandler}>
+              <button type="button" className="modal-close-btn" onClick={logoutModalHandler}>
                <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" />
@@ -109,7 +109,7 @@ export default function Layout({ children }) {
                  Are you sure you want to Logout of your WrenchBoard account?
                </p>
              </div>
-              <div className="flex space-x-2.5">
+              <div className="modal-footer-wrapper flex justify-center items-center gap-5">
                <button onClick={logOut} type="button" className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full">
                  {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
                </button>
@@ -89,7 +89,9 @@ export default function MobileSidebar({
            <ul className="flex flex-col space-y-6">
              {/* Using mini component reduces the bulk amount of html */}
              <ListItem
-                title= {userDetails?.account_type == "FULL" ? "Dashboard" : "Home"}
+                title={
+                  userDetails?.account_type == "FULL" ? "Dashboard" : "Home"
+                }
                route="/"
                sidebar={sidebar}
                iconName="new-dashboard"
@@ -190,17 +192,21 @@ export default function MobileSidebar({
                <div className="items">
                  <ul className="flex flex-col space-y-6">
                    {[
-                      { name: "List", path: "/myjobs", iconName: "job-list" },
+                      {
+                        name: "List",
+                        path: "/myjobs",
+                        iconName: "job-list",
+                      },
+                      // {
+                      //   name: "Waiting",
+                      //   path: "/pend-interest",
+                      //   iconName: "pending-job",
+                      // },
                      {
                        name: "Offers",
                        path: "/my-offers",
                        iconName: "pending-job",
                      },
-                      {
-                        name: "Waiting",
-                        path: "/pend-interest",
-                        iconName: "pending-job",
-                      },
                      {
                        name: "Active",
                        path: "/my-active-jobs",
@@ -4,6 +4,7 @@ import { NavLink } from "react-router-dom";
 //import SideStatistics from "./SideStatistics";
 import { localImgLoad } from "../../lib";
 import DarkModeContext from "../Contexts/DarkModeContext";
+import Icons from "../Helpers/Icons";

 export default function RightSideBar({ myJobList }) {
  const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
@@ -39,7 +40,7 @@ export default function RightSideBar({ myJobList }) {
  return (
    <>
      <div className="right-sidebar-wrapper overflow-y-scroll overflow-style-none 2xl:fixed h-full 2xl:pb-96">
-        <div className="top-platform bg-white dark:bg-dark-white rounded-2xl p-8 2xl:w-[268px] w-full 2xl:mb-10 2xl:border-none border ">
+        <div className="top-platform bg-white dark:bg-dark-white rounded-2xl p-8 2xl:w-[268px] w-full 2xl:mb-6 2xl:border-none border ">
          {/* heading */}
          <div className="heading flex justify-between items-center mb-3.5">
            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
@@ -48,10 +49,10 @@ export default function RightSideBar({ myJobList }) {
            <div></div>
          </div>

-          <div className="platform-list">
+          <div className="platform-list flex flex-col gap-y-2.5">
            {userDetails && userDetails?.account_type !== "FAMILY" && (
              <>
-                <div className="item flex space-x-3 items-center mb-4">
+                <div className="item flex space-x-3 items-center">
                  {/* image */}
                  <div className="w-8 h-8 rounded-full">
                    <svg
@@ -81,7 +82,20 @@ export default function RightSideBar({ myJobList }) {
                  {/* action */}
                </div>

-                <div className="item flex space-x-3 items-center mb-4">
+                <div className="item flex space-x-3 items-center">
+                  {/* image */}
+                  <div className="w-8 h-8 rounded-full flex items-center justify-center">
+                    <Icons name="pending-job" />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/pend-interest">Waiting</NavLink>
+                    </p>
+                  </div>
+                  {/* action */}
+                </div>
+                <div className="item flex space-x-3 items-center">
                  {/* image */}
                  <div className="w-8 h-8 rounded-full">
                    <svg
@@ -115,10 +129,29 @@ export default function RightSideBar({ myJobList }) {
                    </p>
                  </div>
                </div>
+                <div className="item flex space-x-3 items-center">
+                  {/* image */}
+                  <div className="w-8 h-8 rounded-full bg-sky-500/50 p-1 flex justify-center items-center">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
+                      <path
+                        fillRule="evenodd"
+                        d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
+                        fill="#ffffff"
+                        className="color000000 svgShape"
+                      ></path>
+                    </svg>
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/yourpage">My Page</NavLink>
+                    </p>
+                  </div>
+                </div>
              </>
            )}

-            <div className="item flex space-x-3 items-center mb-4">
+            <div className="item flex space-x-3 items-center">
              {/* image */}
              <div className="w-8 h-8 rounded-full">
                <svg
@@ -158,7 +191,7 @@ export default function RightSideBar({ myJobList }) {
            {/* dark mode */}
            <div
              onClick={darkMode.handleThemeSwitch}
-              className="item flex space-x-5 items-center mb-4 cursor-pointer"
+              className="item flex space-x-5 items-center cursor-pointer"
            >
              <span className="dark:text-dark-gray text-white">
                {darkMode.theme === "light" ? (
@@ -235,6 +268,7 @@ export default function RightSideBar({ myJobList }) {
                    />
                  </svg>
                )}
+
              </span>
              <p className="text-thin-light-gray text-base font-medium">
                {darkMode.theme === "light" ? "Dark" : "Light"} Mode
@@ -255,8 +289,8 @@ export default function RightSideBar({ myJobList }) {
                <div></div>
              </div>

-              <div className="platform-list">
-                <div className="px-8 item flex space-x-3 items-center mb-4">
+              <div className="platform-list flex flex-col gap-y-2.5">
+                <div className="px-8 item flex space-x-3 items-center">
                  {/* image */}
                  <div className="w-8 h-8 p-[4px] rounded-full">
                    <img
@@ -274,7 +308,25 @@ export default function RightSideBar({ myJobList }) {
                  {/* action */}
                </div>

-                <div className="px-8 item flex space-x-3 items-center mb-4">
+                <div className="px-8 item flex space-x-3 items-center">
+                  {/* image */}
+                  <div className="w-8 h-8 p-[4px] rounded-full">
+                    <img
+                      src={localImgLoad("images/icons/job_active.svg")}
+                      className="w-full h-full"
+                      alt="Active Task"
+                    />
+                  </div>
+                  {/* name */}
+                  <div>
+                    <p className="text-thin-light-gray text-base font-medium">
+                      <NavLink to="/offer-interest">Offers Interest</NavLink>
+                    </p>
+                  </div>
+                  {/* action */}
+                </div>
+
+                <div className="px-8 item flex space-x-3 items-center">
                  {/* image */}
                  <div className="w-8 h-8 p-[4px] rounded-full">
                    <img
@@ -291,7 +343,7 @@ export default function RightSideBar({ myJobList }) {
                  </div>
                </div>

-                <div className="px-8 item flex space-x-3 items-center mb-4">
+                <div className="px-8 item flex space-x-3 items-center">
                  {/* image */}
                  <div className="w-8 h-8 p-[4px] rounded-full">
                    <img
@@ -311,7 +363,7 @@ export default function RightSideBar({ myJobList }) {
                {/* Line */}
                <div className="my-4 mx-auto w-10/12 h-[2px] bg-slate-500 dark:bg-white rounded-full"></div>

-                <div className="px-8 item flex space-x-3 items-center mb-4">
+                <div className="px-8 item flex space-x-3 items-center">
                  {/* image */}
                  <div className="w-8 h-8 p-[4px] rounded-full">
                    <img
@@ -216,11 +216,11 @@ export default function Sidebar({
                        path: "/myjobs",
                        iconName: "job-list",
                      },
-                      {
-                        name: "Waiting",
-                        path: "/pend-interest",
-                        iconName: "pending-job",
-                      },
+                      // {
+                      //   name: "Waiting",
+                      //   path: "/pend-interest",
+                      //   iconName: "pending-job",
+                      // },
                      {
                        name: "Offers",
                        path: "/my-offers",
@@ -0,0 +1,62 @@
+import React, { useEffect, useState } from 'react'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+
+export default function InfiniteScroll({
+    allData=data,
+    addItemBy=12,
+    intialItemsToShow=39,
+    children
+}) {
+
+    let [currentPage, setCurrentPage] = useState(intialItemsToShow)
+
+    let [loading, setLoading] = useState(false)
+
+    let dataToShow = allData.slice(0, currentPage)
+
+    // let [winScr, setWinScr] = useState(0)
+
+    const customScroll = ()=>{
+        let wi = window.innerHeight + window.scrollY
+        // let scrollContainer = document.querySelector('.scroll-container').scrollHeight
+        let scrollBody = document.body.offsetHeight
+        if(wi >= scrollBody && allData.length > currentPage){
+            setLoading(true)
+            setTimeout(()=>{
+                setCurrentPage(prev => prev+addItemBy)
+                setLoading(false)
+            },2000)
+        }
+        // else if(window.scrollY < winScr && currentPage > intialItemsToShow){
+        //         setCurrentPage(prev => prev-addItemBy)
+        //         window.scrollTo(0,wi)
+        //         setWinScr(window.scrollY)
+        // }
+        // else if(winScr == 0 && currentPage > intialItemsToShow){
+        //         setCurrentPage(prev => intialItemsToShow)
+        //         window.scrollTo(0,0)
+        //         setWinScr(window.scrollY)
+        // }
+    }
+    useEffect(()=>{
+        window.addEventListener('scroll', customScroll)
+        return () => {
+            window.removeEventListener('scroll', customScroll)
+        }
+    },[currentPage])
+
+  return (
+    <div className='w-full'>
+
+        {children({ dataToShow })}
+        
+        {loading && 
+        <div className='w-full my-2 p-2 flex justify-center items-center'>
+            <LoadingSpinner size='8' />
+        </div>
+        }
+    </div>
+  )
+}
+
+// let data = new Array(100).fill(0).map((_,i) => i )
@@ -123,13 +123,13 @@ function FamilyOfferJobPopout({ details, onClose, situation }) {
  return (
    <ModalCom action={onClose} situation={situation}>
      <div className="logout-modal-wrapper w-[90%] md:w-[768px] 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">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
            Start Task
          </h1>
          <button
            type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
            onClick={onClose}
          >
            <svg
@@ -153,7 +153,7 @@ function FamilyOfferJobPopout({ details, onClose, situation }) {
            </svg>
          </button>
        </div>
-        <div className="md:flex bg-white rounded-lg shadow-lg">
+        <div className="md:flex bg-white rounded-lg">
          <div className="p-4 w-full md:w-3/4 md:border-r-2">
            <div className="flex gap-2">
                <div className="image-wrapper w-32">
@@ -261,12 +261,12 @@ function FamilyOfferJobPopout({ details, onClose, situation }) {
        </div>

        {/* close button */}
-        <div className="p-6 flex justify-end">
+        <div className="modal-footer-wrapper flex justify-end">
          <button
            onClick={onClose}
            disabled={requestStatus.loading}
            type="button"
-            className="border-gradient text-18 tracking-wide px-2 py-2 rounded-full"
+            className="custom-btn border-gradient"
          >
            <span className="text-gradient">Cancel</span>
          </button>
@@ -103,13 +103,13 @@ function OfferJobPopout({ details, onClose, situation }) {
  return (
    <ModalCom action={onClose} situation={situation}>
      <div className="logout-modal-wrapper w-[90%] md:w-[768px] 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">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
            Start Task
          </h1>
          <button
            type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
            onClick={onClose}
          >
            <svg
@@ -133,7 +133,7 @@ function OfferJobPopout({ details, onClose, situation }) {
            </svg>
          </button>
        </div>
-        <div className="md:flex bg-white dark:bg-dark-white rounded-lg shadow-lg">
+        <div className="md:flex bg-white dark:bg-dark-white rounded-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 dark:text-white tracking-wide">
              {details.title}
@@ -234,12 +234,12 @@ function OfferJobPopout({ details, onClose, situation }) {
        </div>

        {/* close button */}
-        <div className="p-6 flex justify-end">
+        <div className="modal-footer-wrapper flex justify-end">
          <button
            onClick={onClose}
            disabled={requestStatus.loading}
            type="button"
-            className="border-gradient text-18 tracking-wide px-2 py-2 rounded-full"
+            className="custom-btn border-gradient"
          >
            <span className="text-gradient">Cancel</span>
          </button>
@@ -9,6 +9,7 @@ import Detail from "./popoutcomponent/Detail";

 import { useDispatch } from "react-redux";
 import { tableReload } from "../../store/TableReloads";
+import { NewDateTimeFormatter } from "../../lib/NewDateTimeFormatter";

 const showSuccessToast = (message) => {
  toast.success(message, {
@@ -184,12 +185,12 @@ function PendingJobsPopout({ details, onClose, situation }) {
            </div>

            {/* INPUT SECTION */}
-            <div className="my-2 md:flex">
+            {/* <div className="my-2 md:flex">
              <Detail
                label="Date Added"
                value={details.offer_added || "default"}
              />
-            </div>
+            </div> */}

            <div className="my-2 md:flex">
              <Detail label="Description" value={details.description} />
@@ -198,12 +199,13 @@ function PendingJobsPopout({ details, onClose, situation }) {
            <div className="my-2 md:flex">
              <Detail
                label="Offer Expire"
-                value={
-                  details.expire &&
-                  `${details.expire.split(" ")[0]} ${
-                    details.expire.split(" ")[1].split(".")[0]
-                  }`
-                }
+                // value={
+                //   details.expire &&
+                //   `${details.expire.split(" ")[0]} ${
+                //     details.expire.split(" ")[1].split(".")[0]
+                //   }`
+                // }
+                value={NewDateTimeFormatter(new Date(details.expire))}
              />
            </div>

@@ -160,7 +160,8 @@
    @apply flex items-center gap-2
  }

-  /* style for all modal header */
+  /* STYLES FOR MODAL */
+  /* Modal Header */
  .modal-header-con{
    @apply w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] bg-sky-blue/50 border-b dark:border-[#5356fb29]  border-light-purple
  }
@@ -170,7 +171,17 @@
  .modal-close-btn{
    @apply text-[#000] dark:text-red-500
  }
-  /* end of style for all modal header */
+
+  /* modal footer */
+  .modal-footer-wrapper{
+    @apply py-2 px-4 border-t-2 flex justify-between items-center
+  }
+  /* END OF STYLES FOR MODAL BOX */
+
+  /* STYLES FOR BUTTON */
+  .custom-btn {
+    @apply px-2 min-w-[80px] h-11 flex justify-center items-center text-base rounded-full cursor-pointer
+  }
 }

 /* =====================  EXTRA ===================== */
@@ -0,0 +1,17 @@
+export function NewDateTimeFormatter(isoDateString, addHour = true) {
+    const date = new Date(isoDateString);
+    if (addHour) {
+      date.setTime(date.getTime() + 1 * 60 * 60 * 1000);
+    }
+    const formattedDate = date.toLocaleDateString("en-US", {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+      hour: "2-digit",
+      minute: "2-digit",
+    //   second: "2-digit",
+      hour12: true,
+      timeZone: "UTC",
+    });
+    return formattedDate;
+  }
@@ -0,0 +1,4 @@
+
+export let errorMsg = {
+    error_unable_to_create_fund_for_task: "Insufficient Wallet Balance to Create Task",
+}
@@ -219,8 +219,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
    const getMarketActiveJobList = async () => {
      try {
        const res = await apiCall.getActiveJobList();
-        dispatch(updateJobs(res.data));
+        dispatch(updateJobs({loading: false, ...res.data}));
      } catch (error) {
+        dispatch(updateJobs({loading: false}));
        console.log("Error getting mode");
      }
    };
@@ -1174,7 +1174,7 @@ class usersService {
    return this.postAuxEnd("/suggeststatus", postData);
  }

-  // FUNCTION TO GET FAMILY WALLET
+  // FUNCTION TO GET FAMILY WALLET AS A KID
  getFamilyWallet(reqData) {
    var postData = {
      uid: localStorage.getItem("uid"),
@@ -1186,6 +1186,18 @@ class usersService {
    return this.postAuxEnd("/familywallet", postData);
  }

+  // FUNCTION TO GET FAMILY WALLET AS A PARENT
+  getKidWallets(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: apiConst.WRENCHBOARD_FAMILY_WALLET,
+      ...reqData,
+    };
+    return this.postAuxEnd("/kidwallets", postData);
+  }
+
  // FUNCTION TO START FAMILY TRANSFER
  familyTransferStart(reqData) {
    var postData = {
@@ -13,6 +13,7 @@ const initialState = {
  marketTableList: false,
  familyOfferList: false,
  parentFamilyTaskList: false,
+  offerInterestListReload: false,
 };

 export const tableReloadSlice = createSlice({
@@ -57,6 +58,9 @@ export const tableReloadSlice = createSlice({
        case "PARENTFAMILYTASKLIST": // reloads list of active family task on parent side
          state.parentFamilyTaskList = !state.parentFamilyTaskList;
          return;
+        case "OFFERINTERESTLISTRELOAD": // to reload offer interest list of owner when a worker sends interest in a job
+          state.offerInterestListReload = !state.offerInterestListReload;
+          return;
        default:
          return state;
      }
@@ -1,7 +1,7 @@
 import { createSlice } from "@reduxjs/toolkit";

 const initialState = {
-  jobLists: {}
+  jobLists: {loading: true}
 };

 export const jobSlice = createSlice({
@@ -12,7 +12,7 @@ export default function MyReviewDueJobsPage() {
    let { othersInterestedTable } = useSelector((state) => state.tableReload); // FOR OTHERS INTERESTED TABLE RELOAD

    const apiCall = new usersService();
-    const [othersInterestedList, setOthersInterestedList] = useState({loading: true, data: []})
+    const [othersInterestedList, setOthersInterestedList] = useState({loading: true, data: [], imageServer:''})
   
    useEffect(() => {
        if(!state){
@@ -26,9 +26,9 @@ export default function MyReviewDueJobsPage() {
            }else{
                newData = []
            }
-            setOthersInterestedList({loading: false, data: newData})
+            setOthersInterestedList({loading: false, data: newData, imageServer:res.data.session_image_server})
        }).catch(err => {
-            setOthersInterestedList({loading: false, data: []})
+            setOthersInterestedList({loading: false, data: [], imageServer:''})
            console.log('Error: ', err)
        })
    }, [othersInterestedTable]);
@@ -5,20 +5,33 @@ import OffersInterest from "../components/OffersInterest";

 import usersService from "../services/UsersService";

+import { SocketValues } from "../components/Contexts/SocketIOContext"; // for reading socket context values
+
 export default function OffersInterestPage() {
+
+    const { offerInterestListReload } = useSelector((state) => state.tableReload); // table/list reload variable
+
+    const {userDetails} = useSelector((state) => state?.userDetails); // Gets USER Details
+
+    let {joinRoom} = SocketValues() // function to join room for socket
+
    const apiCall = new usersService()

    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)

-    let [offerInterestList, setOfferInterestList] = useState({loading: true, data: []})
+    let [offerInterestList, setOfferInterestList] = useState({loading: true, data: [], imgServer:''})

    useEffect(()=>{
        apiCall.offersInterestList().then(res => {
-            setOfferInterestList({loading: false, data: res.data.result_list})
+            setOfferInterestList({loading: false, data: res.data.result_list, imgServer:res.data.session_image_server})
        }).catch(err => {
-            setOfferInterestList({loading: false, data: []})
+            setOfferInterestList({loading: false, data: [], imgServer:''})
            console.log('Error: ', err)
        })
+    },[offerInterestListReload])
+
+    useEffect(()=>{
+        joinRoom(`INTEREST-${userDetails?.uid}`)
    },[])

    return (
Author	SHA1	Message	Date
victorAnumudu	002e2fead4	added error message object	2024-03-26 12:51:59 +01:00
ameye	160c302417	Merge branch 'my-page-link' of WrenchBoard/Users-Wrench into master	2024-03-25 16:46:49 +00:00
victorAnumudu	44ae966cc1	removed my page link from header nav	2024-03-25 17:17:08 +01:00
ameye	f3b977c624	Merge branch 'package-lock-revert' of WrenchBoard/Users-Wrench into master	2024-03-25 14:25:14 +00:00
victorAnumudu	0c99e416ea	reverted package-lock.json	2024-03-25 15:23:37 +01:00
tokslaw	fd531d7d10	Merge branch 'assign-job-popout-style' of WrenchBoard/Users-Wrench into master	2024-03-25 11:47:25 +00:00
victorAnumudu	ac027a3228	changed font weight	2024-03-25 12:45:55 +01:00
victorAnumudu	001492eeb5	changed price to reward	2024-03-25 12:40:01 +01:00
victorAnumudu	72fe2cad5f	changed assign new job popout style	2024-03-25 12:36:10 +01:00
ameye	eac693eba6	Merge branch 'pagination-item' of WrenchBoard/Users-Wrench into master	2024-03-24 19:25:43 +00:00
victorAnumudu	d3b1462fe3	increased number of item to show in pagination	2024-03-24 15:57:21 +01:00
ameye	748546641d	Merge branch 'market-pagination' of WrenchBoard/Users-Wrench into master	2024-03-24 12:35:26 +00:00
victorAnumudu	48a50fd47c	added pagination for market list	2024-03-23 20:06:30 +01:00
tokslaw	e87cb95b43	Merge branch 'offer-interest-refresh-fixed' of WrenchBoard/Users-Wrench into master	2024-03-22 17:09:35 +00:00
victorAnumudu	7638d68a7d	merged branch with master, offer interest refresh fixed	2024-03-22 16:20:38 +01:00
victorAnumudu	3541363f9f	added dummy pagination	2024-03-22 16:18:19 +01:00
victorAnumudu	30ce6a7d6e	initial commit	2024-03-22 15:07:13 +01:00
ameye	115366672a	Merge branch 'return-link' of WrenchBoard/Users-Wrench into master	2024-03-22 13:16:19 +00:00
victorAnumudu	3cd8b6e574	added link to family page	2024-03-22 12:45:34 +01:00
ameye	9850cdd392	Merge branch 'offer-interest-refresh' of WrenchBoard/Users-Wrench into master	2024-03-22 10:30:33 +00:00
victorAnumudu	6d98141c39	offer interest refresh started	2024-03-22 10:40:57 +01:00
victorAnumudu	5fe5ccbd4d	merge with master	2024-03-22 07:46:17 +01:00
victorAnumudu	76c0994eb0	initial commit	2024-03-21 22:00:31 +01:00
ameye	a1bc6db381	Merge branch 'others-interested-offer' of WrenchBoard/Users-Wrench into master	2024-03-21 20:03:22 +00:00
victorAnumudu	6f5d72e033	merge master	2024-03-21 20:33:37 +01:00
ameye	762de4c23e	Merge branch 'market-job-event' of WrenchBoard/Users-Wrench into master	2024-03-21 17:13:37 +00:00
victorAnumudu	2a8b7ba6ec	updated marketjob-addded to marketjob-added	2024-03-21 18:05:48 +01:00
victorAnumudu	50e44dab43	initial commit	2024-03-21 17:37:57 +01:00
ameye	7649a90c47	Merge branch 'job-interest-modal' of WrenchBoard/Users-Wrench into master	2024-03-21 15:30:37 +00:00
victorAnumudu	3c2c46e293	added footer style to modal	2024-03-21 16:27:52 +01:00
ameye	8dc634d900	Merge branch 'modal-footer-style-start' of WrenchBoard/Users-Wrench into master	2024-03-21 14:10:51 +00:00
victorAnumudu	3a9cb4667e	added some custom style for modal footer	2024-03-21 15:08:26 +01:00
ameye	5f4b032f68	Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master	2024-03-21 13:17:35 +00:00
Ebube	8ab3e9ae50	Changed the Name of link	2024-03-21 14:15:28 +01:00
ameye	01b5fba75b	Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master	2024-03-21 13:09:19 +00:00
Ebube	66b8c96592	fixed typo on link path	2024-03-21 14:04:34 +01:00
ameye	616352e1ac	Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master	2024-03-21 12:53:43 +00:00
Ebube	acc4417835	commit issue fix	2024-03-21 13:51:49 +01:00
Ebube	7da693f298	fix commit issue	2024-03-21 13:49:22 +01:00
ameye	b0423c665c	Merge branch 'popout-fix' of WrenchBoard/Users-Wrench into master	2024-03-21 12:44:43 +00:00
victorAnumudu	7089b8f14b	fixed popout header style	2024-03-21 13:38:01 +01:00
ameye	2c2e2b0ca5	Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master	2024-03-21 12:33:20 +00:00
Ebube	ba3dd91d81	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into home-banners-dashboard	2024-03-21 13:28:42 +01:00
Ebube	3f04c9f9f8	added items to right sidebar	2024-03-21 13:28:03 +01:00
ameye	781f5cc5a6	Merge branch 'add-group-email' of WrenchBoard/Users-Wrench into master	2024-03-21 11:33:48 +00:00
ameye	58097d8b57	Merge branch 'home-banners-dashboard' of WrenchBoard/Users-Wrench into master	2024-03-21 11:33:41 +00:00
victorAnumudu	630ccefa51	Made the email input longer	2024-03-21 12:20:20 +01:00
Ebube	ed9f2dec0e	fixed link location	2024-03-21 12:01:32 +01:00
Ebube	d2ed29c6a6	fixed link location	2024-03-21 11:53:58 +01:00
ameye	4e81156d72	Merge branch 'parent-kid-wallet' of WrenchBoard/Users-Wrench into master	2024-03-21 09:50:41 +00:00
ameye	e402c02c1f	Merge branch 'assign-task-image' of WrenchBoard/Users-Wrench into master	2024-03-21 09:50:34 +00:00
victorAnumudu	5907b5d872	parent kids wallet bug fixed	2024-03-20 21:04:49 +01:00
victorAnumudu	042cc4110c	initial commit	2024-03-20 19:16:16 +01:00
tokslaw	5e6b208513	Merge branch 'family-wallet-refresh' of WrenchBoard/Users-Wrench into master	2024-03-20 13:32:48 +00:00
victorAnumudu	762601a5c3	made kid wallet refresh when parent transfers cash	2024-03-20 13:44:14 +01:00
victorAnumudu	1e28a0e15b	made kid wallet refresh when parent transfers cash	2024-03-20 13:43:23 +01:00