Rename workspaceAccountID to policyAccountID in App by miproxy · Pull Request #86365 · Expensify/App

miproxy · 2026-03-25T22:29:27Z

Explanation of Change

Renames the workspaceAccountID property to policyAccountID across the App codebase. This is part of a broader refactor (Expensify/Expensify#604128) to align naming conventions so that all WORKSPACE_ACCOUNT constants/fields use POLICY_ACCOUNT naming instead.

Changes include updating all usages in hooks, actions, pages, components, API parameter types, and tests.

Fixed Issues

$ #86364
PROPOSAL: https://github.com/Expensify/Expensify/issues/604128#issuecomment-4071620594

Tests

Verify that no errors appear in the JS console

Navigate to a workspace with an Expensify card configured
Verify card-related pages (company cards, Expensify card bank accounts, card reconciliation) load correctly with no errors
Verify workspace overview and workflows pages load correctly
Verify wallet/ExpensifyCard page loads correctly

Offline tests

N/A — this is a pure rename refactor with no behavioral changes.

QA Steps

[No QA] — Pure rename refactor, no user-facing behavioral changes.

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

melvin-bot · 2026-03-25T22:29:33Z

@situchan 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 · 2026-03-25T22:29:38Z

@jjcoffee @chiragsalian One of you needs to 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]

github-actions · 2026-03-25T22:29:54Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 97d2e5eac1

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

miproxy · 2026-03-25T22:46:37Z

I have read the CLA Document and I hereby sign the CLA

miproxy · 2026-03-25T22:54:24Z

Hi @chiragsalian @MariaHCD — this is a replacement for the previous PR #86293 (PR3 from the plan in Expensify/Expensify#604128) which got locked out due to an authorization issue. The changes are identical — renaming workspaceAccountID to policyAccountID across the App codebase. Would appreciate a fresh review here. Thanks!

situchan · 2026-03-25T22:56:20Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

situchan · 2026-03-25T23:00:11Z

@miproxy is backend deployed?

policyAccountID doesn't exist yet in policy.

heyjennahay

Refactor. Product review not required

chiragsalian · 2026-03-26T17:48:42Z

@situchan

is backend deployed?
policyAccountID doesn't exist yet in policy.

Backend just got deployed today like 9 hours ago.

situchan · 2026-03-26T19:57:06Z

Still not exist yet. Tested against staging backend.

MariaHCD · 2026-03-31T07:12:34Z

@miproxy can you please look into #86365 (comment)

The BE has been deployed for a few days now - but perhaps we are not sending the policyAccountID as the FE expects

miproxy · 2026-04-05T23:41:53Z

@MariaHCD The issue was that Auth wasn't sending policyAccountID in the Onyx updates yet. I've addressed this in
https://github.com/Expensify/Auth/pull/20807, which is currently under review. Once that merges and is deployed,
policyAccountID should be visible in the policy object on staging.

chiragsalian · 2026-04-07T18:27:27Z

You have conflicts to address.
Also looks like this PR needs your auth PR to be live to not break our product right? If so, then you need to prefix your App PR title with [HOLD], and explain why in the description, something like HOLD-ing until Auth PR is live.

miproxy · 2026-04-09T03:27:45Z

Also looks like this PR needs your auth PR to be live to not break our product right? If so, then you need to prefix your App PR title with [HOLD], and explain why in the description, something like HOLD-ing until Auth PR is live.

No, this doesn't need to wait for the Auth PR. There are two fallbacks in place: Web-Expensify already accepts both policyAccountID and workspaceAccountID as API parameters, and the App has a policyAccountID ??workspaceAccountID fallback for reading from Onyx (to handle cached data that doesn't have policyAccountID yet). Auth #20807 just ensures the backend starts populating policyAccountID in Onyx updates — nothing breaks without it. Once all 3 PRs are merged, I'll open a cleanup PR to remove the fallbacks.

situchan · 2026-04-09T06:08:58Z

Is this ready for review? job 6 test failing

