[Payment due @Eskalifer1] fix: don't show DEW approve error next step for auto-approval failures by abzokhattab · Pull Request #96198 · Expensify/App

abzokhattab · 2026-07-15T16:18:02Z

Explanation of Change

Restores the automaticAction check for DEW approve failure next steps. The check was added during #79165's development in commit b59668317fb , but a later commit in the same PR (a9b205c73aa) accidentally dropped the condition while scoping the error to the current approver, so the intended behavior never shipped to main. When DEW blocks auto-approval (DEW_APPROVE_FAILED with automaticAction: true), the report should keep the normal workflow next step (e.g. "Waiting for A to approve the report"). The red error next step should only appear for manual approval failures (automaticAction: false) when the current user is the approver.

Fixed Issues

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

Tests

Prerequisites:

Use a Control workspace with DEW enabled
Ask an internal employee to enable DEW processor GENERIC_CATEGORY_THRESHOLD_AUTO_APPROVAL on the workspace (by default this DEW blocks all auto-approval)
Enable "Auto-approve compliant reports" on the workspace (Workflows / Rules) and set audit rate to 0% so the report would normally auto-approve without DEW
Add at least one approver member (A) to the workspace

Test 1: Auto-approve blocked by DEW (customer regression)

Create and submit an expense report that would normally be auto-approved (compliant report under the auto-approve limit)
Verify DEW blocks auto-approval and report actions show:
- submitted
- Concierge: report routed to A due to custom approval workflow
- Concierge: failed to approve via workspace rules because...
Sign in as approver A and open the report
Verify next step is "Waiting for you to approve" / "Waiting for A to approve the report"
Verify next step is not "This report can't be approved. Please review the comments to resolve"
Verify the Approve button is still available so A can manually approve

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

Before

Screen.Recording.2026-07-17.at.01.54.11.mov

After

Screen.Recording.2026-07-17.at.01.54.20.mov

Restore the automaticAction check removed in Expensify#79165 so auto-approval blocks keep the normal workflow next step while manual approval failures still show the error banner to the current approver.

melvin-bot · 2026-07-15T16:18:09Z

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

Eskalifer1 · 2026-07-15T17:09:23Z

Hi! I will review it in a couple of hours 😃

abzokhattab · 2026-07-15T17:31:01Z

its not ready for review yet sorry ... i am not sure if c+ is needed .. need to confirm with @sakluger

codecov · 2026-07-16T23:57:04Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/NextStepUtils.ts	`77.36% <100.00%> (+5.54%)`	⬆️
src/hooks/useOptimisticNextStep.ts	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

Extract shouldShowDynamicExternalWorkflowApproveErrorNextStep so we can unit test that auto-approve failures keep the normal next step while manual failures still show the error banner for the current approver.

joekaufmanexpensify

Good for product

abzokhattab · 2026-07-21T15:55:41Z

This is ready for review @sakluger .. Let us know if a C+ review would be needed

sakluger · 2026-07-21T21:51:07Z

@abzokhattab probably good to have a C+ review it. I see @Eskalifer1 is assigned to review it, that should be sufficient.

Eskalifer1 · 2026-07-22T07:06:21Z

Hi @sakluger, could you please add me to the workspace with DEW enabled(as stated in preconditions), so i could all test?

My account is artemkryt1800+test2@gmail.com

Prerequisites:

Use a Control workspace with DEW enabled

Ask an internal employee to enable DEW processor GENERIC_CATEGORY_THRESHOLD_AUTO_APPROVAL on the workspace (by default this DEW blocks all auto-approval)

Enable "Auto-approve compliant reports" on the workspace (Workflows / Rules) and set audit rate to 0% so the report would normally auto-approve without DEW

Eskalifer1 · 2026-07-23T17:17:59Z

Hi @sakluger gentle bump on comment above, thank you!

sakluger · 2026-07-28T06:17:09Z

@Eskalifer1 Sorry for the delay! I've added you to my workspace Tommy's Tasty Tacos (E72BDF3A9DBE334A) as an admin, and applied the GENERIC_CATEGORY_THRESHOLD_AUTO_APPROVAL DEW. I set the auto-approval threshold to $1000 and set the random audit % to 0%.

Eskalifer1 · 2026-07-28T07:50:46Z

Hi @abzokhattab, could you please pin-point where it was accidentally removed in #79165?

I can't find that, If this has never been implemented, then the Explanation of Change should be corrected.

Eskalifer1 · 2026-07-28T07:51:22Z

On more q: Do you plan to record videos for all other platforms?

Eskalifer1 · 2026-07-28T08:23:10Z

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 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 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)
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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.
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

96198-android-native.mov

