From 3d88bfd85e3a669a2a64ae8de2bcb9ec1b34621e Mon Sep 17 00:00:00 2001
From: Dmytro Klymenko <dmytro.klymenko@protonmail.com>
Date: Sun, 18 Jul 2021 12:00:02 +0300
Subject: [PATCH] Revert "Merge pull request #4085 from
 Expensify/chirag-revert-3979"

This reverts commit c2f92b63d2e8f43310162ccddea32446cbbd5753.
---
 src/languages/en.js        | 1 +
 src/languages/es.js        | 1 +
 src/libs/actions/Report.js | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 2c13b708c404..952e77df8750 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -56,6 +56,7 @@ export default {
         send: 'Send',
         notifications: 'Notifications',
         noResultsFound: 'No results found',
+        deletedCommentMessage: 'Comment deleted',
         timePrefix: 'It\'s',
         conjunctionFor: 'for',
     },
diff --git a/src/languages/es.js b/src/languages/es.js
index de5b415a1fdf..678cdd8b2536 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -52,6 +52,7 @@ export default {
         send: 'Enviar',
         notifications: 'Notificaciones',
         noResultsFound: 'No se han encontrado resultados',
+        deletedCommentMessage: 'Comentario borrado',
         timePrefix: 'Son las',
         conjunctionFor: 'para',
     },
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 75c82c8a3eb5..b82d0ad9ca16 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -172,7 +172,7 @@ function getSimplifiedReportObject(report) {
     // We convert the line-breaks in html to space ' ' before striping the tags
     const lastMessageText = lastActionMessage
         .replace(/((<br[^>]*>)+)/gi, ' ')
-        .replace(/(<([^>]+)>)/gi, '');
+        .replace(/(<([^>]+)>)/gi, '') || `[${translateLocal('common.deletedCommentMessage')}]`;
     const reportName = lodashGet(report, ['reportNameValuePairs', 'type']) === 'chat'
         ? getChatReportName(report, chatType)
         : report.reportName;
@@ -501,7 +501,7 @@ function updateReportActionMessage(reportID, sequenceNumber, message) {
     // If this is the most recent message, update the lastMessageText in the report object as well
     if (sequenceNumber === reportMaxSequenceNumbers[reportID]) {
         Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
-            lastMessageText: message.html,
+            lastMessageText: message.html || `[${translateLocal('common.deletedCommentMessage')}]`,
         });
     }
 }