interest count bug fixed

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
+import { useSelector } from "react-redux";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
 import ModalCom from "../../Helpers/ModalCom";
@@ -9,6 +10,11 @@ import LockJob from "./LockJob";
 
 const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduct }) => {
 
+  let { jobLists } = useSelector((state) => state.jobLists);
+  const interestCount = jobLists?.interest_list?.filter(item => item.job_uid == details.job_uid);
+  // console.log('interestList', interest_count)
+  // console.log('MEMO', jobLists?.interest_list, datas.job_uid)
+
   let {sendJobInterestToOwner} = SocketValues() // function to emit job interest request
   const emitOfferInterest = () => {
     let message = {
@@ -326,7 +332,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt, marketPlaceProduc
 
                 <div className="text-slate-900">
                   <p className="flex items-center tracking-wide">
-                    <span className="job-label">Interest: </span> <b className="ml-1">{details.interest_count}</b>
+                    <span className="job-label">Interest: </span> <b className="ml-1">{interestCount.length > 0 ? interestCount[0].interest_count : '0'}</b>
                   </p>
                   <hr />
                   <p className="my-1 flex flex-col">

src/components/jobPopout/NewJobListPopout.jsx

@@ -252,7 +252,7 @@ function NewJobListPopout({
     ];
 
     return (
-      <div className="px-4 pb-3 w-full md:border-r-2 flex flex-col justify-between">
+      <div className="px-4 pb-3 w-full h-full md:border-r-2 flex flex-col justify-between">
         {/* <p className='text-lg font-semibold text-slate-900 tracking-wide'>{details.title}</p> */}
 
         {/* INPUT SECTION */}
@@ -320,7 +320,7 @@ function NewJobListPopout({
           <>
             {/* ACTION SECTION */}
             {+taskWalletSelector.amount > +details.price ? (
-              <div className="px-4 pb-3 w-full flex flex-col justify-between">
+              <div className="px-4 pb-3 w-full flex flex-col justify-between h-auto md:min-h-[450px]">
                 <h1 className="text-lg mt-3 font-medium tracking-wide text-black dark:text-white">
                   Send this Task to:
                 </h1>

src/components/jobPopout/popoutcomponent/AssignToFamily.jsx

@@ -28,7 +28,7 @@ export default function AssignToFamily({
   >
     {(props) => {
       return (
-        <Form className="w-full">
+        <Form className="w-full h-auto md:h-full flex flex-col justify-between">
           <div className='w-full'>
               <div className='hidden w-full'>
                 <JobFieldInput

src/components/jobPopout/popoutcomponent/AssignToGroup.jsx

@@ -28,7 +28,7 @@ export default function AssignToGroup({
   >
     {(props) => {
       return (
-        <Form className="w-full">
+        <Form className="w-full h-auto md:h-full flex flex-col justify-between">
           <div className='w-full'>
               <div className='w-full'>
                 <JobFieldInput

src/components/jobPopout/popoutcomponent/AssignToIndividual.jsx

@@ -32,7 +32,7 @@ export default function AssignToIndividual({
   >
     {(props) => {
       return (
-        <Form className="w-full">
+        <Form className="w-full h-auto md:h-full flex flex-col justify-between">
           <div className='w-full'>
               <div className='w-full'>
                 <JobFieldInput
@@ -41,7 +41,8 @@ export default function AssignToIndividual({
                     value={props?.values.individual}
                     placeholder="Enter email of individual"
                     inputHandler={props?.handleChange}
-                    parentClass="w-full flex flex-col gap-4"
+                    parentClass="w-full"
+                    labelClass="mb-0"
                 />
                 <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
                   {(props.errors.individual && props.touched.individual) && (

src/components/jobPopout/popoutcomponent/AssignToPublic.jsx

@@ -15,8 +15,8 @@ const validationSchema = Yup.object().shape({
 
 let initialValues = {
     public: "",
-    depend_uid: '',
+    depend_uid: "",
-    timeline: ''
+    timeline: "0"
 };
 
 export default function AssignToPublic({
@@ -36,37 +36,37 @@ export default function AssignToPublic({
   >
     {(props) => {
       return (
-        <Form className="w-full">
+        <Form className="w-full h-auto md:h-full flex flex-col justify-between">
             <div className='w-full'>
                 <div className='mb-3 w-full flex flex-col xxs:flex-row items-center gap-1'>
-                <label className='w-full xxs:max-w-[120px] xxs:text-right'>Depends on:</label>
+                  <label className='w-full xxs:max-w-[120px] xxs:text-right'>Depends on:</label>
-                <div
+                  <div
-                    className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[1rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base`}
+                      className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-[1rem] h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base`}
-                >
+                  >
-                    <select 
+                      <select 
-                    className='px-2 w-full h-full bg-white border-0 outline-0'
+                      className='px-2 w-full h-full bg-white border-0 outline-0'
-                    name="depend_uid"
+                      name="depend_uid"
-                    value={props?.values.depend_uid}
+                      value={props?.values.depend_uid}
-                    onChange={props.handleChange}
+                      onChange={props.handleChange}
-                    >
+                      >
-                    <>
+                      <>
-                        {myJobList.loading ? (
+                          {myJobList.loading ? (
-                        <option value={""}>Loading...</option>
+                          <option value={""}>Loading...</option>
-                        ) : myJobList?.data?.result_list?.length > 0 ? (
+                          ) : myJobList?.data?.result_list?.length > 0 ? (
-                        <>
+                          <>
-                            <option value="">None</option>
+                              <option value="">None</option>
-                            {myJobList?.data?.result_list?.filter(item => item.job_uid != details.job_uid)?.map((item, index) => (
+                              {myJobList?.data?.result_list?.filter(item => item.job_uid != details.job_uid)?.map((item, index) => (
-                            <option value={item?.job_uid} key={item.job_uid}>
+                              <option value={item?.job_uid} key={item.job_uid}>
-                                {item?.title}
+                                  {item?.title}
-                            </option>
+                              </option>
-                            ))}
+                              ))}
-                        </>
+                          </>
-                        ) : (
+                          ) : (
-                        <option value="">No Job Found</option>
+                          <option value="">No Job Found</option>
-                        )}
+                          )}
-                    </>
+                      </>
-                    </select>
+                      </select>
-                </div>
+                  </div>
                 </div>
                 
                 <div className='mb-3 w-full flex flex-col xxs:flex-row items-center gap-1'>

src/components/jobPopout/popoutcomponent/JobFieldInput.jsx

@@ -36,7 +36,9 @@ export default function JobFieldInput({
                 {(inputName == "family" || inputName == "public" || inputName == "timeline") &&
                   Array.isArray(data) && (
                     <>
+                    {inputName != "timeline" &&
                       <option value="">{optionText}</option>
+                    }
                       {data?.map((item, idx) => (
                         <React.Fragment key={idx}>
                           {inputName === "family" &&
@@ -98,6 +100,7 @@ export default function JobFieldInput({
           inputBg="bg-white"
           parentClass={`${parentClass}`}
           disable={disabled}
+          labelClass={labelClass}
         />
       )}
     </div>