Merge pull request #71568 from situchan/revert-71264-fix/70912

[CP Staging] Revert "Fix/70912 - Edit composer isn't automatically focused"

(cherry picked from commit c5ee5c5)

(cherry-picked to staging by mountiny)

Author: mountiny

src/components/Modal/ReanimatedModal/index.tsx

@@ -145,13 +145,13 @@ function ReanimatedModal({
         if (handleRef.current) {
             InteractionManager.clearInteractionHandle(handleRef.current);
         }
-        // On the web platform, the Modal's onDismiss callback may not be triggered if the dismiss process is interrupted by other actions such as navigation.
-        // Specifically on Android, the Modal's onDismiss callback does not work reliably. There's a reported issue at:
+        // Because on Android, the Modal's onDismiss callback does not work reliably. There's a reported issue at:
         // https://stackoverflow.com/questions/58937956/react-native-modal-ondismiss-not-invoked
-        // Therefore, we manually call onDismiss and onModalHide here.
-        onDismiss?.();
-        onModalHide();
-    }, [onDismiss, onModalHide]);
+        // Therefore, we manually call onModalHide() here for Android.
+        if (getPlatform() === CONST.PLATFORM.ANDROID) {
+            onModalHide();
+        }
+    }, [onModalHide]);
 
     const containerView = (
         <Container
@@ -208,6 +208,12 @@ function ReanimatedModal({
                 onRequestClose={onBackButtonPressHandler}
                 statusBarTranslucent={statusBarTranslucent}
                 testID={testID}
+                onDismiss={() => {
+                    onDismiss?.();
+                    if (getPlatform() !== CONST.PLATFORM.ANDROID) {
+                        onModalHide();
+                    }
+                }}
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             >