Implement optimistic state updates for employee approvals by cretadn22 · Pull Request #80215 · Expensify/App

cretadn22 · 2026-01-22T12:18:12Z

Explanation of Change

Fixed Issues

$ #72109
PROPOSAL: #72109 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to staging.new.expensify.com
Go to workspace settings > Members.
Invite User B and User C.
Upgrade the workspace.
Go to workspace settings > Workflows.
Click on the default workflow.
Click Approver.
Change the approver to User B, then save it.
Turn off "Add approvals".
Turn on "Add approvals".
No new workflow will be created.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-01-22.at.19.22.28.mov

Android: mWeb Chrome

Screen.Recording.2026-01-22.at.19.20.47.mov

iOS: Native

Screen.Recording.2026-01-22.at.19.21.16.mov

iOS: mWeb Safari

Screen.Recording.2026-01-22.at.19.19.51.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-22.at.19.18.46.mov

melvin-bot · 2026-01-22T12:18:19Z

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

…a single updates object for employee properties

codecov · 2026-01-22T12:38:04Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/Policy/Policy.ts	`36.66% <84.61%> (+0.49%)`	⬆️
... and 6 files with indirect coverage changes

situchan

Optimistic data is not enough. Still issue after logout & re-login. We need backend fix as well. Otherwise find different solution.

cretadn22 · 2026-01-25T06:41:07Z

@situchan This change only addresses the frontend side. We’ll still need a backend fix as well

situchan · 2026-01-25T06:42:43Z

@francoisl should we hold frontend PR until backend is done?

francoisl · 2026-01-28T20:05:29Z

Yeah let's hold on a second. I'll try to finish the backend portion this week.

JmillsExpensify

Nice product polish

francoisl · 2026-02-05T00:57:39Z

Hey team, sorry for the delay here. The backend changes are merged but we've had a deploy freeze that's been delaying things a little.

