Add optimistic nextStep on hold/unhold by s77rt · Pull Request #78820 · Expensify/App

s77rt · 2026-01-03T23:07:43Z

Explanation of Change

Add optimistic nextStep for hold/unhold requests

Fixed Issues

#70343
PROPOSAL:

Tests

Have a workspace

Go to policy expense chat
Create two different manual expenses.
Open the report of the just created expenses.
Select both expenses and hold them.
Once redirected to report, long tap and select one of the expenses.
Tap on "More" and select "Merge"
Select the other expense and tap on "Continue"
Select any amount to keep and finish the merging flow.
Once rediredted to report again, tap on "Remove Hold"
Verify the report header displays Waiting for you to submit expenses.

Screen.Recording.2026-01-04.at.12.05.42.AM.mov

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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

…manual)

codecov · 2026-01-03T23:16:14Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useSelectedTransactionsActions.ts	`82.14% <100.00%> (ø)`
src/libs/NextStepUtils.ts	`60.16% <100.00%> (+0.16%)`	⬆️
src/libs/actions/IOU/index.ts	`68.51% <100.00%> (+0.19%)`	⬆️
src/libs/ReportUtils.ts	`73.07% <0.00%> (ø)`
... and 6 files with indirect coverage changes

s77rt · 2026-01-04T20:04:23Z

src/libs/NextStepUtils.ts


            // Scheduled submit enabled
-            if (policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL && isReportContainingTransactions) {
+            if (policy?.harvesting?.enabled && isReportContainingTransactions) {


The autoReportingFrequency is never set to manual.

Manual auto reporting is actually === harvesting.enabled = false && autoReportingFrequency = daily.

Checking for harvesting.enabled is enough.

(same applies for other similar changes below)

melvin-bot · 2026-01-04T20:05:14Z

@grgia 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 · 2026-01-04T20:06:36Z

Not sure if this needs a C+ review. Let me know if that's the case.

situchan · 2026-01-04T20:11:39Z

If requires C+ review, I can help.

s77rt · 2026-01-07T23:47:53Z

This can be reviewed/tested.

chuckdries · 2026-01-08T00:16:47Z

@situchan please go ahead and review as C+! Thanks!

situchan · 2026-01-08T09:06:00Z

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

iOS: mWeb Safari

MacOS: Chrome / Safari

after.mov

situchan · 2026-01-08T09:33:14Z

job 4 Tests failing. Please merge main

s77rt · 2026-01-08T23:00:42Z

Merged main.

situchan · 2026-01-09T14:52:48Z

@s77rt when we have violations, we should still show Waiting for you to fix the issue.

Screen.Recording.2026-01-09.at.8.52.25.PM.mov

s77rt · 2026-01-09T17:17:04Z

Thanks for catching this! It should be fixed now

situchan · 2026-01-09T19:32:56Z

job 2 failure is not related.

melvin-bot · 2026-01-09T19:47:45Z

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

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

chuckdries

Looks good to me. Retrying failed test

OSBotify · 2026-01-09T23:26:21Z

✋ 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-01-13T03:39:38Z

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

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

OSBotify · 2026-01-14T02:55:55Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.3.0-8 🚀

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

s77rt added 5 commits January 3, 2026 23:06

optimistic nextStep on hold

abe65cc

optimistic nextStep on unhold

636eab1

add missing param

500d350

fix IOUTest

777433a

remove uncorrect autoReportingFrequency check (this value is never = …

5c68fe4

…manual)

melvin-bot bot assigned s77rt Jan 3, 2026

s77rt changed the title ~~Add optimistic nextStep on hold/unhold~~ [Hold Web-E#50004] Add optimistic nextStep on hold/unhold Jan 3, 2026

s77rt mentioned this pull request Jan 3, 2026

[Payment due on 2026-01-21] [$250] [Merge] - "Waiting for you to fix the issue" still seen after removing hold on merged expense #70343

Closed

8 tasks

s77rt added 4 commits January 4, 2026 20:36

fix tests

7f5e3b8

fix ts

864da86

Merge branch 'main' into optimistic-nextstep-hold

e2c8bd5

fix test

0efef37

s77rt commented Jan 4, 2026

View reviewed changes

s77rt marked this pull request as ready for review January 4, 2026 20:04

s77rt requested review from a team as code owners January 4, 2026 20:04

melvin-bot bot requested review from grgia and heyjennahay and removed request for a team January 4, 2026 20:04

s77rt requested review from chuckdries and removed request for grgia January 4, 2026 20:05

s77rt added 2 commits January 8, 2026 00:44

Merge branch 'main' into optimistic-nextstep-hold

a465ed0

style

c42d09d

s77rt changed the title ~~[Hold Web-E#50004] Add optimistic nextStep on hold/unhold~~ Add optimistic nextStep on hold/unhold Jan 7, 2026

Merge branch 'main' into optimistic-nextstep-hold

a5541f2

s77rt added 2 commits January 9, 2026 18:11

Merge branch 'main' into optimistic-nextstep-hold

f2b1edf

fix violations length check

f6a1435

situchan approved these changes Jan 9, 2026

View reviewed changes

melvin-bot bot mentioned this pull request Jan 9, 2026

[Due for payment 2026-01-20] Payment issue for E/App PR#78820 #79254

Closed

chuckdries approved these changes Jan 9, 2026

View reviewed changes

chuckdries merged commit a356d53 into Expensify:main Jan 9, 2026
39 of 40 checks passed

OSBotify mentioned this pull request Jan 13, 2026

Deploy Checklist: New Expensify 2026-01-13 #79402

Closed

91 tasks

Conversation

s77rt commented Jan 3, 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!

codecov bot commented Jan 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!

s77rt Jan 4, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jan 4, 2026

Uh oh!

s77rt commented Jan 4, 2026

Uh oh!

situchan commented Jan 4, 2026

Uh oh!

s77rt commented Jan 7, 2026

Uh oh!

chuckdries commented Jan 8, 2026

Uh oh!

situchan commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan commented Jan 8, 2026

Uh oh!

s77rt commented Jan 8, 2026

Uh oh!

situchan commented Jan 9, 2026

Uh oh!

s77rt commented Jan 9, 2026

Uh oh!

situchan commented Jan 9, 2026

Uh oh!

melvin-bot bot commented Jan 9, 2026

Uh oh!

chuckdries left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 9, 2026

Uh oh!

OSBotify commented Jan 13, 2026

Uh oh!

OSBotify commented Jan 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

s77rt commented Jan 3, 2026 •

edited

Loading

codecov bot commented Jan 3, 2026 •

edited by github-actions bot

Loading

situchan commented Jan 8, 2026 •

edited

Loading

chuckdries left a comment •

edited

Loading