Merge pull request #4133 from dklymenk/3743-3293-return-LHN-label-for…

…-deleted-messages Revert "Merge pull request #4085 from Expensify/chirag-revert-3979"
Expensify · Nov 16, 2021 · 8ca2cbb · 8ca2cbb
2 parents 9541bb1 + 54d1781
commit 8ca2cbb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -66,6 +66,7 @@ export default {
         notifications: 'Notifications',
         na: 'N/A',
         noResultsFound: 'No results found',
+        deletedCommentMessage: 'Comment deleted',
         timePrefix: 'It\'s',
         conjunctionFor: 'for',
         todayAt: 'Today at',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -66,6 +66,7 @@ export default {
         notifications: 'Notificaciones',
         na: 'N/A',
         noResultsFound: 'No se han encontrado resultados',
+        deletedCommentMessage: 'Comentario borrado',
         timePrefix: 'Son las',
         conjunctionFor: 'para',
         todayAt: 'Hoy a las',

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -168,7 +168,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;
@@ -529,7 +529,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.text,
+            lastMessageText: message.text || `[${translateLocal('common.deletedCommentMessage')}]`,
         });
     }
 }