From e214450e9a35c2006fa6b1cbe4c8df24f4a44959 Mon Sep 17 00:00:00 2001
From: panteliselef <panteliselef@outlook.com>
Date: Fri, 24 Nov 2023 10:23:08 +0200
Subject: [PATCH] fix(clerk-js): Reset CodeControl when resetting wizard in
 VerifyDomainPage (#2200)

---
 .changeset/clever-moose-act.md                              | 5 +++++
 .../components/OrganizationProfile/VerifyDomainPage.tsx     | 6 +++++-
 .../ui/components/OrganizationProfile/VerifyDomainPage.tsx  | 6 +++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/clever-moose-act.md

diff --git a/.changeset/clever-moose-act.md b/.changeset/clever-moose-act.md
new file mode 100644
index 0000000000..4c23441a63
--- /dev/null
+++ b/.changeset/clever-moose-act.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Reset OTP field when pressing "Cancel" in VerifyDomainPage inside `<OrganziatoinProfile/>`.
diff --git a/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/VerifyDomainPage.tsx b/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/VerifyDomainPage.tsx
index c551ab7143..2ccd4399f9 100644
--- a/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/VerifyDomainPage.tsx
+++ b/packages/clerk-js/src/ui.retheme/components/OrganizationProfile/VerifyDomainPage.tsx
@@ -186,7 +186,11 @@ export const VerifyDomainPage = withCardStateProvider(() => {
             textVariant='buttonExtraSmallBold'
             type='reset'
             isDisabled={status.isLoading || success}
-            onClick={wizard.prevStep}
+            onClick={() => {
+              codeControlState.clearFeedback();
+              codeControl.reset();
+              wizard.prevStep();
+            }}
             localizationKey={localizationKeys('userProfile.formButtonReset')}
           />
         </FormButtonContainer>
diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/VerifyDomainPage.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/VerifyDomainPage.tsx
index c551ab7143..2ccd4399f9 100644
--- a/packages/clerk-js/src/ui/components/OrganizationProfile/VerifyDomainPage.tsx
+++ b/packages/clerk-js/src/ui/components/OrganizationProfile/VerifyDomainPage.tsx
@@ -186,7 +186,11 @@ export const VerifyDomainPage = withCardStateProvider(() => {
             textVariant='buttonExtraSmallBold'
             type='reset'
             isDisabled={status.isLoading || success}
-            onClick={wizard.prevStep}
+            onClick={() => {
+              codeControlState.clearFeedback();
+              codeControl.reset();
+              wizard.prevStep();
+            }}
             localizationKey={localizationKeys('userProfile.formButtonReset')}
           />
         </FormButtonContainer>