codecov · 2026-04-10T20:18:27Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ents/ReportActionAvatars/useReportActionAvatars.ts	`91.47% <100.00%> (ø)`
src/hooks/useAssignCard.ts	`86.11% <100.00%> (ø)`
src/hooks/useGetExpensifyCardFromReportAction.ts	`100.00% <100.00%> (ø)`
src/hooks/useIsAllowedToIssueCompanyCard.ts	`100.00% <100.00%> (ø)`
src/hooks/usePoliciesWithCardFeedErrors.ts	`100.00% <100.00%> (ø)`
src/hooks/useWorkspaceAccountID.ts	`100.00% <100.00%> (ø)`
src/libs/actions/Card.ts	`0.00% <ø> (ø)`
src/libs/actions/Policy/Policy.ts	`69.41% <100.00%> (ø)`
.../pages/settings/Wallet/ExpensifyCardPage/index.tsx	`69.91% <100.00%> (ø)`
src/pages/workspace/WorkspacesListPage.tsx	`71.42% <100.00%> (ø)`
... and 21 more
... and 8 files with indirect coverage changes

Updates all Policy field accesses, API parameter objects, types, and tests to use policyAccountID. The wire-format key sent to the server is now policyAccountID, relying on Web-Expensify PR2 supporting both params.

Updates three test files that were missed in the initial rename (useIsAllowedToIssueCompanyCard, useAccountTabIndicatorStatus, useIndicatorStatus) and fixes prettier formatting in StatementCloseDateStep.

…ched data

…untID fallback, fix test mocks

…nflict resolution

miproxy · 2026-04-14T01:57:18Z

@chiragsalian , @MariaHCD, @situchan - #2087 has been deployed. Is there anything else I should do to help move this issue forward?

situchan · 2026-04-14T03:01:23Z

Still I am not seeing policyAccountID in staging

MariaHCD · 2026-04-14T10:51:52Z

@situchan I see both the workspaceAccountID and the policyAccountID in the policy Onyx object:

situchan · 2026-04-14T11:01:32Z

I see it now in recently created account but still not in old account created a few years ago.
Is that fine?

chiragsalian · 2026-04-14T18:09:01Z

https://github.com/Expensify/Auth/pull/20807 has been deployed. Is there anything else I should do to help move this issue forward?

Just it being deployed should suffice.

I see it now in recently created account but still not in old account created a few years ago. Is that fine?

No i don't believe so. Did you do a fresh log into this old account? Can you figure out some test steps to share.
Also i suspect its because the keys here need to be updated @miproxy - code.

situchan · 2026-04-15T16:52:08Z

yes I fresh logged in.

policyID: F151E60B77A363F8
policy owner: situchandrashil7+a1@gmail.com
Invite situchandrashil7+2@gmail.com as admin
Login with situchandrashil7+2@gmail.com

(Still not exist even on owner (situchandrashil7+a1@gmail.com) account)

MariaHCD · 2026-04-17T11:14:46Z

@miproxy could you checkout the above comments? Perhaps we are missing some more places where we need to send the new key like Chirag pointed out.

miproxy · 2026-04-20T01:10:05Z

@situchan , @MariaHCD This was caused by policyAccountID not being included in the Onyx payload on fresh login. I added it in AppInit.php alongside workspaceAccountID and verified across owner/admin flows, with and without cards. It now appears correctly and I didn’t find other missing cases.

Changes are in PR: https://github.com/Expensify/Web-Expensify/pull/52214

cc: @chiragsalian

miproxy requested review from a team as code owners March 25, 2026 22:29

melvin-bot Bot assigned miproxy Mar 25, 2026

melvin-bot Bot requested a review from situchan March 25, 2026 22:29

melvin-bot Bot requested review from a team, chiragsalian, heyjennahay and jjcoffee and removed request for a team March 25, 2026 22:29

melvin-bot Bot removed the request for review from a team March 25, 2026 22:29

chatgpt-codex-connector Bot reviewed Mar 25, 2026

