refactor split phrase phoneError using RenderHTML by PiyushChandra17 · Pull Request #64704 · Expensify/App

PiyushChandra17 · 2025-06-21T18:18:24Z

Explanation of Change

refactor split phrase phoneError using RenderHTML

Fixed Issues

$ #62808
PROPOSAL: #62808 (Comment)

Tests

Pre-condition: Login via phone number

Open the new expensify web-app
Tap on FAB
Go to Book Travel
Click on Book Travel button
Verify the error text "Please add an email as a primary login to book travel" is displayed correctly and we are able to click on the link and being redirected

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I verified there are no new alerts related to the canBeMissing param for useOnyx
I followed proper code patterns (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 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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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)
[x 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 Design label and/or tagged @Expensify/design 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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-06-21T18:18:29Z

@allgandalf 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]

PiyushChandra17 · 2025-06-21T18:29:09Z

@allgandalf This PR is ready for review

trjExpensify · 2025-06-24T11:21:56Z

👋 @PiyushChandra17 you have conflicts on this one, can you resolve please? Thanks!

PiyushChandra17 · 2025-06-24T14:18:39Z

@trjExpensify Done

allgandalf · 2025-06-25T03:43:03Z

@PiyushChandra17 conflicts still exist

…andra17/refactor/splitphrase-phoneError

…se-phoneError

PiyushChandra17 · 2025-06-25T08:50:59Z

@allgandalf Conflicts fixed

allgandalf

@PiyushChandra17 The above image shows the size of the link text on staging, please match the same, currently on your PR the link text size is a lot bigger

@

PiyushChandra17 · 2025-06-26T09:20:55Z

@allgandalf i think applying fontSize to 13px to that link matches the staging size

PiyushChandra17 · 2025-06-26T14:42:20Z

@allgandalf Updated the link size to match the staging, now need to figure this out how to set textDecorationLine: none, currently it's underline by default

allgandalf · 2025-06-27T05:04:14Z

cool, lmk once this is ready

…se-phoneError

allgandalf · 2025-06-30T17:45:09Z

@PiyushChandra17 please resolve conflicts

allgandalf · 2025-06-30T17:46:09Z

also please fix the issue where the link is underlined

PiyushChandra17 · 2025-07-01T09:48:45Z

@allgandalf i think wrapping the rbr tag with comment tag will solve this underline link issue

…se-phoneError

PiyushChandra17 · 2025-07-01T13:25:36Z

@allgandalf I think it's fully fledged working now, removed that underline. Here's the screenshot

Copilot

Pull Request Overview

This PR refactors the travel booking phone error message to use RenderHTML instead of split phrases. It consolidates multiple translation components (phrase1, link, phrase2) into a single HTML string that contains the link element, improving maintainability and localization consistency.

Key Changes

Refactored phoneError translations across all language files from object with separate phrases to HTML function with embedded link
Updated BookTravelButton component to use RenderHTML component instead of manual Text/TextLink composition
Added PhoneErrorRouteParams type for translation function parameters

