Translation Migration common.iAcceptThe split phrase using `RenderHTML` by PiyushChandra17 · Pull Request #73191 · Expensify/App

PiyushChandra17 · 2025-10-22T09:47:46Z

Explanation of Change

Translation Migration common.iAcceptThe split phrase using RenderHTML

Fixed Issues

$ #72049
PROPOSAL: #72049 (Comment)

Tests

Part 1

Open the New Expensify App
Click on "Account" tab
Click on "Subscription"
Click on "Add payment card" button
On Add payment card page > Verify the text "I accept the Expensify Terms of Service and Privacy Policy" is displayed correctly and it matches with staging/prod and clicking on the link, we are being redirected to correct Terms of Service and Privacy Policy page.

Part 2

Open the New Expensify App
Click on "Accounts" tab
Go to "Wallet"
Click on "Add bank account"
Select the country > Tap on "Next" button
Fill the Account Details > Tap on "Next" button
Click on "Savings" > Confirm
Fill the bank details > Tap on "Next"
Fill the Account holder details > Tap on "Next"
On check your info page > Verify the Text "I accept the Expensify Terms of Service" is displayed correctly and clicking on the link redirects us to "Terms of service" page

Part 3

Open the New Expensify App
Tap on "Workspaces" Tab
Tap on "Workspace" Name
Go to "Workflows"
Tap on "Add bank account"
Tap on "Log into your bank"
Fill all the details and go to "substep 6"
On reimbursement account page > Verify the text "I accept the terms and conditions" is displayed correctly and clicking on the link we are being redirected to correct "ACH terms" page

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

"Same as tests"

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

MacOS: Desktop

melvin-bot · 2025-10-22T09:47:55Z

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

…anguages

…ion/common

codecov · 2025-10-23T07:49:11Z

Codecov Report

❌ Patch coverage is 14.28571% with 6 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...ompleteVerification/subSteps/ConfirmAgreements.tsx	0.00%	5 Missing ⚠️
...ernationalDepositAccount/substeps/Confirmation.tsx	0.00%	1 Missing ⚠️

Files with missing lines	Coverage Δ
src/components/AddPaymentCard/PaymentCardForm.tsx	`92.75% <100.00%> (+0.64%)`	⬆️
...ernationalDepositAccount/substeps/Confirmation.tsx	`0.00% <0.00%> (-29.79%)`	⬇️
...ompleteVerification/subSteps/ConfirmAgreements.tsx	`0.00% <0.00%> (ø)`

... and 12 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

thesahindia · 2025-10-27T00:50:08Z

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
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 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

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

thesahindia · 2025-10-27T18:20:45Z

@PiyushChandra17, looks like you have only provided steps for one page and added screenshots for that. Could you add the steps to test other pages and screenshots? Also please add screenshots for native.

thesahindia · 2025-10-27T19:09:22Z

src/languages/en.ts

+        iAcceptTheFull: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a> and <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacy Policy</a>`,
+        iAcceptTheConfirmAgreements: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.ACH_TERMS_URL}">terms and conditions</a>`,
+        iAcceptTheConfirmation: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a>`,


@aldo-expensify, any reason for keeping 2 different translations? We use I accept the Expensify Terms of Service and Privacy Policy at payments page and I accept the Expensify Terms of Service at wallet substep. Can we use the full version for both?

Well, the terms are different in each case (different URL), so I think it is fine that the text is also different. One is our terms, the other seems to be ACH terms.

@aldo-expensify, the translations I mentioned have same url (1st and 3rd) for "Expensify Terms of Service", the translation only have an extra part for privacy policy in payments page. I think we should confirm with the team.

I don't think changing this in the scope of this PR, and I'm not sure why would want to start asking the user to read and confirm the Privacy policy if that was not the case before.

I'm not sure why would want to start asking the user to read and confirm the Privacy policy if that was not the case before.

I think it's possible that it was missed as there was a similar case in past. But as it's not in the scope of this PR we can skip the discussion here. Will confirm it with design team on slack later.

Sounds good, thanks @thesahindia !

PiyushChandra17 · 2025-10-27T19:36:57Z

Could you add the steps to test other pages and screenshots

@thesahindia Sure, will update the steps and screenshots. Thanks for the review.

thesahindia · 2025-10-27T19:53:21Z

src/languages/en.ts

+        iAcceptTheFull: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a> and <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacy Policy</a>`,
+        iAcceptTheConfirmAgreements: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.ACH_TERMS_URL}">terms and conditions</a>`,
+        iAcceptTheConfirmation: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a>`,


Suggested change

iAcceptTheFull: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a> and <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacy Policy</a>`,

iAcceptTheConfirmAgreements: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.ACH_TERMS_URL}">terms and conditions</a>`,

iAcceptTheConfirmation: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a>`,

acceptTermsAndPrivacy: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a> and <a href="${CONST.OLD_DOT_PUBLIC_URLS.PRIVACY_URL}">Privacy Policy</a>`,

acceptTermsAndConditions: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.ACH_TERMS_URL}">terms and conditions</a>`,

acceptTermsOfService: `I accept the <a href="${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}">Expensify Terms of Service</a>`,

@aldo-expensify Do we really need to change the translation keys here, iAcceptTheFull, iAcceptTheConfirmAgreements, and iAcceptTheConfirmation. I think this makes more sense to me w.r.t file names ...

For me any of the options is fine, so I would consider it a NAB 🤷

@thesahindia Your thoughts on this? As it's not a blocker,I think we should move ahead with this

