Skip to content

CopyPolicySettings: add missing rules and categories fields - #93936

Merged
yuwenmemon merged 5 commits into
Expensify:mainfrom
ishpaul777:copy-policy-settings-rules-fields
Jul 28, 2026
Merged

yuwenmemon merged 5 commits into
Expensify:mainfrom
ishpaul777:copy-policy-settings-rules-fields

Conversation

@ishpaul777

@ishpaul777 ishpaul777 commented Jun 18, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Companion App change for Auth #22338 (already merged).

Extends the optimistic update field lists in CopyPolicySettings.ts to match the fields copied on the backend:

  • categories part: adds requiresCategory
  • rules part: adds defaultReimbursable, disabledFields, glCodes, and customRules (the last was already copied by Auth but missing from the App's optimistic fields, so the client relied on the server push)

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/650099
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Automated tests

No new App tests needed - the change is purely additive to the field lists used for optimistic state updates. The Auth test suite covers the backend copy behavior.

Manual tests

  1. Create two Control workspaces (Source and Target)
  2. On Source:
    • Categories: enable "Members must categorize all expenses"
    • Rules: set Default reimbursable to a non-default value, change any expense field visibility under disabled fields, enable GL codes, and add some custom Expense policy text
  3. On Target, leave those same settings at different/opposite values
  4. From Source → More features / workspace settings → Copy settings
  5. Select Target, choose Categories and Rules, and confirm the copy
  6. Immediately open Target workspace settings (no refresh) and confirm:
    • Categories: "Members must categorize all expenses" matches Source
    • Rules: default reimbursable, field visibility, GL codes, and Expense policy text match Source
  7. Confirm there are no console errors

Offline tests

N/A - this change only affects optimistic update field lists and has no offline-specific behavior.

QA Steps

Auth PR is already deployed. This App change only makes the newly copied fields show up immediately in Onyx after Copy settings (instead of waiting for a full policy refresh).

  1. Log in with an account that has at least two Control workspaces (Source and Target)
  2. On Source workspace, set these to values different from Target:
    • Categories → enable "Members must categorize all expenses"
    • Rules → change Default reimbursable / expense field visibility, enable GL codes, and add custom Expense policy text
  3. On Target workspace, confirm those settings are still different from Source
  4. From Source, open Copy settings
  5. Select Target → select Categories and Rules → confirm copy
  6. Right after the copy completes, open Target and verify Categories + Rules settings now match Source (no manual refresh needed)
  7. Verify no JS console errors
  • 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

@ishpaul777
ishpaul777 requested review from a team as code owners June 18, 2026 13:30
@melvin-bot
melvin-bot Bot requested a review from huult June 18, 2026 13:30
@melvin-bot

melvin-bot Bot commented Jun 18, 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

@melvin-bot
melvin-bot Bot requested review from heyjennahay and removed request for a team and heyjennahay June 18, 2026 13:30
@melvin-bot

melvin-bot Bot commented Jun 18, 2026

Copy link
Copy Markdown

@huult 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 removed the request for review from a team June 18, 2026 13:30
@ishpaul777
ishpaul777 removed the request for review from huult June 18, 2026 13:32
@ishpaul777
ishpaul777 marked this pull request as draft June 18, 2026 13:32
Add defaultReimbursable, disabledFields, glCodes, and customRules to
the rules part optimistic update fields. Add requiresCategory to the
categories part. Matches the new fields being copied on the Auth side.
@ishpaul777
ishpaul777 force-pushed the copy-policy-settings-rules-fields branch from a801054 to 014690f Compare June 18, 2026 13:34

@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: a801054b2a

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/hooks/useSearchBulkActions.ts Outdated
Comment thread src/libs/ExpensifyCardStatementUtils.ts Outdated
@ishpaul777

Copy link
Copy Markdown
Contributor Author

@fedirjh can you please review this, the BE pr was merged a while ago but this got off my radar, dont think we need c+ for this small review

@ishpaul777
ishpaul777 marked this pull request as ready for review July 16, 2026 17:45
@ishpaul777
ishpaul777 requested a review from fedirjh July 16, 2026 17:45

@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: 8b179cdca7

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/libs/actions/Policy/CopyPolicySettings.ts
@codecov

codecov Bot commented Jul 27, 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/libs/actions/Policy/CopyPolicySettings.ts 77.41% <ø> (ø)
src/pages/workspace/duplicate/utils.ts 79.24% <50.00%> (-3.74%) ⬇️
... and 451 files with indirect coverage changes

@ishpaul777

Copy link
Copy Markdown
Contributor Author

bump @fedirjh

@fedirjh

fedirjh commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

On it

@fedirjh

fedirjh commented Jul 28, 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 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
    • 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 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
CleanShot.2026-07-28.at.18.14.51.mp4

@ishpaul777
ishpaul777 requested a review from yuwenmemon July 28, 2026 21:55
@yuwenmemon
yuwenmemon merged commit 04e6040 into Expensify:main Jul 28, 2026
35 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.4.46-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — no docs changes required

I reviewed the changes in this PR against the help site articles under App/docs/articles.

Conclusion: No help site update is needed, so I did not create a draft PR.

Why

This PR is a purely technical/optimistic-update change:

  • src/libs/actions/Policy/CopyPolicySettings.ts — extends the optimistic-update field lists (requiresCategory under categories; defaultReimbursable, disabledFields, glCodes, customRules under rules) so the newly-copied fields appear in Onyx immediately instead of waiting for a server push. The backend (Auth Add regression test for #20510 #22338) already copies these fields.
  • src/pages/workspace/duplicate/utils.ts — adds those same items to the in-app summary of what the Rules selection will copy.

The only related help article is Duplicate-Workspace.md, which documents the top-level categories a Workspace Admin can select when duplicating (Overview, Members, Reports, Accounting Connection, Categories, Tags, Taxes, Workflows, Rules, Merchant rules, Distance Rates, Per Diem, Invoices, Travel).

Those selectable categories are unchanged by this PR — the article does not (and by design should not) enumerate the individual sub-fields within each category. The change only makes the copy behavior more complete and immediate for fields already inside the Categories and Rules groups, so nothing in the documented feature surface becomes inaccurate.

@ishpaul777, please confirm you agree no help site changes are needed here. If you think the article should call out any of these specific settings (e.g. GL codes, custom expense policy text, default reimbursable) as part of what Rules/Categories copies, let me know and I'll draft the update.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.46-10 🚀

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.

5 participants