Merge branch 'send-to-group' of WrenchBoard/Users-Wrench into master
This commit is contained in:
@@ -84,4 +84,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
|
|||||||
#Family
|
#Family
|
||||||
REACT_APP_MAX_FAMILY_MEMBERS=8
|
REACT_APP_MAX_FAMILY_MEMBERS=8
|
||||||
|
|
||||||
REACT_SHOW_OFFER_GROUP_JOB=0
|
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
||||||
+1
-1
@@ -52,4 +52,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
|
|||||||
|
|
||||||
REACT_APP_MAX_FAMILY_MEMBERS=8
|
REACT_APP_MAX_FAMILY_MEMBERS=8
|
||||||
|
|
||||||
REACT_SHOW_OFFER_GROUP_JOB=0
|
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
||||||
+1
-1
@@ -58,4 +58,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
|
|||||||
|
|
||||||
REACT_APP_MAX_FAMILY_MEMBERS=8
|
REACT_APP_MAX_FAMILY_MEMBERS=8
|
||||||
|
|
||||||
REACT_SHOW_OFFER_GROUP_JOB=0
|
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
||||||
|
|||||||
@@ -168,7 +168,6 @@ function JobListPopout({ details, onClose, situation }) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// console.log("Job List P >> ", details)
|
// console.log("Job List P >> ", details)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalCom action={onClose} situation={situation} className="job-popup">
|
<ModalCom action={onClose} situation={situation} className="job-popup">
|
||||||
<div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
|
<div className="logout-modal-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>
|
</Formik>
|
||||||
|
|
||||||
|
{ process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 &&
|
||||||
<Formik
|
<Formik
|
||||||
initialValues={initialValues}
|
initialValues={initialValues}
|
||||||
validationSchema={validationSchema.fields.group}
|
validationSchema={validationSchema.fields.group}
|
||||||
@@ -368,6 +368,7 @@ function JobListPopout({ details, onClose, situation }) {
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
</Formik>
|
</Formik>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
{/* END OF ACTION SECTION */}
|
{/* END OF ACTION SECTION */}
|
||||||
</div>
|
</div>
|
||||||
@@ -468,10 +469,14 @@ const JobFieldInput = ({
|
|||||||
type="submit"
|
type="submit"
|
||||||
name={inputName}
|
name={inputName}
|
||||||
onClick={errorHandler}
|
onClick={errorHandler}
|
||||||
className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
|
// className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
|
||||||
!value && "disabled:grayscale-[65%] transition duration-300"
|
// !value && "disabled:grayscale-[65%] transition duration-300"
|
||||||
}`}
|
// }`}
|
||||||
disabled={!value}
|
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}
|
{loader ? <LoadingSpinner size={5} /> : btnText}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user