From 0d5398ab906fff8ce5cdec43805a24334daa5e3b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 18 Apr 2023 13:52:44 -0400
Subject: [PATCH 1/2] Merge pull request #17605 from
 Expensify/version-BUILD-F552CCAA-9B5E-469C-A90A-5D7016365D7F

Update version to 1.3.1-2 on main

(cherry picked from commit 2ea232df07439d826eac98f6d17721024bb2632b)
---
 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 aee47932ef02..ba8d6958b62a 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 1001030101
-        versionName "1.3.1-1"
+        versionCode 1001030102
+        versionName "1.3.1-2"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 65dea8a3d78a..72158c761829 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.1.1</string>
+	<string>1.3.1.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index eb369c6b82e8..2717b3e6dec8 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.1.1</string>
+	<string>1.3.1.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index ae529ba4fc0d..46ddb33777ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-1",
+  "version": "1.3.1-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.1-1",
+      "version": "1.3.1-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index d4cdc05f140f..6be5f859bca6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-1",
+  "version": "1.3.1-2",
   "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 ea11e4ff0b237f2adffe7162f7bc84185d240855 Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Tue, 18 Apr 2023 10:29:49 -0700
Subject: [PATCH 2/2] Merge pull request #17586 from
 dukenv0307/fix/17212-not-update-edited-message-on-LHN-in-offline-mode

(cherry picked from commit b2c28acea914a54dc6585485529fd01019a8bfcf)
---
 src/libs/actions/Report.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 9d771f006732..04357f2cb08f 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -924,11 +924,10 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
 
     const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, optimisticReportActions);
     if (reportActionID === lastVisibleAction.reportActionID) {
+        const reportComment = parser.htmlToText(htmlForNewComment);
+        const lastMessageText = ReportUtils.formatReportLastMessageText(reportComment);
         const optimisticReport = {
-            lastMessageHtml: lodashGet(lastVisibleAction, 'message[0].html'),
-            lastMessageText: lodashGet(lastVisibleAction, 'message[0].text'),
-            lastVisibleActionCreated: lastVisibleAction.created,
-            lastActorEmail: lastVisibleAction.actorEmail,
+            lastMessageText: Str.htmlDecode(lastMessageText),
         };
         optimisticData.push({
             onyxMethod: CONST.ONYX.METHOD.MERGE,
