Expense rules follow-up by situchan · Pull Request #80383 · Expensify/App

situchan · 2026-01-23T17:25:51Z

Explanation of Change

Update the copy for the table from Update x, update y, update z to Update x, y, z
Add a searchbox for the personal rules table
Add padding to the bottom of the personal rules table
Expense Rules - New category added is not arranged in alphabetical order in Category list

Fixed Issues

Part of #80217

Tests

Go to https://staging.new.expensify.com/settings/rules
Create new rules
Verify that search box is displayed when more than 15 rules
Verify that search works as expected (both Merchant and Change are searchable)
Scroll list down to the end
Verify that there's padding at the bottom of the table
Observe Change column in table
Verify that copies are Update x, y, z, not Update x, update y, update z
Go to New rule > Category
Verify that categories are sorted alphabetically

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

melvin-bot · 2026-01-23T17:25:57Z

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:

Look at the code and make sure there are no malicious changes.
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

codecov · 2026-01-23T17:37:06Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/SelectionList/BaseSelectionList.tsx	`68.34% <ø> (ø)`
...omponents/SelectionList/ListItem/TableListItem.tsx	`100.00% <100.00%> (ø)`
.../components/Search/SearchSingleSelectionPicker.tsx	`0.00% <0.00%> (ø)`
src/libs/ExpenseRuleUtils.ts	`90.32% <80.00%> (+5.70%)`	⬆️
src/pages/settings/Rules/ExpenseRulesPage.tsx	`0.00% <0.00%> (ø)`
... and 66 files with indirect coverage changes

melvin-bot · 2026-01-23T17:42:18Z

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

src/libs/ExpenseRuleUtils.ts

src/pages/settings/Rules/ExpenseRulesPage.tsx

src/components/Search/SearchSingleSelectionPicker.tsx

src/components/SelectionList/BaseSelectionList.tsx

src/pages/settings/Rules/ExpenseRulesPage.tsx

src/libs/ExpenseRuleUtils.ts

situchan · 2026-01-23T18:38:41Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 92bc99db69

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

src/components/Search/SearchSingleSelectionPicker.tsx

chatgpt-codex-connector · 2026-01-23T19:10:45Z

Codex Review: Didn't find any major issues. Chef's kiss.

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

JS00001

LGTM, @ikevin127 lmk when this is ready for final approval

ikevin127 · 2026-01-23T23:06:22Z

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

Android: HybridApp

android.mp4

Android: mWeb Chrome

android-mweb.mp4

iOS: HybridApp

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

src/libs/ExpenseRuleUtils.ts

src/pages/settings/Rules/ExpenseRulesPage.tsx

src/languages/pl.ts

src/languages/nl.ts

ikevin127 · 2026-01-24T00:21:52Z

Note

👁️‍🗨️ The only thing that I found looks a bit weird UX-wise is ⚠️ not seeing scrollbar on web (wide layouts) when rules length overflows the screen - though the list is scrollable ✅

p1.mov

✅ Well Implemented

Positive Observations

Proper use of existing patterns: The useSearchResults hook and tokenizedSearch function are correctly leveraged, consistent with other workspace pages like WorkspaceCategoriesPage and WorkspaceMembersPage.
Correct threshold constant: Using CONST.SEARCH_ITEM_LIMIT (15) for showing search bar is consistent with the codebase.
Good use of shouldHideAlternateText: The new ListItem property cleanly separates the concern of hiding alternate text from the data model, allowing the same data to render differently on narrow vs. wide layouts.
Translation structure is correct: The new translation key structure (*Update for first item, base key for subsequent) is well-designed for the UX goal.
Test coverage: The unit tests properly verify the new formatting behavior.

📊 Test Coverage Analysis

Current Coverage by Author

Estimated coverage: ~20% (only utility function tested)

Area	Coverage	Notes
`formatExpenseRuleChanges`	✅ Good	Two tests verify the new formatting with Update prefix
Search functionality	❌ None	No tests for `ExpenseRulesPage` search/filter
Category sorting	❌ None	No tests for `SearchSingleSelectionPicker` sorting
`shouldHideAlternateText`	❌ None	No tests for `TableListItem` conditional rendering

♻️ Recommended Additional Tests

// tests/unit/ExpenseRulesPageTest.tsx
describe('ExpenseRulesPage search', () => {
    it('filters rules by merchant name', () => {...});
    it('filters rules by change description', () => {...});
    it('shows empty state when no rules match', () => {...});
    it('toggleAllRules only affects filtered results', () => {...});
});

🔥 Edge Case / Destructive Tests

✅ 1. Boundary conditions:

Create exactly 15 rules → search bar should NOT appear
Create 16th rule → search bar should appear
Delete rules to drop below 15 → search bar should hide, input value should reset

