Fix: Approver page shows empty state when prevent self-approvals is enabled by marufsharifi · Pull Request #85036 · Expensify/App

marufsharifi · 2026-03-12T08:42:56Z

Explanation of Change

When “Prevent self-approvals” is enabled, the Approver picker should still show the currently selected approver so admins can review and remove them if needed. After removal, that same person must stay blocked from being re‑added (because they are also in “Expenses from”), which can result in an empty list. This keeps the UI consistent: you can see and remove an invalid approver, but you can’t reselect them once the policy disallows it.

Fixed Issues

$ #77034
PROPOSAL: #77034 (comment)

Tests

Precondition:

Invite another user to the workspace.

Go to Workspace Settings → Workflows.
Click Add Approval Workflow.
Click Approver and select the invited member.
Click Save to create the new workflow.
Enable Prevent self-approvals.
Click the workflow that you created in Step 4.
Click the Approver field.
Verify that:
- The selected member appears as the approver.
- The approver can be deselected.

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// 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-03-12.at.12.10.38.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-03-12.at.12.15.11.PM.mov

iOS: Native

Screen.Recording.2026-03-12.at.12.55.28.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-03-12.at.12.58.29.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-12.at.12.12.28.PM.mov

…nabled

codecov · 2026-03-12T08:55:28Z

Codecov Report

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

Files with missing lines	Coverage Δ
...rovals/WorkspaceWorkflowsApprovalsApproverPage.tsx	`0.00% <0.00%> (ø)`
... and 6 files with indirect coverage changes

jjcoffee · 2026-03-12T10:40:56Z

@marufsharifi I know this is still in draft, but I gave this a quick test run and I noticed there's a brief flash of the empty screen after you deselect the approver. I think ideally it should only change once the animation is complete.

melvin-bot · 2026-03-12T10:43:04Z

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

marufsharifi · 2026-03-12T10:47:16Z

@marufsharifi I know this is still in draft, but I gave this a quick test run and I noticed there's a brief flash of the empty screen after you deselect the approver. I think ideally it should only change once the animation is complete.

@jjcoffee, thanks, checking.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a06e9fafff

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

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx

joekaufmanexpensify

Good for product

marufsharifi · 2026-03-15T07:56:52Z

@jjcoffee, I've addressed all the comments, please take another look. thanks.

marufsharifi · 2026-03-16T05:12:31Z

@jjcoffee, gentle bump. thanks.

jjcoffee · 2026-03-16T09:19:22Z

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 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-app-2026-03-12_11.33.06.mp4

Android: mWeb Chrome

android-chrome-2026-03-12_11.35.49.mp4

iOS: HybridApp

ios-app-2026-03-12_11.04.01.mp4

iOS: mWeb Safari

ios-safari-2026-03-12_11.05.50.mp4

MacOS: Chrome / Safari

desktop-chrome-2026-03-12_10.56.04.mp4

jjcoffee · 2026-03-16T09:37:04Z

@marufsharifi Have you retested since you made the recent changes? I can't deselect the approver anymore.

desktop-chrome-2026-03-16_10.36.39.mp4

marufsharifi · 2026-03-16T13:21:28Z

@jjcoffee I tested it, and it seems to be working fine on my end. Could you please take another look? Thanks!

web.mp4

jjcoffee · 2026-03-16T13:34:47Z

@marufsharifi Was that with a fresh account? I wonder if it's because I reused the same test account.

marufsharifi · 2026-03-16T15:28:32Z

@jjcoffee, I used a fresh account, thanks

jjcoffee

LGTM! Can't reproduce this issue anymore.

MonilBhavsar · 2026-03-17T12:24:28Z

@codex review

MonilBhavsar · 2026-03-17T12:37:40Z

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx

    const isInitialCreationFlow = approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && approvalWorkflow?.isInitialFlow;
    const currentApprover = approvalWorkflow?.approvers[approverIndex];
    const selectedApproverEmail = currentApprover?.email;
