Merge pull request Expensify#85015 from Expensify/revert-84452-marco/fix-followup-formatting-bugs

Author: marcochavezf

src/libs/ReportActionFollowupUtils/index.ts

@@ -1,4 +1,3 @@
-import render from 'dom-serializer';
 import {DomUtils, parseDocument} from 'htmlparser2';
 import {getReportActionMessage, isActionOfType} from '@libs/ReportActionsUtils';
 import CONST from '@src/CONST';
@@ -54,7 +53,7 @@ function parseFollowupsFromHtml(html: string): Followup[] | null {
         const followupTextElement = DomUtils.getElementsByTagName('followup-text', followupEl, true).at(0);
         const followupResponseElement = DomUtils.getElementsByTagName('followup-response', followupEl, true).at(0);
         const text = followupTextElement ? DomUtils.textContent(followupTextElement) : '';
-        const response = followupResponseElement ? render(followupResponseElement.children) : undefined;
+        const response = followupResponseElement ? DomUtils.textContent(followupResponseElement) : undefined;
         return {text, response};
     });
 }

src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx

@@ -23,7 +23,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import Parser from '@libs/Parser';
 import {getCleanedTagName, isPolicyAdmin} from '@libs/PolicyUtils';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
-import stripFollowupListFromHtml from '@libs/ReportActionFollowupUtils/stripFollowupListFromHtml';
 import {
     getActionableCardFraudAlertMessage,
     getActionableMentionWhisperMessage,
@@ -1074,9 +1073,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                     );
                     setClipboardMessage(displayMessage);
                 } else if (content) {
-                    const contentWithoutFollowups = stripFollowupListFromHtml(content) ?? content;
                     setClipboardMessage(
-                        contentWithoutFollowups.replaceAll(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {
+                        content.replaceAll(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {
                             const modifiedContent = Str.removeSMSDomain(innerContent) || '';
                             return openTag + modifiedContent + closeTag || '';
                         }),

tests/unit/ReportActionsFollowupUtilsTest.ts

@@ -62,25 +62,14 @@ describe('ReportActionsFollowupUtils', () => {
             expect(parseFollowupsFromHtml(html)).toEqual([]);
         });
 
-        it('should parse followup with pre-generated response preserving HTML', () => {
+        it('should parse followup with pre-generated response', () => {
             const html = `<followup-list>
   <followup>
     <followup-text>How do I set up QuickBooks?</followup-text>
-    <followup-response>To set up QuickBooks, go to <strong>Settings</strong> &gt; Integrations.</followup-response>
+    <followup-response>To set up QuickBooks, go to Settings > Integrations...</followup-response>
   </followup>
 </followup-list>`;
-            expect(parseFollowupsFromHtml(html)).toEqual([{text: 'How do I set up QuickBooks?', response: 'To set up QuickBooks, go to <strong>Settings</strong> > Integrations.'}]);
-        });
-
-        it('should preserve bullet lists in pre-generated responses', () => {
-            const html = `<followup-list>
-  <followup>
-    <followup-text>What are the steps?</followup-text>
-    <followup-response><ul><li>Step one</li><li>Step two</li></ul></followup-response>
-  </followup>
-</followup-list>`;
-            const result = parseFollowupsFromHtml(html);
-            expect(result).toEqual([{text: 'What are the steps?', response: '<ul><li>Step one</li><li>Step two</li></ul>'}]);
+            expect(parseFollowupsFromHtml(html)).toEqual([{text: 'How do I set up QuickBooks?', response: 'To set up QuickBooks, go to Settings > Integrations...'}]);
         });
 
         it('should parse multiple followups with mixed response availability', () => {
@@ -90,12 +79,12 @@ describe('ReportActionsFollowupUtils', () => {
   </followup>
   <followup>
     <followup-text>Question with response</followup-text>
-    <followup-response>Here is the <strong>cached</strong> response</followup-response>
+    <followup-response>Here is the cached response</followup-response>
   </followup>
 </followup-list>`;
             expect(parseFollowupsFromHtml(html)).toEqual([
                 {text: 'Question without response', response: undefined},
-                {text: 'Question with response', response: 'Here is the <strong>cached</strong> response'},
+                {text: 'Question with response', response: 'Here is the cached response'},
             ]);
         });