Filter Expensify team members from approval workflows table by MobileMage · Pull Request #83366 · Expensify/App

MobileMage · 2026-02-24T19:45:19Z

Explanation of Change

Filters internal Expensify team members (SRAMs/guides with @expensify.com or @team.expensify.com emails) from the approval workflows table in Workspace Workflows. This matches the existing filtering behavior already implemented in WorkspaceMembersPage.

Changes in WorkflowUtils.ts:

Added currentUserLogin param to convertPolicyEmployeesToApprovalWorkflows
When the policy owner and current user are both non-Expensify, Expensify team members are filtered from workflow members, approvers, and available members
If an employee's submitsTo points to an Expensify team member, the workflow redirects to the first non-Expensify approver in the forwardsTo chain
No filtering is applied when the policy owner or current user is an Expensify team member (internal use case)

Updated all three call sites to pass currentUserLogin:

WorkspaceWorkflowsPage.tsx
WorkspaceWorkflowsApprovalsEditPage.tsx
WorkspaceMemberDetailsPage.tsx

Fixed Issues

$ #80744
PROPOSAL: #80744 (comment)

Tests

Create a workspace owned by a non-Expensify email
Add an Expensify team member (e.g., an @expensify.com email) to the workspace
Navigate to Workspace > Workflows
Click "Add Approval Workflow"
Verify the Expensify team member does not appear in the menu

Verify that no errors appear in the JS console

Offline tests

N/A - The filtering logic runs client-side and does not depend on network state.

QA Steps

Create a workspace owned by a non-Expensify email
Add an Expensify team member (e.g., an @expensify.com email) to the workspace
Navigate to Workspace > Workflows
Click "Add Approval Workflow"
Verify the Expensify team member does not appear in the menu

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

Kapture.2026-03-09.at.17.56.29.mp4

codecov · 2026-02-24T22:15:36Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/PolicyUtils.ts	`62.24% <100.00%> (+0.08%)`	⬆️
...s/workspace/members/WorkspaceMemberDetailsPage.tsx	`0.00% <ø> (ø)`
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx	`0.00% <ø> (ø)`
.../approvals/WorkspaceWorkflowsApprovalsEditPage.tsx	`73.07% <ø> (ø)`
...rkspaceWorkflowsApprovalsOverLimitApproverPage.tsx	`0.00% <0.00%> (ø)`
...rovals/WorkspaceWorkflowsApprovalsApproverPage.tsx	`0.00% <0.00%> (ø)`
src/libs/WorkflowUtils.ts	`86.28% <87.50%> (+0.15%)`	⬆️
... and 12 files with indirect coverage changes

…ows-table

melvin-bot · 2026-03-09T16:57:35Z

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

eh2077

Looks good overall, can you add unit tests to cover changes please?

eh2077 · 2026-03-10T10:18:41Z

+    // Determine if we should filter Expensify team members (only for non-Expensify customers)
+    const shouldFilterExpensifyTeam = !!policyOwner && !!currentUserLogin && !isExpensifyTeam(policyOwner) && !isExpensifyTeam(currentUserLogin);


I think this condition intents to filter out Expensify team members, so please update the comment and rename to variable to shouldFilterOutExpensifyTeam

trjExpensify

Create a workspace owned by a non-Expensify email

Add an Expensify team member (e.g., an @expensify.com email) to the workspace

Configure the Expensify team member as an approver in a workflow

Navigate to Workspace > Workflows

Verify the Expensify team member does not appear in the workflows table (not as a member or approver)

Click "Add Approval Workflow"

Verify the Expensify team member does not appear in the menu

The tests don't make sense. How can you do step 3?

MobileMage · 2026-03-11T23:41:55Z

Right, updated @trjExpensify

eh2077 · 2026-03-12T15:20:36Z

@MobileMage bump on #83366 (review), thanks!

MobileMage · 2026-03-12T15:48:43Z

@eh2077 done

eh2077 · 2026-03-12T15:50:17Z

Can you also add unit tests?

MobileMage · 2026-03-12T17:43:16Z

Added @eh2077

eh2077 · 2026-03-13T13:21:16Z

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

Screen.Recording.2026-04-16.at.9.17.03.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-04-16.at.9.13.48.PM.mov

