Skip to content

[CP Staging] Update SPEND_CATEGORY_SELECTOR entryScreens to use renamed screen#89544

Merged
mjasikowski merged 1 commit intomainfrom
claude-fixSpendCategoryEntryScreens
May 4, 2026
Merged

[CP Staging] Update SPEND_CATEGORY_SELECTOR entryScreens to use renamed screen#89544
mjasikowski merged 1 commit intomainfrom
claude-fixSpendCategoryEntryScreens

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented May 4, 2026

Explanation of Change

PR #88842 renamed the categories settings screen from CATEGORIES_SETTINGS to DYNAMIC_CATEGORIES_SETTINGS in the navigator, linking config, and WORKSPACE_TO_RHP mapping, but missed updating the entryScreens array in the SPEND_CATEGORY_SELECTOR dynamic route. This caused the navigation guard in getStateFromPath to reject navigation to the spend category selector from the categories settings page, showing the "Not Here" page instead.

This PR updates the stale screen reference in SPEND_CATEGORY_SELECTOR.entryScreens to use SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_SETTINGS.

Fixed Issues

$ #89526
PROPOSAL: #89526 (comment)

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as #89526

AI Tests

  • TypeScript: npm run typecheck — passed
  • Lint: npm run lint-changed — passed (no lintable files changed)
  • Navigation tests: npm test -- --testPathPattern="ROUTES" — 3 suites, 32 tests passed
  • Prettier: no formatting changes needed

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

image

The categories settings screen was renamed from CATEGORIES_SETTINGS to
DYNAMIC_CATEGORIES_SETTINGS in PR #88842, but the entryScreens array in
SPEND_CATEGORY_SELECTOR was not updated. This caused the navigation
guard to reject the route, showing the "Not Here" page.

Co-authored-by: Michał Jasikowski <mjasikowski@users.noreply.github.com>
@mjasikowski
Copy link
Copy Markdown
Contributor

Tested and working fine

@MelvinBot
Copy link
Copy Markdown
Contributor Author

The failing check (test job 6) is unrelated to this PR.

Failing test: Middleware › HandleUnusedOptimisticID › OpenReport to a chat with preexistingReportID and clean up optimistic participant data in tests/unit/MiddlewareTest.ts

Why it's unrelated: This PR only changes src/ROUTES.ts (updating a screen reference in SPEND_CATEGORY_SELECTOR.entryScreens). The failing test covers HTTP middleware and optimistic ID cleanup — a completely different subsystem with no connection to routing config.

This appears to be a pre-existing flaky test. Re-running the checks should resolve it.

@MelvinBot
Copy link
Copy Markdown
Contributor Author

The failing ESLint check is unrelated to this PR.

Failure: tests/unit/DomainSelectorsTest.ts has 3 unused eslint-disable directives for @typescript-eslint/naming-convention (lines 405, 407, 423).

This PR only changes: src/ROUTES.ts

This is a pre-existing lint issue on main — not introduced by this PR.

@MelvinBot
Copy link
Copy Markdown
Contributor Author

The failing ESLint check is unrelated to this PR.

Failure: tests/unit/DomainSelectorsTest.ts has 3 unused eslint-disable directives for @typescript-eslint/naming-convention (lines 405, 407, 423).

This PR only changes src/ROUTES.ts — the lint failure is a pre-existing issue on main, not introduced by this PR. No fix needed here.

@mjasikowski mjasikowski marked this pull request as ready for review May 4, 2026 18:10
@mjasikowski mjasikowski requested a review from a team as a code owner May 4, 2026 18:10
@melvin-bot melvin-bot Bot requested review from flaviadefaria and huult and removed request for a team May 4, 2026 18:10
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 4, 2026

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

@francoisl
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 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.ts 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 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.
  • 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

@mjasikowski mjasikowski merged commit 64c27ae into main May 4, 2026
61 of 66 checks passed
@mjasikowski mjasikowski deleted the claude-fixSpendCategoryEntryScreens branch May 4, 2026 18:17
@melvin-bot melvin-bot Bot added the Emergency label May 4, 2026
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 4, 2026

@mjasikowski looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@mjasikowski mjasikowski changed the title Update SPEND_CATEGORY_SELECTOR entryScreens to use renamed screen [CP Staging] Update SPEND_CATEGORY_SELECTOR entryScreens to use renamed screen May 4, 2026
@mjasikowski
Copy link
Copy Markdown
Contributor

Test failure is unrelated, not an emergency

OSBotify pushed a commit that referenced this pull request May 4, 2026
…Screens

(cherry picked from commit 64c27ae)

(cherry-picked to staging by francoisl)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label May 4, 2026
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented May 4, 2026

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.3.66-2 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor Author

No help site changes are required for this PR.

The change is a one-line internal navigation fix in src/ROUTES.ts — it updates a stale screen reference (CATEGORIES_SETTINGSDYNAMIC_CATEGORIES_SETTINGS) in the SPEND_CATEGORY_SELECTOR.entryScreens array. This is purely a code-level routing correction that doesn't alter any user-facing feature, behavior, or UI. No documentation under App/docs/articles needs to be updated.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 4, 2026

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants