Skip to content

Comments

Fix approval workflow member selection to include all workspace members#82841

Merged
dangrous merged 14 commits intomainfrom
beaman-fixApprovalWorkflowCreation
Feb 23, 2026
Merged

Fix approval workflow member selection to include all workspace members#82841
dangrous merged 14 commits intomainfrom
beaman-fixApprovalWorkflowCreation

Conversation

@Beamanator
Copy link
Contributor

@Beamanator Beamanator commented Feb 18, 2026

Explanation of Change

The "Expenses from" page for approval workflows was not showing all workspace members. In ADVANCED approval mode, availableMembers was derived only from the first (default) workflow, so members in custom workflows (e.g., Alex/Hannah who submit to Carolyn) were excluded from the selection list.

This change updates convertPolicyEmployeesToApprovalWorkflows to build availableMembers from all workspace members in employeeList, ensuring every member can be assigned to a workflow when configuring "Expenses from."

EmployeeList where my expensifail has a nonexistent submitsTo:

Screenshot 2026-02-18 at 1 15 21 PM

EmployeeList where submitsTo is fine:

Screenshot 2026-02-18 at 1 15 03 PM

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/598876

PROPOSAL: N/A (direct fix)

Tests

  1. Run npm test -- tests/unit/WorkflowUtilsTest.ts — all tests pass including tests for availableMembers (custom workflows and orphaned submitsTo)
  2. Navigate to a workspace with ADVANCED approval workflows (multiple custom workflows)
  3. Add a new approval workflow and go to "Expenses from"
  4. Search for members who are in custom workflows (not the default)
  5. Verify all workspace members appear in the selection list
  6. Optional — reproduce the bug: On NewDot web (dev build), open a workspace's Workflows page, then run in the browser console to simulate orphaned submitsTo (member's submitsTo points to non-member). Replace policyID and targetEmail with your policy ID and a member email from Object.keys(policy?.employeeList || {}):
const policyID = 'YOUR_POLICY_ID';
const policy = await window.Onyx.get(`policy_${policyID}`);
const employees = policy?.employeeList ? { ...policy.employeeList } : {};
const targetEmail = 'member@example.com';  // use an actual member email from Object.keys(employees)
if (employees[targetEmail]) {
  employees[targetEmail] = { ...employees[targetEmail], submitsTo: 'nonexistent@example.com' };
  await window.Onyx.merge(`policy_${policyID}`, { employeeList: employees });
}

Then go to Add approval workflow → Expenses from and verify the member appears (with the fix). Refresh to restore data.

  • Verify that no errors appear in the JS console

Offline tests

N/A — member list is derived from cached policy data.

QA Steps

  1. Log into New Expensify staging with a workspace that has ADVANCED approval workflows
  2. Go to Workflows → Approvals → Add approval workflow
  3. On the "Expenses from" page, search for each workspace member
  4. Verify all workspace members (including those in custom workflows like Alex/Hannah in the reported case) appear when searching
  5. Select members and complete workflow creation — verify it saves successfully
  6. Optional: Use the console script above to create orphaned submitsTo and verify the affected member still appears in "Expenses from"
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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
Screenshot 2026-02-18 at 1 18 19 PM

Available members were incorrectly limited to only the default workflow in
ADVANCED mode, excluding members in custom workflows (e.g., Alex/Hannah
who submit to Carolyn). Now includes all workspace members from employeeList.

Fixes Expensify/Expensify#598876

Co-authored-by: Cursor <cursoragent@cursor.com>
@Beamanator Beamanator requested review from a team as code owners February 18, 2026 17:23
@melvin-bot melvin-bot bot requested review from a team, heyjennahay and ikevin127 and removed request for a team February 18, 2026 17:23
@melvin-bot
Copy link

melvin-bot bot commented Feb 18, 2026

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

@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and removed request for a team February 18, 2026 17:23
@Beamanator
Copy link
Contributor Author

Beamanator commented Feb 18, 2026

Addressed by extracting buildMemberFromEmployee helper used in both the for-loop and availableMembers mapping. Single source of truth if the Member shape changes.

@github-actions
Copy link
Contributor

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

@github-actions

This comment has been minimized.

@Beamanator
Copy link
Contributor Author

@codex review

@Beamanator
Copy link
Contributor Author

@ikevin127 can you please review & test? 🙏

@chatgpt-codex-connector
Copy link

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

We were unable to download your code in a timely manner.
ℹ️ 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".

@ikevin127
Copy link
Contributor

ikevin127 commented Feb 18, 2026

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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.js 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 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.
  • 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

Screen.Recording.2026-02-18.at.16.33.40.mov

@ikevin127
Copy link
Contributor

@Beamanator 🟢 Completed PR Reviewer Checklist, everything looks good except for the 2 comments - let me know what you think then I can approve based on feedback 🙌

Co-authored-by: Cursor <cursoragent@cursor.com>
@Beamanator Beamanator requested a review from ikevin127 February 19, 2026 14:21
@Beamanator
Copy link
Contributor Author

Thanks for the review @ikevin127 ! Back to you!

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for product

Copy link
Contributor

@ikevin127 ikevin127 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 LGTM - Thanks for the changes!

@melvin-bot melvin-bot bot requested a review from dangrous February 19, 2026 21:51
@melvin-bot
Copy link

melvin-bot bot commented Feb 19, 2026

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

@melvin-bot
Copy link

melvin-bot bot commented Feb 19, 2026

🎯 @ikevin127, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #83003.

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine except - did we mean to push changes to Mobile-Expensify? I haven't seen that on a PR before.

@dangrous
Copy link
Contributor

Oh yeah okay it's conflicts now, let's update that

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix Mobile Expensify issues

Co-authored-by: Cursor <cursoragent@cursor.com>
@Beamanator Beamanator requested a review from dangrous February 20, 2026 16:44
@Beamanator
Copy link
Contributor Author

Hah good call @dangrous - it's pretty common in some PRs but not these 😬 I saw it when I was fixing other conflicts, not sure what happened! But we're good here now!

@Beamanator
Copy link
Contributor Author

hopefully pulling main will fix the remote rock build 🤷

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix Mobile Expensify issues

@dangrous dangrous merged commit b444ba2 into main Feb 23, 2026
33 checks passed
@dangrous dangrous deleted the beaman-fixApprovalWorkflowCreation branch February 23, 2026 15:43
@dangrous
Copy link
Contributor

lol why did that duplicate my comment from before as my approval

@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 9.3.25-0 🚀

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

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.

5 participants