Skip to content

refactor: type date labels, state options, and account indicators - #103165

Merged
blimpich merged 11 commits into
Expensify:mainfrom
KJ21-ENG:seatbelt-v2/fresh-20261006-4-54053af7
Nov 11, 2026
Merged

blimpich merged 11 commits into
Expensify:mainfrom
KJ21-ENG:seatbelt-v2/fresh-20261006-4-54053af7

Conversation

@KJ21-ENG

@KJ21-ENG KJ21-ENG commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Use an explicit custom-date translation map, typed state values, and ordered account-indicator checks instead of unsafe assertions. Search date choices, State selection, and first-matching indicator priority are unchanged.

Changed files
  • src/components/Search/FilterComponents/DatePresetFilterBase.tsx
  • src/components/StatePicker/StateSelectorModal.tsx
  • src/hooks/useAccountIndicatorChecks.ts
  • tests/ui/DatePresetFilterBaseCustomDateModifiersTest.tsx
  • tests/ui/StateSelectorModalTest.tsx
  • tests/unit/useAccountIndicatorChecksTest.ts

Fixed Issues

$ #94739
PROPOSAL: #94739 (comment)

Tests

CI passed typecheck, ESLint, Oxfmt, spellcheck, React Compiler checks and Jest on this head. DatePresetFilterBaseCustomDateModifiersTest, StateSelectorModalTest and useAccountIndicatorChecksTest exercise the changed code.

Use a build containing this PR and a signed-in ordinary test account. Run the supported product cases on Android native, Android Chrome, iOS native, iOS Safari, and macOS Chrome/Safari where each flow is available.

Search custom date

Start from Search with an expense query.

  1. Open Filters → Date → Custom date. The choices appear as On, Before, and After in that order.
  2. Choose Before and an allowed date, then apply the filter. The chip describes Before and the chosen date.
  3. Reopen the date filter. Before and the same date remain selected.

No additional manual case covers the State modal or account indicators because their behavior is unchanged. StateSelectorModalTest covers the 52 options, search order and pinned selection. useAccountIndicatorChecksTest covers first-match priority, simultaneous matches and no-match results.

  • Verify that no errors appear in the JS console

Offline tests

N/A for an additional disconnect/reconnect case: this diff changes local date labels, State options, and indicator selection without changing a network request, persistence queue, retry, or reconnect path.

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
  • 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 (3)

Search custom date desktop

PR-103165-C01-D.mp4

Search custom date phone-sized

PR-103165-C01-M.mp4

Recordings from earlier revisions

PR-103165-Chrome-QA-unmasked.mp4

…unt indicators

Seatbelt-Operation: fresh-54053af7-sign-6824e9fc-fa97-471f-86fa-0e391484be1b
@melvin-bot

melvin-bot Bot commented Oct 6, 2026

Copy link
Copy Markdown

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

Seatbelt-Operation: knip-54053af7-sign-5da5386e-1ae5-4b97-ac74-bbbeea894aa6
Seatbelt-Operation: c8b3925e-4ffe-4e2a-bd53-1fb27e3c250f
@KJ21-ENG KJ21-ENG changed the title Remove unsafe type assertions in date, state, and account indicators [WIP] refactor: type date labels, state options, and account indicators Oct 23, 2026
Seatbelt-Operation: main-20261030-103165-sign-888a6ca1-83f2-4fcd-9851-822a53ff892b
@codecov

codecov Bot commented Oct 30, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...s/Search/FilterComponents/DatePresetFilterBase.tsx 64.79% <100.00%> (+1.20%) ⬆️
src/components/StatePicker/StateSelectorModal.tsx 100.00% <100.00%> (ø)
src/hooks/useAccountIndicatorChecks.ts 100.00% <100.00%> (ø)
... and 3 files with indirect coverage changes

