Skip to content

[Payment due @linhvovan29546] Exclude non-manageable agents from workspace invite list - #104110

Merged
yuwenmemon merged 12 commits into
Expensify:mainfrom
s77rt:company-agent-authorize-invite-to-workspace
Oct 22, 2026
Merged

yuwenmemon merged 12 commits into
Expensify:mainfrom
s77rt:company-agent-authorize-invite-to-workspace

Conversation

@s77rt

@s77rt s77rt commented Oct 15, 2026 •

Copy link
Copy Markdown
Member

This is based on #103817 so let's merge that one first

Explanation of Change

Added includeAgentsOnly param to the personal details list selector that is similar to includeLoginsOnly. However includeAgentsOnly only applies to agents i.e. other regular accounts are not affected, it will only make sure that if an agent is displayed then it's part of includeAgentsOnly set.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/681641
$ https://github.com/Expensify/Expensify/issues/694594
PROPOSAL:

Tests

  • Have 2 accounts, each account have an agent
  • In one of the account, send a message to both agents (so they are known to you)
  1. Create workspace
  2. Go to Members and click on Invite member
  3. Verify only your agent(s) are displayed
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

  • 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 any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

@s77rt
s77rt marked this pull request as ready for review October 15, 2026 16:13
@s77rt
s77rt requested review from a team as code owners October 15, 2026 16:13
@melvin-bot
melvin-bot Bot requested review from garrettmknight and removed request for a team October 15, 2026 16:13
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-15T16:40:53.294730Z c8a6bd3 Draft marked ready
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot requested review from amyevans and removed request for a team October 15, 2026 16:13
@melvin-bot

melvin-bot Bot commented Oct 15, 2026

Copy link
Copy Markdown

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

@s77rt
s77rt requested review from linhvovan29546 and removed request for amyevans and garrettmknight October 15, 2026 16:14
Comment thread src/pages/workspace/DynamicWorkspaceInvitePage.tsx Outdated
Comment thread src/hooks/useWorkspaceMembers.ts
Comment thread src/hooks/useWorkspaceAgents.ts Outdated

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c8a6bd3e2f

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

Comment thread src/DelegateAccessHandler.tsx
Comment thread src/hooks/usePersonalDetailOptions.ts Outdated
Comment thread src/pages/workspace/WorkspaceAgentsPage.tsx Outdated
Comment thread src/libs/actions/Agent.ts
@codecov

codecov Bot commented Oct 21, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/usePersonalDetailOptions.ts 71.87% <100.00%> (+1.87%) ⬆️
src/hooks/usePersonalDetailSearchSelector/base.ts 95.50% <100.00%> (ø)
src/libs/PersonalDetailOptionsListUtils/index.ts 77.25% <100.00%> (+0.70%) ⬆️
src/pages/workspace/WorkspaceInitialPage.tsx 86.48% <100.00%> (+0.12%) ⬆️
src/pages/workspace/getWorkspaceMenuItems.ts 98.50% <ø> (ø)
src/pages/workspace/DynamicWorkspaceInvitePage.tsx 0.00% <0.00%> (ø)
... and 614 files with indirect coverage changes

@s77rt

s77rt commented Oct 21, 2026

Copy link
Copy Markdown
Member Author

@linhvovan29546 This is good for review / test

@linhvovan29546

linhvovan29546 commented Oct 21, 2026 •

Copy link
Copy Markdown
Contributor

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 any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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-10-22.at.17.29.38.mov
Android: mWeb Chrome
Screen.Recording.2026-10-22.at.17.26.46.mov
Screen.Recording.2026-10-22.at.17.26.59.mov
iOS: HybridApp
Screen.Recording.2026-10-22.at.17.31.16.mov
iOS: mWeb Safari
Screen.Recording.2026-10-22.at.17.25.34.mov
MacOS: Chrome / Safari
Screen.Recording.2026-10-22.at.17.14.19.mov

@linhvovan29546

Copy link
Copy Markdown
Contributor

@MelvinBot Review

@MelvinBot

Copy link
Copy Markdown
Contributor