+    const visibleSelectedApproverEmail = removingApproverEmail ?? selectedApproverEmail;


Do you mind explaining in code comment, "why" we need this additional state variable alongside selectedApproverEmail?

chatgpt-codex-connector · 2026-03-17T12:59:36Z

Codex Review: Didn't find any major issues. What shall we delve into next?

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

marufsharifi · 2026-03-18T08:08:45Z

@MonilBhavsar, I've addressed your comment, please take another look. thanks.

MonilBhavsar

Thanks!

github-actions · 2026-03-18T08:47:30Z

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

github-actions · 2026-03-18T08:52:33Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d6841fd-84e475f-77d09b73609720c3600ee9a5e3eae06352e51080/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d6841fd-84e475f-504ddab03ed9b6fbb0e6cb65555a77d56cfbdb77/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-18T08:56:28Z

✋ 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-03-18T13:29:57Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.40-0 🚀

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

OSBotify · 2026-03-18T14:05:58Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.40-0 🚀

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

OSBotify · 2026-03-23T09:27:15Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

fix: approver page shows empty state when prevent self-approvals is e…

ab7f3e8

…nabled

melvin-bot bot assigned marufsharifi Mar 12, 2026

fixed prettier

a06e9fa

marufsharifi marked this pull request as ready for review March 12, 2026 10:42

marufsharifi requested review from a team as code owners March 12, 2026 10:42

melvin-bot bot requested review from jjcoffee and removed request for a team March 12, 2026 10:43

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 12, 2026 10:43

chatgpt-codex-connector bot reviewed Mar 12, 2026

View reviewed changes

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx Show resolved Hide resolved

joekaufmanexpensify previously approved these changes Mar 12, 2026

View reviewed changes

marufsharifi added 2 commits March 15, 2026 11:58

Merge branch 'main' into fix/approver-empty-state-prevent-self-approval

bf9dea0

Fix approver workflow back navigation and deselect transition

13d5e26

marufsharifi dismissed joekaufmanexpensify’s stale review via 13d5e26 March 15, 2026 07:39

jjcoffee approved these changes Mar 16, 2026

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar March 16, 2026 15:46

MonilBhavsar reviewed Mar 17, 2026

View reviewed changes

marufsharifi added 2 commits March 18, 2026 12:00

Merge branch 'main' into fix/approver-empty-state-prevent-self-approval

4caeba6

docs: clarify temporary approver state comment

099d67b

MonilBhavsar approved these changes Mar 18, 2026

View reviewed changes

MonilBhavsar merged commit d6841fd into Expensify:main Mar 18, 2026
31 checks passed

OSBotify mentioned this pull request Mar 18, 2026

Deploy Checklist: New Expensify 2026-03-18 #85646

Closed

100 tasks

melvin-bot bot mentioned this pull request Mar 23, 2026

[Due for payment 2026-03-30] [$250] Approver page shows empty state when approver is selected when prevent self-approvals is ON #77034

Open

8 tasks

Conversation

marufsharifi commented Mar 12, 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 Mar 12, 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!

jjcoffee commented Mar 12, 2026

Uh oh!

melvin-bot bot commented Mar 12, 2026

Uh oh!

marufsharifi commented Mar 12, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Mar 15, 2026

Uh oh!

marufsharifi commented Mar 16, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

jjcoffee commented Mar 16, 2026

Uh oh!

marufsharifi commented Mar 16, 2026

Uh oh!

jjcoffee commented Mar 16, 2026

Uh oh!

marufsharifi commented Mar 16, 2026

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented Mar 17, 2026

Uh oh!

MonilBhavsar Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot commented Mar 17, 2026

Uh oh!

marufsharifi commented Mar 18, 2026

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

marufsharifi commented Mar 12, 2026 •

edited

Loading

codecov bot commented Mar 12, 2026 •

edited by github-actions bot

Loading

jjcoffee commented Mar 16, 2026 •

edited

Loading