Add messageKey handling as fallback by ishpaul777 · Pull Request #81223 · Expensify/App

ishpaul777 · 2026-02-02T21:35:25Z

Explanation of Change

This PR adds support for the messageKey format for ReportNextStep updates while maintaining backward compatibility with the deprecated message array format.

Why this is needed:

Auth commands send NextStep updates using the new messageKey format
PHP still sends the old message array format
The frontend needs to support both formats during the transition period
This ensures a smooth migration without breaking existing functionality

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/595924
PROPOSAL:

Tests

Create a WS as User A, invite userB, and user C
set User B as approver of expensed from C
As user C submit a expense, as user B approve it and as user A pay expense elsewhere
As user A cancel payment, verify user B and C expense report updated with "Wating for UserA to pay expense" next step

Offline tests

QA Steps

Create a WS as User A, invite userB, and user C
set User B as approver of expensed from C
As user C submit a expense, as user B approve it and as user A pay expense elsewhere
As user A cancel payment, verify user B and C expense report updated with "Wating for UserA to pay expense" next step

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Uploading Screen Recording 2026-02-03 at 3.11.43 AM.mov…

melvin-bot · 2026-02-02T21:42:37Z

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

This PR adds support for the new messageKey format for ReportNextStep updates while maintaining backward compatibility with the deprecated message array format. This is part of the migration effort to move NextStep update logic from PHP (Web-Expensify) to Auth (C++). Changes: - Updated MoneyReportHeaderStatusBar to handle both old format (message array) and new format (messageKey) - Added type guard isDeprecatedFormatNextStep to detect deprecated format - Modified MoneyReportHeader to check for both formats when determining if the NextStep bar should be shown - Prioritized old format first for backward compatibility

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 164b221705

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

src/components/MoneyReportHeaderStatusBar.tsx

bernhardoj · 2026-02-03T12:11: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 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 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.mp4

src/components/MoneyReportHeaderStatusBar.tsx

bernhardoj · 2026-02-03T13:32:12Z

I followed the QA Steps but the next step returned by the BE is still in the old format. Do we need to wait for some BE changes?

ishpaul777 · 2026-02-03T17:46:21Z

We need this PR to support the new format before we can send it from backend, (to not break prod. behaviour) so if you like you can user my Local dev BE via ngrok to test this, Please DM me on slack whenever you are available to test this

codecov · 2026-02-03T18:07:42Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/DebugUtils.ts	`68.63% <ø> (ø)`
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
src/components/MoneyReportHeaderStatusBar.tsx	`0.00% <0.00%> (ø)`
... and 10 files with indirect coverage changes

trjExpensify

@dangrous @s77rt is this part of the Report Next Steps in Auth project?

ishpaul777 · 2026-02-03T20:24:02Z

its part of https://github.com/Expensify/Expensify/issues/570443 which i am working on this which is moving php onyx updates to Auth

s77rt · 2026-02-04T03:04:57Z

We still want to use the PHP old format. The new format is not ready yet because report.nextStep is not always updated and could be stale. Thus for now we should still queue onyx updates from PHP.

ishpaul777 · 2026-02-04T07:46:38Z

@s77rt do you mean that auth not send updates for report.nextStep? if yes i created these PRs https://github.com/Expensify/Auth/pull/19685, https://github.com/Expensify/Auth/pull/19691 to move all nextStep updates from onyx updates from php to auth, Also in this PR we are checking new format only as fallback, let me knw if there is any other concern?

dangrous · 2026-02-04T17:19:13Z

Yeah at the moment we're not sending any onyx updates for next steps, just getting the data from OpenReport/other calls. I think there are a couple exceptions to this but that's the current state of things.

We are eventually, though, going to send the onyx updates from Auth, once we've confirmed that the new code in Auth matches the old code in PHP exactly. It seems like this App side of things can move forward with no risk, but I think we should hold on the actual updates until later, does that feel right to you @s77rt ? Let me know if I'm missing anything.

s77rt · 2026-02-04T18:40:45Z

As long as we are using the new next step only as fallback then I think it's fine. As for the onyx updates I think it's fine too, the only concern is about performance of ReportNextStep::get. We iterated on this so it should perform well. We will have to test this eventually anyways

melvin-bot · 2026-02-06T02:32:41Z

🎯 @bernhardoj, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #81621.

chuckdries

Works like a charm, tests pass

github-actions · 2026-02-06T23:06:48Z

🚧 @chuckdries has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-02-06T23:10:41Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #81223.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ad3b837-cc9fb948f79fedd9b657a68374c8b3b984d8a3f5/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ad3b837-c4ef11e1cd28762d86754de5b6d1aca01896a1c2/index.html