Android: mWeb Chrome

96198-android-web.mov

iOS: HybridApp

96198-ios-native.mov

iOS: mWeb Safari

96198-ios-web.mov

MacOS: Chrome / Safari

96198-web.mov

Eskalifer1 · 2026-07-28T08:55:08Z

Hi @abzokhattab i have left 2 comment, let me know when you give an answer, thank you!

abzokhattab · 2026-07-28T14:52:17Z

done @Eskalifer1

Eskalifer1

LGTM!

melvin-bot · 2026-07-28T14:54:38Z

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

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/652010.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

abzokhattab · 2026-07-29T20:35:57Z

@sakluger no internal engineer was added to review this. How can i trigger that

abzokhattab · 2026-07-31T09:30:40Z

@Eskalifer1 can u approve again maybe this time a backend engineer will be assigned?

Eskalifer1

LGTM!

OSBotify · 2026-07-31T14:31:30Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-07-31T15:00:27Z

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

github-actions · 2026-07-31T15:06:10Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1373e17e713-1fafb70-ba6e9a483580465698b49dc6ada7c9c9d6073925/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1373e17-1fafb70-f70524764d73fe6b33b25a654685f413b3fa8f4c/index.html

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

👀 View the workflow run that generated this build 👀

melvin-bot · 2026-07-31T16:42:14Z

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

situchan · 2026-07-31T16:45:27Z

@MelvinBot can you prevent assigning reviewers on merged PRs?

MelvinBot · 2026-07-31T16:49:22Z

Good call — assigning a reviewer and requesting the checklist on an already-merged PR is just noise.

This isn't controlled by any workflow in this repo (the reviewer-assignment + checklist request comes from the Melvin service), so it can't be fixed with an App PR. I filed a tracking issue to add a guard that skips reviewer assignment when the PR is already merged: https://github.com/Expensify/Expensify/issues/666894

OSBotify · 2026-08-01T03:05:06Z

🚀 Deployed to staging by https://github.com/NicolasBonet in version: 9.4.48-0 🚀

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

MelvinBot · 2026-08-01T03:09:46Z

Help site review — no docs changes required

I reviewed the changes in this PR against the help site files under docs/articles, and no help site updates are needed.

Why: This is an internal bug fix that restores the automaticAction check when computing the report next step chip. It corrects a regression where the red "This report can't be approved. Please review the comments to resolve." next step was shown for auto-approval failures blocked by a Dynamic External Workflow (DEW), instead of keeping the normal "Waiting for … to approve" next step. The fix is limited to next-step display logic in NextStepUtils.ts and useOptimisticNextStep.ts (plus tests).

It does not add, rename, or change any user-facing feature, workspace setting, tab, or button. The auto-approval feature itself is documented in Add-Approvals.md (the Auto-approve compliant reports setting), but that configuration flow and its labels are unchanged by this PR. The specific next-step message wording is computed UI that isn't described in any help article, so there is nothing to update.

No draft docs PR was created.

@abzokhattab, please confirm you agree no help site changes are needed here. If you believe a documented behavior did change, let me know and I'll draft the help site PR.

m-natarajan · 2026-08-03T11:52:04Z

@NicolasBonet @abzokhattab @Eskalifer1 Blocked from validating this PR because of this requirement Ask an internal employee to enable DEW processor GENERIC_CATEGORY_THRESHOLD_AUTO_APPROVAL on the workspace (by default this DEW blocks all auto-approval)

sakluger · 2026-08-03T15:38:23Z

@m-natarajan let me know if you need me to enable the DEW on one of your test workspaces.

m-natarajan · 2026-08-03T16:04:09Z

@sakluger We have the following DEW enabled accounts

applausetester+ndk80@applause.expensifail.com
applausetester+rg_46@applause.expensifail.com
Not sure these accounts meet the procondition enable DEW processor GENERIC_CATEGORY_THRESHOLD_AUTO_APPROVAL on the workspace (by default this DEW blocks all auto-approval)

NicolasBonet · 2026-08-03T17:10:51Z

@sakluger We have the following DEW enabled accounts

applausetester+ndk80@applause.expensifail.com

applausetester+rg_46@applause.expensifail.com
Not sure these accounts meet the procondition enable DEW processor GENERIC_CATEGORY_THRESHOLD_AUTO_APPROVAL on the workspace (by default this DEW blocks all auto-approval)

Added for policy F7CEFC312A481080 @m-natarajan

melvin-bot · 2026-08-03T23:29:46Z

🤖 Payment issue created: #97734

OSBotify · 2026-08-03T23:31:18Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.4.48-3 🚀

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

Bundle Size Analysis (Sentry):