The filtering logic looks correct. I found one possible gap and two smaller cleanups.

  1. You can still invite an unmanaged agent by typing their full email. Because the agent is now removed from the options, getUserToInviteOption creates an "invite user" option for that email. If the backend rejects this invite, the change is fine. If it doesn't, exclude agent logins that aren't in includeAgentsOnly, for example through excludeLogins.

  2. The Set code can be simpler. Every key returned by useOnyx(ONYXKEYS.COLLECTION.AGENT) is a collection member key, so the isCollectionMemberKey filter does nothing. You can also drop the deep import from react-native-onyx/dist/OnyxKeys. useAgents.ts:66 already uses Number(key.slice(ONYXKEYS.COLLECTION.AGENT.length)). See DynamicWorkspaceInvitePage.tsx:71-76.

  3. There's no unit test. The checklist says tests were added, and Codecov reports lower coverage. tests/unit/usePersonalDetailOptionsTest.tsx already tests includeLoginsOnly. Add a similar case that keeps regular accounts and the allowed agents, and drops other agents.


view run

const [personalDetails] = useAllPersonalDetails();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const employeePersonalDetails = usePersonalDetailsByLogins(Object.keys(policy?.employeeList ?? {}));
const [allAgents] = useOnyx(ONYXKEYS.COLLECTION.AGENT);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

COLLECTION.AGENT is only populated by openAgentsPage() (called from useAgents / ProfilePage), and this page never calls it. So on a fresh session allAgents is undefined and managedAgentsAccountIDs is an empty Set. includeAgentsOnly is still truthy, so all agents are filtered out, including the user's own.

Reproduced on dev: Troubleshoot → Clear cache and restart → go straight to Workspace → Members → Invite. The list is empty even though the user's own agent (personal) and a workspace-owned agent are both in personal details with isCustomAgent: true. After opening Settings → Agents and coming back, they appear.

Should we call openAgentsPage() when this page opens (and/or gate on ARE_AGENTS_LOADED)?

const [areAgentsLoaded] = useOnyx(ONYXKEYS.ARE_AGENTS_LOADED);
// ...
includeAgentsOnly: areAgentsLoaded ? managedAgentsAccountIDs : undefined,

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Updated to use useAgents. This fixes the issue as it opens the agents page. However this also meants that now we are calling two API commands on page open OpenWorkspaceInvitePage and OpenAgentsPage. We should not do that but given the urgency it's fine for now. I also just noticed that the Agents page has same issue (calling both. OpenWorkspaceMembersPage and OpenAgentsPage)

Comment thread src/pages/workspace/DynamicWorkspaceInvitePage.tsx Outdated
Comment thread src/hooks/usePersonalDetailOptions.ts Outdated
}
const accountIDToReportIDMap = generateAccountIDToReportIDMap(reports, accountID);

return memoizedCreateOptionList(accountID, personalDetails, accountIDToReportIDMap, reports, reportAttributes, reportNameValuePairs ?? {}, formatPhoneNumber, translate, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

NAB: memoizedCreateOptionList has maxSize: 1, and the invite page now always requests a narrowed list, so switching between this page and any full-list consumer rebuilds the whole option list each time. Probably fine, but the doc comment above memoizedCreateOptionList only mentions includeLoginsOnly evicting the whole-list entry. Can we mention includeAgentsOnly too?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Updated comment

Comment thread src/hooks/usePersonalDetailOptions.ts Outdated
@melvin-bot melvin-bot Bot changed the title Exclude non-manageable agents from workspace invite list [Payment due @linhvovan29546] Exclude non-manageable agents from workspace invite list Oct 22, 2026
@melvin-bot

melvin-bot Bot commented Oct 22, 2026

Copy link
Copy Markdown

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

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - no internal issue.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@linhvovan29546

Copy link
Copy Markdown
Contributor

Fixed Issues
https://github.com/Expensify/Expensify/issues/681641

@s77rt Could you please update the fixed issue section? Thanks!

@yuwenmemon
yuwenmemon merged commit b4939a4 into Expensify:main Oct 22, 2026
35 of 36 checks passed
@OSBotify

Copy link
Copy Markdown
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.

@github-actions

Copy link
Copy Markdown
Contributor

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

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