iOS: HybridApp

Screen.Recording.2026-04-16.at.9.11.04.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-04-16.at.9.12.28.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-16.at.9.07.52.PM.mov

eh2077 · 2026-03-13T13:48:25Z

@MobileMage I can still select an Expensify team (fake) member when adding a new workflow

Screen.Recording.2026-03-13.at.9.46.29.PM.mov

MobileMage · 2026-03-13T13:51:10Z

Looking into it now

MobileMage · 2026-03-13T14:49:16Z

@eh2077 that's odd, can't seem to reproduce

Here's how it looks for me, left is staging, right is my branch

Are you sure you've got the right branch?

eh2077 · 2026-03-18T12:55:05Z

@MobileMage Let me recheck, can you help merge main? thanks!

eh2077 · 2026-03-23T13:40:10Z

@MobileMage friendly bump

eh2077 · 2026-03-25T10:49:46Z

@MobileMage friendly bump!

…ows-table # Conflicts: # src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

MobileMage · 2026-03-25T22:22:09Z

done

eh2077 · 2026-03-27T12:00:08Z

It seems like a bug: still able to select an Expensify team member as approver.

Screen.Recording.2026-03-27.at.7.55.41.PM.mov

@trjExpensify Wdyt?

trjExpensify · 2026-03-27T20:26:21Z

Agreed, it does.

eh2077 · 2026-03-31T13:17:21Z

@MobileMage bump on #83366 (comment)

eh2077 · 2026-04-07T12:39:29Z

@MobileMage Friendly bump!

…ows-table # Conflicts: # src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx # src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx

MobileMage · 2026-04-07T16:52:26Z

I've made the fix @eh2077

eh2077 · 2026-04-10T14:55:42Z

thanks! I'll recheck soon.

eh2077 · 2026-04-13T13:37:12Z

+    // Hide internal Expensify team members (SRAMs/guides) from non-Expensify customers, matching the workflows table filtering.
+    const shouldFilterOutExpensifyTeam = !!policy?.owner && !!currentUserPersonalDetails?.login && !isExpensifyTeam(policy.owner) && !isExpensifyTeam(currentUserPersonalDetails.login);


To follow DRY principle, I think we can move this logic to a method in src/libs/PolicyUtils.ts, wdyt?

eh2077 · 2026-04-14T14:15:06Z

@MobileMage Thanks for the update! Can you also resolve conflicts?

Resolve conflicts: keep both pendingAction DELETE guards from main and Expensify team filtering from this branch.

MobileMage · 2026-04-15T12:57:23Z

fixed @eh2077

eh2077

works well

francoisl · 2026-04-16T22:39:05Z

+ * Find the first non-Expensify team member in the approval chain.
+ * Used to skip internal Expensify approvers when displaying workflows to customers.
+ * Returns undefined if no non-Expensify approver is found in the chain.


NAB - I'd clarify that the startEmail should be the first-level approver of a report (the submitsTo of the submitter), otherwise it's potentially misleading.

Tom's comments have been addressed

OSBotify · 2026-04-16T22:48:37Z

✋ 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-04-16T23:01:08Z

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

github-actions · 2026-04-16T23:06:14Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d866817-54c248e-ecd8add257585ca4ef5135983dbb82e3b9234233/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d866817-54c248e-7458b42bff6fec445f0c1fd694e85bff683f3373/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-21T11:35:46Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-21T11:37:20Z

No help site changes are required for this PR.

The changes filter internal Expensify team members (SRAMs/guides) from the approval workflows UI for external customers. This is a transparent, behind-the-scenes behavioral change — external users simply won't see internal team members they shouldn't see.

The relevant help articles (Add Approvals, Workspace Workflows) describe how to configure approval workflows (steps, navigation, options) and don't reference which members appear in selection lists. No user-facing steps, settings, terminology, or navigation paths changed.

OSBotify · 2026-04-23T19:55:24Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.3.61-4 🚀

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

Filter Expensify team members from approval workflows table

31ee903

melvin-bot Bot assigned MobileMage Feb 24, 2026

Merge remote-tracking branch 'origin/main' into fix/80744-sram-workfl…

1c9baa3

…ows-table

