From 9be4f5b4cd9092550063ef67bb5ea86d91a6432c Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Wed, 1 Feb 2023 19:07:44 +0530
Subject: [PATCH] fix: Fixed issue where the first input in the challenge modal
 would get focused when typing in another input

---
 .../Components/ChallengeModal/ChallengePrompt.tsx      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
index e422a3dfb..f1f6a547f 100644
--- a/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
+++ b/packages/web/src/javascripts/Components/ChallengeModal/ChallengePrompt.tsx
@@ -49,9 +49,15 @@ const ChallengeModalPrompt: FunctionComponent<Props> = ({
       }
 
       biometricsButtonRef.current?.click()
-    } else {
-      inputRef.current?.focus()
+      return
     }
+
+    const parentForm = inputRef.current?.closest('form')
+    if (parentForm?.contains(document.activeElement)) {
+      return
+    }
+
+    inputRef.current?.focus()
   }, [application, prompt.id, prompt.validation, values])
 
   useEffect(() => {