From c746fdcdfe69fee8782c86675e1afb1ee76ca103 Mon Sep 17 00:00:00 2001
From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:01:16 +0530
Subject: [PATCH] ix disable cancelling persistence and rescheduling toggle
 (#26131)

---
 .../tabs/advanced/DisableReschedulingController.tsx      | 8 +++++---
 .../components/tabs/advanced/EventAdvancedTab.tsx        | 9 +++------
 2 files changed, 8 insertions(+), 9 deletions(-)

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 && (
         <>
           <Controller
-            name="disableCancelling"
-            render={({ field: { onChange } }) => (
+            name="disabledCancelling"
+            render={({ field: { onChange, value } }) => (
               <SettingsToggle
                 labelClassName="text-sm"
                 toggleSwitchAtTheEnd={true}
@@ -707,9 +705,8 @@ export const EventAdvancedTab = ({
                     href="https://cal.com/help/event-types/disable-canceling-rescheduling#disable-cancelling"
                   />
                 }
-                checked={disableCancelling}
+                checked={value}
                 onCheckedChange={(val) => {
-                  setDisableCancelling(val);
                   onChange(val);
                 }}
               />