From cd80a29ae6f176791fcc8a6aa26f868ec7dc66e1 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 26 Jul 2022 18:55:17 -0400
Subject: [PATCH 1/2] Merge pull request #10124 from
 Expensify/version-BUILD-8E71340F-F1F3-4138-B205-D2F0A8209DE5

Update version to 1.1.86-4 on main

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index c8f725f30144..9febb141ca00 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018603
-        versionName "1.1.86-3"
+        versionCode 1001018604
+        versionName "1.1.86-4"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 6d8660aef07d..cb5d5aa80d9e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.86.3</string>
+	<string>1.1.86.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ac2c003ffd66..eb01d7bf5b73 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.1.86.3</string>
+	<string>1.1.86.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 07df4a08832c..eb3249d9fce0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.86-3",
+  "version": "1.1.86-4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8d9795d911a2..66304d3c7f8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.86-3",
+  "version": "1.1.86-4",
   "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 b8d61522330a4209de3e05fa860d0108dd909a6f Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 26 Jul 2022 15:47:31 -0700
Subject: [PATCH 2/2] Merge pull request #10123 from
 Expensify/ckt_blocker_fixNewLineText

Fix line breaks not working properly

(cherry picked from commit 0f58f34655c60da13990217e35e9231676f1a3f1)
---
 src/pages/home/report/ReportActionItemFragment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
index 4111de6a1dca..ae62f0010789 100644
--- a/src/pages/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -118,9 +118,9 @@ const ReportActionItemFragment = (props) => {
             return (
                 <Text
                     selectable={!canUseTouchScreen() || !props.isSmallScreenWidth}
-                    style={[EmojiUtils.containsOnlyEmojis(props.fragment.text) ? styles.onlyEmojisText : undefined, styles.ltr]}
+                    style={[EmojiUtils.containsOnlyEmojis(text) ? styles.onlyEmojisText : undefined, styles.ltr]}
                 >
-                    {StyleUtils.convertToLTR(Str.htmlDecode(props.fragment.text))}
+                    {StyleUtils.convertToLTR(Str.htmlDecode(text))}
                     {props.fragment.isEdited && (
                     <Text
                         fontSize={variables.fontSizeSmall}