fix: "Waiting for you to add expenses" is not translated by MobileMage · Pull Request #80715 · Expensify/App

MobileMage · 2026-01-28T07:33:33Z

Explanation of Change

This PR adds translation support for the next step status bar messages in the MoneyReportHeader component.

Changes:

MoneyReportHeaderStatusBar.tsx:
- Added support for the new ReportNextStep format (with messageKey) that enables translation
- Uses buildNextStepMessage() from NextStepUtils when the new format is available
- Falls back to the deprecated parseMessage() for backward compatibility
MoneyReportHeader.tsx:
- Added hasOptimisticOverride check to detect when local error states (DEW failures, offline submission, policy violations) override server data
- Only passes the new translated format when there's NO optimistic override, ensuring error messages take precedence

This approach ensures:

Translation works for all supported locales when server sends the new format
Local optimistic error states are preserved and not overwritten by translated messages
Full backward compatibility with the deprecated message format

Fixed Issues

$ #79619
PROPOSAL: #79619 (comment)

Tests

Log in with a user whose locale is set to a non-English language (e.g., German, Spanish)
Create an expense report that shows the "Waiting for you to add expenses" next step message
Verify the message is displayed in the user's locale language

Verify that no errors appear in the JS console

Offline tests

Set the app to offline mode
Navigate to an expense report with a next step message
Verify the next step message still displays correctly (using cached/optimistic data)
Verify error states (DEW failures) display the correct non-translated error message

QA Steps

Log in with a user whose locale is set to German or Spanish
Create a new expense report
Verify the next step status bar shows "Waiting for you to add expenses" in the user's locale language
Test with different report states (pending approval, waiting to pay, etc.)

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

This change adds support for the new translated next step format (ReportNextStep) while preserving backward compatibility with the deprecated format and ensuring local optimistic overrides (error states, offline submission) take precedence.

melvin-bot · 2026-01-28T07:33:40Z

@aimane-chnaif 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]

codecov · 2026-01-28T07:42:57Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/NextStepUtils.ts	`65.73% <100.00%> (+6.13%)`	⬆️
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
... and 16 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9502e77c2a

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-01-28T07:44:11Z

src/components/MoneyReportHeaderStatusBar.tsx

