Normalize streamed Concierge markdown delimiters

Author: inimaga

src/pages/inbox/conciergeDraftState.ts

@@ -110,10 +110,30 @@ function stripUnpairedLastLineDelimiter(text: string, delimiter: string, ignored
     return text;
 }
 
+function normalizeDelimiterForExpensiMark(text: string, delimiter: string, replacement: string, ignoredRanges: MarkdownRange[] = []): string {
+    let result = '';
+
+    for (let pos = 0; pos < text.length; pos++) {
+        const isInIgnoredRange = ignoredRanges.some((range) => pos >= range.start && pos < range.end);
+        if (text.startsWith(delimiter, pos) && !isEscaped(text, pos) && !isInIgnoredRange) {
+            result += replacement;
+            pos += delimiter.length - 1;
+            continue;
+        }
+
+        result += text[pos];
+    }
+
+    return result;
+}
+
 /**
  * Strips incomplete markdown constructs from the tail of a streaming markdown
  * string so that ExpensiMark doesn't render raw syntax for half-finished
- * links, bold, strikethrough, or code blocks.
+ * links, bold, strikethrough, or code blocks. Completed double-delimiter
+ * emphasis is normalized to ExpensiMark's single-delimiter syntax so the text
+ * stays styled without leaking raw delimiters while the server-rendered HTML is
+ * still pending.
  */
 function stripIncompleteMarkdown(markdown: string): string {
     if (!markdown) {
@@ -149,7 +169,13 @@ function stripIncompleteMarkdown(markdown: string): string {
 
     codeRanges = getCodeRanges(result).ranges;
     result = stripUnpairedLastLineDelimiter(result, '**', codeRanges);
+    codeRanges = getCodeRanges(result).ranges;
+    result = normalizeDelimiterForExpensiMark(result, '**', '*', codeRanges);
+
+    codeRanges = getCodeRanges(result).ranges;
     result = stripUnpairedLastLineDelimiter(result, '~~', codeRanges);
+    codeRanges = getCodeRanges(result).ranges;
+    result = normalizeDelimiterForExpensiMark(result, '~~', '~', codeRanges);
 
     return result;
 }

tests/unit/pages/inbox/conciergeDraftState.test.ts

@@ -47,7 +47,7 @@ describe('conciergeDraftState', () => {
         expect(draft?.reportAction.actorAccountID).toBe(CONST.ACCOUNT_ID.CONCIERGE);
         expect(draft?.reportAction.created).toBe(CREATED);
         expect(getFirstMessageHTML(draft)).toContain('<strong>world</strong>');
-        expect(getFirstMessageText(draft)).toBe('Hello, *world*!');
+        expect(getFirstMessageText(draft)).toBe('Hello, world!');
     });
 
     it('should update the same draft session when a newer sequence arrives', () => {
@@ -79,7 +79,7 @@ describe('conciergeDraftState', () => {
         );
 
         expect(staleDraft).toBe(initialDraft);
-        expect(getFirstMessageText(staleDraft)).toBe('Hello, *world*!');
+        expect(getFirstMessageText(staleDraft)).toBe('Hello, world!');
     });
 
     it('should keep the draft visible through completion and prefer finalRenderedHTML when provided', () => {
@@ -138,10 +138,14 @@ describe('conciergeDraftState', () => {
         });
 
         it('does not alter complete markdown', () => {
-            const complete = 'Hello **bold** and [link](https://example.com) and `code`';
+            const complete = 'Hello *bold* and [link](https://example.com) and `code`';
             expect(stripIncompleteMarkdown(complete)).toBe(complete);
         });
 
+        it('normalizes complete double-delimiter emphasis for ExpensiMark', () => {
+            expect(stripIncompleteMarkdown('Hello **bold** and ~~strike~~')).toBe('Hello *bold* and ~strike~');
+        });
+
         // --- Links / Images ---
         it('strips an incomplete link with only opening bracket', () => {
             expect(stripIncompleteMarkdown('Check out [')).toBe('Check out ');
@@ -182,7 +186,7 @@ describe('conciergeDraftState', () => {
         });
 
         it('preserves complete bold and strips only the unclosed one', () => {
-            expect(stripIncompleteMarkdown('**done** and **broken')).toBe('**done** and ');
+            expect(stripIncompleteMarkdown('**done** and **broken')).toBe('*done* and ');
         });
 
         // --- Strikethrough (~~) ---
@@ -221,6 +225,13 @@ describe('conciergeDraftState', () => {
         });
 
         // --- Streaming integration ---
+        it('keeps complete double-delimiter bold styled without showing raw delimiters during streaming', () => {
+            const draft = applyConciergeDraftEvent(null, createDraftEvent({bodyMarkdown: 'Hello **bold**!'}), REPORT_ID);
+
+            expect(getFirstMessageHTML(draft)).toContain('<strong>bold</strong>');
+            expect(getFirstMessageHTML(draft)).not.toContain('*');
+        });
+
         it('strips incomplete markdown during a streaming draft event', () => {
             const draft = applyConciergeDraftEvent(null, createDraftEvent({bodyMarkdown: 'Check [this link'}), REPORT_ID);
             // The raw '[this link' syntax should NOT appear in the rendered HTML