Skip to content

Fix regressions from [Rules Revamp] Release 1 - #94478

Merged
luacmartins merged 6 commits into
Expensify:mainfrom
Krishna2323:krishna2323/rules-revamp-r2
Jun 25, 2026
Merged

luacmartins merged 6 commits into
Expensify:mainfrom
Krishna2323:krishna2323/rules-revamp-r2

Conversation

@Krishna2323

@Krishna2323 Krishna2323 commented Jun 24, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #94352
$ #94353
$ #94360
$ #94384
$ #94473

PROPOSAL:

Tests

Prerequisites

  • Workspace with Rules enabled (More features)
  • rulesRevamp beta enabled

#94352 — Select-all shows pointer when not clickable

Setup: Enable Expensify Card (with bank account). Enable Rules. Do not create custom card spend rules (only the built-in default row).

  1. Open Workspace settings → Rules → Card restrictions
  2. Hover the select-all checkbox in the table header

Verify: Cursor is disabled (not-allowed), not a hand/pointer. Checkbox is not clickable.


#94353 — “1 selected” persists after deleting rule from edit page

Setup: Create an expense default rule (Add rule → Apply expense defaults).

  1. Open Rules → Expense defaults
  2. Select the rule via checkbox
  3. Open the rule (tap/click row)
  4. Delete rule → Delete

Verify: “1 selected” bulk-actions dropdown is gone after returning to the table.


#94360 — “Custom rules” section splits when sorting by Card

Setup: Enable Expensify Card. Assign virtual cards to you and another member. Create two custom card spend rules (one per card).

  1. Open Rules → Card restrictions
  2. Click the Card column header to sort

Verify: “Custom rules” appears once as a section header (default row stays grouped; no extra “Custom rules” band in the middle of the list).


#94384 — Require fields Save needs two taps

Setup: Enable Tags in More features and add tags. Enable Rules.

  1. Open Rules → Require fields for all expenses
  2. Enable the Tag toggle (Categories and Tags both unlocked)
  3. Tap Save rule once

Verify: Rule saves and you navigate back to the Rules page on the first tap (not a no-op, and not two screens back on a second tap).

  • Verify that no errors appear in the JS console

Offline tests

#94473 — Offline indicator mid-screen on Add rule (mobile)

Setup: Enable Rules. Use iOS or Android app.

  1. Open Workspace settings → Rules
  2. Tap Add rule
  3. Go offline

Verify: “You appear to be offline” is pinned to the bottom of the screen, not floating under the menu items.

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
bug_94473_android.mp4
Android: mWeb Chrome
iOS: Native
bug_94384.mp4
bug_94473_ios.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
bug_94352.mp4
bug_94353.mp4
bug_94360.mp4

…line layout.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
…ects.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@codecov

codecov Bot commented Jun 24, 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 Δ
...ges/workspace/rules/RulesProhibitedDefaultPage.tsx 0.00% <ø> (ø)
...c/pages/workspace/rules/RulesRequireFieldsPage.tsx 0.00% <0.00%> (ø)
...mponents/Tables/WorkspaceSpendRulesTable/index.tsx 0.00% <0.00%> (ø)
...rc/pages/workspace/rules/PolicyRulesPageRevamp.tsx 2.04% <0.00%> (-0.02%) ⬇️
src/pages/workspace/rules/RulesNewPage.tsx 0.00% <0.00%> (ø)
... and 138 files with indirect coverage changes

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 changed the title Krishna2323/rules revamp r2 Fix regressions from [Rules Revamp] Release 1 Jun 25, 2026
@Krishna2323
Krishna2323 marked this pull request as ready for review June 25, 2026 14:58
@Krishna2323
Krishna2323 requested review from a team as code owners June 25, 2026 14:58
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and situchan and removed request for a team June 25, 2026 14:58
@melvin-bot

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

@situchan

situchan commented Jun 25, 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.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mov

@situchan

Copy link
Copy Markdown
Contributor

I am not able to reproduce #94352 on main. Any other specific repro step?

web.mov

@situchan

