From 46680b7e8b8e85131d48e86ff9c529e1b6d8d17f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 13 Jun 2023 17:51:52 -0400
Subject: [PATCH 1/2] Merge pull request #20718 from
 Expensify/version-BUILD-B68C469E-A1FB-4DE4-B673-1B31BC6029E0

Update version to 1.3.27-5 on main

(cherry picked from commit b089bde1dcc506adab2c90659769b08a879ce045)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 33f987cc4f8b..0233484596f7 100644
--- 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
index 838a3db98d28..0f9251c9f640 100644
--- 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
index a80980ddc2e6..04eb5204b4c1 100644
--- 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
index 1127a61fdea3..d4aab8430cd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.27-4",
+  "version": "1.3.27-5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.27-4",
+      "version": "1.3.27-5",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 385b1eea567c..58a377ec0876 100644
--- 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.",

From 3e4eb3326650dfa585f8fb92820ec565b4071f69 Mon Sep 17 00:00:00 2001
From: Jack Nam <30609178+thienlnam@users.noreply.github.com>
Date: Tue, 13 Jun 2023 14:45:06 -0700
Subject: [PATCH 2/2] Merge pull request #20704 from
 HezekielT/Fix---mWeb---Chat---Cancel-button-must-be-pressed-two-times

(cherry picked from commit fb1aec2d5a78fb968ff3f175b426144beef57067)
---
 src/components/Pressable/PressableWithFeedback.js    | 5 +++++
 src/pages/home/report/ReportActionItemMessageEdit.js | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js
index 281492568867..4516a57a85d3 100644
--- 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
index 0e4c602e674f..d6242d3f2886 100644
--- 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')}