From 281c7b5000bcc50a56d0603c95ebdd848f3adbc6 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 24 May 2023 11:05:41 -0400
Subject: [PATCH 1/2] Merge pull request #19538 from
 Expensify/version-BUILD-1F18D05B-A673-4CF0-8BBD-4D7532446525

Update version to 1.3.17-3 on main

(cherry picked from commit 098960e6f684be39f7a6da90542d9944a32b897a)
---
 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 16f45ba53cd8..ad1bf218af7d 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 1001031702
-        versionName "1.3.17-2"
+        versionCode 1001031703
+        versionName "1.3.17-3"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2d0a111663e4..c2d80cefbc27 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.17.2</string>
+	<string>1.3.17.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 014dd4a083d7..d95ce34ee8aa 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.17.2</string>
+	<string>1.3.17.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index aad5afc055e9..7ff9d9dd2ce7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.17-2",
+  "version": "1.3.17-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.17-2",
+      "version": "1.3.17-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index eeb32e6c5c7e..baa643658343 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.17-2",
+  "version": "1.3.17-3",
   "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 2ce2673b2b78ee01afa6c4265d6a37ddc81afa06 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 24 May 2023 08:57:48 -0600
Subject: [PATCH 2/2] Merge pull request #19537 from hungvu193/fix-8269

Fix truncate label checkbox and ios's safafri long press link issue.

(cherry picked from commit 052bce2b9f2bc114dab9317f49fcef2f79154a38)
---
 src/components/CheckboxWithLabel.js | 1 +
 src/components/TextLink.js          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/CheckboxWithLabel.js b/src/components/CheckboxWithLabel.js
index 417734eaa25a..298f1252d48a 100644
--- a/src/components/CheckboxWithLabel.js
+++ b/src/components/CheckboxWithLabel.js
@@ -104,6 +104,7 @@ class CheckboxWithLabel extends React.Component {
                     />
                     <PressableWithFeedback
                         focusable={false}
+                        wrapperStyle={[styles.flex1]}
                         onPress={this.toggleCheckbox}
                         pressDimmingValue={variables.checkboxLabelActiveOpacity}
                         hoverDimmingValue={variables.checkboxLabelHoverOpacity}
diff --git a/src/components/TextLink.js b/src/components/TextLink.js
index 4d4a9cdce307..f075002058ab 100644
--- a/src/components/TextLink.js
+++ b/src/components/TextLink.js
@@ -27,7 +27,7 @@ const defaultProps = {
     href: undefined,
     style: [],
     onPress: undefined,
-    onMouseDown: undefined,
+    onMouseDown: (event) => event.preventDefault(),
 };
 
 const TextLink = (props) => {