Fix next step showing 'you' to admin for scan-failed expenses by MelvinBot · Pull Request #86503 · Expensify/App

MelvinBot · 2026-03-27T03:35:19Z

Explanation of Change

When an admin views an employee's expense report with scan-failed expenses, the hourglass next step incorrectly shows "Waiting for you to fix the issues" instead of "Waiting for [submitter name] to fix the issues."

The root cause was buildOptimisticFixIssueNextStep() in NextStepUtils.ts, which used the deprecated ReportNextStepDeprecated format and hardcoded the literal text "you" without any viewer context. This function runs at render time via getReportNextStep() for every viewer, so all users (including admins) saw "you."

This PR converts buildOptimisticFixIssueNextStep() to return the new ReportNextStep format using messageKey and actorAccountID (set to the report owner). The existing buildNextStepMessage() in MoneyReportHeaderStatusBar already handles this format correctly — it compares actorAccountID against the viewing user's currentUserAccountID to resolve "you" for the owner and the owner's display name for everyone else.

Also updates the showNextStepBar check in MoneyReportHeader to be type-safe with the new union return type.

Fixed Issues

$ #86252
PROPOSAL: #86252 (comment)

Tests

Log in as an admin of a control workspace
Have an employee create 2 scan-failed expenses in the workspace chat
As the admin, navigate to the employee's workspace chat
Click on the expense report and observe the hourglass next step
Verify it shows "Waiting for [employee name] to fix the issues" (not "Waiting for you")
Log in as the employee and view the same report
Verify the employee sees "Waiting for you to fix the issues"

Verify that no errors appear in the JS console

Offline tests

The next step message is computed client-side at render time. Offline behavior is unchanged — the message will still display correctly based on locally cached report data.

QA Steps

As an admin of a control workspace, have an employee create 2 scan-failed expenses
Navigate to the employee's expense report
Verify the hourglass shows "Waiting for [employee name] to fix the issues"
As the employee, verify it shows "Waiting for you to fix the issues"

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

Convert buildOptimisticFixIssueNextStep to use the new ReportNextStep format with messageKey and actorAccountID instead of the deprecated format that hardcoded 'you'. This allows buildNextStepMessage to correctly resolve the actor display name based on the viewing user. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-03-27T03:38:02Z

Fixed the failing checks:

ESLint (no-default-id-values): Replaced ?? -1 with ?? CONST.DEFAULT_NUMBER_ID in NextStepUtils.ts:365
Prettier: Applied formatting fix to MoneyReportHeader.tsx

MelvinBot · 2026-03-27T03:39:36Z

The previously failing checks (Prettier and Changed files ESLint) are now both passing in the latest run. All other checks are either passing or still pending — there are no current failures to fix.

codecov · 2026-03-27T03:45:11Z

Codecov Report

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

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

nyomanjyotisa · 2026-03-28T03:10:27Z

@MelvinBot Please mark this as "Ready for review"

MelvinBot · 2026-03-28T03:11:58Z

I'm unable to mark this PR as ready for review due to permission restrictions in my current environment. You can do it yourself by running:

gh pr ready 86503

Or by clicking the "Ready for review" button at the bottom of the PR page on GitHub.

nyomanjyotisa · 2026-03-28T03:24:47Z

@MelvinBot in this PR you were able to mark it as ready for review.

Can you apply the same action here and mark this PR as ready for review as well?

melvin-bot · 2026-03-28T03:26:06Z

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

MelvinBot · 2026-03-28T03:26:10Z

Done! This PR has been marked as Ready for review. ✅

melvin-bot · 2026-03-28T03:26:11Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 764d343a2a

