Skip to content

Add payments admin workspace access#94018

Merged
flodnv merged 7 commits into
Expensify:mainfrom
ShridharGoel:ws1.6
Jul 7, 2026
Merged

Add payments admin workspace access#94018
flodnv merged 7 commits into
Expensify:mainfrom
ShridharGoel:ws1.6

Conversation

@ShridharGoel

@ShridharGoel ShridharGoel commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR adds Payments Admin to the workspace UI and lets that role manage Workflows > Payments.

Payments Admins can now be selected in role pickers, shown in member badges and filters, selected as workspace payer, and access payment setup pages through WORKFLOWS_PAYMENTS write access. Approval and broader workspace settings stay gated by their existing permissions.

Fixed Issues

$ #90504

Tests

  1. Add a member as Payments Admin in a Control workspace.
  2. Sign in as that Payments Admin.
  3. Verify only Overview, Members, and Workflows are visible in workspace navigation.
  4. Go to Workflows and verify Payments is editable.
  5. Verify workspace bank account setup, preferred payer, payment methods, and auto-pay can be managed.
  6. Verify Approvals and Submissions are visible but not editable.
  7. Verify the Payments Admin can be selected as workspace payer.
  8. Verify paying reports still follows existing bank account sharing and eligibility rules.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same

  • 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 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)
  • 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)
  • 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.
  • 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

@melvin-bot

melvin-bot Bot commented Jun 19, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@codecov

codecov Bot commented Jun 19, 2026

Copy link
Copy Markdown

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/CONST/index.ts 93.33% <ø> (ø)
src/components/WorkspaceMemberRoleList.tsx 0.00% <ø> (ø)
src/pages/workspace/MemberRightIcon.tsx 94.11% <100.00%> (+0.36%) ⬆️
src/pages/workspace/WorkspaceMembersPage.tsx 60.56% <80.00%> (+0.31%) ⬆️
...s/workspace/rules/RulesAutoPayReportsUnderPage.tsx 0.00% <0.00%> (ø)
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx 74.36% <0.00%> (-0.27%) ⬇️
.../components/Tables/WorkspaceMembersTable/index.tsx 31.63% <0.00%> (-4.37%) ⬇️
.../ReimbursementAccount/ReimbursementAccountPage.tsx 0.00% <0.00%> (ø)
...orkspace/workflows/WorkspaceWorkflowsPayerPage.tsx 0.00% <0.00%> (ø)
... and 148 files with indirect coverage changes

# Conflicts:
#	src/components/WorkspaceMemberRoleList.tsx
#	src/languages/de.ts
#	src/languages/es.ts
#	src/languages/fr.ts
#	src/languages/it.ts
#	src/languages/ja.ts
#	src/languages/nl.ts
#	src/languages/pl.ts
#	src/languages/pt-BR.ts
#	src/languages/zh-hans.ts
#	src/pages/workspace/WorkspaceMembersPage.tsx
#	src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@ShridharGoel ShridharGoel marked this pull request as ready for review July 1, 2026 15:01
@ShridharGoel ShridharGoel requested review from a team as code owners July 1, 2026 15:01
@melvin-bot melvin-bot Bot requested review from flaviadefaria and removed request for a team July 1, 2026 15:01
@ShridharGoel ShridharGoel requested review from Pujan92 and removed request for a team July 1, 2026 15:02
@melvin-bot melvin-bot Bot requested a review from Beamanator July 1, 2026 15:02
@melvin-bot

melvin-bot Bot commented Jul 1, 2026

Copy link
Copy Markdown

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

@ShridharGoel ShridharGoel removed the request for review from Beamanator July 1, 2026 15:03

@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: 59430afb83

ℹ️ 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/components/WorkspaceMemberRoleList.tsx
@flodnv flodnv requested review from JmillsExpensify and removed request for flaviadefaria July 1, 2026 15:47
@JmillsExpensify

Copy link
Copy Markdown
Contributor

Kicked off an adhoc build for review.

@github-actions

github-actions Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

JmillsExpensify
JmillsExpensify previously approved these changes Jul 2, 2026

@JmillsExpensify JmillsExpensify left a comment

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.

Workflows page works really well. Submission and Approvals were locked, Payments weren't, and only the Auto-pay toggle in Advanced was editable.

@Pujan92

Pujan92 commented Jul 4, 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 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 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)
  • 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)
  • 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.
  • 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: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-07-07.at.11.58.36.mov
Screenshot 2026-07-07 at 11 57 10
Screen.Recording.2026-07-07.at.11.54.48.mov
Screen.Recording.2026-07-07.at.11.50.48.mov

@Pujan92

Pujan92 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

@ShridharGoel Let's fix the conflicts

@ShridharGoel

Copy link
Copy Markdown
Contributor Author

@Pujan92 Done

@Pujan92 Pujan92 left a comment

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.

LGTM!

@melvin-bot melvin-bot Bot requested a review from flodnv July 7, 2026 06:31
@Pujan92

