fix: prevent stale next_plan form data from overriding explicit null when switching users, ensuring the next-plan toggle resets correctly

triplem-dev · triplem-dev · commit 9590f9045575 · 2026-01-07T05:04:46.000+03:30
diff --git a/dashboard/src/components/dialogs/user-modal.tsx b/dashboard/src/components/dialogs/user-modal.tsx
@@ -357,11 +357,17 @@ export default function UserModal({ isDialogOpen, onOpenChange, form, editingUse
         // This ensures we catch the data even if form hasn't been populated yet
         const nextPlanFromForm = form.getValues('next_plan')
         const nextPlanFromData = editingUserData?.next_plan
+        if (nextPlanFromData === null) {
+          // Prevent stale form data from overriding explicit nulls.
+          form.setValue('next_plan', undefined, { shouldValidate: false, shouldDirty: false })
+        }
         
         // Use editingUserData if form doesn't have it yet, otherwise use form value
-        const nextPlan = nextPlanFromForm !== null && nextPlanFromForm !== undefined 
-          ? nextPlanFromForm 
-          : nextPlanFromData
+        const nextPlan = nextPlanFromData === null
+          ? null
+          : (nextPlanFromForm !== null && nextPlanFromForm !== undefined 
+              ? nextPlanFromForm 
+              : nextPlanFromData)
         
         const hasData = nextPlan !== null && 
                        nextPlan !== undefined && 
