Merge pull request #39675 from teneeto/fix/39601/auto-focus-on-edit-t…

…ax-amount fix autofocus on edit tax amount text input
Expensify · Apr 5, 2024 · b0a50cb · b0a50cb
2 parents 3ee7004 + 16d9c5c
commit b0a50cb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/pages/EditRequestTaxAmountPage.tsx b/src/pages/EditRequestTaxAmountPage.tsx
@@ -24,13 +24,13 @@ type EditRequestTaxAmountPageProps = {
 
 function EditRequestTaxAmountPage({defaultAmount, defaultTaxAmount, defaultCurrency, onSubmit}: EditRequestTaxAmountPageProps) {
     const {translate} = useLocalize();
-    const textInput = useRef<BaseTextInputRef>(null);
+    const textInput = useRef<BaseTextInputRef | null>();
 
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
     useFocusEffect(
         useCallback(() => {
-            focusTimeoutRef.current = setTimeout(() => textInput.current && textInput.current.focus(), CONST.ANIMATED_TRANSITION);
+            focusTimeoutRef.current = setTimeout(() => textInput.current?.focus(), CONST.ANIMATED_TRANSITION);
             return () => {
                 if (!focusTimeoutRef.current) {
                     return;
@@ -52,7 +52,7 @@ function EditRequestTaxAmountPage({defaultAmount, defaultTaxAmount, defaultCurre
                 currency={defaultCurrency}
                 amount={defaultAmount}
                 taxAmount={defaultTaxAmount}
-                ref={textInput}
+                ref={(e) => (textInput.current = e)}
                 isCurrencyPressable={false}
                 onSubmitButtonPress={onSubmit}
                 isEditing