❌ 2. Selection with search:

Select 2 rules from full list
Search for other rules to hide the 2 selected rules
Verify that 'toggle all' checkbox has the - symbol as partial selection is occuring
Clear search → verify previously selected hidden rules maintain selection (with - symbol)

Actual result: 'toggle all' checkbox is empty but top-right screen shows 2 Selected.

Video

e1.mov

✅ 3. Long content handling:

Create rule with very long merchant name (100+ chars)
Create rule with all change types (billable, category, comment, merchant, reimbursable, tag, tax, report)
Verify text truncation and layout on narrow screens

❌ 4. Rapid typing:

Type fase in search field and clear rapidly
Verify UI doesn't flicker or show inconsistent states
Verify no errors in console

Actual result: Two different ❌ crash types occur in different cases if this is done long enough (see videos for details).

Important

Not sure if these would occur in production environments or not, could be dev-only crashes 🤔

Videos

❌ `index out of bounds, not enough layouts`

e2-1.mov

❌ `There was an error during concurrent rendering but React was able to recover by instead synchronously rendering the entire root.`

e2-2.mov

e2-23.mov

✅ 5. Navigation state:

Search for rules, select a result
Navigate to edit rule
Press back → verify search state is preserved

@JS00001 @situchan This concludes my review - let me know when ready for another final pass before approval 🙌

situchan · 2026-01-25T00:43:20Z

❌ 4. Rapid typing:

Type fase in search field and clear rapidly
Verify UI doesn't flicker or show inconsistent states
Verify no errors in console

For this edge case, let's create separate issue.

Happens on other pages with search:

Screen.Recording.2026-01-25.at.6.41.13.AM.mov

JS00001 · 2026-01-26T16:15:28Z

@situchan Could you report the search bug in expensify-bugs so we make sure to track it?

situchan · 2026-01-26T16:19:12Z

@situchan Could you report the search bug in expensify-bugs so we make sure to track it?

We already have the issue with the same root cause.
Reported here

JS00001 · 2026-01-26T16:30:58Z

@ikevin127 could you run another pass?

ikevin127

@JS00001 The issues that were not addressed in the latest 2 commits are in this comment:

UX-wise: ⚠️ not seeing scrollbar on web (wide layouts) when rules length overflows the screen - though the list is scrollable ✅
Test Coverage Analysis: current estimated coverage: ~20% (only 1 utility function tested)
Edge Case / Destructive Tests:

❌ 2. Selection with search:

Select 2 rules from full list

Search for other rules to hide the 2 selected rules

Verify that 'toggle all' checkbox has the - symbol as partial selection is occuring

Clear search → verify previously selected hidden rules maintain selection (with - symbol)

Actual result: 'toggle all' checkbox is empty but top-right screen shows 2 Selected.

Video

e1.mov

If these are not blockers - then all good with me, ready to merge 🟢

situchan · 2026-01-27T02:28:47Z

❌ 2. Selection with search:

Select 2 rules from full list

Search for other rules to hide the 2 selected rules

Verify that 'toggle all' checkbox has the - symbol as partial selection is occuring

Clear search → verify previously selected hidden rules maintain selection (with - symbol)

Actual result: 'toggle all' checkbox is empty but top-right screen shows 2 Selected.

The behavior is same as other pages like categories so it's fine.

OSBotify · 2026-01-27T15:47:17Z

✋ 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 · 2026-01-27T20:12:55Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.10-0 🚀

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

OSBotify · 2026-01-28T22:58:06Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.10-6 🚀

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

Krishna2323 · 2026-03-03T18:57:42Z

src/components/SelectionList/BaseSelectionList.tsx

                        onEndReached={onEndReached}
                        onEndReachedThreshold={onEndReachedThreshold}
                        style={style?.listStyle}
+                        contentContainerStyle={styles.pb3}


This PR introduced a regression (see #82415). Adding contentContainerStyle={styles.pb3} to BaseSelectionList without updating getSelectionListPopoverHeight caused filter popovers (View, Status, Type) on the Reports page to show an unnecessary scrollbar. Fixed in #82634.

Apologies for the multiple comments — GitHub is behaving weirdly at the moment.

Expense rules follow-up

592c016

melvin-bot bot assigned situchan Jan 23, 2026

situchan mentioned this pull request Jan 23, 2026

Release #2 Follow up: Polish Personal Rules #80217

Closed

fix lint

96ff01c

situchan marked this pull request as ready for review January 23, 2026 17:42

situchan requested review from a team as code owners January 23, 2026 17:42

melvin-bot bot requested review from heyjennahay and ikevin127 January 23, 2026 17:42

melvin-bot bot removed request for a team January 23, 2026 17:42