Handle agent deleted on approval workflow in offline mode by NicolasBonet · Pull Request #92286 · Expensify/App

NicolasBonet · 2026-06-01T21:49:44Z

Explanation of Change

Shows the agents with their names crossed-out if they are removed in offline mode.

Fixed Issues

$ #92262
PROPOSAL: #92262

Tests

Navigate to "Account" > "Agents"
Create a new agent.
Navigate to "Workspaces" > "Workflows"
Click on "Add Agent" > "Save"
Note that agent was added as approver.
Turn off internet connection.
Return to "Account" > Agents" and delete the agent.
Return to "Workspaces" > "Workflows"
Note that agent is still displayed as approver but with its name crossed-out.
Tap on approver to open "Edit Approval" RHP.
Click on "Approver" field where agent is an approver two times to reach "Set Approver".
Agent shouldn't be visible anymore.

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-01.at.5.02.30.PM.mov

github-actions · 2026-06-01T22:06:57Z

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

melvin-bot · 2026-06-01T22:20:31Z

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

github-actions · 2026-06-01T22:23:00Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-35ae306dfea-e140494-f7f45a9987557cf2ac2374db4c162a0252c4b847/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-35ae306-e140494-a6158ea5aca2a81f50a4e08e2c094658ff3fea24/index.html

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

👀 View the workflow run that generated this build 👀

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e7e3bd8ab8

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-06-01T22:35:27Z

            approvalLimit: employee.approvalLimit,
            overLimitForwardsTo: employee.overLimitForwardsTo,
            overLimitForwardsToDisplayName: getOverLimitForwardsToDisplayName(employee.overLimitForwardsTo, personalDetailsByEmail),
+            pendingAction: employee.pendingAction,


Propagate delete errors to approver rows

When DeleteAgent fails for a policy, the new failure update stores errors on policy.employeeList[agentEmail], but this conversion only copies pendingAction into the Approver. In the online failure state, ApprovalWorkflowSection passes approver.errors to OfflineWithFeedback; without those errors, a pendingAction: delete row is hidden instead of showing the failed-delete error/RBR, so admins lose the failed approver row on the workflows page. Please copy employee.errors onto the approver alongside pendingAction.

Useful? React with 👍 / 👎.

mkhutornyi · 2026-06-02T14:05:02Z

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

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

NicolasBonet · 2026-06-03T14:37:01Z

@mkhutornyi any news?

mkhutornyi · 2026-06-03T14:57:00Z

Note that agent is still displayed as approver.

Note that agent is added as approver again, despite being deleted.

Looks like QA Steps describe the bug, not the fix

mkhutornyi · 2026-06-03T15:08:13Z

Can you please add my account to customAgent beta?

mkhutorniy+92286@gmail.com
mkhutorniy+922861@gmail.com

NicolasBonet · 2026-06-03T16:17:21Z

Can you please add my account to customAgent beta?

Added

Looks like QA Steps describe the bug, not the fix

Adjusted

NicolasBonet · 2026-06-05T15:36:48Z

@mkhutornyi waiting for you review 🙏

mkhutornyi · 2026-06-05T15:38:33Z

Please merge main to fix failing check

NicolasBonet · 2026-06-05T15:50:47Z

Please merge main to fix failing check

@mkhutornyi done, but let's not hold reviews for that reason in the future please

mkhutornyi · 2026-06-05T16:07:59Z

Click on agent to remove it as approver.

This is failing. I don't see agent anymore in Approvers list

mkhutornyi

Tap on approver to open "Edit Approval" RHP.

Click on "Approver" field where agent is an approver two times to reach "Set Approver".

Click on agent to remove it as approver.

Reopen approver field.

Click on agent again.

Note that agent is the approver, but with its name crossed-out.

Should we remove these QA steps as failing here?

Otherwise looks good.

melvin-bot · 2026-06-05T16:32:17Z

@neil-marcellini 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]

mkhutornyi

Oh we should fix above bug.

I noticed that doesn't happen on production

Just make it crossed-out (should not completely disappear)

mkhutornyi · 2026-06-05T16:51:41Z

I checked workspace member (as approver) offline delete case. And noticed a different behavior.

Approver (workspace member) is automatically switched to default approver (in this PR, we are not automatically switching but show offline feedback for deleted agent)
Offlined deleted workspace member doesn't show in approver selection list (This PR behaves the same for agent case. In production, we show deleted agent without offline feedback - maybe bug)

member.mov

cc: @trjExpensify

trjExpensify · 2026-06-05T17:32:59Z

Yeah, it doesn't seem to be enforcing the pattern properly. You can see the card is at reduced opacity, but doesn't have the "deleted" element with strikethrough:

…g delete in associated policies

NicolasBonet · 2026-06-05T20:05:52Z

@mkhutornyi please provide a step by step of how to reproduce the error and what would be the expected outcome, because based on your video that is a different production bug, not quite what we are resolving in here.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

mkhutornyi · 2026-06-05T20:18:52Z

@mkhutornyi please provide a step by step of how to reproduce the error and what would be the expected outcome, because based on your video that is a different production bug, not quite what we are resolving in here.

Nothing new. I just followed your Tests steps:

Navigate to "Account" > "Agents"

Create a new agent.

Navigate to "Workspaces" > "Workflows"

Click on "Add Agent" > "Save"

