Merge branch 'dev' into clients-pops

src/app/setup/page.tsx

@@ -42,6 +42,7 @@ export default function StepperForm() {
     const [loading, setLoading] = useState(false);
     const [isChecked, setIsChecked] = useState(false);
     const [error, setError] = useState<string | null>(null);
+    const [orgCreated, setOrgCreated] = useState(false);
 
     const orgSchema = z.object({
         orgName: z.string().min(1, { message: t('orgNameRequired') }),
@@ -83,7 +84,7 @@ export default function StepperForm() {
     };
 
     const checkOrgIdAvailability = useCallback(async (value: string) => {
-        if (loading) {
+        if (loading || orgCreated) {
             return;
         }
         try {
@@ -96,7 +97,7 @@ export default function StepperForm() {
         } catch (error) {
             setOrgIdTaken(false);
         }
-    }, []);
+    }, [loading, orgCreated, api]);
 
     const debouncedCheckOrgIdAvailability = useCallback(
         debounce(checkOrgIdAvailability, 300),
@@ -129,7 +130,7 @@ export default function StepperForm() {
             });
 
             if (res && res.status === 201) {
-                // setCurrentStep("site");
+                setOrgCreated(true);
                 router.push(`/${values.orgId}/settings/sites/create`);
             }
         } catch (e) {