+        // Use new format with translation support when available
+        if (nextStepNew?.messageKey && currentUserAccountID !== undefined) {
+            return buildNextStepMessage(nextStepNew, translate, currentUserAccountID);


Escape user display names before HTML render

When nextStepNew is present this path renders the HTML returned by buildNextStepMessage(). That helper interpolates actor directly into translation strings that contain HTML tags (e.g., nextStep.message.* uses <strong>${actor}</strong> in src/languages/en.ts), and there is no escaping of the display name. Because RenderHTML renders the string as HTML, any participant name containing </> will be interpreted as markup (e.g., injecting links or styling) instead of plain text. This can occur whenever a user sets a display name with HTML characters. Consider escaping actor (and other user-provided params) before translation or adding Str.safeEscape inside buildNextStepMessage to match the safety of parseMessage.

Useful? React with 👍 / 👎.

…ction The actor display name is now escaped using Str.safeEscape before being interpolated into translation strings that contain HTML tags, preventing potential HTML injection when a user's display name contains special characters.

MobileMage · 2026-01-28T08:19:41Z

Adding some tests to fix code coverage

Adds comprehensive test coverage for the buildNextStepMessage function: - Tests for different actor types (current user, other user, unspecified admin) - Tests for ETA handling with etaKey and dateTime - Tests HTML escaping of actor display names to prevent XSS

aimane-chnaif · 2026-02-03T08:42:12Z

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

web.mov

aimane-chnaif · 2026-02-03T08:42:28Z

@MobileMage please fix conflict

chatgpt-codex-connector · 2026-02-03T09:03:30Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

We were unable to download your code in a timely manner.

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

…-expenses-translation # Conflicts: # src/components/MoneyReportHeaderStatusBar.tsx # tests/unit/NextStepUtilsTest.ts

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c7b50b2d96

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-02-09T02:45:35Z

src/components/MoneyReportHeader.tsx

                <View style={[styles.flexRow, styles.gap2, styles.justifyContentStart, styles.flexNoWrap, styles.ph5, styles.pb3]}>
                    <View style={[styles.flexShrink1, styles.flexGrow1, styles.mnw0, styles.flexWrap, styles.justifyContentCenter]}>
-                        {showNextStepBar && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}
+                        {showNextStepBar && <MoneyReportHeaderStatusBar nextStep={hasOptimisticOverride ? optimisticNextStep : (moneyRequestReport?.nextStep ?? optimisticNextStep)} />}


Gate the status bar on the same nextStep you render

Because MoneyReportHeaderStatusBar now prefers moneyRequestReport?.nextStep, the component can be hidden even when a new-format next step exists: showNextStepBar is still computed from optimisticNextStep, which is populated from the deprecated NEXT_STEP collection. If the backend stops sending the deprecated collection (or clears it) while still sending report.nextStep, showNextStepBar becomes false and the status bar never renders despite having data. Consider computing the visibility from the same effective nextStep you pass to the component.

Useful? React with 👍 / 👎.

This makes sense

chatgpt-codex-connector · 2026-02-09T09:15:37Z

Codex Review: Didn't find any major issues. 👍

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

MarioExpensify

LGTM!!

OSBotify · 2026-02-10T07:23:14Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.3.16-0 🚀

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

Revert the effectiveNextStep logic from Expensify#80715 that incorrectly preferred the server's nextStep over the optimistic one after approval, causing the status bar to show "Waiting for an admin to pay" instead of "Waiting for you to pay". Fixes Expensify#81967

…or-expenses-translation" This reverts commit 892aed5, reversing changes made to 5602c93.

chuckdries · 2026-02-10T18:23:00Z

Hi @MobileMage, we ended up needing to revert #81223 to address a deployblocker, which meant I had to revert this PR as well as it built on top of the messageKey changes. Stay tuned for next steps after @ishpaul777 opens a new PR to re-add messageKey

OSBotify · 2026-02-11T06:27:42Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.16-9 🚀

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

OSBotify · 2026-02-11T06:53:33Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.3.17-0 🚀

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

OSBotify · 2026-02-12T15:22:53Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.17-9 🚀

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

ishpaul777 · 2026-02-13T23:52:28Z

we most probably not need this PR once we fully migrate to new format that uses messageKey so i suggest we put this on hold

MobileMage requested review from a team as code owners January 28, 2026 07:33

melvin-bot bot assigned MobileMage Jan 28, 2026

melvin-bot bot requested review from aimane-chnaif and heyjennahay and removed request for a team January 28, 2026 07:33

chatgpt-codex-connector bot reviewed Jan 28, 2026

View reviewed changes

MobileMage force-pushed the fix/79619-waiting-for-expenses-translation branch from 2d9c590 to 66153cc Compare January 28, 2026 08:33

MobileMage force-pushed the fix/79619-waiting-for-expenses-translation branch from 66153cc to 6c10d27 Compare January 28, 2026 08:38

MobileMage added 2 commits February 8, 2026 23:56

Merge remote-tracking branch 'origin/main' into fix/79619-waiting-for…

b58753e

…-expenses-translation # Conflicts: # src/components/MoneyReportHeaderStatusBar.tsx # tests/unit/NextStepUtilsTest.ts

Run prettier on conflict resolution files

c7b50b2

aimane-chnaif approved these changes Feb 9, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Feb 9, 2026

View reviewed changes

Gate status bar visibility on the same nextStep passed to the component

fab3db1

aimane-chnaif approved these changes Feb 9, 2026

View reviewed changes

melvin-bot bot requested a review from MarioExpensify February 9, 2026 09:57

MarioExpensify approved these changes Feb 9, 2026

View reviewed changes

MarioExpensify merged commit 892aed5 into Expensify:main Feb 9, 2026
30 checks passed

OSBotify mentioned this pull request Feb 10, 2026

Deploy Checklist: New Expensify 2026-02-10 #81937

Closed

MrMuzyk mentioned this pull request Feb 10, 2026

Report -"Waiting for and admin to pay expenses" on approved expense changes when reopening it #81967

Closed

7 tasks

MobileMage mentioned this pull request Feb 10, 2026

Fix next step showing 'an admin' instead of 'you' after approval #81998

Closed

53 tasks

chuckdries added a commit that referenced this pull request Feb 10, 2026

Revert "Merge pull request #80715 from MobileMage/fix/79619-waiting-f…

09b9aad

…or-expenses-translation" This reverts commit 892aed5, reversing changes made to 5602c93.

chuckdries mentioned this pull request Feb 10, 2026

[CP Staging] Revert nextSteps changes #82019

Merged

53 tasks

melvin-bot bot mentioned this pull request Feb 12, 2026

[Due for payment 2026-02-19] [$250] Report - "Waiting for you to add expenses" in empty report is not translated #79619

Closed

7 tasks

ishpaul777 mentioned this pull request Feb 13, 2026

Add messageKey handling as fallback #82469

Merged

51 tasks

Conversation

MobileMage commented Jan 28, 2026 • 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 Jan 28, 2026

Uh oh!

codecov bot commented Jan 28, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

MobileMage commented Jan 28, 2026

Uh oh!

aimane-chnaif commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Feb 3, 2026

Uh oh!

chatgpt-codex-connector bot commented Feb 3, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot commented Feb 9, 2026

Uh oh!

MarioExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Feb 10, 2026

Uh oh!

chuckdries commented Feb 10, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

ishpaul777 commented Feb 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MobileMage commented Jan 28, 2026 •

edited

Loading

codecov bot commented Jan 28, 2026 •

edited by github-actions bot

Loading

aimane-chnaif commented Feb 3, 2026 •

edited

Loading