Merge pull request #12968 from Expensify/aldo_lastMessageText

Message html to text and last message (LHN) fixes

package.json

@@ -68,7 +68,7 @@
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
     "dotenv": "^8.2.0",
-    "expensify-common": "git+https://github.com/Expensify/expensify-common.git#db2c245c1e6b39232092b1415b9235fadda2a529",
+    "expensify-common": "git+https://github.com/Expensify/expensify-common.git#6bd112f1e7ebbd6679042fa04060104b68beace2",
     "fbjs": "^3.0.2",
     "file-loader": "^6.0.0",
     "html-entities": "^1.3.1",

src/CONST.js

@@ -756,6 +756,7 @@ const CONST = {
         NON_NUMERIC: /\D/g,
         EMOJI_NAME: /:[\w+-]+:/g,
         EMOJI_SUGGESTIONS: /:[a-zA-Z]{1,20}(\s[a-zA-Z]{0,20})?$/,
+        AFTER_FIRST_LINE_BREAK: /\n.*/g,
     },
 
     PRONOUNS: {

src/libs/ReportUtils.js

@@ -403,7 +403,9 @@ function canShowReportRecipientLocalTime(personalDetails, report) {
  * @returns {String}
  */
 function formatReportLastMessageText(lastMessageText) {
-    return String(lastMessageText).substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
+    return String(lastMessageText)
+        .replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '')
+        .substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH);
 }
 
 /**

src/pages/home/report/ReportActionItemFragment.js

@@ -98,20 +98,15 @@ const ReportActionItemFragment = (props) => {
                         )
                 );
             }
-            let {html, text} = props.fragment;
+            const {html, text} = props.fragment;
 
             // If the only difference between fragment.text and fragment.html is <br /> tags
-            // we replace them with line breaks and render it as text, not as html.
+            // we render it as text, not as html.
             // This is done to render emojis with line breaks between them as text.
-            const differByLineBreaksOnly = Str.replaceAll(props.fragment.html, '<br />', ' ') === props.fragment.text;
-            if (differByLineBreaksOnly) {
-                const textWithLineBreaks = Str.replaceAll(props.fragment.html, '<br />', '\n');
-                html = textWithLineBreaks;
-                text = textWithLineBreaks;
-            }
+            const differByLineBreaksOnly = Str.replaceAll(html, '<br />', '\n') === text;
 
             // Only render HTML if we have html in the fragment
-            if (html !== text) {
+            if (!differByLineBreaksOnly) {
                 const editedTag = props.fragment.isEdited ? '<edited></edited>' : '';
                 const htmlContent = html + editedTag;
                 return (