Skip to content

refactor: remove unsafe Search chart assertions - #100148

Merged
blimpich merged 12 commits into
Expensify:mainfrom
KJ21-ENG:seatbelt/c13-260901-r13
Nov 11, 2026
Merged

blimpich merged 12 commits into
Expensify:mainfrom
KJ21-ENG:seatbelt/c13-260901-r13

Conversation

@KJ21-ENG

@KJ21-ENG KJ21-ENG commented Sep 2, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Search charts check the expense group before reading labels or composing drilldown filters. Matching groups keep their existing values; mismatched groups return empty labels and queries, and missing optional labels still display as empty.

Intentional change: pressing a chart point from another group now adds no filter. In a time chart it previously crashed, and in other charts it added a filter built from undefined.

Changed files
  • src/components/Search/chartGroupByConfig.ts
  • tests/unit/Search/chartGroupByConfigTest.ts

Fixed Issues

$ #94739
PROPOSAL: #94739 (comment)

Tests

Upstream Jest passed. npx jest tests/unit/Search/chartGroupByConfigTest.ts --runInBand covers ten group types, mismatches, missing labels, date bounds and account ID zero.

Platforms: Android native, Android mWeb Chrome, iOS native, iOS mWeb Safari and macOS Chrome/Safari.

Category drilldown

Setup: Use Expenses Search with an existing filter covering multiple categories.

  1. Choose Category grouping and Bar view. Verify the category labels.
  2. Select a known category. Verify the table retains the original filter and shows only that category’s expenses.

Month drilldown

Setup: Use expenses spanning at least two months with an existing search filter.

  1. Choose Month grouping and Line view. Verify a point’s month label and tooltip.
  2. Select that point. Verify inclusive month-start/month-end dates, the original filter and only that month’s expenses.
  3. Check for new JavaScript console errors during both cases.

Offline tests

No additional offline case: these guards read existing grouped items and compose labels and queries; network, cached-data and reconnect handling are unchanged.

QA Steps

Same as tests.

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 verified any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Screenshots/Videos (8)

Category Bar desktop

PR-100148-C01-D.mp4

Category Bar phone-sized

PR-100148-C01-M.mp4

Month Line desktop

PR-100148-C02-D.mp4

Month Line phone-sized

PR-100148-C02-M.mp4

Merchant Pie desktop (extra evidence, no matching case)

PR-100148-C03-D.mp4

Merchant Pie phone-sized (extra evidence, no matching case)

PR-100148-C03-M.mp4

Earlier revision: Category Bar desktop

01-category-bar-desktop.mp4

Earlier revision: Month Line desktop

02-month-line-desktop.mp4

@KJ21-ENG KJ21-ENG changed the title Remove unsafe type assertions from Search chart group-by config refactor: remove unsafe Search chart assertions Sep 29, 2026
@codecov

codecov Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/components/Search/chartGroupByConfig.ts 85.18% <100.00%> (+53.18%) ⬆️
... and 13 files with indirect coverage changes

Seatbelt-Operation: main-refresh-100148-20261014-26cd-sign-7843c99b
Resolve chart configuration and test conflicts.

Seatbelt-Operation: legacy-100148-20261017-sign-b94722f6-8b54-48a9-b118-b62612803c91
Seatbelt-Operation: main-20261030-100148-sign-e5e98177-9804-4c3c-9e8b-34e2fd5f8c8e
Seatbelt-Operation: main-20261030-100148-empty-sign-52c543de-8ab1-466d-ae0b-84efa90688f7
Seatbelt-Operation: main-20261031-100148-100148-sign-951e6216-c98c-4cb0-a5af-ceeb9846e179
@KJ21-ENG
KJ21-ENG marked this pull request as ready for review November 2, 2026 11:23
@KJ21-ENG
KJ21-ENG requested review from a team as code owners November 2, 2026 11:23
@melvin-bot
melvin-bot Bot requested review from situchan and removed request for a team November 2, 2026 11:24
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 2, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-02T11:41:36.299722Z 50826f1 Draft marked ready
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot requested a review from JmillsExpensify November 2, 2026 11:24
@melvin-bot

melvin-bot Bot commented Nov 2, 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]

@melvin-bot
melvin-bot Bot removed the request for review from a team November 2, 2026 11:24

@JmillsExpensify JmillsExpensify left a comment

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.

No product review required.

@KJ21-ENG

KJ21-ENG commented Nov 4, 2026

Copy link
Copy Markdown
Contributor Author

@situchan Could you please take a look at this when you get a chance, Thanks!

Seatbelt-Operation: merge-main-20261106-100148-sign-d87f93e9-6445-4aea-8e31-027a6ab4f29c
titleIconName: 'Users',
getLabel: (item: GroupedItem) => (item as TransactionMemberGroupListItemType).formattedFrom ?? '',
getFilterQuery: (item: GroupedItem) => `from:${(item as TransactionMemberGroupListItemType).accountID}`,
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.FROM ? (item.formattedFrom ?? '') : ''),

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.

The changes in this PR conflicts with #104927 on the chart config

Both PRs rewrite the same lines in chartGroupByConfig.ts and its test, in opposite ways.
#104927 replaces these groupedBy guards with 'x' in item checks, so whichever merges second conflicts and undoes the other.

