Expensify · techievivek · Dec 25, 2024 · Dec 3, 2024 · Dec 4, 2024 · Dec 4, 2024
@@ -18,6  18,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {Participant} from '@src/types/onyx/IOU';
 import KeyboardUtils from '@src/utils/keyboard';
 import StepScreenWrapper from './StepScreenWrapper';
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
@@ -131,11  132,14 @@ function IOURequestStepParticipants({
             transactionID,
             selectedReportID.current || reportID,
         );
-        if (isCategorizing) {
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, selectedReportID.current || reportID, iouConfirmationPageRoute));
-        } else {
-            Navigation.navigate(iouConfirmationPageRoute);
-        }
 
         const route = isCategorizing
             ? ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, selectedReportID.current || reportID, iouConfirmationPageRoute)
             : iouConfirmationPageRoute;
 
         KeyboardUtils.dismiss().then(() => {
             Navigation.navigate(route);
         });
     }, [iouType, transactionID, transaction, reportID, action, participants]);
 
     const navigateBack = useCallback(() => {
@@ -153,7  157,9 @@ function IOURequestStepParticipants({
         IOU.setCustomUnitRateID(transactionID, rateID);
         IOU.setMoneyRequestParticipantsFromReport(transactionID, ReportUtils.getReport(selfDMReportID));
         const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, CONST.IOU.TYPE.TRACK, transactionID, selfDMReportID);
-        Navigation.navigate(iouConfirmationPageRoute);
         KeyboardUtils.dismiss().then(() => {
             Navigation.navigate(iouConfirmationPageRoute);
         });
     };
 
     useEffect(() => {

@@ -1,32  1,93 @@
-import {Keyboard} from 'react-native';
 import {InteractionManager, Keyboard} from 'react-native';
 import getPlatform from '@libs/getPlatform';
 import CONST from '@src/CONST';
 
-let isVisible = false;
 let isNativeKeyboardVisible = false; // Native keyboard visibility
 let isWebKeyboardOpen = false; // Web keyboard visibility
 const isWeb = getPlatform() === CONST.PLATFORM.WEB;
 /**
  * Initializes native keyboard visibility listeners
  */
 const initializeNativeKeyboardListeners = () => {
     Keyboard.addListener('keyboardDidHide', () => {
         isNativeKeyboardVisible = false;
     });
 
     Keyboard.addListener('keyboardDidShow', () => {
         isNativeKeyboardVisible = true;
     });
 };
 
 /**
  * Checks if the given HTML element is a keyboard-related input
  */
 const isKeyboardInput = (elem: HTMLElement): boolean =>
     (elem.tagName === 'INPUT' && !['button', 'submit', 'checkbox', 'file', 'image'].includes((elem as HTMLInputElement).type)) || elem.hasAttribute('contenteditable');
 
-Keyboard.addListener('keyboardDidHide', () => {
-    isVisible = false;
-});
 /**
  * Initializes web-specific keyboard visibility listeners
  */
 const initializeWebKeyboardListeners = () => {
     if (typeof document === 'undefined' || !isWeb) {
         return;
     }
 
     const handleFocusIn = (e: FocusEvent) => {
         const target = e.target as HTMLElement;
         if (target && isKeyboardInput(target)) {
             isWebKeyboardOpen = true;
         }
     };
 
     const handleFocusOut = (e: FocusEvent) => {
         const target = e.target as HTMLElement;
         if (target && isKeyboardInput(target)) {
             isWebKeyboardOpen = false;
         }
     };
 
-Keyboard.addListener('keyboardDidShow', () => {
-    isVisible = true;
-});
     document.addEventListener('focusin', handleFocusIn);
     document.addEventListener('focusout', handleFocusOut);
 };
 
 /**
  * Dismisses the keyboard and resolves the promise when the dismissal is complete
  */
 const dismiss = (): Promise<void> => {
     return new Promise((resolve) => {
-        if (!isVisible) {
-            resolve();
         if (isWeb) {
             if (!isWebKeyboardOpen) {
                 resolve();
                 return;
             }
 
             Keyboard.dismiss();
             InteractionManager.runAfterInteractions(() => {
                 isWebKeyboardOpen = false;
                 resolve();
             });
 
             return;
         }
 
         if (!isNativeKeyboardVisible) {
             resolve();
             return;
         }
 
         const subscription = Keyboard.addListener('keyboardDidHide', () => {
-            resolve(undefined);
             resolve();
             subscription.remove();
         });
 
         Keyboard.dismiss();
     });
 };
 
 // Initialize listeners for native and web
 initializeNativeKeyboardListeners();
 initializeWebKeyboardListeners();
 
 const utils = {dismiss};
 
 export default utils;