Merge pull request #27798 from tienifr/fix/27782

[CP Staging] revert: "fix: 26178 Context menu does not close after user goes to the previous page" (cherry picked from commit 44f8f4a)
Expensify · Sep 20, 2023 · c5e9bab · c5e9bab
1 parent f4581dd
commit c5e9bab
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
@@ -11,8 +11,6 @@ import Log from '../Log';
 import StatusBar from '../StatusBar';
 import useCurrentReportID from '../../hooks/useCurrentReportID';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
-import * as ReportActionContextMenu from '../../pages/home/report/ContextMenu/ReportActionContextMenu';
-import * as EmojiPickerAction from '../actions/EmojiPickerAction';
 
 // https://reactnavigation.org/docs/themes
 const navigationTheme = {
@@ -123,10 +121,6 @@ function NavigationRoot(props) {
         if (!state) {
             return;
         }
-        ReportActionContextMenu.hideContextMenu();
-        ReportActionContextMenu.hideDeleteModal();
-        EmojiPickerAction.hideEmojiPicker(true);
-
         updateCurrentReportID(state);
         parseAndLogRoute(state);
         animateStatusBarBackgroundColor();

diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.js
@@ -198,9 +198,6 @@ class BasePopoverReactionList extends React.Component {
      * Hide the ReactionList modal popover.
      */
     hideReactionList() {
-        if (!this.state.isPopoverVisible) {
-            return;
-        }
         this.setState({
             isPopoverVisible: false,
         });

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
@@ -132,13 +132,6 @@ function ReportActionsView(props) {
         }
     }, [props.report, didSubscribeToReportTypingEvents, reportID]);
 
-    useEffect(() => {
-        if (isFocused || !context.reactionListRef || !context.reactionListRef.current) {
-            return;
-        }
-        context.reactionListRef.current.hideReactionList();
-    }, [isFocused, context.reactionListRef]);
-
     /**
      * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
      * displaying.