[No QA] ReportNextStep: New format by s77rt · Pull Request #71855 · Expensify/App

s77rt · 2025-10-04T17:11:23Z

Explanation of Change

The next step is now part of the report's data (report.nextStep). This PR adds support to that new format and optimistically update nextStep. This is basically a preparation and shouldn't impact existing behavior. Once we start sending nextStep from backend, we'd need to update MoneyReportHeader and MoneyReportHeaderStatusBar to actually make use of that.

Fixed Issues

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

Tests

n/a

Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

n/a

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: https://expensify.slack.com/archives/C01GTK53T8Q/p1761768573711109?thread_ts=1761768554.431179&cid=C01GTK53T8Q
- 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 new assets were added or existing ones were modified, I verified that:
- The assets are optimized and compressed (for SVG files, run npm run compress-svg)
- The assets load correctly across all supported platforms.
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.
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

codecov · 2025-10-04T17:21:44Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/CONST/index.ts	`85.71% <ø> (ø)`
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/components/MoneyReportHeaderStatusBar.tsx	`22.22% <ø> (ø)`
src/libs/ReportUtils.ts	`75.16% <ø> (+0.06%)`	⬆️
src/pages/home/ReportScreen.tsx	`70.47% <ø> (ø)`
src/types/utils/whitelistedReportKeys.ts	`100.00% <ø> (ø)`
src/libs/DebugUtils.ts	`68.61% <0.00%> (-0.30%)`	⬇️
src/libs/actions/Report.ts	`54.48% <78.57%> (+0.22%)`	⬆️
src/libs/actions/Transaction.ts	`48.70% <38.88%> (-0.36%)`	⬇️
src/libs/actions/IOU.ts	`64.44% <57.14%> (-0.06%)`	⬇️
... and 1 more
... and 9 files with indirect coverage changes

melvin-bot · 2025-10-07T20:53:29Z

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

s77rt · 2025-10-31T20:50:13Z

We don't need to wait for translation as this won't be displayed to users yet. I have just merged main, most of the failing tests do no look related except one which I fixed.

melvin-bot · 2025-11-01T00:23:03Z

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

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

eh2077 · 2025-11-05T07:44:43Z

@dangrous Can you take a look? Thanks

dangrous

okay this looks great! just a couple of questions

dangrous · 2025-11-05T17:52:55Z

+                    case CONST.NEXT_STEP.ACTOR_TYPE.CURRENT_USER:
+                        return `Waiting for <strong>your</strong> expenses to automatically submit${formattedETA}.`;
+                    case CONST.NEXT_STEP.ACTOR_TYPE.OTHER_USER:
+                        return `Waiting for <strong>${actor}'s</strong> expenses to automatically submit${formattedETA}.`;
+                    case CONST.NEXT_STEP.ACTOR_TYPE.UNSPECIFIED_ADMIN:
+                        return `Waiting for an admin's expenses to automatically submit${formattedETA}.`;


@jamesdeanexpensify since you've been working on these lately - is this the message we want in ND? Or should it just be Waiting for expenses... instead of your/actor's

dangrous · 2025-11-05T18:06:02Z

    },
 });

