Skip to content

Filter Expensify team members from Workflows table#84521

Draft
MelvinBot wants to merge 1 commit intomainfrom
claude-filterExpensifyTeamFromWorkflows
Draft

Filter Expensify team members from Workflows table#84521
MelvinBot wants to merge 1 commit intomainfrom
claude-filterExpensifyTeamFromWorkflows

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

Explanation of Change

Internal Expensify roles (e.g., SRAM/guides with @expensify.com or @team.expensify.com emails) were appearing in the customer-facing Workspace Workflows table. This confused customers who saw random people in their approval workflows.

This PR filters Expensify team members from both the members list and the approvers chain in the Workflows table when:

  • The policy owner is NOT an Expensify team member, AND
  • The current user is NOT an Expensify team member

This mirrors the existing filtering logic already used in WorkspaceMembersPage (which hides guides from the members list) but extends it to the approval workflows data layer in WorkflowUtils.ts.

Key changes:

  • Added currentUserLogin parameter to convertPolicyEmployeesToApprovalWorkflows
  • Added findFirstNonExpensifyApprover helper to skip internal approvers in approval chains
  • Filter Expensify team members from workflow members and approvers
  • Updated all 4 call sites to pass the current user's login email

Fixed Issues

$ #80744
PROPOSAL: #80744 (comment)

Tests

  1. Log in as a non-Expensify user who is an admin of a workspace that has an SRAM or guide assigned
  2. Navigate to Workspace → Workflows
  3. Verify that the SRAM/guide does NOT appear in any approval workflow (neither as a member nor as an approver)
  4. Log in as an Expensify team member (e.g., @expensify.com or @team.expensify.com email)
  5. Navigate to the same workspace's Workflows page
  6. Verify that the SRAM/guide IS visible in workflows (Expensify team members can see all members)
  • Verify that no errors appear in the JS console

Offline tests

No special offline behavior changes. The filtering is applied client-side during data transformation, so offline behavior remains unchanged.

QA Steps

  1. Log in as a non-Expensify customer who has an SRAM assigned to their workspace
  2. Navigate to Workspace → Workflows
  3. Verify the SRAM does not appear in the approval workflows table
  4. Verify that adding/editing approval workflows works correctly without the SRAM appearing
  5. Log in as an Expensify guide and verify the SRAM IS visible in the workflows table
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

…customers

Internal Expensify roles (SRAM, guides) with @expensify.com or @team.expensify.com
emails were appearing in the customer-facing Workflows table. This filters them from
both the members list and the approvers chain when the policy owner and current user
are not Expensify team members.

Co-authored-by: Eric Han <eh2077@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 9, 2026 02:24
@MelvinBot
Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-filterExpensifyTeamFromWorkflows
git checkout -b claude-filterExpensifyTeamFromWorkflows upstream/claude-filterExpensifyTeamFromWorkflows
git push -u origin claude-filterExpensifyTeamFromWorkflows

Then you can close this PR and open a new one from your fork.

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 9, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/pages/workspace/WorkspaceMembersPage.tsx 63.00% <ø> (ø)
...s/workspace/members/WorkspaceMemberDetailsPage.tsx 0.00% <ø> (ø)
.../approvals/WorkspaceWorkflowsApprovalsEditPage.tsx 73.07% <ø> (ø)
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx 0.00% <0.00%> (ø)
src/libs/WorkflowUtils.ts 80.50% <76.00%> (-0.93%) ⬇️
... and 14 files with indirect coverage changes

@eh2077
Copy link
Copy Markdown
Contributor

eh2077 commented Apr 2, 2026

@MelvinBot please close this PR

@MelvinBot
Copy link
Copy Markdown
Contributor Author

🤖 eh2077 requested to close this PR. However, I'm unable to close PRs directly due to environment permission restrictions. Please close it manually using the "Close pull request" button below.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants