From 10c6c169c8ec2325449ff9842fc266724a403080 Mon Sep 17 00:00:00 2001 From: joana Date: Wed, 13 Dec 2023 09:52:19 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Allow=20process=20if=20not=20con?= =?UTF-8?q?tract=20modification=20in=20D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marta --- src/containers/CaseDetail/AcceptD1.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/containers/CaseDetail/AcceptD1.js b/src/containers/CaseDetail/AcceptD1.js index 31a2e5f4..171218e0 100644 --- a/src/containers/CaseDetail/AcceptD1.js +++ b/src/containers/CaseDetail/AcceptD1.js @@ -18,7 +18,8 @@ import SendIcon from '@material-ui/icons/Send' import Uploader from '../../components/Uploader' -const showD1PowerModificationChooser = process.env.REACT_APP_SHOW_D1_POWER_MODIFICATION_CHOOSER === 'true' +const showD1PowerModificationChooser = + process.env.REACT_APP_SHOW_D1_POWER_MODIFICATION_CHOOSER === 'true' const useStyles = makeStyles((theme) => ({ root: { @@ -60,10 +61,11 @@ function AcceptD1({ const [sending, setSending] = useState(false) const AcceptD1Schema = Yup.object().shape({ - m1: Yup.bool() - .required(t('UNACCEPTED_PRIVACY_POLICY')) - .oneOf([true, false], t('UNACCEPTED_PRIVACY_POLICY')), - }) + m1: Yup.bool() + .required(t('UNACCEPTED_PRIVACY_POLICY')) + .oneOf([true, false], t('UNACCEPTED_PRIVACY_POLICY')) + } + ) return ( @@ -71,7 +73,7 @@ function AcceptD1({ initialValues={{ ...{ d1Attachments: [], - m1: '' + m1: showD1PowerModificationChooser ? '' : false }, ...params }} @@ -122,7 +124,7 @@ function AcceptD1({ maxFiles={5} fieldError={ errors?.d1Attachments && - (touched?.d1Attachments || values?.m1 !== "") && + (touched?.d1Attachments || values?.m1 !== '') && errors?.d1Attachments } callbackFn={(d1Attachments) => @@ -172,7 +174,7 @@ function AcceptD1({ className={classes.button} color="primary" variant="contained" - disabled={!isValid || sending} + disabled={(showD1PowerModificationChooser && !isValid) || sending} endIcon={ (sending && ) || (values?.m1 === false && ) || (