Note that agent was added as approver.

Turn off internet connection.

Return to "Account" > Agents" and delete the agent.

Return to "Workspaces" > "Workflows"

Note that agent is still displayed as approver but with its name crossed-out.

Tap on approver to open "Edit Approval" RHP.

Click on "Approver" field where agent is an approver two times to reach "Set Approver".

Click on agent to remove it as approver.

Reopen approver field.

Click on agent again.

Note that agent is the approver, but with its name crossed-out.

Looks good until Step 11.
In Step 12, I don't see an agent to remove. In production, I see an agent without ~~crossed out~~

You can just follow Tests steps you created yourself.

this branch	production

NicolasBonet · 2026-06-05T20:29:53Z

So this is the flow in this branch:

Screen.Recording.2026-06-05.at.3.28.09.PM.mov

The problem you have is that the agent is no longer shown in the set approver list around second 43? @mkhutornyi

I don't think you should see it anymore, since it cannot become an approver optimistically speaking.

mkhutornyi · 2026-06-05T20:30:49Z

So this is the flow in this branch:

Screen.Recording.2026-06-05.at.3.28.09.PM.mov
The problem you have is that the agent is no longer shown in the set approver list? @mkhutornyi

Right. And I am afraid QA will mark this as regression since agent is shown in set approver list in production.

mkhutornyi · 2026-06-05T20:32:42Z

I don't think you should see it anymore, since it cannot become an approver optimistically speaking.

ok then remove invalid steps (10 - 15) in Tests.

NicolasBonet · 2026-06-05T20:38:04Z

I don't think you should see it anymore, since it cannot become an approver optimistically speaking.

ok then remove invalid steps (10 - 15) in Tests.

On that was the error man, I just changed that.

melvin-bot Bot assigned NicolasBonet Jun 1, 2026

NicolasBonet force-pushed the fix/92262-agent-deleted-offline-still-approver branch from 35ae306 to e7e3bd8 Compare June 1, 2026 22:11

NicolasBonet marked this pull request as ready for review June 1, 2026 22:20

NicolasBonet requested review from a team as code owners June 1, 2026 22:20

melvin-bot Bot requested review from joekaufmanexpensify and mkhutornyi and removed request for a team June 1, 2026 22:20

melvin-bot Bot removed request for a team and joekaufmanexpensify June 1, 2026 22:20

github-actions Bot reviewed Jun 1, 2026

View reviewed changes

Comment thread src/pages/settings/Agents/EditAgentPage.tsx

github-actions Bot reviewed Jun 1, 2026

View reviewed changes

Comment thread src/libs/actions/Agent.ts

chatgpt-codex-connector Bot reviewed Jun 1, 2026

View reviewed changes

mkhutornyi reviewed Jun 3, 2026

View reviewed changes

Comment thread src/libs/WorkflowUtils.ts

NicolasBonet force-pushed the fix/92262-agent-deleted-offline-still-approver branch from aca2a6a to 9a70999 Compare June 5, 2026 15:50

mkhutornyi approved these changes Jun 5, 2026

View reviewed changes

melvin-bot Bot requested a review from neil-marcellini June 5, 2026 16:32

mkhutornyi suggested changes Jun 5, 2026

View reviewed changes

Enhance agent deletion process to optimistically mark agent as pendin…

0da19f9

…g delete in associated policies

NicolasBonet force-pushed the fix/92262-agent-deleted-offline-still-approver branch from 9a70999 to 0da19f9 Compare June 5, 2026 19:10

Merge branch 'main' into fix/92262-agent-deleted-offline-still-approver

ee3c45a

Add regression test for DELETE pendingAction on approver

1e55186

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

mkhutornyi approved these changes Jun 5, 2026

View reviewed changes

Conversation

NicolasBonet commented Jun 1, 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!

github-actions Bot commented Jun 1, 2026

Uh oh!

melvin-bot Bot commented Jun 1, 2026

Uh oh!

github-actions Bot commented Jun 1, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 1, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented Jun 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

NicolasBonet commented Jun 3, 2026

Uh oh!

Uh oh!

mkhutornyi commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mkhutornyi commented Jun 3, 2026

Uh oh!

NicolasBonet commented Jun 3, 2026

Uh oh!

NicolasBonet commented Jun 5, 2026

Uh oh!

mkhutornyi commented Jun 5, 2026

Uh oh!

NicolasBonet commented Jun 5, 2026

Uh oh!

mkhutornyi commented Jun 5, 2026

Uh oh!

mkhutornyi left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Jun 5, 2026

Uh oh!

mkhutornyi left a comment

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Jun 5, 2026

Uh oh!

NicolasBonet commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mkhutornyi commented Jun 5, 2026

Uh oh!

NicolasBonet commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mkhutornyi commented Jun 5, 2026

Uh oh!

mkhutornyi commented Jun 5, 2026

Uh oh!

NicolasBonet commented Jun 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

NicolasBonet commented Jun 1, 2026 •

edited

Loading

mkhutornyi commented Jun 2, 2026 •

edited

Loading

mkhutornyi commented Jun 3, 2026 •

edited

Loading

mkhutornyi commented Jun 5, 2026 •

edited

Loading

NicolasBonet commented Jun 5, 2026 •

edited

Loading

NicolasBonet commented Jun 5, 2026 •

edited

Loading