Copy link
Copy Markdown
Contributor

Also not able to reproduce #94353, #94384 on main

<FixedFooter
addBottomSafeAreaPadding
addOfflineIndicatorBottomSafeAreaPadding
style={styles.ph5}

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.

FixedFooter already has styles.ph5 so redundant

Suggested change
style={styles.ph5}

<FixedFooter
addBottomSafeAreaPadding
addOfflineIndicatorBottomSafeAreaPadding
style={styles.ph5}

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.

Same here

@situchan

Copy link
Copy Markdown
Contributor

@codex review

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Code review

Overall the changes are clean and targeted, and all CI checks are green. The FixedFooter + addOfflineIndicatorBottomSafeAreaPadding changes (#94473), the ScrollView wrap on the New-rule page, and the compareItems default-rule grouping (#94360) all look correct. A few things worth a second look before merge:

1. #94353 fix may not clear selection for a pending delete (medium)
validExpenseDefaultKeys / validSpendRuleKeys are built from the full table data, which still includes rows that are pending deletion (they're only marked disabled, not removed — see PolicyRulesPageRevamp.tsx:237). So when a selected rule is deleted from the edit page, its key stays in validKeys until the server removes it, and filteredSelectedExpenseDefaultKeys keeps it — so the "1 selected" bulk dropdown can still persist during the optimistic/offline window. Excluding disabled rows would make this match the selection-handler logic and clear immediately:

const validExpenseDefaultKeys = new Set(expenseDefaultsTableData.filter((rule) => !rule.disabled).map((rule) => rule.keyForList));
const validSpendRuleKeys = new Set(spendRulesTableData.filter((rule) => !rule.disabled).map((rule) => rule.keyForList));

This is the same !rule.disabled filter already used in handleExpenseDefaultSelectionChange.

2. #94352 (select-all cursor) — no corresponding code change
The diff doesn't contain anything addressing the select-all checkbox cursor; the only change to WorkspaceSpendRulesTable is the sort grouping (that's the #94360 fix). That lines up with situchan being unable to reproduce #94352 on main. If it's no longer reproducible, consider dropping #94352 from Fixed Issues (or pointing to where it's actually fixed) so the linked issue isn't auto-closed without a fix.

3. Minor — toggle flash on RulesRequireFieldsPage (low)
Initial state was changed from useState(!!policy?.requiresCategory) to useState(false), with the real values applied in a useEffect. If policy is already loaded on mount (the common case when navigating from the Rules page), the toggles render off for one frame before the effect flips them on. Lazy-initializing from policy (useState(() => !!policy?.requiresCategory)) would avoid the flicker while keeping the rest of the fix.

4. Minor — isSavingRef is never reset (low)
isSavingRef is set to true and never cleared. That's fine for the normal save-and-leave flow (the page unmounts), but if goBack is ever blocked the Save button becomes permanently inert. Resetting it would be safer, though it's an edge case.

Verification
  • Reviewed against PR head dd0d459.
  • All CI checks passing (ESLint, Prettier, TypeScript, React Compiler, tests, perf).
  • Findings 3 & 4 are non-blocking polish; finding 1 is the one I'd most want confirmed against the offline delete flow; finding 2 is a bookkeeping question about the linked issue.

Next Steps: Reply with @MelvinBot <feedback> to refine, or have the PR author/assignee confirm the #94353 offline case and the #94352 linkage.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🚀

Reviewed commit: dd0d459768

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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@Krishna2323

Copy link
Copy Markdown
Contributor Author

@melvin-bot
melvin-bot Bot requested review from JS00001 and luacmartins June 25, 2026 16:28
@JS00001

JS00001 commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@luacmartins over to you

@luacmartins
luacmartins merged commit 12f9dfe into Expensify:main Jun 25, 2026
36 checks passed
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Jun 25, 2026
60 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.20-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

⚠️ Something went wrong. This may be a transient issue — try again. If it persists, check status.anthropic.com.

Run details

@mitarachim

Copy link
Copy Markdown

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.20-1 🚀

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