+function buildNextStepMessage(nextStep: ReportNextStep, translate: LocaleContextProps['translate']): string {


is this essentially the same logic as the existing optimistic next step code, just with the new format?

This is not the optimistic next step builder, it's buildOptimisticNextStep and yes that one is basically same as buildNextStepNew but for new the format.

buildNextStepMessage is the function that generates the message given the report next step object, it's kinda the equivalent of parseMessage but for the new format.

oh got it, thanks that's helpful!

dangrous · 2025-11-07T14:49:00Z

many many conflicts now (sorry!) but then I think we're good to go!

s77rt · 2025-11-09T01:13:17Z

Resolved conflicts

dangrous

one more conflict, looks good thoguh!

s77rt · 2025-11-11T01:29:49Z

Merged main

dangrous · 2025-11-11T15:10:59Z

sigh, now an (unrelated?) typecheck error. Can you double check and merge main one more time? Sorry this is dragging so much...

s77rt · 2025-11-11T18:57:28Z

Yeah I saw that error in other places. Should be fixed now

JmillsExpensify

No review require from the product team. Unsubscribing.

dangrous

Appreciate all the back and forth here, let's do it!

OSBotify · 2025-11-12T18:26:10Z

✋ 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-13T17:29:23Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.2.58-0 🚀

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

OSBotify · 2025-11-14T18:25:05Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.2.58-3 🚀

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

s77rt added 4 commits October 4, 2025 16:28

add nextStep field to Report type

f9453dd

update comment

4cbaf67

export type ReportNextStep

16b9af1

deprecate ReportNextStep old format

917e0c4

melvin-bot Bot assigned s77rt Oct 4, 2025

s77rt added 16 commits October 5, 2025 01:17

pass nextStep (new format) to MoneyReportHeaderStatusBar

adb45d5

add nextstep messages

3f37b79

add buildMessage()

7ab6aee

lint

b874870

merge main

44d2c3d

lint

5373d7a

actorAccountID is optional

7033ee9

deprecate old NextStep util functions

7a384a0

better deprecation message

f1a0fbb

implement buildOptimisticNextStep

2170fb8

optimistically set report.nextStep

76f2eac

lint

4b7b440

better custom date handling

5f0dfe7

handle optimistic custom offset eta

8b0b598

fix dependency cycle

f271005

lint + spell

453a225

s77rt changed the title ~~ReportNextStep: New format~~ [Hold Web-E#48800] ReportNextStep: New format Oct 7, 2025

s77rt added 2 commits October 7, 2025 21:51

fix translation

cd34fb5

lint

63be1af

s77rt marked this pull request as ready for review October 7, 2025 20:53

s77rt requested a review from a team as a code owner October 7, 2025 20:53

melvin-bot Bot requested review from eh2077 and removed request for a team October 7, 2025 20:53

s77rt added 2 commits October 31, 2025 23:38

Merge branch 'main' into report-nextstep

e91e374

fix test

fba394c

eh2077 approved these changes Nov 1, 2025

View reviewed changes

melvin-bot Bot mentioned this pull request Nov 1, 2025

Payment issue for E/App PR#71855 #73997

Closed

dangrous suggested changes Nov 5, 2025

View reviewed changes

merge main

682e58d

s77rt requested a review from a team as a code owner November 9, 2025 01:13

melvin-bot Bot requested review from JmillsExpensify and removed request for a team November 9, 2025 01:13

fix tests

bead5f9

dangrous previously approved these changes Nov 10, 2025

View reviewed changes

merge main

c44e3cb

s77rt dismissed dangrous’s stale review via c44e3cb November 11, 2025 01:29

Merge branch 'main' into report-nextstep

eeca03e

JmillsExpensify reviewed Nov 11, 2025

View reviewed changes

dangrous approved these changes Nov 12, 2025

View reviewed changes

dangrous merged commit bc5705a into Expensify:main Nov 12, 2025
28 checks passed

OSBotify mentioned this pull request Nov 13, 2025

Deploy Checklist: New Expensify 2025-11-13 #75063

Closed

52 tasks

DylanDylann mentioned this pull request Dec 1, 2025

[No QA] ReportNextStep: New format (Part 2) #76357

Merged

53 tasks

Uh oh!

Conversation

s77rt commented Oct 4, 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!

codecov Bot commented Oct 4, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Oct 7, 2025

Uh oh!

s77rt commented Oct 31, 2025

Uh oh!

melvin-bot Bot commented Nov 1, 2025

Uh oh!

eh2077 commented Nov 5, 2025

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

dangrous Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

dangrous Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

s77rt Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

dangrous Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

dangrous commented Nov 7, 2025

Uh oh!

s77rt commented Nov 9, 2025

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

s77rt commented Nov 11, 2025

Uh oh!

dangrous commented Nov 11, 2025

Uh oh!

s77rt commented Nov 11, 2025

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Nov 12, 2025

Uh oh!

OSBotify commented Nov 13, 2025

Uh oh!

OSBotify commented Nov 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

s77rt commented Oct 4, 2025 •

edited

Loading

codecov Bot commented Oct 4, 2025 •

edited by github-actions Bot

Loading