[CONST.SEARCH.GROUP_BY.FROM]: {
titleIconName: 'Users',
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.FROM ? (item.formattedFrom ?? '') : ''),
getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.FROM ? `from:${item.accountID}` : ''),
},
[CONST.SEARCH.GROUP_BY.CARD]: {
titleIconName: 'CreditCard',
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.CARD ? (item.formattedCardName ?? '') : ''),
getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.CARD ? `cardID:${item.cardID}` : ''),
},
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: {
titleIconName: 'Send',
// eslint-disable-next-line rulesdir/no-default-id-values -- formattedWithdrawalID is a display label, not an Onyx ID
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID ? (item.formattedWithdrawalID ?? '') : ''),
getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID ? `withdrawalID:${item.entryID}` : ''),
},
[CONST.SEARCH.GROUP_BY.CATEGORY]: {
titleIconName: 'Folder',
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.CATEGORY ? (item.formattedCategory ?? '') : ''),
getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.CATEGORY ? `category:"${item.category}"` : ''),
},
[CONST.SEARCH.GROUP_BY.MERCHANT]: {
titleIconName: 'Basket',
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.MERCHANT ? (item.formattedMerchant ?? '') : ''),
getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.MERCHANT ? `merchant="${item.merchant}"` : ''),
},
[CONST.SEARCH.GROUP_BY.TAG]: {
titleIconName: 'Tag',
getLabel: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.TAG ? (item.formattedTag ?? '') : ''),
getFilterQuery: (item: GroupedItem) => (item.groupedBy === CONST.SEARCH.GROUP_BY.TAG ? `tag:"${item.tag}"` : ''),
},

[CONST.SEARCH.GROUP_BY.FROM]: {
titleIconName: 'Users',
getLabel: (item: GroupedItem) => ('formattedFrom' in item ? item.formattedFrom : undefined) ?? '',
getFilterQuery: (item: GroupedItem) => `from:${'accountID' in item ? item.accountID : undefined}`,
},
[CONST.SEARCH.GROUP_BY.CARD]: {
titleIconName: 'CreditCard',
getLabel: (item: GroupedItem) => ('formattedCardName' in item ? item.formattedCardName : undefined) ?? '',
getFilterQuery: (item: GroupedItem) => `cardID:${'cardID' in item ? item.cardID : undefined}`,
},
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: {
titleIconName: 'Send',
getLabel: (item: GroupedItem) => ('formattedWithdrawalID' in item ? item.formattedWithdrawalID : undefined) ?? '',
getFilterQuery: (item: GroupedItem) => `withdrawalID:${'entryID' in item ? item.entryID : undefined}`,
},
[CONST.SEARCH.GROUP_BY.CATEGORY]: {
titleIconName: 'Folder',
getLabel: (item: GroupedItem) => ('formattedCategory' in item ? item.formattedCategory : undefined) ?? '',
getFilterQuery: (item: GroupedItem) => `category:"${'category' in item ? item.category : undefined}"`,
},
[CONST.SEARCH.GROUP_BY.MERCHANT]: {
titleIconName: 'Basket',
getLabel: (item: GroupedItem) => ('formattedMerchant' in item ? item.formattedMerchant : undefined) ?? '',
getFilterQuery: (item: GroupedItem) => `merchant="${'merchant' in item ? item.merchant : undefined}"`,
},
[CONST.SEARCH.GROUP_BY.TAG]: {
titleIconName: 'Tag',
getLabel: (item: GroupedItem) => ('formattedTag' in item ? item.formattedTag : undefined) ?? '',
getFilterQuery: (item: GroupedItem) => `tag:"${'tag' in item ? item.tag : undefined}"`,
},

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Resolved. #104927 no longer changes chartGroupByConfig.ts or its test, so this PR is the only one that touches them. It uses the groupedBy guard for each entry.

@KJ21-ENG

KJ21-ENG commented Nov 9, 2026

Copy link
Copy Markdown
Contributor Author

@situchan The conflict with #104927 is resolved. That PR no longer changes the chart config, so this PR is the only one that does. Please take another look.

KJ21-ENG added a commit to KJ21-ENG/App that referenced this pull request Nov 9, 2026
…company size

Address review: getCountryCode has one signature that looks the value up in CONST.ALL_COUNTRIES
and returns undefined for an unknown value, and normalizeCountryCode is one generic function, so the
overloads, IntlStore.get overloads and translateCountry are gone. The chart change is left to Expensify#100148
and the companySize change moved to Expensify#106381. Tests now cover only the changed country behaviour.
@situchan

situchan commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Please merge main after all comments are resolved. Applies to all existing/upcoming PRs

@situchan

situchan commented Nov 11, 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 any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
test.mov

@KJ21-ENG

Copy link
Copy Markdown
Contributor Author

@situchan Merged main. The new VIOLATION chart entry from main already uses the same groupedBy guard, so it needed no changes. All review comments are addressed. Please take another look.

@blimpich blimpich left a comment

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.

LGTM

– written by Claude on Ben's behalf

@blimpich
blimpich merged commit c42c3d9 into Expensify:main Nov 11, 2026
37 of 39 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.5.37-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR prevents crashes and invalid filters when chart data doesn’t match the selected grouping, without adding a feature, changing the expected workflow, or making existing article guidance incorrect.


view run

@jponikarchuk

Copy link
Copy Markdown

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.5.37-1 🚀

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

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.

7 participants