MobileMage marked this pull request as ready for review March 9, 2026 16:57

MobileMage requested review from a team as code owners March 9, 2026 16:57

melvin-bot Bot requested review from eh2077 and removed request for a team March 9, 2026 16:57

melvin-bot Bot requested review from trjExpensify and removed request for a team March 9, 2026 16:57

eh2077 reviewed Mar 10, 2026

View reviewed changes

trjExpensify previously requested changes Mar 11, 2026

View reviewed changes

Rename shouldFilterExpensifyTeam to shouldFilterOutExpensifyTeam

227f9b1

Add unit tests for Expensify team filtering in workflows

ecea97e

Merge remote-tracking branch 'origin/main' into fix/80744-sram-workfl…

3db06d2

…ows-table # Conflicts: # src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

MobileMage added 2 commits April 7, 2026 15:36

Filter Expensify team members from approver picker pages

b24b147

Merge remote-tracking branch 'origin/main' into fix/80744-sram-workfl…

d3e66e8

…ows-table # Conflicts: # src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx # src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx

eh2077 reviewed Apr 13, 2026

View reviewed changes

Extract shouldFilterExpensifyTeam helper to PolicyUtils for DRY

7117120

Merge branch 'main' into fix/80744-sram-workflows-table

162bd9f

Resolve conflicts: keep both pendingAction DELETE guards from main and Expensify team filtering from this branch.

eh2077 approved these changes Apr 16, 2026

View reviewed changes

melvin-bot Bot requested a review from francoisl April 16, 2026 13:19

francoisl approved these changes Apr 16, 2026

View reviewed changes

francoisl merged commit d866817 into Expensify:main Apr 16, 2026
33 checks passed

OSBotify mentioned this pull request Apr 21, 2026

Deploy Checklist: New Expensify 2026-04-21 #88394

Closed

melvin-bot Bot mentioned this pull request Apr 23, 2026

[Due for payment 2026-04-30] Assigned SRAM Displayed in Workflows Table #80744

Closed

7 tasks

		// Determine if we should filter Expensify team members (only for non-Expensify customers)
		const shouldFilterExpensifyTeam = !!policyOwner && !!currentUserLogin && !isExpensifyTeam(policyOwner) && !isExpensifyTeam(currentUserLogin);

		// Hide internal Expensify team members (SRAMs/guides) from non-Expensify customers, matching the workflows table filtering.
		const shouldFilterOutExpensifyTeam = !!policy?.owner && !!currentUserPersonalDetails?.login && !isExpensifyTeam(policy.owner) && !isExpensifyTeam(currentUserPersonalDetails.login);

Uh oh!

Conversation

MobileMage commented Feb 24, 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 Feb 24, 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!

melvin-bot Bot commented Mar 9, 2026

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

eh2077 Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

MobileMage commented Mar 11, 2026

Uh oh!

eh2077 commented Mar 12, 2026

Uh oh!

MobileMage commented Mar 12, 2026

Uh oh!

eh2077 commented Mar 12, 2026

Uh oh!

MobileMage commented Mar 12, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 commented Mar 13, 2026

Uh oh!

MobileMage commented Mar 13, 2026

Uh oh!

MobileMage commented Mar 13, 2026

Uh oh!

eh2077 commented Mar 18, 2026

Uh oh!

eh2077 commented Mar 23, 2026

Uh oh!

eh2077 commented Mar 25, 2026

Uh oh!

MobileMage commented Mar 25, 2026

Uh oh!

eh2077 commented Mar 27, 2026

Uh oh!

trjExpensify commented Mar 27, 2026

Uh oh!

eh2077 commented Mar 31, 2026

Uh oh!

eh2077 commented Apr 7, 2026

Uh oh!

MobileMage commented Apr 7, 2026

Uh oh!

eh2077 commented Apr 10, 2026

Uh oh!

eh2077 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

MobileMage Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

eh2077 commented Apr 14, 2026

Uh oh!

MobileMage commented Apr 15, 2026

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

MobileMage commented Feb 24, 2026 •

edited

Loading

codecov Bot commented Feb 24, 2026 •

edited by github-actions Bot

Loading

eh2077 commented Mar 13, 2026 •

edited

Loading