In the meantime, can we update the PR and change the API.write(WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE, ... to use the new API command DisablePolicyApprovals. The only param it needs is policyID, and you can keep the optimistic data the same as they are now.

I'll let you know once the command is deployed (hopefully tomorrow).

francoisl · 2026-02-06T01:17:12Z

Ok the API command DisablePolicyApprovals is on staging now, we can unblock this now. I'll edit the title.

…e-approvals

cretadn22 · 2026-02-08T08:16:02Z

The test failed because the action exceeded the timeout

cretadn22 · 2026-02-08T08:16:54Z

@situchan The PR is ready for review 👍

francoisl · 2026-02-11T01:04:53Z

I reran the failed test but it failed again, can you pull main in case it's something unrelated that's fixed now?

…e-approvals

situchan · 2026-02-11T20:45:37Z

@cretadn22 I think the failing test is caused by this PR. Can you check?

…e-approvals

…to DISABLE_POLICY_APPROVALS

cretadn22 · 2026-02-12T18:35:27Z

@situchan I updated tests

JmillsExpensify

Still good with these changes.

francoisl · 2026-02-13T18:56:09Z

Tests are passing now, @situchan can you review and fill out the checklist please?

situchan · 2026-02-13T18:59:16Z


            expect(apiWriteSpy).toHaveBeenCalledWith(
-                WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE,
+                WRITE_COMMANDS.DISABLE_POLICY_APPROVALS,


Please also add test case of SET_WORKSPACE_APPROVAL_MODE

We already have test cases covering both SET_WORKSPACE_APPROVAL_MODE and DISABLE_POLICY_APPROVALS. In this test, the goal is to verify the behavior of the next step when it’s changed to optional, so we need to adjust the corresponding API call accordingly

I mean the case where WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE is expected to be called. (approvalMode is not optional)
After this PR, only DISABLE_POLICY_APPROVALS case is added (as it's replaced from SET_WORKSPACE_APPROVAL_MODE)

Could you please check again the code change? I’ve added test cases to ensure the SET_WORKSPACE_APPROVAL_MODE call is properly called

situchan · 2026-02-16T07:25:52Z

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

web.mov

chatgpt-codex-connector · 2026-02-16T08:07:54Z

Codex Review: Didn't find any major issues. Delightful!

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

situchan · 2026-02-16T08:54:28Z

+            Policy.setWorkspaceApprovalMode(policyID, ESH_EMAIL, CONST.POLICY.APPROVAL_MODE.BASIC);
+            await waitForBatchedUpdates();
+
+            expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE, expect.objectContaining({policyID}), expect.anything());


Ah I see this now. Thanks

OSBotify · 2026-02-16T17:21:05Z

✋ 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-02-16T17:35:13Z

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

github-actions · 2026-02-16T17:38:31Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8dfe759-200e80a-f32204e3ed9111ce9f469aa989a5b8f7013c5050/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8dfe759-200e80a-3f7ced2a751d6f89b3f5cd687e65263dc538c473/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-18T00:05:40Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.3.21-0 🚀

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

OSBotify · 2026-02-18T22:01:14Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.21-4 🚀

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

Implement optimistic state updates for employee approvals

53e415d

cretadn22 requested review from a team as code owners January 22, 2026 12:18

melvin-bot Bot assigned cretadn22 Jan 22, 2026

melvin-bot Bot requested review from JmillsExpensify and situchan and removed request for a team January 22, 2026 12:18

melvin-bot Bot removed the request for review from a team January 22, 2026 12:18

github-actions Bot reviewed Jan 22, 2026

View reviewed changes

Comment thread src/libs/actions/Policy/Policy.ts

Refactor optimistic state updates in setWorkspaceApprovalMode to use …

27a2cb7

…a single updates object for employee properties

situchan reviewed Jan 22, 2026

View reviewed changes

cretadn22 changed the title ~~Implement optimistic state updates for employee approvals~~ [Hold Backend] Implement optimistic state updates for employee approvals Jan 25, 2026

JmillsExpensify previously approved these changes Feb 2, 2026

View reviewed changes

francoisl changed the title ~~[Hold Backend] Implement optimistic state updates for employee approvals~~ Implement optimistic state updates for employee approvals Feb 6, 2026

Merge branch 'main' into fix/workspace-workflow-duplicate-after-toggl…

8035714

…e-approvals

cretadn22 dismissed JmillsExpensify’s stale review via 8035714 February 8, 2026 05:51

cretadn22 added 2 commits February 8, 2026 13:00

Add DISABLE_POLICY_APPROVALS command

f32082e

add params

d7c8c33

Merge branch 'main' into fix/workspace-workflow-duplicate-after-toggl…

244586e

…e-approvals

cretadn22 added 4 commits February 13, 2026 01:11

Merge branch 'main' into fix/workspace-workflow-duplicate-after-toggl…

7e9f58e

…e-approvals

Update PolicyTest to reflect change from SET_WORKSPACE_APPROVAL_MODE …

55d6ee4

…to DISABLE_POLICY_APPROVALS

add more test cases

9a72afd

run prettier

e2cd04a

francoisl self-requested a review February 12, 2026 19:54

JmillsExpensify reviewed Feb 13, 2026

View reviewed changes

situchan reviewed Feb 13, 2026

View reviewed changes

situchan reviewed Feb 16, 2026

View reviewed changes

situchan approved these changes Feb 16, 2026

View reviewed changes

francoisl approved these changes Feb 16, 2026

View reviewed changes

francoisl merged commit 8dfe759 into Expensify:main Feb 16, 2026
30 of 34 checks passed

OSBotify mentioned this pull request Feb 17, 2026

Deploy Checklist: New Expensify 2026-02-17 #82716

Closed

93 tasks done

mountiny mentioned this pull request Feb 18, 2026

[CP Staging] Revert "Implement optimistic state updates for employee approvals" #82827

Closed

melvin-bot Bot mentioned this pull request Feb 18, 2026

[Due for payment 2026-02-25] [$250] Workspace - After turning off and on "Add approvals" and editing existing workflow, new workflow is created #72109

Closed

8 tasks done

yusufdeveloper2903 mentioned this pull request May 26, 2026

[$250] Workspace - Custom approval workflow disappears after offline disable and back online #91739

Closed

1 of 7 tasks

Conversation

cretadn22 commented Jan 22, 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 Jan 22, 2026

Uh oh!

Uh oh!

codecov Bot commented Jan 22, 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!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

cretadn22 commented Jan 25, 2026

Uh oh!

situchan commented Jan 25, 2026

Uh oh!

francoisl commented Jan 28, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

francoisl commented Feb 5, 2026

Uh oh!

francoisl commented Feb 6, 2026

Uh oh!

cretadn22 commented Feb 8, 2026

Uh oh!

cretadn22 commented Feb 8, 2026

Uh oh!

francoisl commented Feb 11, 2026

Uh oh!

situchan commented Feb 11, 2026

Uh oh!

cretadn22 commented Feb 12, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

francoisl commented Feb 13, 2026

Uh oh!

situchan Feb 13, 2026

Choose a reason for hiding this comment

Uh oh!

cretadn22 Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

situchan Feb 16, 2026 • 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!

cretadn22 Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

chatgpt-codex-connector Bot commented Feb 16, 2026

Uh oh!

situchan Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Feb 16, 2026

Uh oh!

github-actions Bot commented Feb 16, 2026

Uh oh!

github-actions Bot commented Feb 16, 2026

Uh oh!

OSBotify commented Feb 18, 2026

cretadn22 commented Jan 22, 2026 •

edited

Loading

codecov Bot commented Jan 22, 2026 •

edited by github-actions Bot

Loading

situchan Feb 16, 2026 •

edited

Loading

situchan commented Feb 16, 2026 •

edited

Loading