d.id === doctor.id) ? [doctor, ...doctorOptions] : doctorOptions}
+ doctors={selectedDoctor && !doctorOptions.some((d) => d.id === selectedDoctor.id) ? [selectedDoctor, ...doctorOptions] : doctorOptions}
value={values.doctorId}
onChange={set('doctorId')}
date={date}
@@ -286,10 +291,10 @@ export default function LeadModal({ form = 'appointment', doctor, slot, service,
/>
)}
- {form === 'appointment' && !selectedDoctor ? (
- availabilityMessage ? (
-
- {availabilityMessage}
+ {form === 'appointment' && (!selectedDoctor || selectedDateMessage) ? (
+ appointmentMessage ? (
+
+ {appointmentMessage}
) : null
) : native ? (