Pujan92 commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot review

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Reviewed the diff. No blocking bugs — the change faithfully follows the existing PEOPLE_ADMIN / CARD_ADMIN role pattern, and the permission model is sound:

  • PAYMENTS_ADMINWORKFLOWS_PAYMENTS: WRITE (+ read on Overview/Members/Workflows) is consistent with the sibling role bundles in PolicyUtils.ts:176.
  • Swapping isPolicyAdmincanWritePayments in the workflows page preserves admin access (admins have WRITE_ALL) and extends it to payments admins. canWritePayments is correctly listed in the useMemo deps (WorkspaceWorkflowsPage.tsx:856).
  • The bulk-action gate for paymentsAdminOption matches the people/card-admin gates exactly, and translations (makePaymentsAdmin, paymentsAdmins) landed in all 10 locales.

A few non-blocking items worth a look before this ships:

  1. No unit tests added. The author checklist claims unit tests were added and Codecov flags decreased coverage, but no test files are in the diff. This PR introduces new permission-gating on a money-movement surface (payer eligibility, bank-account access) — a small test on canMemberWrite(policy, login, WORKFLOWS_PAYMENTS) and payer eligibility for the PAYMENTS_ADMIN role would be worthwhile.

  2. Admin badge copy change in the payer picker. WorkspaceWorkflowsPayerPage.tsx:121 now renders roleName(role) for non-owners, so an admin's badge changes from “Admin” (common.admin) to “Workspace Admin” (roleName(ADMIN)). Probably intentional/more consistent, but it's a visible copy change for existing admins — please confirm it's expected.

  3. Redundant ACCESS_VARIANTS.ADMIN removal. In RulesAutoPayReportsUnderPage and WorkspaceWorkflowsPayerPage, dropping ACCESS_VARIANTS.ADMIN from accessVariants is a no-op — AccessOrNotFoundWrapper already strips ADMIN whenever policyFeature is set (AccessOrNotFoundWrapper.tsx:203). Harmless, just noting it wasn't required.

  4. Minor nits: the totalNumberOfEmployeesEitherOwnerOrAdmin variable (WorkspaceWorkflowsPayerPage.tsx:265) now also counts payments admins, so the name is a bit stale; and onPress={canWritePayments ? ... : undefined} (WorkspaceWorkflowsPage.tsx:779) is redundant since the same item already sets interactive={canWritePayments}.

What I verified
  • PAYMENTS_ADMIN role, WORKFLOWS_PAYMENTS feature, paymentsAdminAlternateText, and the roleName PAYMENTS_ADMIN case all pre-exist on the ws1.6 base (added in earlier branch commits); this PR is the incremental UI wiring.
  • hasPolicyFeaturePermission correctly restricts PAYMENTS_ADMIN to Control policies via CONTROL_POLICY_ONLY_ROLES / isControlPolicyOnlyRole.
  • Other files that branch on sibling admin roles (Member.ts hasPolicyAdminsRoomsAccess, ImportedMembersPage.tsx control-only roles) already include PAYMENTS_ADMIN, so no missed spots there.
  • Did not run typecheck/lint/tests locally — recommend confirming CI is green (Codecov coverage flag noted above).

Comment thread src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx Outdated
Comment thread src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx Outdated
Comment thread src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx Outdated
@ShridharGoel ShridharGoel requested a review from flodnv July 7, 2026 12:01

@flodnv flodnv left a comment

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.

🙌

const isOwner = policy?.owner === email;
const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
return !isDeletedPolicyEmployee(policyEmployee) && (isOwner || isAdmin);
const totalNumberOfPayerCandidates = Object.entries(policy?.employeeList ?? {}).filter(([email, policyEmployee]) => {

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

Suggested change
const totalNumberOfPayerCandidates = Object.entries(policy?.employeeList ?? {}).filter(([email, policyEmployee]) => {
const payerCandidatesCount = Object.entries(policy?.employeeList ?? {}).filter(([email, policyEmployee]) => {

@flodnv flodnv merged commit 45afbcd into Expensify:main Jul 7, 2026
36 checks passed
@OSBotify

OSBotify commented Jul 7, 2026

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

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/flodnv in version: 9.4.29-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against the help site files under docs/articles, and yes — a help site update is required.

Why: This PR introduces a new Payments Admin workspace role (Control workspaces only) that can manage payments in Workflows, be selected as the workspace payer, and has scoped read-only access elsewhere. The canonical role documentation — Managing-Workspace-Members.md — did not list this role in either the roles list or the role filter list.

Draft PR: #95527

What it changes:

  • Adds a Payments Admin entry to the workspace member roles list.
  • Adds Payments Admins to the role filter list (and also People Admins, which was already a filter option in the UI but missing from the docs).
  • Adds payments admin to the article keywords.

Role names, section names, and Control-plan gating were verified against this PR's code (src/languages/en.ts role names, WorkspaceMembersTable filter gating on isControlPolicy, and the WORKFLOWS_PAYMENTS write-access changes).

@ShridharGoel, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #95536 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #95560 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #95615 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #95625 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #95629 was identified to be related to this PR.

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/flodnv in version: 9.4.31-0 🚀

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

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.31-0 🚀

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

Bundle Size Analysis (Sentry):

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.

8 participants