Merge pull request #33366 from Krishna2323/krishna2323/issue/33170

fix: Settings - Focus shifts to first digit on shortcut & back.
Expensify · Dec 21, 2023 · 9ce52d1 · 9ce52d1
2 parents 8970aa3 + 2bb4d0c
commit 9ce52d1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
@@ -109,7 +109,7 @@ function BaseValidateCodeForm(props) {
             if (focusTimeoutRef.current) {
                 clearTimeout(focusTimeoutRef.current);
             }
-            focusTimeoutRef.current = setTimeout(inputValidateCodeRef.current.focus, CONST.ANIMATED_TRANSITION);
+            focusTimeoutRef.current = setTimeout(inputValidateCodeRef.current.focusLastSelected, CONST.ANIMATED_TRANSITION);
             return () => {
                 if (!focusTimeoutRef.current) {
                     return;