Skip to content

Fix: Category list opens instead of pop-over - #103153

Merged
puneetlath merged 4 commits into
Expensify:mainfrom
DylanDylann:dylann/103124-category-popover-after-upgrade
Oct 8, 2026
Merged

puneetlath merged 4 commits into
Expensify:mainfrom
DylanDylann:dylann/103124-category-popover-after-upgrade

Conversation

@DylanDylann

@DylanDylann DylanDylann commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #103124
$ #103125
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition:

  • Enable anchoredFieldDropdowns
  • Account has no workspace.

Test 1:

  1. Go to staging.new.expensify.com
  2. Go to self DM
  3. Open FAB > Create expense > Manual
  4. Click Category
  5. Click Upgrade > Confirm > Got it, thanks
  6. Create an expense
  7. The category pop-over will open

Test 2:

  1. Go to staging.new.expensify.com
  2. Login to a new account that have no workspace
  3. Go to self DM
  4. Open FAB > Create expense > Manual
  5. Create an expense
  6. Click Submit to employee
  7. Click on Category row
  8. The category pop-over will open
    • 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 followed proper code patterns (see Reviewing the code)
    • 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 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)
  • 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 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

Android: Native
Screen.Recording.2026-10-06.at.16.48.34.mov
Android: mWeb Chrome
Screen.Recording.2026-10-06.at.16.46.06.mov
iOS: Native
Screen.Recording.2026-10-06.at.16.47.00.mov
iOS: mWeb Safari
Screen.Recording.2026-10-06.at.16.47.34.mov
MacOS: Chrome / Safari
Screen.Recording.2026-10-06.at.16.00.24.mov
Screen.Recording.2026-10-07.at.14.56.50.mov

@melvin-bot

melvin-bot Bot commented Oct 6, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed request for a team October 6, 2026 08:59
@DylanDylann
DylanDylann marked this pull request as draft October 6, 2026 09:34
@DylanDylann
DylanDylann marked this pull request as ready for review October 6, 2026 09:47

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

Fixing DBs

@ikevin127

ikevin127 commented Oct 6, 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 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
    • 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 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 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

MacOS: Chrome / Safari
Screen.Recording.2026-10-06.at.16.18.08.mov

@ikevin127

Copy link
Copy Markdown
Contributor

@DylanDylann The first issue fix tests well, the second issue is not fixed yet - checkout the (7) code-comments above and let me know once the issues are addressed, tag me and I'll recheck 🙌

@DylanDylann

Copy link
Copy Markdown
Contributor Author

@ikevin127 I addressed all your comments. Please check again

@codecov

codecov Bot commented Oct 7, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...RequestConfirmationList/sections/CategoryField.tsx 97.53% <100.00%> (+6.30%) ⬆️
...ConfirmationList/sections/ExpenseFieldDropdown.tsx 100.00% <100.00%> (ø)
.../iou/request/step/DynamicIOURequestStepUpgrade.tsx 78.07% <100.00%> (+78.07%) ⬆️
src/ROUTES.ts 32.35% <50.00%> (+1.02%) ⬆️
...onfirmationList/sections/CategoryFieldDropdown.tsx 0.00% <0.00%> (ø)
src/pages/SetDefaultWorkspacePage.tsx 0.00% <0.00%> (ø)
... and 292 files with indirect coverage changes

@ikevin127

Copy link
Copy Markdown
Contributor

@DylanDylann Thanks for addressing the initial review comments. I did another pass and found some new ones 👇

Ready after these 3 items: the effect gate at line 125 matching the row's condition and the stale isAwaitingWorkspaceRef arm.

The 🟢 item is a nit. The draft test switch to SUBMIT is worth doing in the same push, since right now nothing in the suite would catch a regression of the #103125 fix.

Tag me once these are addressed 🙌

@DylanDylann

Copy link
Copy Markdown
Contributor Author

@ikevin127 All updated

const {translate} = useLocalize();
const icons = useMemoizedLazyExpensifyIcons(['Sparkles']);
const dropdownRef = useRef<ExpenseFieldDropdownHandle>(null);
const isFocused = useIsFocused();

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.

🟡 src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx:74 useIsFocused() is back, which is what I asked to remove in round 1, so CategoryField re-renders on every focus and blur of the confirmation screen again.

The state machine only needs the blur edge, not a render. A listener gives the same edge with no re-render, and it is the established pattern here (useCloseOnScreenBlur.ts, MapView.tsx, VideoPlayerPreview):

const navigation = useNavigation();
useEffect(
    () =>
        navigation.addListener('blur', () => {
            if (workspaceStepRef.current === 'departing') {
                workspaceStepRef.current = 'away';
            } else if (workspaceStepRef.current === 'returned') {
                workspaceStepRef.current = 'idle';
            }
        }),
    [navigation],
);

@ikevin127 ikevin127 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 - All 4 of my round-2 threads are resolved. The code is approvable as it stands. The useIsFocused swap is worth doing in the same push since it undoes a round-1 improvement - I won't block on it though 🙌

@melvin-bot
melvin-bot Bot requested a review from puneetlath October 8, 2026 21:01
@puneetlath
puneetlath merged commit 7dd30ab into Expensify:main Oct 8, 2026
36 of 39 checks passed
@github-actions

github-actions Bot commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Oct 9, 2026
74 tasks done
@OSBotify

OSBotify commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.5.7-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update is needed: every user-facing change in this PR (the Category pop-over opening after you create or pick a workspace) only applies when the anchoredFieldDropdowns beta is enabled, so most users won't see it until that beta is removed.

Details
  • The new return-to-form path in CategoryField.tsx runs only when canOpenInDropdownAfterWorkspaceStep is true, and that requires isBetaEnabled(CONST.BETAS.ANCHORED_FIELD_DROPDOWNS).
  • shouldReturnToConfirmation in DynamicIOURequestStepUpgrade.tsx is set from that same beta check.
  • In SetDefaultWorkspacePage.tsx, the new path with no navigateTo is reached only from the beta-gated Category row. Every other caller (RateField, MoneyRequestView, DynamicSplitExpenseEditPage) still passes a destination route, so their behavior doesn't change.

view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.5.7-3 🚀

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.

6 participants