From 89133550b9e40367cc8f5d35a3533a7d6b2c51a7 Mon Sep 17 00:00:00 2001
From: alejandrobailo <alejandrobailo94@gmail.com>
Date: Mon, 23 Feb 2026 15:56:25 +0100
Subject: [PATCH] fix(ui): preserve setup phase on wizard back navigation

---
 .../providers/organizations/org-setup-form.tsx         | 10 ++++++----
 .../providers/wizard/provider-wizard-modal.tsx         |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/components/providers/organizations/org-setup-form.tsx b/ui/components/providers/organizations/org-setup-form.tsx
index 762b076eb9..5f3b0ec606 100644
--- a/ui/components/providers/organizations/org-setup-form.tsx
+++ b/ui/components/providers/organizations/org-setup-form.tsx
@@ -72,6 +72,7 @@ interface OrgSetupFormProps {
   onNext: () => void;
   onFooterChange: (config: WizardFooterConfig) => void;
   onPhaseChange: (phase: OrgSetupPhase) => void;
+  initialPhase?: OrgSetupPhase;
 }
 
 export function OrgSetupForm({
@@ -79,14 +80,13 @@ export function OrgSetupForm({
   onNext,
   onFooterChange,
   onPhaseChange,
+  initialPhase = ORG_SETUP_PHASE.DETAILS,
 }: OrgSetupFormProps) {
   const { data: session } = useSession();
   const [apiError, setApiError] = useState<string | null>(null);
   const [isExternalIdCopied, setIsExternalIdCopied] = useState(false);
   const stackSetExternalId = session?.tenantId ?? "";
-  const [setupPhase, setSetupPhase] = useState<OrgSetupPhase>(
-    ORG_SETUP_PHASE.DETAILS,
-  );
+  const [setupPhase, setSetupPhase] = useState<OrgSetupPhase>(initialPhase);
   const {
     setOrganization,
     setDiscovery,
@@ -207,7 +207,9 @@ export function OrgSetupForm({
         return;
       }
 
-      const existingOrganization = Array.isArray(existingOrganizationsResult?.data)
+      const existingOrganization = Array.isArray(
+        existingOrganizationsResult?.data,
+      )
         ? existingOrganizationsResult.data.find(
             (organization: {
               id: string;
diff --git a/ui/components/providers/wizard/provider-wizard-modal.tsx b/ui/components/providers/wizard/provider-wizard-modal.tsx
index 52c203edc6..9b7e689c8f 100644
--- a/ui/components/providers/wizard/provider-wizard-modal.tsx
+++ b/ui/components/providers/wizard/provider-wizard-modal.tsx
@@ -366,6 +366,7 @@ export function ProviderWizardModal({
                 }}
                 onFooterChange={setFooterConfig}
                 onPhaseChange={setOrgSetupPhase}
+                initialPhase={orgSetupPhase}
               />
             )}
 
@@ -385,7 +386,7 @@ export function ProviderWizardModal({
                 <OrgAccountSelection
                   onBack={() => {
                     setOrgCurrentStep(ORG_WIZARD_STEP.SETUP);
-                    setOrgSetupPhase(ORG_SETUP_PHASE.DETAILS);
+                    setOrgSetupPhase(ORG_SETUP_PHASE.ACCESS);
                   }}
                   onNext={() => {
                     setOrgCurrentStep(ORG_WIZARD_STEP.LAUNCH);