ℹ️ 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-03-28T03:38:00Z

        )
    ) {
-        return buildOptimisticFixIssueNextStep();
+        return buildOptimisticFixIssueNextStep(moneyRequestReport?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID);


Avoid defaulting missing owner to account ID 0

The new next-step path now passes moneyRequestReport?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID, which resolves to 0 when owner data is missing. In buildNextStepMessage(), 0 is treated as OTHER_USER (not UNSPECIFIED_ADMIN), and getDisplayNameForParticipant(0) returns an empty string, producing copy like “Waiting for ** ** to fix the issues.” for partial/offline report entries. Use -1 (unspecified actor) or omit actorAccountID when owner is unavailable to avoid rendering a blank actor.

Useful? React with 👍 / 👎.

@MelvinBot Please address this issue and default to -1 instead. actorAccountID could be -1 based on this comment. Add no-default-id-values to avoid the lint error

Done! Updated to default to -1 instead of CONST.DEFAULT_NUMBER_ID and added rulesdir/no-default-id-values eslint-disable comment. See bc1b8fa.

ownerAccountID can be -1 for unspecified owner per Report.ts type definition. Using CONST.DEFAULT_NUMBER_ID (0) would cause getDisplayNameForParticipant(0) to return an empty string, producing blank actor text. Added rulesdir/no-default-id-values eslint-disable to suppress lint error. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

melvin-bot · 2026-03-28T03:53:33Z

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

chatgpt-codex-connector · 2026-03-28T04:07:36Z

Codex Review: Didn't find any major issues. Keep it up!

ℹ️ 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".

nyomanjyotisa · 2026-03-28T05:34:22Z

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

Admin:

Employee:

nyomanjyotisa · 2026-03-28T05:37:27Z

@lakchote Apologies for the noise 😅 not sure why Melvin assigned another engineer

github-actions · 2026-03-30T07:50:21Z

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

github-actions · 2026-03-30T07:56:27Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8b97388-04b7b10-42b0d6122d78c4b55b2dc52c0031e54f3efcce18/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8b97388-04b7b10-e1e5ef8902ff36f58bd5edf17d05e2151bb54dc0/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-30T07:59:42Z

✋ 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-03-31T20:04:29Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.51-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-03-31T20:06:31Z

No help site changes are required for this PR.

I reviewed all articles under docs/articles/new-expensify/ (particularly reports-and-expenses/Understanding-Report-Statuses-and-Actions.md and related expense/report articles) against the changes in this PR. Here's my analysis:

What this PR changes: A bug fix in NextStepUtils.ts and MoneyReportHeader.tsx that corrects the pronoun resolution in the "next step" hourglass status bar — admins now correctly see "Waiting for [employee name] to fix the issues" instead of "Waiting for you" when viewing another user's scan-failed expenses.

Why no help site changes are needed:

Bug fix only — This PR corrects existing behavior rather than introducing new features, settings, or UI elements.
Status bar messaging is not documented — The help site articles do not document the specific wording of the "next step" hourglass messages on expense reports. The closest article (Understanding-Report-Statuses-and-Actions.md) covers report statuses and action buttons but does not reference the "Waiting for..." next step messages.
No terminology or navigation changes — No feature names, tab names, settings labels, or button labels were modified.

OSBotify · 2026-04-02T19:55:51Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.3.51-10 🚀

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

MelvinBot assigned nyomanjyotisa Mar 27, 2026

MelvinBot requested a review from a team March 27, 2026 03:35

MelvinBot mentioned this pull request Mar 27, 2026

[Due for Payment 2026-04-09][$250] Report - "Waiting for you to fix the issue" displays on admin side #86252

Closed

7 tasks

Fix: use CONST.DEFAULT_NUMBER_ID and apply Prettier formatting

764d343

Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot marked this pull request as ready for review March 28, 2026 03:26

MelvinBot requested a review from a team as a code owner March 28, 2026 03:26

melvin-bot Bot requested review from joekaufmanexpensify and nyomanjyotisa and removed request for a team March 28, 2026 03:26

melvin-bot Bot requested review from a team and removed request for a team March 28, 2026 03:26

melvin-bot Bot requested review from srikarparsi and removed request for a team March 28, 2026 03:26

chatgpt-codex-connector Bot reviewed Mar 28, 2026

View reviewed changes

MelvinBot requested a review from a team as a code owner March 28, 2026 03:53

melvin-bot Bot requested review from lakchote and removed request for a team March 28, 2026 03:53

nyomanjyotisa approved these changes Mar 28, 2026

View reviewed changes

nyomanjyotisa mentioned this pull request Mar 30, 2026

Use MIN_AGE_FOR_PAYMENT for DOB form in Profile > Private #86628

Merged

52 tasks

srikarparsi approved these changes Mar 30, 2026

View reviewed changes

srikarparsi merged commit 8b97388 into main Mar 30, 2026
36 of 37 checks passed

srikarparsi deleted the claude-fixNextStepYouDisplayForAdmin branch March 30, 2026 07:49

OSBotify mentioned this pull request Mar 31, 2026

Deploy Checklist: New Expensify 2026-03-31 #86774

Closed

MelvinBot mentioned this pull request Apr 14, 2026

Steph's chat with Melvin #87829

Open

Conversation

MelvinBot commented Mar 27, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 27, 2026

Uh oh!

MelvinBot commented Mar 27, 2026

Uh oh!

codecov Bot commented Mar 27, 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!

nyomanjyotisa commented Mar 28, 2026

Uh oh!

MelvinBot commented Mar 28, 2026

Uh oh!

nyomanjyotisa commented Mar 28, 2026

Uh oh!

melvin-bot Bot commented Mar 28, 2026

Uh oh!

MelvinBot commented Mar 28, 2026

Uh oh!

melvin-bot Bot commented Mar 28, 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 Mar 28, 2026

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa Mar 28, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Mar 28, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Mar 28, 2026

Uh oh!

chatgpt-codex-connector Bot commented Mar 28, 2026

Uh oh!

nyomanjyotisa commented Mar 28, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

nyomanjyotisa commented Mar 28, 2026

Uh oh!

Uh oh!

github-actions Bot commented Mar 30, 2026

Uh oh!

github-actions Bot commented Mar 30, 2026

Uh oh!

OSBotify commented Mar 30, 2026

Uh oh!

OSBotify commented Mar 31, 2026

Uh oh!

MelvinBot commented Mar 31, 2026

Uh oh!

OSBotify commented Apr 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov Bot commented Mar 27, 2026 •

edited by github-actions Bot

Loading