Android

fix: don't show DEW approve error next step for auto-approval failures

97fb6e5

Restore the automaticAction check removed in Expensify#79165 so auto-approval blocks keep the normal workflow next step while manual approval failures still show the error banner to the current approver.

abzokhattab requested review from a team as code owners July 15, 2026 16:18

melvin-bot Bot assigned abzokhattab Jul 15, 2026

melvin-bot Bot requested review from Eskalifer1 and removed request for a team July 15, 2026 16:18

melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team July 15, 2026 16:18

abzokhattab marked this pull request as draft July 15, 2026 21:54

abzokhattab marked this pull request as ready for review July 16, 2026 23:56

abzokhattab added 3 commits July 17, 2026 02:02

fix: narrow DEW approve failed action before reading automaticAction

e4ed492

test: cover DEW approve error next step automaticAction gating

d9c2201

Extract shouldShowDynamicExternalWorkflowApproveErrorNextStep so we can unit test that auto-approve failures keep the normal next step while manual failures still show the error banner for the current approver.

Merge origin/main into abzokhattab/fix-dew-auto-approve-next-step

d1a4202

joekaufmanexpensify approved these changes Jul 17, 2026

View reviewed changes

Eskalifer1 approved these changes Jul 28, 2026

View reviewed changes

melvin-bot Bot changed the title ~~fix: don't show DEW approve error next step for auto-approval failures~~ [Payment due @Eskalifer1] fix: don't show DEW approve error next step for auto-approval failures Jul 28, 2026

Eskalifer1 approved these changes Jul 31, 2026

View reviewed changes

NicolasBonet approved these changes Jul 31, 2026

View reviewed changes

NicolasBonet merged commit 1373e17 into Expensify:main Jul 31, 2026
40 of 41 checks passed

sakluger requested a review from a team July 31, 2026 16:42

melvin-bot Bot requested a review from situchan July 31, 2026 16:42

melvin-bot Bot removed the request for review from a team July 31, 2026 16:42

OSBotify mentioned this pull request Aug 1, 2026

Deploy Checklist: New Expensify 2026-08-01 #97614

Closed

60 tasks

melvin-bot Bot mentioned this pull request Aug 3, 2026

[Due for payment 2026-08-10] Payment issue for E/App PR#96198 #97734

Closed

Eskalifer1 mentioned this pull request Aug 7, 2026

Add DEW support for approve action #79165

Merged

51 tasks

MelvinBot mentioned this pull request Sep 14, 2026

LHN — report with a failed DEW approval shows a GBR for every participant, not just the approver #100863

Open

Uh oh!

Conversation

abzokhattab commented Jul 15, 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 Jul 15, 2026

Uh oh!

Eskalifer1 commented Jul 15, 2026

Uh oh!

abzokhattab commented Jul 15, 2026

Uh oh!

codecov Bot commented Jul 16, 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!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

abzokhattab commented Jul 21, 2026

Uh oh!

sakluger commented Jul 21, 2026

Uh oh!

Eskalifer1 commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Eskalifer1 commented Jul 23, 2026

Uh oh!

sakluger commented Jul 28, 2026

Uh oh!

Eskalifer1 commented Jul 28, 2026

Uh oh!

Eskalifer1 commented Jul 28, 2026

Uh oh!

Eskalifer1 commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Eskalifer1 commented Jul 28, 2026

Uh oh!

abzokhattab commented Jul 28, 2026

Uh oh!

Eskalifer1 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Jul 28, 2026

Uh oh!

abzokhattab commented Jul 29, 2026

Uh oh!

abzokhattab commented Jul 31, 2026

Uh oh!

Eskalifer1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jul 31, 2026

Uh oh!

github-actions Bot commented Jul 31, 2026

Uh oh!

github-actions Bot commented Jul 31, 2026

Uh oh!

melvin-bot Bot commented Jul 31, 2026

Uh oh!

situchan commented Jul 31, 2026

Uh oh!

MelvinBot commented Jul 31, 2026

Uh oh!

OSBotify commented Aug 1, 2026

Uh oh!

MelvinBot commented Aug 1, 2026

Help site review — no docs changes required

Uh oh!

m-natarajan commented Aug 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

abzokhattab commented Jul 15, 2026 •

edited

Loading

codecov Bot commented Jul 16, 2026 •

edited by github-actions Bot

Loading

Eskalifer1 commented Jul 22, 2026 •

edited

Loading

Eskalifer1 commented Jul 28, 2026 •

edited

Loading

m-natarajan commented Aug 3, 2026 •

edited

Loading

NicolasBonet commented Aug 3, 2026 •

edited

Loading