Reviewed Changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/languages/*.ts	Converted phoneError from object with separate phrases to HTML function with embedded link
src/languages/params.ts	Added PhoneErrorRouteParams type definition
src/components/BookTravelButton.tsx	Updated to use RenderHTML and removed manual Text/TextLink construction
src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx	Removed hardcoded textDecorationLine underline style
docs/articles/travel/getting-started/Common-Travel-Terms-and-Abbreviations.md	Fixed typo "Expatriot" to "Expatriate"
cspell.json	Added travel-related terms to spelling dictionary

Comments suppressed due to low confidence (1)

cspell.json:758

Missing comma after "iaco" entry. This will cause a syntax error in the JSON file.

        "iaco"

PiyushChandra17 · 2025-07-30T16:54:57Z

@allgandalf I think now this is fully fledged ready and the line height is set to 16px and it matches with staging

cc: @shawnborton

shawnborton · 2025-07-30T17:15:38Z

Awesome, thank you for the adjustments!

allgandalf · 2025-08-01T05:39:19Z

Please fix the failing tests

…se-phoneError

PiyushChandra17 · 2025-08-04T18:20:37Z

@allgandalf Done +

shubham1206agra · 2025-08-05T07:30:13Z

+        "ASPAC",
+        "CLIA",
+        "EMEA",
+        "ESTA",
+        "IBTA",
+        "NBTA",
+        "Cliqbook",
+        "GDSO",
+        "TIMATIC",
+        "UDIDS",
+        "VMPD",
+        "midoffice",
+        "airside",
+        "outplant",
+        "rebooking",
+        "Heathrow",
+        "eticket",
+        "eraa",
+        "FWTV",
+        "EDIFACT",
+        "NLRA",
+        "NTSB",
+        "TBUM",
+        "iaco",


Suggested change

"ASPAC",

"CLIA",

"EMEA",

"ESTA",

"IBTA",

"NBTA",

"Cliqbook",

"GDSO",

"TIMATIC",

"UDIDS",

"VMPD",

"midoffice",

"airside",

"outplant",

"rebooking",

"Heathrow",

"eticket",

"eraa",

"FWTV",

"EDIFACT",

"NLRA",

"NTSB",

"TBUM",

"iaco",

Reverse these changes.

Hmm, was skeptical about that

shubham1206agra · 2025-08-05T07:30:28Z

 | executive card | Types of privilege cards available to frequent users of airlines, hotel chains, car rental companies, etc. Most carry benefits and have their own brand names (e.g., British Airways Executive Blue, Executive Silver, Executive Gold and Premier). |
 | executive room | Higher grade than standard room and usually slightly larger, the executive room often has additional facilities for the business traveler such as trouser press, desk etc. and may be located on a separate Executive Club Floor. |
-| Expatriot (or expat) | An expatriate (in abbreviated form, expat) is a person temporarily or permanently residing in a country and culture other than that of the person’s upbringing or legal residence. |
+| Expatriate (or expat) | An expatriate (in abbreviated form, expat) is a person temporarily or permanently residing in a country and culture other than that of the person’s upbringing or legal residence. |


Suggested change

| Expatriate (or expat) | An expatriate (in abbreviated form, expat) is a person temporarily or permanently residing in a country and culture other than that of the person’s upbringing or legal residence. |

| Expatriot (or expat) | An expatriate (in abbreviated form, expat) is a person temporarily or permanently residing in a country and culture other than that of the person’s upbringing or legal residence. |

Same here

allgandalf · 2025-08-12T05:13:44Z

bump @PiyushChandra17

PiyushChandra17 · 2025-08-12T06:28:40Z

@allgandalf Same for this one ..

PiyushChandra17 · 2025-08-12T14:32:42Z

@allgandalf I think we are good to go here ...

cc: @shubham1206agra

allgandalf · 2025-08-13T05:07:24Z

                styles.link,
                {
                    fontSize: HTMLEngineUtils.getFontSizeOfRBRChild(tnode),
-                    textDecorationLine: 'underline',


why this change?

@allgandalf To remove the underline from the link

shubham1206agra · 2025-09-06T18:19:21Z

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 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
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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
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.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 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
xIf 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 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 Design label and/or tagged @Expensify/design 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.
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 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

shubham1206agra · 2025-09-06T18:21:03Z

@roryabraham This PR can be merged now.

PiyushChandra17 · 2025-09-08T10:11:11Z

@roryabraham bump here 👀 . Thanks

OSBotify · 2025-09-09T23:39:29Z

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

PiyushChandra17 · 2025-09-10T06:22:09Z

Thanks for the merge here, a special shoutout to @allgandalf for the amazing mentorship here. He's my MENTOR 😄

OSBotify · 2025-09-10T23:28:32Z

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

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

OSBotify · 2025-09-11T11:09:51Z

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

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

OSBotify · 2025-09-12T00:15:25Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.12-4 🚀

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

PiyushChandra17 added 2 commits June 21, 2025 23:19

refactor splitphrase phoneError

ac713bc

removed unneccessary dependency

c160266

PiyushChandra17 requested a review from a team as a code owner June 21, 2025 18:18

melvin-bot Bot requested a review from allgandalf June 21, 2025 18:18

melvin-bot Bot removed the request for review from a team June 21, 2025 18:18

PiyushChandra17 mentioned this pull request Jun 21, 2025

Stop splitting up phrases for formatting #62808

Closed

Merge branch 'main' into PiyushChandra17/refactor/splitphrase-phoneError

94593a1

PiyushChandra17 and others added 3 commits June 25, 2025 11:25

Merge branch 'main' of https://github.com/Expensify/App into PiyushCh…

2fda502

…andra17/refactor/splitphrase-phoneError

Fix merge conflict

c489a54

Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…

2da19ef

…se-phoneError

added styles directly in languages

0572fc6

allgandalf suggested changes Jun 25, 2025

View reviewed changes

update font-size in link

bd9e72e

Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…

d97f961

…se-phoneError

PiyushChandra17 and others added 3 commits July 1, 2025 18:26

Merge branch 'main' into PiyushChandra17/refactor/splitphrase-phoneError

81f983b

Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…

06bfb7d

…se-phoneError

Fix underline link

71e2463

Copilot AI review requested due to automatic review settings July 30, 2025 16:04

Copilot AI reviewed Jul 30, 2025

View reviewed changes

PiyushChandra17 added 2 commits July 30, 2025 22:05

removed Text style

ac8661c

Fix eslint and prettier check

f3c5cda

Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…

9408892

…se-phoneError

shubham1206agra reviewed Aug 5, 2025

View reviewed changes

PiyushChandra17 and others added 2 commits August 12, 2025 19:42

Merge branch 'main' into PiyushChandra17/refactor/splitphrase-phoneError

ced497b

Modified cpell.json && MD file

9fa03dd

allgandalf suggested changes Aug 13, 2025

View reviewed changes

shubham1206agra approved these changes Sep 6, 2025

View reviewed changes

melvin-bot Bot requested a review from roryabraham September 6, 2025 18:19

roryabraham approved these changes Sep 9, 2025

View reviewed changes

roryabraham merged commit d48319d into Expensify:main Sep 9, 2025
23 of 25 checks passed

OSBotify mentioned this pull request Sep 10, 2025

Deploy Checklist: New Expensify 2025-09-10 #70325

Closed

	\| Expatriate (or expat) \| An expatriate (in abbreviated form, expat) is a person temporarily or permanently residing in a country and culture other than that of the person’s upbringing or legal residence. \|
	\| Expatriot (or expat) \| An expatriate (in abbreviated form, expat) is a person temporarily or permanently residing in a country and culture other than that of the person’s upbringing or legal residence. \|

Conversation

PiyushChandra17 commented Jun 21, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 21, 2025

Uh oh!

PiyushChandra17 commented Jun 21, 2025

Uh oh!

trjExpensify commented Jun 24, 2025

Uh oh!

PiyushChandra17 commented Jun 24, 2025

Uh oh!

allgandalf commented Jun 25, 2025

Uh oh!

PiyushChandra17 commented Jun 25, 2025

Uh oh!

allgandalf left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PiyushChandra17 commented Jun 26, 2025

Uh oh!

PiyushChandra17 commented Jun 26, 2025

Uh oh!

allgandalf commented Jun 27, 2025

Uh oh!

allgandalf commented Jun 30, 2025

Uh oh!

allgandalf commented Jun 30, 2025

Uh oh!

PiyushChandra17 commented Jul 1, 2025

Uh oh!

PiyushChandra17 commented Jul 1, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Key Changes

Reviewed Changes

Uh oh!

PiyushChandra17 commented Jul 30, 2025

Uh oh!

shawnborton commented Jul 30, 2025

Uh oh!

allgandalf commented Aug 1, 2025

Uh oh!

PiyushChandra17 commented Aug 4, 2025

Uh oh!

shubham1206agra Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

PiyushChandra17 Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

PiyushChandra17 Aug 5, 2025

Choose a reason for hiding this comment

Uh oh!

allgandalf commented Aug 12, 2025

Uh oh!

PiyushChandra17 commented Aug 12, 2025

Uh oh!

PiyushChandra17 commented Aug 12, 2025

Uh oh!

allgandalf Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

PiyushChandra17 Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Sep 6, 2025

Reviewer Checklist

allgandalf left a comment •

edited

Loading