Fix next step showing 'an admin' instead of 'you' after approval by MobileMage · Pull Request #81998 · Expensify/App

MobileMage · 2026-02-10T15:08:25Z

Explanation of Change

PR #80715 introduced effectiveNextStep logic that chose between the optimistic (client-computed) next step and the server's nextStep based on a hasOptimisticOverride check. After approval, optimisticNextStep === nextStep (no override), so it fell through to moneyRequestReport?.nextStep from the server, which contains generic "an admin" text instead of the personalized "you" message. This PR reverts that logic so the status bar always uses the client-computed optimistic next step, which correctly personalizes the actor.

Fixed Issues

$ #81967

Tests

Create a workspace with approval workflows enabled
Create and submit an expense on that workspace
As the approver, open the expense report and approve it
Verify the next step message says "Waiting for you to pay expenses" (not "Waiting for an admin to pay expenses")
Close and reopen the report — verify the message remains correct

Verify that no errors appear in the JS console

Offline tests

Submit and approve an expense while online
Go offline
Verify the next step message still shows correctly with "you" instead of "an admin"

QA Steps

Create a workspace with approval workflows enabled
Create and submit an expense on that workspace
As the approver, open the expense report and approve it
Verify the next step message says "Waiting for you to pay expenses" (not "Waiting for an admin to pay expenses")
Close and reopen the report — verify the message remains correct

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

81967.mp4

melvin-bot · 2026-02-10T15:08:34Z

@shubham1206agra 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-02-10T15:15:32Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
... and 36 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ed5bcc71f8

ℹ️ 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-10T15:17:04Z

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={effectiveNextStep} />}
+                        {showNextStepBar && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}


Restore fallback to canonical report nextStep

This change always renders optimisticNextStep, which comes from the deprecated reportNextStep_ collection, but those two next-step sources are not always rolled back together. For example, in setReportField we optimistically write both (src/libs/actions/Report/index.ts around 2725–2743) and on failure only restore report.nextStep (.../Report/index.ts 2775–2791), leaving reportNextStep_ stale; with this header change, a failed optimistic update can keep showing outdated next-step text instead of the corrected server state. The previous effectiveNextStep fallback prevented that by using moneyRequestReport.nextStep whenever there was no explicit local override.

Useful? React with 👍 / 👎.

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

aimane-chnaif · 2026-02-10T15:24:51Z

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

Screen.Recording.2026-02-10.at.4.33.01.pm.mov

aimane-chnaif · 2026-02-10T15:26:01Z

I can confirm that the changes in MoneyReportHeader are exactly reverted so it's safe to CP.

MobileMage · 2026-02-10T16:02:08Z

Sorry, that was a mistake, I'll undo the force push

aimane-chnaif · 2026-02-10T16:05:00Z

@MobileMage in the future, don't force push once review started.

aimane-chnaif · 2026-02-10T18:41:59Z

@MobileMage please close this PR. No longer needed.

MobileMage requested review from a team as code owners February 10, 2026 15:08

melvin-bot bot assigned MobileMage Feb 10, 2026

melvin-bot bot requested review from heyjennahay and shubham1206agra and removed request for a team February 10, 2026 15:08

chatgpt-codex-connector bot reviewed Feb 10, 2026

View reviewed changes

MobileMage force-pushed the fix/81967-next-step-admin-message branch from ed5bcc7 to 8f77bd0 Compare February 10, 2026 15:17

aimane-chnaif approved these changes Feb 10, 2026

View reviewed changes

melvin-bot bot requested a review from srikarparsi February 10, 2026 15:38

MobileMage force-pushed the fix/81967-next-step-admin-message branch from 8f77bd0 to 4819f46 Compare February 10, 2026 15:53

MobileMage force-pushed the fix/81967-next-step-admin-message branch from 4819f46 to 8f77bd0 Compare February 10, 2026 16:02

MobileMage closed this Feb 10, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

Fix next step showing 'an admin' instead of 'you' after approval#81998
MobileMage wants to merge 1 commit intoExpensify:mainfrom
MobileMage:fix/81967-next-step-admin-message

MobileMage commented Feb 10, 2026

Uh oh!

melvin-bot bot commented Feb 10, 2026

Uh oh!

codecov bot commented Feb 10, 2026 •

edited by github-actions bot

Loading

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Feb 10, 2026

Uh oh!

aimane-chnaif commented Feb 10, 2026 •

edited

Loading

Uh oh!

aimane-chnaif commented Feb 10, 2026

Uh oh!

MobileMage commented Feb 10, 2026

Uh oh!

aimane-chnaif commented Feb 10, 2026

Uh oh!

aimane-chnaif commented Feb 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

MobileMage commented Feb 10, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 10, 2026

Uh oh!

codecov bot commented Feb 10, 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 Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Feb 10, 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 10, 2026

Uh oh!

MobileMage commented Feb 10, 2026

Uh oh!

aimane-chnaif commented Feb 10, 2026

Uh oh!

aimane-chnaif commented Feb 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov bot commented Feb 10, 2026 •

edited by github-actions bot

Loading

aimane-chnaif commented Feb 10, 2026 •

edited

Loading