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

.env

@@ -84,4 +84,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
 #Family
 REACT_APP_MAX_FAMILY_MEMBERS=8
 
-REACT_SHOW_OFFER_GROUP_JOB=0
+REACT_APP_SHOW_OFFER_GROUP_JOB=0

.env.development

@@ -52,4 +52,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
 
 REACT_APP_MAX_FAMILY_MEMBERS=8
 
-REACT_SHOW_OFFER_GROUP_JOB=0
+REACT_APP_SHOW_OFFER_GROUP_JOB=0

.env.production

@@ -58,4 +58,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
 
 REACT_APP_MAX_FAMILY_MEMBERS=8
 
-REACT_SHOW_OFFER_GROUP_JOB=0
+REACT_APP_SHOW_OFFER_GROUP_JOB=0

src/components/Home/index.jsx

@@ -67,7 +67,7 @@ export default function Home(props) {
   useEffect(() => {
     getMyActiveJobList();
   }, []);
-console.log('MyActiveJobList',MyActiveJobList)
+
   return (
     <Layout>
       <div className="home-page-wrapper">

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -405,6 +405,7 @@ function ActiveJobs(props) {
                   name="message"
                   onChange={handleMessageChange}
                   value={messageToSend}
+                  autoFocus
                 />
               ) : (
                 <div className="p-4 w-full h-[300px] text-base text-slate-600 border border-slate-300">

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -113,9 +113,9 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                                     state: { ...value, pathname },
                                   });
                                 }}
-                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                               >
-                                View
+                                {value.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
                               </button>
                             </div>
                           </td>

src/components/MyPendingJobs/MyPendingJobTable.jsx

@@ -18,7 +18,7 @@ export default function MyPendingJobTable({ MyJobList, className }) {
     indexOfFirstItem,
     indexOfLastItem
   );
-
+  
   const handlePagination = (e) => {
     handlePagingFunc(e, setCurrentPage);
   };
@@ -103,9 +103,9 @@ export default function MyPendingJobTable({ MyJobList, className }) {
                               onClick={() => {
                                 setJobPopout({ show: true, data: value });
                               }}
-                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                              className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                             >
-                              View
+                              {value.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
                             </button>
                           </td>
                         </tr>

src/components/MyTasks/MyJobTable.jsx

@@ -128,9 +128,9 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
                           state: { ...task, pathname },
                         });
                       }}
-                      className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                      className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                     >
-                      Manage
+                      {task.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
                     </button>
                   </div>
                 </div>

src/components/jobPopout/JobListPopout.jsx

@@ -168,7 +168,6 @@ function JobListPopout({ details, onClose, situation }) {
   };
 
   // console.log("Job List P >> ", details)
-
   return (
     <ModalCom action={onClose} situation={situation} className="job-popup">
       <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
@@ -338,7 +337,8 @@ function JobListPopout({ details, onClose, situation }) {
                 );
               }}
             </Formik>
-
+            
+            { process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 &&
             <Formik
               initialValues={initialValues}
               validationSchema={validationSchema.fields.group}
@@ -368,6 +368,7 @@ function JobListPopout({ details, onClose, situation }) {
                 );
               }}
             </Formik>
+            }
           </div>
           {/* END OF ACTION SECTION */}
         </div>
@@ -468,10 +469,14 @@ const JobFieldInput = ({
           type="submit"
           name={inputName}
           onClick={errorHandler}
-          className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
-            !value && "disabled:grayscale-[65%] transition duration-300"
-          }`}
-          disabled={!value}
+          // className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
+          //   !value && "disabled:grayscale-[65%] transition duration-300"
+          // }`}
+          className={`px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white ${
+            !value && ""
+          }
+          `}
+          // disabled={!value}
         >
           {loader ? <LoadingSpinner size={5} /> : btnText}
         </button>