Merge pull request #6458 from dklymenk/3734-3293-remove-comment-delet…

…ed-message-on-new-chat remove deleted comment message on new chats
Expensify · Nov 24, 2021 · 0aa9834 · 0aa9834
2 parents abb8068 + 98298a4
commit 0aa9834
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -170,12 +170,15 @@ function getSimplifiedReportObject(report) {
     const isLastMessageAttachment = /<img([^>]+)\/>/gi.test(lastActionMessage);
     const chatType = lodashGet(report, ['reportNameValuePairs', 'chatType'], '');
 
-    // We are removing any html tags from the message html since we cannot access the text version of any comments as
-    // the report only has the raw reportActionList and not the processed version returned by Report_GetHistory
-    // We convert the line-breaks in html to space ' ' before striping the tags
-    const lastMessageText = lastActionMessage
-        .replace(/((<br[^>]*>)+)/gi, ' ')
-        .replace(/(<([^>]+)>)/gi, '') || `[${translateLocal('common.deletedCommentMessage')}]`;
+    let lastMessageText = null;
+    if (report.reportActionCount > 0) {
+        // We are removing any html tags from the message html since we cannot access the text version of any comments as
+        // the report only has the raw reportActionList and not the processed version returned by Report_GetHistory
+        // We convert the line-breaks in html to space ' ' before striping the tags
+        lastMessageText = lastActionMessage
+            .replace(/((<br[^>]*>)+)/gi, ' ')
+            .replace(/(<([^>]+)>)/gi, '') || `[${translateLocal('common.deletedCommentMessage')}]`;
+    }
     const reportName = lodashGet(report, ['reportNameValuePairs', 'type']) === 'chat'
         ? getChatReportName(report, chatType)
         : report.reportName;