@KJ21-ENG KJ21-ENG changed the title [WIP] refactor: type date labels, state options, and account indicators refactor: type date labels, state options, and account indicators Oct 30, 2026
@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 trjExpensify and removed request for a team 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
@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:45:46.013913Z 15faf74 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.

@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: 15faf74637

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

createMock<OnyxMultiSetInput>({
[ONYXKEYS.USER_WALLET]: {errors: {error: 'Wallet error'}},
[ONYXKEYS.BANK_ACCOUNT_LIST]: {
// eslint-disable-next-line @typescript-eslint/naming-convention

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Justify both new naming-convention suppressions

In the new multi-match test, both @typescript-eslint/naming-convention directives—here and on the login fixture—suppress the rule without an accompanying reason. AGENTS.md requires the app coding standards, whose CONSISTENCY-5 rule explicitly requires a justification because these suppressions hide violations from the seatbelt baseline. Add a brief explanation of why each fixture key requires this format, or avoid the suppressions.

AGENTS.md reference: AGENTS.md:L9-L10

Useful? React with 👍 / 👎.

@KJ21-ENG KJ21-ENG Nov 2, 2026 •

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.

Fixed in b13a722. Both new naming-convention suppressions now give their reason after -- on the same line, so eslint-disable-next-line still applies to the code below it.

Add a reason to the two naming-convention suppressions this PR added. Comments only.

Addresses Expensify#103165 (comment)

Seatbelt-Operation: repair-codex-103165-sign-628a2cdf-85b2-4ceb-9255-22d28c9062c0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@trjExpensify

Copy link
Copy Markdown
Contributor

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@trjExpensify
trjExpensify removed their request for review November 2, 2026 18:26
Seatbelt-Operation: merge-main-20261103-103165-sign-b1ae0e74-cabf-49f3-9529-454970d6cad4
@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!

Resolve the useAccountIndicatorChecks.ts conflict by adding main's Wise more-info check to the ordered infoChecks list.

Seatbelt-Operation: merge-main-20261106-103165-sign-117a7ae0-f535-487f-9c98-279c98d1581d
Comment on lines +245 to +248
const [rangeEphemeralValues, setRangeEphemeralValues] = useState<{
from?: string;
to?: string;
}>(() => getRangeEphemeralValuesFromDateValues(normalizedDefaultDateValues));

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.

Any reason for reformatting?

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.

No reason. It was unintended. I reverted the line wrapping, so the only changes left in this file are the translation-key map and its two uses.

Comment thread src/hooks/useAccountIndicatorChecks.ts Outdated
Comment on lines +29 to +31
const [loginList] = useOnyx(ONYXKEYS.LOGINS, {
selector: expensifyLoginsSelector,
});

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

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.

Reverted here too. I also reverted the same unintended wrapping in StateSelectorModal.tsx and in the existing test lines.

Address review: keep the existing single-line formatting so the diff only holds the real changes.
@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

@situchan

Copy link
Copy Markdown
Contributor

Please fix react compiler check. It's failing

Move the first-match lookup into getFirstMatchingStatus. Calling find on the local check list let the
compiler drop the cache for every check, so they ran on each render. With the helper they stay cached, as on main.
@situchan

Copy link
Copy Markdown
Contributor

Typecheck failing

@KJ21-ENG

Copy link
Copy Markdown
Contributor Author

@situchan All points are addressed: the reformatting is reverted and the React Compiler check passes. The only red check is typecheck, which is broken on main by #104989 and fixed by #106622. I'll merge main once that lands. Please take another look.

@melvin-bot
melvin-bot Bot requested a review from blimpich November 11, 2026 10:43
@KJ21-ENG

Copy link
Copy Markdown
Contributor Author

@situchan Thanks for the approval. #106622 has landed, so I merged main again. Typecheck passes now.

@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 f5f4c78 into Expensify:main Nov 11, 2026
35 of 37 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 is a type-safety refactor that preserves existing behavior and labels, adds no user-facing feature, and makes no existing article sentence incorrect.


view run

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

6 participants