Skip to content

Fix category rules regressions from the contextual Category rules section - #97729

Open
Krishna2323 wants to merge 4 commits into
Expensify:mainfrom
Krishna2323:krishna2323/r4-regressions-97560-97561-97563
Open

Fix category rules regressions from the contextual Category rules section#97729
Krishna2323 wants to merge 4 commits into
Expensify:mainfrom
Krishna2323:krishna2323/r4-regressions-97560-97561-97563

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR fixes three regressions introduced by the contextual Category rules section in the category details RHP.

1. Creating a rule didn't preload existing category settings

Creating a new Field requirements or Flag for review rule opened an empty form, even when the category already had that rule.

Since both rule types are limited to one per category, re-selecting the same values counted as no change:

  • Field requirements showed "Please select at least one field.".
  • Flag for review could overwrite the existing amount with an empty value.

The Add pages now pass categoryName whenever the category already has that rule, so the form is prefilled the same way as when editing from the category RHP. They continue passing initialCategoryName, so saving still returns to the category details page instead of the New rule hub.

2. Optimistically deleted rules remained interactive

Rules pending deletion could still be opened.

Both rule types now expose isDisabled when pendingAction === DELETE, making the menu item non-interactive and removing the chevron.

3. Pending-delete Field requirements disappeared

A deleted Field requirements rule disappeared instead of remaining visible with a strikethrough.

getCategoryContextualRules now mirrors getRequireFieldsTableData:

  • Keep rules visible while they are pending delete.
  • Pass shouldIncludePendingDeleteFields so the summary continues to render.
  • Remove pending-delete rules only after the deletion resolves online, preventing UI flicker.

Fixed Issues

$ #97560
$ #97561
$ #97563
PROPOSAL:

Tests

  • Precondition:
    • Log in with Expensifail account.
    • Enable Rules.

#97560 Rules - "Please select at least one field" is shown when all fields are selected

  1. Go to staging.new.expensify.com
  2. Go to workspace settings > Categories.
  3. Open any category.
  4. Click Create new rule > Field requirements.
  5. Select Require for all fields > Save rule.
  6. Click Create new rule > Field requirements.
  7. Verify category is already selected and the existing settings are also pre-filled
  8. Edit or save as is and verify it works without any error
  • Verify that no errors appear in the JS console

Offline tests

  • Precondition:
    • Log in with Expensifail account.
    • Enable Rules.

#97561 Rules - Deleted flag for review rule can be opened in offline mode

  1. Go to staging.new.expensify.com
  2. Go to workspace settings > Categories.
  3. Open any category.
  4. Click Create new rule > Flag for review.
  5. Enter the required field > Save rule.
  6. Go offline.
  7. Go to workspace settings > Rules > Flag for review.
  8. Delete the rule in Step 5.
  9. Open the same category whose rule is deleted.
  10. Click on the deleted rule
  11. Verify rule is disabled and nothing happens

#97563 Rules - Deleted field requirements rule disappears instead of showing crossed-out in offline

  1. Go to staging.new.expensify.com
  2. Go to workspace settings > Categories.
  3. Open any category.
  4. Click Create new rule.
  5. Create Flag for review rule and Field requirements rule.
  6. Go offline.
  7. Go to workspace settings > Rules > Flag for review.
  8. Delete flag for review rule in Step 5.
  9. Go to workspace settings > Rules > Field requirements.
  10. Delete field requirements rule in Step 5.
  11. Open the category whose rules are deleted in Step 8 and 10.
  12. Verify both rules are there with stricke through, and are not tappable.

QA Steps

  • Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • 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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
web_chrome.mp4

…tion

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323
Krishna2323 marked this pull request as ready for review August 3, 2026 21:10
@Krishna2323
Krishna2323 requested review from a team as code owners August 3, 2026 21:10
@melvin-bot
melvin-bot Bot requested review from heyjennahay and situchan and removed request for a team August 3, 2026 21:10
@melvin-bot

melvin-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

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

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

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

@codecov

codecov Bot commented Aug 3, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/CategoryContextualRulesUtils.ts 92.59% <100.00%> (+1.68%) ⬆️
...ages/workspace/categories/CategorySettingsPage.tsx 0.00% <0.00%> (ø)
...s/RequireFieldsRules/RequireFieldsRulePageBase.tsx 0.00% <0.00%> (ø)
...es/FlagForReviewRules/AddFlagForReviewRulePage.tsx 0.00% <0.00%> (ø)
...s/FlagForReviewRules/FlagForReviewRulePageBase.tsx 0.00% <0.00%> (ø)
...es/RequireFieldsRules/AddRequireFieldsRulePage.tsx 0.00% <0.00%> (ø)
... and 13 files with indirect coverage changes

…rules test

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
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.

1 participant