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

…-20704 🍒 Cherry pick PR #20704 to staging 🍒
Expensify · Jun 13, 2023 · 1672478 · 1672478
2 parents 912089d + 3e4eb33
commit 1672478
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001032704
-        versionName "1.3.27-4"
+        versionCode 1001032705
+        versionName "1.3.27-5"
     }
 
     splits {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.27.4</string>
+	<string>1.3.27.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.27.4</string>
+	<string>1.3.27.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.27-4",
+  "version": "1.3.27-5",
   "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.",

diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js
@@ -24,12 +24,17 @@ const PressableWithFeedbackPropTypes = {
      * @default variables.hoverDimValue
      */
     hoverDimmingValue: propTypes.number,
+    /**
+     *  Used to locate this view from native classes.
+     */
+    nativeID: propTypes.string,
 };
 
 const PressableWithFeedbackDefaultProps = {
     ..._.omit(GenericPressablePropTypes.defaultProps, omittedProps),
     pressDimmingValue: variables.pressDimValue,
     hoverDimmingValue: variables.hoverDimValue,
+    nativeID: '',
     wrapperStyle: [],
 };
 

diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -283,6 +283,7 @@ class ReportActionItemMessageEdit extends React.Component {
                                 {(hovered) => (
                                     <PressableWithFeedback
                                         onPress={this.deleteDraft}
+                                        nativeID={this.cancelButtonID}
                                         style={styles.chatItemSubmitButton}
                                         accessibilityRole="button"
                                         accessibilityLabel={this.props.translate('common.close')}