diff --git a/packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx b/packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx index b3a16e333f..eed517c21a 100644 --- a/packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx +++ b/packages/features/eventtypes/components/tabs/advanced/DisableReschedulingController.tsx @@ -44,11 +44,11 @@ export default function DisableReschedulingController({ ); const radioGroupOnValueChangeRef = useRef<((val: string) => void) | null>(null); - const shouldShowRadioButtons = + const [shouldShowRadioButtons, setShouldShowRadioButtons] = useState( disableRescheduling || (currentMinimumRescheduleNotice !== null && currentMinimumRescheduleNotice > 0) || - eventType.disableRescheduling === true; - + eventType.disableRescheduling === true || false + ); useEffect(() => { if (currentMinimumRescheduleNotice && currentMinimumRescheduleNotice > 0) { setMinimumRescheduleNoticeValue(currentMinimumRescheduleNotice); @@ -93,10 +93,12 @@ export default function DisableReschedulingController({ onChange(true); onDisableRescheduling(true); formMethods.setValue("minimumRescheduleNotice", null, { shouldDirty: true }); + setShouldShowRadioButtons(true); } else { onChange(false); onDisableRescheduling(false); formMethods.setValue("minimumRescheduleNotice", null, { shouldDirty: true }); + setShouldShowRadioButtons(false); } }}> {shouldShowRadioButtons && ( diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx index 541fd26326..832ee524be 100644 --- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx +++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx @@ -541,8 +541,6 @@ export const EventAdvancedTab = ({ multiplePrivateLinksLocked.disabled = true; } - const [disableCancelling, setDisableCancelling] = useState(eventType.disableCancelling || false); - const [disableRescheduling, setDisableRescheduling] = useState(eventType.disableRescheduling || false); const [allowReschedulingCancelledBookings, setallowReschedulingCancelledBookings] = useState( @@ -691,8 +689,8 @@ export const EventAdvancedTab = ({ {!isPlatform && ( <> ( + name="disabledCancelling" + render={({ field: { onChange, value } }) => ( } - checked={disableCancelling} + checked={value} onCheckedChange={(val) => { - setDisableCancelling(val); onChange(val); }} />