Merge pull request #19354 from Expensify/OSBotify-cherry-pick-staging…

…-19339

🍒 Cherry pick PR #19339 to staging 🍒

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001031605
-        versionName "1.3.16-5"
+        versionCode 1001031606
+        versionName "1.3.16-6"
     }
 
     splits {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.16.5</string>
+	<string>1.3.16.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.16.5</string>
+	<string>1.3.16.6</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.16-5",
+  "version": "1.3.16-6",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/PopoverMenu/index.js

@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React from 'react';
+import React, {useState} from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import PopoverWithMeasuredContent from '../PopoverWithMeasuredContent';
@@ -40,11 +40,12 @@ const defaultProps = {
 
 const PopoverMenu = (props) => {
     const {isSmallScreenWidth} = useWindowDimensions();
+    const [selectedItemIndex, setSelectedItemIndex] = useState(null);
 
     const selectItem = (index) => {
         const selectedItem = props.menuItems[index];
         props.onItemSelected(selectedItem);
-        selectedItem.onSelected();
+        setSelectedItemIndex(index);
     };
 
     const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: -1, maxIndex: props.menuItems.length - 1});
@@ -66,7 +67,13 @@ const PopoverMenu = (props) => {
             anchorAlignment={props.anchorOrigin}
             onClose={props.onClose}
             isVisible={props.isVisible}
-            onModalHide={() => setFocusedIndex(-1)}
+            onModalHide={() => {
+                setFocusedIndex(-1);
+                if (selectedItemIndex !== null) {
+                    props.menuItems[selectedItemIndex].onSelected();
+                    setSelectedItemIndex(null);
+                }
+            }}
             animationIn={props.animationIn}
             animationOut={props.animationOut}
             animationInTiming={props.animationInTiming}