View reviewed changes

Comment thread src/hooks/useWorkspaceAccountID.ts Outdated

miproxy requested a review from MariaHCD March 25, 2026 22:54

CLABotify added a commit to Expensify/CLA that referenced this pull request Mar 25, 2026

@miproxy has signed the CLA in Expensify/App#86365

ffef504

heyjennahay reviewed Mar 26, 2026

View reviewed changes

MariaHCD removed the request for review from jjcoffee March 31, 2026 07:10

miproxy force-pushed the miproxy/604128-rename-workspace-to-policy-constants-auth branch from 3e11dcb to 23f4394 Compare April 9, 2026 03:20

miproxy force-pushed the miproxy/604128-rename-workspace-to-policy-constants-auth branch from 1b6673c to 3737e6d Compare April 10, 2026 22:29

miproxy added 6 commits April 10, 2026 15:39

Switch App to send policyAccountID instead of workspaceAccountID

d37f434

Updates all Policy field accesses, API parameter objects, types, and tests to use policyAccountID. The wire-format key sent to the server is now policyAccountID, relying on Web-Expensify PR2 supporting both params.

Fix test mocks and prettier formatting after policyAccountID rename

ec2d741

Updates three test files that were missed in the initial rename (useIsAllowedToIssueCompanyCard, useAccountTabIndicatorStatus, useIndicatorStatus) and fixes prettier formatting in StatementCloseDateStep.

Fix policy.policyAccountID reference in ExpensifyCardPage

0361f11

Add fallback to workspaceAccountID for backward compatibility with ca…

4c5590b

…ched data

Fix CI failures after rebase: add useState imports, update policyAcco…

fa68cbe

…untID fallback, fix test mocks

Remove unused useState declarations accidentally introduced during co…

9139fde

…nflict resolution

miproxy force-pushed the miproxy/604128-rename-workspace-to-policy-constants-auth branch from 3737e6d to 9139fde Compare April 10, 2026 22:40

miproxy changed the title ~~Rename workspaceAccountID to policyAccountID in App~~ [HOLD until 20807 deployed] Rename workspaceAccountID to policyAccountID in App Apr 13, 2026

MariaHCD changed the title ~~[HOLD until 20807 deployed] Rename workspaceAccountID to policyAccountID in App~~ Rename workspaceAccountID to policyAccountID in App Apr 14, 2026

Conversation

miproxy commented Mar 25, 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!

melvin-bot Bot commented Mar 25, 2026

Uh oh!

melvin-bot Bot commented Mar 25, 2026

Uh oh!

github-actions Bot commented Mar 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

miproxy commented Mar 25, 2026

Uh oh!

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

Uh oh!

Uh oh!

situchan commented Mar 25, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan commented Mar 25, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

chiragsalian commented Mar 26, 2026

Uh oh!

situchan commented Mar 26, 2026

Uh oh!

MariaHCD commented Mar 31, 2026

Uh oh!

miproxy commented Apr 5, 2026

Uh oh!

chiragsalian commented Apr 7, 2026

Uh oh!

miproxy commented Apr 9, 2026

Uh oh!

situchan commented Apr 9, 2026

Uh oh!

codecov Bot commented Apr 10, 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!

miproxy commented Apr 14, 2026

Uh oh!

situchan commented Apr 14, 2026

Uh oh!

MariaHCD commented Apr 14, 2026

Uh oh!

situchan commented Apr 14, 2026

Uh oh!

chiragsalian commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

situchan commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MariaHCD commented Apr 17, 2026

Uh oh!

miproxy commented Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

miproxy commented Mar 25, 2026 •

edited

Loading

github-actions Bot commented Mar 25, 2026 •

edited

Loading

miproxy commented Mar 25, 2026 •

edited

Loading

codecov Bot commented Apr 10, 2026 •

edited by github-actions Bot

Loading

chiragsalian commented Apr 14, 2026 •

edited

Loading

situchan commented Apr 15, 2026 •

edited

Loading