Escape special characters in `MARKEDREIMBURSED` message #34081

tienifr · 2024-01-08T02:48:28Z

Details

This PR escapes special characters in MARKEDREIMBURSED message.

Fixed Issues

Tests

In OD, create Collect plan, set as default
Set isPolicyExpenseChatEnabled = true on the policy by:
1. Open the policy settings in OldDot
2. Open the JS console and run the following commands:

p = Policy.getCurrent();
p.policy.isPolicyExpenseChatEnabled = "true";
p.save();

In OD, create report on ^ policy & add an expense
In OD, Submit the report (to yourself) and Approve it
In OD, mark the report as reimbursed (Reimburse -> I'll do it manually). Important: Leave a comment when you're reimbursing: "I'm manually reimbursing this report"
In ND, open the above report
In ND, verify that the system message in OD report is:

You marked this report as manually reimbursed. This report will be reimbursed outside of Expensify, saying I'm marking this as manually reimbursed for testing

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

In OD, create Collect plan, set as default
Set isPolicyExpenseChatEnabled = true on the policy by:
1. Open the policy settings in OldDot
2. Open the JS console and run the following commands:

p = Policy.getCurrent();
p.policy.isPolicyExpenseChatEnabled = "true";
p.save();

In OD, create report on ^ policy & add an expense
In OD, Submit the report (to yourself) and Approve it
In OD, mark the report as reimbursed (Reimburse -> I'll do it manually). Important: Leave a comment when you're reimbursing: "I'm manually reimbursing this report"
In ND, open the above report
In ND, verify that the system message in OD report is:

You marked this report as manually reimbursed. This report will be reimbursed outside of Expensify, saying I'm marking this as manually reimbursed for testing

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-01-09.at.17.33.33-compressed.mov

MacOS: Desktop

melvin-bot · 2024-01-08T02:54:44Z

@cubuspl42 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

cubuspl42 · 2024-01-08T13:54:40Z

@tienifr

In the test steps, you mention NewDot only once:

Open the report in ND, in another tab or device

Is this intentional?

cubuspl42 · 2024-01-08T13:55:48Z

Would you upload a video presenting the test flow, at least from step 3, for at least one platform, let's say macOS / Web?

tienifr · 2024-01-09T10:37:12Z

@cubuspl42 I've supplemented the recording from Step 3 to MacOS: Chrome / Safari section.

cubuspl42 · 2024-01-11T10:59:46Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

roryabraham · 2024-01-14T03:55:11Z

src/pages/home/report/ReportActionItemBasicMessage.tsx

@@ -12,7 +13,7 @@ function ReportActionItemBasicMessage({message, children}: ReportActionItemBasic
    const styles = useThemeStyles();
    return (
        <View>
-            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message}</Text>
+            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Str.htmlDecode(message)}</Text>


Maybe could memoize the decoded message but it probably doesn't make a significant difference

OSBotify · 2024-01-14T03:59:44Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-01-15T11:57:38Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.25-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2024-01-17T01:15:22Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.25-10 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

escape special characters in marked reimbursed message

3fcc49c

tienifr marked this pull request as ready for review January 8, 2024 02:54

tienifr requested a review from a team as a code owner January 8, 2024 02:54

melvin-bot bot removed the request for review from a team January 8, 2024 02:54

melvin-bot bot requested a review from cubuspl42 January 8, 2024 02:54

tienifr mentioned this pull request Jan 8, 2024

[HOLD for payment 2024-01-24] [$500] Special characters not correctly escaped in system messages #33996

Closed

6 tasks

cubuspl42 approved these changes Jan 11, 2024

View reviewed changes

melvin-bot bot requested a review from roryabraham January 11, 2024 11:00

roryabraham approved these changes Jan 14, 2024

View reviewed changes

roryabraham reviewed Jan 14, 2024

View reviewed changes

roryabraham merged commit fd45dea into Expensify:main Jan 14, 2024
23 checks passed

github-actions bot mentioned this pull request Jan 15, 2024

Deploy Checklist: New Expensify 2024-01-15 #34493

Closed

83 tasks

kbecciv mentioned this pull request Jan 16, 2024

[HOLD for payment 2024-04-09] [$250] IOU - Invalid name and timezone is displayed "It's 11:00 AM for Elise" #34570

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Escape special characters in `MARKEDREIMBURSED` message #34081

Escape special characters in `MARKEDREIMBURSED` message #34081

tienifr commented Jan 8, 2024 •

edited

Loading

melvin-bot bot commented Jan 8, 2024

cubuspl42 commented Jan 8, 2024

cubuspl42 commented Jan 8, 2024

tienifr commented Jan 9, 2024 •

edited

Loading

cubuspl42 commented Jan 11, 2024

roryabraham Jan 14, 2024

OSBotify commented Jan 14, 2024

OSBotify commented Jan 15, 2024

OSBotify commented Jan 17, 2024

Escape special characters in MARKEDREIMBURSED message #34081

Escape special characters in MARKEDREIMBURSED message #34081

Conversation

tienifr commented Jan 8, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 8, 2024

cubuspl42 commented Jan 8, 2024

cubuspl42 commented Jan 8, 2024

tienifr commented Jan 9, 2024 • edited Loading

cubuspl42 commented Jan 11, 2024

Reviewer Checklist

Screenshots/Videos

roryabraham Jan 14, 2024

Choose a reason for hiding this comment

OSBotify commented Jan 14, 2024

OSBotify commented Jan 15, 2024

OSBotify commented Jan 17, 2024

Escape special characters in `MARKEDREIMBURSED` message #34081

Escape special characters in `MARKEDREIMBURSED` message #34081

tienifr commented Jan 8, 2024 •

edited

Loading

tienifr commented Jan 9, 2024 •

edited

Loading