diff --git a/src/pages/reportSighting/ReportForm.jsx b/src/pages/reportSighting/ReportForm.jsx index 809d5758..80c16d46 100644 --- a/src/pages/reportSighting/ReportForm.jsx +++ b/src/pages/reportSighting/ReportForm.jsx @@ -178,7 +178,7 @@ export default function ReportForm({ .map(data => ({ ...data, labelId: data.label })); const encountersRequired = encounterFieldSchemas .filter( - schema => schema.customField && schema.required && !customEncounterFormValues[schema.name], + schema => sightingType === 'one' && schema.customField && schema.required && !customEncounterFormValues[schema.name], ) .map(data => ({ ...data, labelId: data.label })); const requiredCustomFields = sightingsRequired.concat(encountersRequired); @@ -368,20 +368,26 @@ export default function ReportForm({ categories={customSightingCategories} fieldSchema={requiredCustomSightingSchemas} /> - - )} + { + !optional && sightingType === 'one' && ( + <> + + + + ) + } {optional && ( <>