Web 🕸️
https://81223.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-06T23:12:22Z

✋ 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 · 2026-02-10T07:24:05Z

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

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

jponikarchuk · 2026-02-10T15:29:14Z

This PR failing because of the issue
This issue is reproducible in: Web and Android app

…dates-to-auth" This reverts commit ad3b837, reversing changes made to 9a29054.

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

🚀 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:54:13Z

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

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

OSBotify · 2026-02-12T15:23:32Z

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

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

melvin-bot bot assigned ishpaul777 Feb 2, 2026

ishpaul777 marked this pull request as ready for review February 2, 2026 21:42

ishpaul777 requested review from a team as code owners February 2, 2026 21:42

melvin-bot bot requested review from bernhardoj and trjExpensify and removed request for a team February 2, 2026 21:42

melvin-bot bot removed the request for review from a team February 2, 2026 21:42

ishpaul777 force-pushed the migrate-nextstep-updates-to-auth branch from 1820695 to 0ed2218 Compare February 2, 2026 21:48

chatgpt-codex-connector bot reviewed Feb 2, 2026

View reviewed changes

src/components/MoneyReportHeaderStatusBar.tsx Show resolved Hide resolved

bernhardoj reviewed Feb 3, 2026

View reviewed changes

src/components/MoneyReportHeaderStatusBar.tsx Outdated Show resolved Hide resolved

Merge branch 'Expensify:main' into migrate-nextstep-updates-to-auth

cf55b28

ishpaul777 requested a review from chuckdries February 3, 2026 17:48

fix lint

06836d5

trjExpensify reviewed Feb 3, 2026

View reviewed changes

ishpaul777 and others added 3 commits February 6, 2026 00:01

fix type

0223e09

Merge branch 'main' into migrate-nextstep-updates-to-auth

d2a83a2

remove const

44777d4

bernhardoj approved these changes Feb 6, 2026

View reviewed changes

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

[Payment due 2026-02-18] Payment issue for E/App PR#81223 #81621

Closed

chuckdries approved these changes Feb 6, 2026

View reviewed changes

chuckdries merged commit ad3b837 into Expensify:main Feb 6, 2026
30 checks passed

OSBotify mentioned this pull request Feb 10, 2026

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

Closed

jponikarchuk mentioned this pull request Feb 10, 2026

[Due for payment 2026-02-19] Expense - Expense status not immediately updated after WS owner cancel the payment #82000

Closed

7 tasks

lanitochka17 mentioned this pull request Feb 10, 2026

[Due for payment 2026-02-19] [$250] Expense -"No further action required!" is shown on draft report on instant submission workspace #82015

Closed

7 tasks

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

Revert "Merge pull request #81223 from ishpaul777/migrate-nextstep-up…

af82173

…dates-to-auth" This reverts commit ad3b837, reversing changes made to 9a29054.

This was referenced Feb 10, 2026

[CP Staging] Revert nextSteps changes #82019

Merged

fix: "Waiting for you to add expenses" is not translated #80715

Merged

srikarparsi 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

ishpaul777 mentioned this pull request Feb 13, 2026

Add messageKey handling as fallback #82469

Merged

51 tasks

shivang-goliyan mentioned this pull request Mar 12, 2026

[$250] Report - Message 'Waiting for you to add expenses' in empty report is not translate #85123

Open

7 tasks

Conversation

ishpaul777 commented Feb 2, 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 Feb 2, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

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

Uh oh!

bernhardoj commented Feb 3, 2026

Uh oh!

ishpaul777 commented Feb 3, 2026

Uh oh!

codecov bot commented Feb 3, 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!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

ishpaul777 commented Feb 3, 2026

Uh oh!

s77rt commented Feb 4, 2026

Uh oh!

ishpaul777 commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dangrous commented Feb 4, 2026

Uh oh!

s77rt commented Feb 4, 2026

Uh oh!

melvin-bot bot commented Feb 6, 2026

Uh oh!

chuckdries left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026

Uh oh!

github-actions bot commented Feb 6, 2026

Uh oh!

OSBotify commented Feb 6, 2026

Uh oh!

OSBotify commented Feb 10, 2026

Uh oh!

jponikarchuk commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

ishpaul777 commented Feb 2, 2026 •

edited

Loading

bernhardoj commented Feb 3, 2026 •

edited

Loading

codecov bot commented Feb 3, 2026 •

edited by github-actions bot

Loading

ishpaul777 commented Feb 4, 2026 •

edited

Loading

jponikarchuk commented Feb 10, 2026 •

edited

Loading