Skip to content

Commit

Permalink
Merge pull request #13703 from Expensify/yuwen-htmlToMarkdown
Browse files Browse the repository at this point in the history
Make sure that we pass markdown to parser when getting the parsed originalCommentHTML

(cherry picked from commit 0d024be)
  • Loading branch information
stitesExpensify authored and OSBotify committed Dec 19, 2022
1 parent e40c0af commit 05e5fcc
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/libs/actions/Report.js
Original file line number Diff line number Diff line change
Expand Up @@ -905,8 +905,13 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
// Do not autolink if someone explicitly tries to remove a link from message.
// https://github.com/Expensify/App/issues/9090
const autolinkFilter = {filterRules: _.filter(_.pluck(parser.rules, 'name'), name => name !== 'autolink')};
<<<<<<< HEAD
const htmlForNewComment = parser.replace(textForNewComment, autolinkFilter);
const originalMessageHTML = parser.replace(originalReportAction.message[0].html, autolinkFilter);
=======
const htmlForNewComment = parser.replace(markdownForNewComment, autolinkFilter);
const parsedOriginalCommentHTML = parser.replace(parser.htmlToMarkdown(originalCommentHTML), autolinkFilter);
>>>>>>> 0d024bed1a (Merge pull request #13703 from Expensify/yuwen-htmlToMarkdown)

// Delete the comment if it's empty
if (_.isEmpty(htmlForNewComment)) {
Expand Down

0 comments on commit 05e5fcc

Please sign in to comment.