Fix: Enable strict HTML tag validation on tax name forms#84872
Fix: Enable strict HTML tag validation on tax name forms#84872MonilBhavsar merged 3 commits intomainfrom
Conversation
Angle brackets in tax names (e.g., GST<10%>) bypass the default HTML tag regex but get stripped by the backend WAF, creating duplicate tax rates and causing selection reversion. Enable shouldUseStrictHtmlTagValidation on both the tax creation and tax rename FormProviders to consistently reject any angle-bracketed content before submission. Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>
This should ensure that the name page while creating a new tax also check for strict html tag validation. |
…ectorModal Pass shouldUseStrictHtmlTagValidation prop through TextPicker and TextSelectorModal so the strict HTML tag validation runs inside the modal's own FormProvider, providing immediate validation feedback while the user is typing. Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>
|
Good catch! You're right — the current approach only sets I've implemented your suggestion in b8b4757:
I also kept |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
|
@MelvinBot I could reproduce the issue in |
Add shouldUseStrictHtmlTagValidation to the FormProvider and the Name TextPicker InputWrapper in CreateReportFieldsPage so that angle bracket patterns are rejected in report field names too. Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>
|
Done! In b5baee7 I added |
sobitneupane
left a comment
There was a problem hiding this comment.
Screenshots/Videos
Android: HybridApp
Screen.Recording.2026-03-16.at.14.53.45.mov
Android: mWeb Chrome
Screen.Recording.2026-03-16.at.14.55.50.mov
iOS: HybridApp
Screen.Recording.2026-03-16.at.14.44.40.mov
iOS: mWeb Safari
Screen.Recording.2026-03-16.at.14.46.53.mov
MacOS: Chrome / Safari
Screen.Recording.2026-03-16.at.14.43.28.mov
sobitneupane
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
- I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- 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 there are no new alerts related to the
canBeMissingparam foruseOnyx - 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.
toggleReportand notonIconClick). - 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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
- 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.
- 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 usingAvatarhave 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.ts 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
- If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
|
We did not find an internal engineer to review this PR, trying to assign a random engineer to #83183 as well as to this PR... Please reach out for help on Slack if no one gets assigned! |
|
@MelvinBot Please mark this PR as ready for review |
|
@sobitneupane 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] |
|
Done — this PR has been marked as ready for review. 🚀 |
JmillsExpensify
left a comment
There was a problem hiding this comment.
Product behavior outline in testing steps LGTM
There was a problem hiding this comment.
@MelvinBot Why changes in CreateReportField page? Is this related to tax?
|
The The change was added in commit If you'd prefer to keep this PR scoped strictly to the tax issue (#83183), the |
|
@MelvinBot I'm fine with it. Could you then please update "QA" section in PR description to also test for Report fields change? |
|
Updated the PR description. Both the Tests and QA Steps sections now include a Report fields subsection with steps to:
I also added a note in the Explanation of Change section mentioning the Report Fields fix. |
|
🚧 @MonilBhavsar has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.39-0 🚀
|
|
🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.39-3 🚀
|
Explanation of Change
Tax names containing certain angle bracket patterns (e.g.,
GST<10%>) bypass the default HTML tag validation regex (VALIDATE_FOR_HTML_TAG_REGEX) because the pattern<10%>doesn't match valid HTML-like tag syntax. However, the backend WAF strips any angle-bracketed content, creating a mismatch: the frontend optimistically savesGST<10%>while the backend createsGST, resulting in duplicate tax rates and broken selection.The codebase already has
STRICT_VALIDATE_FOR_HTML_TAG_REGEXand ashouldUseStrictHtmlTagValidationprop onFormProviderthat catches any content in angle brackets. This PR enables that strict validation on both the tax rate creation and tax rate rename forms, consistently rejecting names likeGST<10%>before submission.Additionally, the same fix is applied to the Report Fields creation page, where the field name input also uses
TextPickerand is susceptible to the same WAF stripping issue.Fixed Issues
$ #83183
PROPOSAL: #83183 (comment)
Tests
Tax rates:
GST<10%>GST 10%), set a value, and saveTax<Rate>Report fields:
Field<test>Field test), select a type, and saveOffline tests
The validation is purely client-side and runs before any API call, so offline behavior is unchanged. The form still works offline with
enabledWhenOffline— it just now also rejects angle bracket patterns.QA Steps
Tax rates:
GST<10%>and try to saveGST 10%), set a value, and save successfullyTax<5%>— verify "Invalid character" error appearsReport fields:
Field<test>Field test), select a type, and save successfullyPR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
N/A - No UI changes, only enabling an existing validation prop
Android: mWeb Chrome
N/A - No UI changes, only enabling an existing validation prop
iOS: Native
N/A - No UI changes, only enabling an existing validation prop
iOS: mWeb Safari
N/A - No UI changes, only enabling an existing validation prop
MacOS: Chrome / Safari
N/A - No UI changes, only enabling an existing validation prop