Skip to content

Conversation

@DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented Sep 29, 2025

Explanation of Change

Fixed Issues

$ #66559
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  1. Go to Category page
  2. Try to edit, create, and remove the category
  3. Verify that it is successful
  • 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
    • MacOS: Desktop
  • 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 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.
  • 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

Screen.Recording.2025-09-29.at.17.20.08.mov
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@DylanDylann DylanDylann requested a review from a team as a code owner September 29, 2025 10:12
@melvin-bot melvin-bot bot requested review from ikevin127 and removed request for a team September 29, 2025 10:12
@melvin-bot
Copy link

melvin-bot bot commented Sep 29, 2025

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

@ikevin127
Copy link
Contributor

ikevin127 commented Sep 29, 2025

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
    • MacOS: Desktop
  • 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.2025-09-29.at.17.04.20.mov

Comment on lines 34 to +35
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
const [allPolicyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}`, {canBeMissing: true});
Copy link
Contributor

Choose a reason for hiding this comment

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

🟡 Same Onyx collection / selector subscription refactor recommendation as https://github.com/Expensify/App/pull/71457/files#r2389503766.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

same above

Copy link
Contributor

Choose a reason for hiding this comment

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

In the other thread, you said:

@ikevin127 We can't know the selected item at mount time, It relies on the user's selection

But I don't think that same statement applies here, does it? This component is using the reportID from the route parameters, so a selector should be used here for getting the report's policy, and then the policy's categories.

@ikevin127
Copy link
Contributor

🟢 PR Review Checklist completed, I have a few comments / improvements code-wise ☝️

Here’s a focused manual test checklist derived from the changed files, grouped by feature/flow, with the exact pages/components:

✅ Pre-setup to cover key paths
• Create two policies (workspaces):
◦ Policy A: Categories enabled with several categories (mix of enabled/disabled), some with:
▪ Comment required + commentHint set
▪ Receipts required thresholds (Always, Never, Default amount)
▪ Max amounts, GL code, Payroll code
◦ Policy B: Categories initially disabled
• Create expenses/transactions:
◦ A few duplicates differing by fields (merchant, description, category, billable, reimbursable, tags, tax code)
◦ Unreported expenses
◦ At least one expense with a split (or ready to be split)

✅ Duplicate Review flows (TransactionPreview, MoneyRequestHeader, TransactionDuplicate/*)
• Transaction action item preview
◦ Component: src/components/ReportActionItem/TransactionPreview
◦ Flow: Open a chat with money request actions -> tap the transaction preview -> press Review (or equivalent) to navigate to the review wizard.
◦ Verify:
▪ The review wizard includes a “Category” step only when categories differ and are available in the policy.
▪ Steps for Merchant, Description, Billable, Reimbursable, Tag, Tax Code appear when appropriate.
▪ No crash/blank screen if categories are still loading.
• Money request header
◦ Component: src/components/MoneyRequestHeader
◦ Flow: Open a money request -> trigger duplicates review from the header action.
◦ Verify same as above.
• Duplicate review wizard screens
◦ Pages: src/pages/TransactionDuplicate/Confirmation, ReviewBillable, ReviewCategory, ReviewDescription, ReviewMerchant, ReviewReimbursable, ReviewTag, ReviewTaxCode
◦ Flow: Start duplicate review -> navigate through each step -> confirm.
◦ Verify:
▪ Category choices list only enabled, non-deleted categories for that policy.
▪ Changing selections updates the summary and final merged transaction correctly.
▪ Works when the target policy has categories disabled (Category step should not appear).

✅ Change report flows (re-routing expenses between reports/policies)
• Search: Change report
◦ Page: src/pages/Search/SearchTransactionsChangeReport
◦ Flow: Search -> multi-select transactions -> Change report -> pick a report in a different policy.
◦ Verify:
▪ Categories on moved transactions are validated and corrected to valid ones in the new policy (or cleared if invalid).
▪ Any category-based violations update immediately (requires category, receipts thresholds).
• IOU Request: Edit report
◦ Page: src/pages/iou/request/step/IOURequestEditReport
◦ Flow: From an IOU request, choose “Edit report” -> move to a different policy report.
◦ Verify same as above.
• IOU Request: Choose report during creation/edit
◦ Page: src/pages/iou/request/step/IOURequestStepReport
◦ Flow: While creating or editing a request, pick a report in a different policy.
◦ Verify same as above.

✅ Add Unreported Expense
• Page: src/pages/AddUnreportedExpense
• Flow: From the “Unreported” list, add an expense to a report (especially across policies).
• Verify:
◦ Category/tags/tax validations and violations reflect the destination policy rules.
◦ No crash if categories for the destination policy were not yet loaded when you opened the page.

✅ Split Expense
• Page: src/pages/iou/SplitExpensePage
• Flows:
◦ Split an expense in a policy with categories enabled.
◦ Split an expense in a policy with categories disabled.
◦ Split a card transaction and a per diem (if applicable in your env).
• Verify:
◦ Saving splits works; sub-transactions get valid categories (or cleared) according to policy rules.
◦ Violations appear for missing required category or receipt thresholds.
◦ No crash when the screen initially loads with policy/categories still loading.

✅ Enable/disable categories at workspace level
• Workspace More Features
◦ Page: src/pages/workspace/WorkspaceMoreFeaturesPage
◦ Flow: Toggle “Categories” on/off.
◦ Verify:
▪ Toggling on populates list items as enabled; toggling off disables category usage across the policy.
▪ Transaction violations update (e.g., requires category) after toggling.

✅ Workspace Categories: list, bulk, settings, and edits
• Categories list and bulk actions
◦ Page: src/pages/workspace/categories/WorkspaceCategoriesPage
◦ Flows:
▪ Enable/disable a single category from the list toggle.
▪ Bulk select multiple categories -> bulk enable/disable.
▪ Delete multiple categories via bulk selection.
▪ Dismiss error rows via the “X” (clear errors) action.
◦ Verify:
▪ State updates match UI; errors are cleared properly.
▪ Cannot disable/delete the last remaining enabled category (modal appears).
• Category settings (single category)
◦ Page: src/pages/workspace/categories/CategorySettingsPage
◦ Flows:
▪ Toggle category enabled.
▪ Toggle “Require description” on/off; when turning off, ensure commentHint is cleared appropriately.
▪ Delete the category (confirm modal) and navigate back.
▪ Clear error from the error row.
◦ Verify:
▪ All changes persist; violations reflect require-description changes; cannot delete/disable last category.
• Category description hint
◦ Page: src/pages/workspace/categories/CategoryDescriptionHintPage
◦ Flow: Set a hint, save, navigate back; also test clearing the hint.
◦ Verify saved hint persists and UI updates.
• Category “flag amounts over”
◦ Page: src/pages/workspace/categories/CategoryFlagAmountsOverPage
◦ Flow: Set different max expense amounts and limit types; save.
◦ Verify persisted and shown correctly, and related violations appear when exceeded.
• Category GL code
◦ Page: src/pages/workspace/categories/CategoryGLCodePage
◦ Flow: Change GL code; save.
◦ Verify persistence and any integration/export-dependent displays if visible in your environment.
• Category Payroll code
◦ Page: src/pages/workspace/categories/CategoryPayrollCodePage
◦ Flow: Change Payroll code; save.
◦ Verify persistence.
• Category receipts required thresholds
◦ Page: src/pages/workspace/categories/CategoryRequireReceiptsOverPage
◦ Flows:
▪ Pick “Always require receipts”.
▪ Pick “Never require receipts”.
▪ Pick “Default amount” and verify currency formatting looks right.
◦ Verify:
▪ Thresholds persist; violations reflect new settings; navigation returns to settings.
• Rename category
◦ Page: src/pages/workspace/categories/EditCategoryPage
◦ Flow: Rename a category; navigate back.
◦ Verify:
▪ Name updates without UI flicker; linked rules (approver/expense rules) remain consistent.

✅ Workspace Categories global requirement
• Page: src/pages/workspace/categories/WorkspaceCategoriesSettingsPage
• Flow: Toggle “Require category”.
• Verify:
◦ Existing transactions in that policy show violations when missing a category; removing the toggle clears violations appropriately.

✅ IOU Request Category Step (auto-enable path)
• Page: src/pages/iou/request/step/IOURequestStepCategory
• Flow: With a policy where categories are disabled, attempt to pick category -> flow should offer/perform enabling categories -> navigate to category selection.
• Verify: Categories become enabled and picker shows available categories.

✅ Cross-cutting edge cases to include while testing
• Load each screen before the policy’s categories have arrived in Onyx (slow network). Ensure:
◦ No crashes or blank screens.
◦ UI updates when categories load.
• Use policies with:
◦ Categories disabled entirely.
◦ Categories enabled but the specific category used on a transaction is disabled or pending deletion.
• Duplicates where category names differ but one of the categories is disabled in the target policy—verify the Category step behavior and available choices.
• Multi-currency policies: Confirm currency formatting on “Require receipts over” page and any place amounts are displayed.

✅ Platforms
• Verify at least on:
◦ Mobile (iOS and Android) for category toggles and duplicate review navigation.
◦ Web/Desktop (Chrome or Safari) for bulk actions and long lists in workspace category pages.

@DylanDylann
Copy link
Contributor Author

@ikevin127 Back to you

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.

Thanks for the updates! LGTM :shipit:

Noting that there were 3 new checkboxes added to PR Author Checklist in the meantime (that's why it's failing:

- [x] If new assets were added or existing ones were modified, I verified that:
    - [x] The assets are optimized and compressed (for SVG files, run `npm run compress-svg`)
    - [x] The assets load correctly across all supported platforms.

@melvin-bot melvin-bot bot requested a review from tgolen September 30, 2025 09:44
Comment on lines 34 to +35
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
const [allPolicyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}`, {canBeMissing: true});
Copy link
Contributor

Choose a reason for hiding this comment

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

In the other thread, you said:

@ikevin127 We can't know the selected item at mount time, It relies on the user's selection

But I don't think that same statement applies here, does it? This component is using the reportID from the route parameters, so a selector should be used here for getting the report's policy, and then the policy's categories.

@DylanDylann
Copy link
Contributor Author

@tgolen Could you please take a look again?

@tgolen tgolen merged commit 391abf2 into Expensify:main Oct 2, 2025
19 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Oct 2, 2025

✋ 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

OSBotify commented Oct 3, 2025

🚀 Deployed to staging by https://github.com/tgolen in version: 9.2.23-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Oct 6, 2025

🚀 Deployed to production by https://github.com/lakchote in version: 9.2.23-3 🚀

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

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.

4 participants