From 3c79ffb16cfc71b34a6171189b8f2427cd1fa269 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Thu, 6 Nov 2025 16:36:17 -0800
Subject: [PATCH] fix: fix project identity wizard not resetting on close

---
 .../components/IdentityTab/IdentityTab.tsx               | 7 ++++++-
 .../IdentityTab/components/ProjectIdentityModal.tsx      | 9 ++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
index a72f1ca0f..56d03e6fc 100644
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
@@ -543,7 +543,12 @@ export const IdentityTab = withProjectPermission(
                   animate={{ opacity: 1, translateX: 0 }}
                   exit={{ opacity: 0, translateX: -30 }}
                 >
-                  <ProjectIdentityModal onClose={() => handlePopUpClose("createIdentity")} />
+                  <ProjectIdentityModal
+                    onClose={() => {
+                      handlePopUpClose("createIdentity");
+                      setWizardStep(WizardSteps.SelectAction);
+                    }}
+                  />
                 </motion.div>
               )}
               {wizardStep === WizardSteps.LinkIdentity && (
diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx
index e44461031..327144733 100644
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectIdentityModal.tsx
@@ -13,6 +13,7 @@ import {
   FormLabel,
   IconButton,
   Input,
+  ModalClose,
   Switch
 } from "@app/components/v2";
 import { useProject } from "@app/context";
@@ -280,9 +281,11 @@ export const ProjectIdentityModal = ({ onClose, identity }: ContentProps) => {
         >
           {isUpdate ? "Update" : "Create"}
         </Button>
-        <Button colorSchema="secondary" variant="plain" onClick={() => onClose()}>
-          Cancel
-        </Button>
+        <ModalClose asChild>
+          <Button colorSchema="secondary" variant="plain">
+            Cancel
+          </Button>
+        </ModalClose>
       </div>
     </form>
   );