I think the suggested ones will be easier to read and understand compared to keys like "iAcceptTheFull." It’s a simple change, update it if you’d like, as Aldo mentioned, it’s a NAB.

…ion/common

melvin-bot · 2025-10-29T04:30:15Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. If you want to automatically generate translations for other locales, you can run the Generate static translations GitHub workflow.

Please look at the code and make sure there are no malicious changes before running the workflow.

If you have the K2 extension, you can simply click: [this button]

PiyushChandra17 · 2025-10-29T07:24:06Z

Could you add the steps to test other pages and screenshots?

@thesahindia Yes i am looking into this, i think this is quite similar and i am quite sure i have implemented correctly, just to double check will update that , perhaps i think that needs some workaround to repro the steps. However if you can repro that steps that would be helpful (where it exists in the UI)

Also please add screenshots for native

I think my Android:Native is not working at the moment, perhaps i think it's NAB

Note: All checks have passed ✅

PiyushChandra17 · 2025-10-29T11:35:43Z

@thesahindia Updated the "acceptTermsOfService" repro steps and screenshots.

Note: "acceptTermsAndConditions" would be damn similar indeed. Thanks

PiyushChandra17 · 2025-10-29T19:34:57Z

@thesahindia Bump

PiyushChandra17 · 2025-10-30T20:01:35Z

@thesahindia Bump

PiyushChandra17 · 2025-10-31T07:17:26Z

@thesahindia Update the "acceptTermsAndConditions" repro steps (needed some workaround here) and screenshots.

Note: For the first part, we can't make changes to "Subscription" in Native, thats the reason screenshots aren't there.

cc: @aldo-expensify

thesahindia

LGTM!

PiyushChandra17 · 2025-11-02T19:30:19Z

@aldo-expensify Bump

OSBotify · 2025-11-03T18:26:05Z

✋ 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 · 2025-11-03T23:02:09Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.2.43-0 🚀

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

OSBotify · 2025-11-04T20:49:42Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.43-2 🚀

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

PiyushChandra17 added 3 commits October 22, 2025 14:19

Added translation migration for common.iAcceptThe using RenderHTML

c2e4d43

removed Text and TextLink imports

d48af84

Fix spacing in en.ts && es.ts

e6e7707

PiyushChandra17 requested a review from a team as a code owner October 22, 2025 09:47

melvin-bot bot assigned PiyushChandra17 Oct 22, 2025

melvin-bot bot requested review from thesahindia and removed request for a team October 22, 2025 09:47

PiyushChandra17 marked this pull request as draft October 22, 2025 09:54

PiyushChandra17 added 3 commits October 23, 2025 11:00

Added translation migration in ConfirmAgreements in all languages

e33623d

removed TextLink

79d91f1

Added translation migration in Confirmation using RenderHTML in all l…

ec21194

…anguages

PiyushChandra17 marked this pull request as ready for review October 23, 2025 06:08

PiyushChandra17 mentioned this pull request Oct 23, 2025

[Due for payment 2025-11-11] [$125] [Translation Migration] Fix split or incomplete translations in common #72049

Closed

PiyushChandra17 and others added 3 commits October 23, 2025 11:55

Merge branch 'Expensify:main' into PiyushChandra17/translation/migrat…

2e42cfb

…ion/common

Fix eslint errors

285bdc1

Fix flaky jest unit test

3aa4b85

thesahindia reviewed Oct 27, 2025

View reviewed changes

thesahindia suggested changes Oct 27, 2025

View reviewed changes

Merge branch 'Expensify:main' into PiyushChandra17/translation/migrat…

86a4d1c

…ion/common

PiyushChandra17 added 2 commits October 29, 2025 11:19

Update the translations keys in all languages locals

a439777

Fix flaky jest error js heap out memory error

67a3bcb

aldo-expensify requested a review from thesahindia October 30, 2025 19:09

thesahindia approved these changes Oct 31, 2025

View reviewed changes

melvin-bot bot requested a review from aldo-expensify October 31, 2025 07:29

aldo-expensify approved these changes Nov 3, 2025

View reviewed changes

aldo-expensify merged commit 187fe4b into Expensify:main Nov 3, 2025
30 checks passed

OSBotify mentioned this pull request Nov 3, 2025

Deploy Checklist: New Expensify 2025-11-03 #74140

Closed

54 tasks

Conversation

PiyushChandra17 commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Oct 22, 2025

Uh oh!

codecov bot commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

thesahindia commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

thesahindia commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PiyushChandra17 commented Oct 27, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Oct 29, 2025

Uh oh!

PiyushChandra17 commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PiyushChandra17 commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PiyushChandra17 commented Oct 29, 2025

Uh oh!

PiyushChandra17 commented Oct 30, 2025

Uh oh!

PiyushChandra17 commented Oct 31, 2025

Uh oh!

thesahindia left a comment

Choose a reason for hiding this comment

Uh oh!

PiyushChandra17 commented Nov 2, 2025

Uh oh!

Uh oh!

OSBotify commented Nov 3, 2025

Uh oh!

OSBotify commented Nov 3, 2025

Uh oh!

OSBotify commented Nov 4, 2025

Uh oh!

Reviewers

Assignees

Labels

PiyushChandra17 commented Oct 22, 2025 •

edited

Loading

codecov bot commented Oct 23, 2025 •

edited

Loading

thesahindia commented Oct 27, 2025 •

edited

Loading

thesahindia commented Oct 27, 2025 •

edited

Loading

PiyushChandra17 commented Oct 29, 2025 •

edited

Loading

PiyushChandra17 commented Oct 29, 2025 •

edited

Loading