From e40c0af97f4197fd3a82f83b5cc7b2b220ad8bfd Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 19 Dec 2022 16:22:52 -0500 Subject: [PATCH 1/5] Merge pull request #13705 from Expensify/version-BUILD-C7DA21B9-B166-4E8D-8DDE-F4669BE8420A Update version to 1.2.41-2 on main (cherry picked from commit 79a9d04a5b8e08f8cd74bd586e88c0b9c1a877f9) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 70571a2bd5aa..a100aef2d0b1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001024101 - versionName "1.2.41-1" + versionCode 1001024102 + versionName "1.2.41-2" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c05413e3b128..ace133fdf042 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.41.1 + 1.2.41.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 5282cef6b51f..548839b266f9 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.41.1 + 1.2.41.2 diff --git a/package-lock.json b/package-lock.json index 39eb4bbe9875..640c1eea07d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.41-1", + "version": "1.2.41-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.41-1", + "version": "1.2.41-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 42dcedf62cd5..f2b82c63f10d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.41-1", + "version": "1.2.41-2", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 05e5fcc3df3daf87399fd7db1fe15d6cfa05bc3a Mon Sep 17 00:00:00 2001 From: Brandon Stites <42391420+stitesExpensify@users.noreply.github.com> Date: Mon, 19 Dec 2022 14:14:38 -0700 Subject: [PATCH 2/5] Merge pull request #13703 from Expensify/yuwen-htmlToMarkdown Make sure that we pass markdown to parser when getting the parsed originalCommentHTML (cherry picked from commit 0d024bed1adb5c954602a64ba1bae45cc9192d26) --- src/libs/actions/Report.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 351b3a3956b5..993fb7faac94 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -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)) { From b7ea7ceb3c95f86d3218c717bba1fe7dfd1705bb Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 19 Dec 2022 14:46:36 -0700 Subject: [PATCH 3/5] Resolve merge conflict --- src/libs/actions/Report.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 993fb7faac94..889113ec0743 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -905,13 +905,9 @@ 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)) { From 1eb10529d79a014fe11637aba71568296db1c6a7 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 19 Dec 2022 14:50:25 -0700 Subject: [PATCH 4/5] Compare to parsed comment --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 889113ec0743..fa2869bc4af4 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -916,7 +916,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) { } // Skip the Edit if message is not changed - if (originalMessageHTML === htmlForNewComment.trim()) { + if (parsedOriginalCommentHTML === htmlForNewComment.trim()) { return; } From 7ace5c46ee62e2ab3c4b4246ef51f505bdb99c4f Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 19 Dec 2022 14:55:51 -0700 Subject: [PATCH 5/5] Remove unused var --- src/libs/actions/Report.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index fa2869bc4af4..ccb1073fe6a0 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -906,7 +906,6 @@ function editReportComment(reportID, originalReportAction, textForNewComment) { // https://github.com/Expensify/App/issues/9090 const autolinkFilter = {filterRules: _.filter(_.pluck(parser.rules, 'name'), name => name !== 'autolink')}; const htmlForNewComment = parser.replace(textForNewComment, autolinkFilter); - const originalMessageHTML = parser.replace(originalReportAction.message[0].html, autolinkFilter); const parsedOriginalCommentHTML = parser.replace(parser.htmlToMarkdown(originalCommentHTML), autolinkFilter); // Delete the comment if it's empty