Skip to content

[CP staging] Fix Merchant quick filter popup collapsing on native - #104141

Merged
neil-marcellini merged 4 commits into
mainfrom
claude-fixMerchantQuickFilterPopupNative
Oct 15, 2026
Merged

neil-marcellini merged 4 commits into
mainfrom
claude-fixMerchantQuickFilterPopupNative

Conversation

@MelvinBot

Copy link
Copy Markdown
Contributor

Explanation of Change

On native, the Merchant quick-filter chip popup only showed the "Merchant" label and the Apply button.

The chip popup reused MerchantFilterContent → TextInputFilterContent, which was built for the full-height advanced filters page. That component has a flex1 root and puts the input and match-type list in a ScrollView. The chip popover sizes to its content, so on native the ScrollView got 0 height and its contents collapsed. Web was not affected because a web ScrollView grows to fit its content.

This PR builds MerchantFilterPopup the same way as TextFilterPopup, so it sizes to its content:

  • It renders NegatableFilter, TextInput, and MerchantMatchTypeSelector directly in BasePopup, and uses the default BasePopup Apply button.
  • It hides the match type when the filter is negated, as before.
  • A new getMerchantFilterFormValues helper in SearchQueryUtils builds the form values. MerchantFilterContent (advanced filters page) and the chip popup both use it.

The advanced filters page layout is unchanged.

AI tests run (MelvinBot):

  • Passed: npm test for MerchantFilterPopupTest, MerchantFilterContentTest, and SearchQueryUtilsTest (521 tests, including new tests for the popup and helper), npm run typecheck, npm run lint-changed, npm run fmt (no diff), npm run spell-changed, and the React Compiler compliance check on the changed components.
  • Not run: the web UI check was blocked because the test browser page went blank. The bug only reproduces on native, which MelvinBot couldn't test.

Fixed Issues

$ #104133
PROPOSAL: #104133 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".
// Please describe what QA needs to do to validate your changes and what areas do they need to test for regressions.

  • 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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

…on native

Co-authored-by: truph01 <truph01@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team October 15, 2026 18:31
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 15, 2026
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-fixMerchantQuickFilterPopupNative
git checkout -b claude-fixMerchantQuickFilterPopupNative upstream/claude-fixMerchantQuickFilterPopupNative
git push -u origin claude-fixMerchantQuickFilterPopupNative

Then you can close this PR and open a new one from your fork.

@codecov

codecov Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...mponents/AdvancedFilters/MerchantFilterContent.tsx 100.00% <ø> (ø)
src/libs/SearchQueryUtils.ts 90.81% <100.00%> (+0.01%) ⬆️
...nts/Search/FilterDropdowns/MerchantFilterPopup.tsx 96.15% <95.45%> (-3.85%) ⬇️
... and 22 files with indirect coverage changes

@truph01

truph01 commented Oct 15, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot Mark this PR as ready

@MelvinBot

MelvinBot commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ✅ pass

On standalone Android NewDot, the Merchant quick-filter chip popup now shows completely: the filter-type toggle, the merchant text input, the match-type options, and Apply. Before the fix it showed only the title and Apply. The negate toggle correctly hides and shows the match-type section. The PR's Tests section is still a TODO, so these steps come from the linked issue's reproduction steps.
Popup toggled back to is - match type reappeared

Step Status
Go to Spend > Expenses - the page loadsNavigated to the Spend tab. The Expenses tab was selected by default, with the search bar, Filters, and Display buttons visible.
Spend Expenses page loaded
✅
Tap Filters - the advanced filters page opensThe Filters page opened, listing Type, Status, From, To, Expense type, Date, Amount, Currency, Merchant, Description, Category, Reimbursable, and Billable, with an Apply filters button.
Advanced filters page
✅
Tap Merchant - the merchant filter page opens with a text inputThe Merchant filter page opened with a Filter type toggle (is / is not), a Merchant text input, and Match type options (Contains / Equal to).
Merchant filter page with text input
✅
Enter a merchant, confirm, then Apply filters - a Merchant chip is appliedEntered "Starbucks", tapped Confirm, then Apply filters. The Expenses list showed a Merchant: Contains "Starbucks" quick-filter chip.
Expenses list with Merchant filter chip applied
✅
Open the Merchant quick filter - the popup shows completelyThe popup showed the is / is not toggle, the text field with "Starbucks", the Contains / Equal to options, and Apply. It no longer collapses to the title and Apply.
Merchant popup fully rendered
✅
Regression: toggle negate - match type hides, then reappearsTapping "is not" hid the match-type options while the text field and Apply stayed visible. Tapping "is" again brought back the Contains / Equal to options.
Popup with is not selected - match type hidden
Popup toggled back to is - match type reappeared
✅

view run · view recording

@MelvinBot
MelvinBot marked this pull request as ready for review October 15, 2026 18:49
@MelvinBot
MelvinBot requested a review from a team as a code owner October 15, 2026 18:49
@melvin-bot
melvin-bot Bot requested a review from truph01 October 15, 2026 18:49
@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Marked this PR as ready for review.

Before reviewers start, fill out the Tests, Offline tests, and QA Steps sections in the PR body. They still contain the TODO placeholders.


view run

@melvin-bot

melvin-bot Bot commented Oct 15, 2026

Copy link
Copy Markdown

@truph01 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 requested review from garrettmknight and removed request for a team October 15, 2026 18:49
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 15, 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-10-15T18:54:03.286051Z 03b6d24 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 removed the request for review from a team October 15, 2026 18:50

@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: 03b6d2460a

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

Comment on lines +65 to +70
<NegatableFilter
baseFilterKey={baseFilterKey}
value={value}
isNegated={isNegated}
merchantOperator={values?.[FILTER_KEYS.MERCHANT_OPERATOR]}
buttonText={translate('common.apply')}
sentryLabel={applySentryLabel}
buttonStyles={styles.mt2}
onChange={applyChanges}
/>
onNegationChange={setIsNegated}
>
<TextInput

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Keep the merchant controls scrollable above the keyboard

On a short native handset, or with larger accessibility text, focusing the merchant input leaves less vertical space than the input, two 64px match-type rows, and Apply button require. These controls now render directly in the bottom sheet without the ScrollView supplied by the removed TextInputFilterContent, while FilterPopupButton explicitly disables the modal's landscape scroll wrapper, so overflowing controls can be clipped with no way to reach them once the keyboard opens. Wrap this content in a height-constrained scroll container, or otherwise preserve scrolling while avoiding the previous flex-collapse.

Useful? React with 👍 / 👎.

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.

@MelvinBot Check this comment

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.

The comment is valid, but it only affects an edge case. On a short phone, or with large accessibility text, the open keyboard can push the match-type rows or Apply out of view. You then can't scroll to them.

Why it can happen: this PR removed the ScrollView from the chip popup to fix the collapse, and FilterPopupButton.tsx:156 turns off the modal's fallback scroll. The popup has more content than TextFilterPopup because of the two 64px match-type rows.

Recommended fix: use the pattern DateSelectPopup already uses in the same popover:

  • Wrap the input and match-type selector in a plain ScrollView with no flex1 and with keyboardShouldPersistTaps="handled". Leave Apply outside it.
  • Give the container a maxHeight so the scroll view has a limit to shrink to.

A plain ScrollView sizes to its content, so it won't bring back the zero-height collapse. That collapse came from the flex1 root in TextInputFilterContent. DisplayPopup.tsx:86 already uses a plain ScrollView in this popover on native.

I didn't push this. The risk is on native, and this run could only test on web. To have me make the change and check it on Android, reply @MelvinBot implement this and test on Android.


view run

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.

@MelvinBot

In Landscape, the merchant popover is cut off and we can't scroll it:

IOS:
Screenshot 2026-10-16 at 02 15 02

Android:

Screenshot 2026-10-16 at 02 16 48

Let's fix it

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.

@MelvinBot Any updates on this?

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.

@MelvinBot could we cap the popup with style={styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode)} on BasePopup (like ReportFieldPopup) and wrap the NegatableFilter + MerchantMatchTypeSelector in a ScrollView with styles.flexShrink1 and keyboardShouldPersistTaps="handled", similar to DateSelectPopup? Without flex1 it stays content-sized and only shrinks/scrolls when it hits the max height, so the Apply button stays visible in landscape and with the keyboard open.

@MelvinBot MelvinBot Oct 15, 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.

I pushed a fix for the landscape cutoff in 98bbd8f. The popup now scrolls when its controls don't fit, and Apply stays visible below the scroll area.

What changed in MerchantFilterPopup.tsx:

  • The popup gets a max height from styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode). That's 75% of the window height in landscape, the same limit ReportFieldPopup uses.
  • The toggle, input, and match-type selector are wrapped in a plain ScrollView with keyboardShouldPersistTaps="handled". It has no flex1, so it sizes to its content and the original zero-height collapse doesn't come back.

Checks: the MerchantFilterPopupTest and MerchantFilterContentTest suites (10 tests), typecheck, lint, the React Compiler check, and the formatter all pass on the changed file.

Not tested in the UI: this run only had a web session, and it never got past sign-in (a blank page), so I couldn't open the popup. I haven't checked landscape on iOS or Android. Please recheck your landscape case on both, or ask me to test it on Android.


view run · no recording available

@MelvinBot

Copy link
Copy Markdown
Contributor Author

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

@melvin-bot

melvin-bot Bot commented Oct 15, 2026

Copy link
Copy Markdown

⚠️ MelvinBot couldn't start on that request — a transient infrastructure error stopped me before I began. Please try again in a moment. If it keeps happening, post in #melvinbot-ai.

…h as in landscape

Co-authored-by: truph01 <truph01@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team as a code owner October 15, 2026 20:12
@melvin-bot
melvin-bot Bot requested review from neil-marcellini and removed request for a team October 15, 2026 20:12
@melvin-bot

melvin-bot Bot commented Oct 15, 2026

Copy link
Copy Markdown

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

Co-authored-by: truph01 <truph01@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Done. I added styles.flexShrink1 to the popup's ScrollView in MerchantFilterPopup.tsx:73-76 (commit c107795).

The earlier commit 98bbd8f already had the rest of what you asked for:

  • styles.getPopoverMaxHeight(windowHeight, isInLandscapeMode) on BasePopup
  • a ScrollView with keyboardShouldPersistTaps="handled" around NegatableFilter and MerchantMatchTypeSelector

The popup now fits its content and only shrinks and scrolls when it reaches the max height. That keeps Apply visible.

Checks run: MerchantFilterPopupTest (4 passed), ESLint, typecheck, oxfmt (no changes), and the React Compiler check. I didn't run cspell or test the UI in landscape or with the keyboard open.


view run

@neil-marcellini

Copy link
Copy Markdown
Contributor

The code looks good to me, I reviewed up to before that last commit. Can you pls show test evidence for landscape on Android? Then it should be good to go @truph01.

@truph01

truph01 commented Oct 15, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot The Apply button isn't fully visible when the keyboard is open in landscape mode.

Screenshot 2026-10-16 at 03 34 34

Co-authored-by: truph01 <truph01@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I pushed a fix in 68e0b13. While the keyboard is open, the popup now fits in the space above the keyboard. The match-type list scrolls, and Apply stays visible.

Cause: the popup's max height was 75% of the window height in landscape, and it ignored the keyboard. The popover moves up by the keyboard's height to stay above it. In landscape, the keyboard covers about half the screen, so the 75% cap pushed Apply behind the keyboard.

Fix: in MerchantFilterPopup.tsx:55-57, the max height now also has a keyboard limit. That limit is the window height minus the keyboard height, the top safe area, and the sheet's top padding. This is the same calculation as getBottomSheetHeight.ts:39, which CategoryPickerModal uses.

Checks passed: MerchantFilterPopupTest (4 tests), ESLint, typecheck, oxfmt, and the React Compiler check. I didn't run cspell.

Not tested on a device: this run could only test on web, and the bug only happens with a native keyboard. Please confirm on iOS and Android in landscape with the keyboard open.


view run

@truph01

truph01 commented Oct 15, 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 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 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 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.
  • 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
Screen.Recording.2026-10-16.at.04.03.04.mov
Screen.Recording.2026-10-16.at.04.03.18.mov
Android: mWeb Chrome
Screen.Recording.2026-10-16.at.04.00.38.mov
iOS: HybridApp
Screen.Recording.2026-10-16.at.03.53.57.mov
Screen.Recording.2026-10-16.at.03.55.01.mov
iOS: mWeb Safari
Screen.Recording.2026-10-16.at.03.56.11.mov
MacOS: Chrome / Safari
Screen.Recording.2026-10-16.at.04.04.05.mov

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

I think it's good to go

@neil-marcellini neil-marcellini changed the title Fix Merchant quick filter popup collapsing on native [CP staging] Fix Merchant quick filter popup collapsing on native Oct 15, 2026
@melvin-bot
melvin-bot Bot requested a review from neil-marcellini October 15, 2026 21:07
@neil-marcellini

Copy link
Copy Markdown
Contributor

For Melvin PRs from C+ the reviewer checklist is effectively the author checklist, so I'm going to merge this without it.

@neil-marcellini
neil-marcellini merged commit f5ed466 into main Oct 15, 2026
43 of 45 checks passed
@neil-marcellini
neil-marcellini deleted the claude-fixMerchantQuickFilterPopupNative branch October 15, 2026 21:12
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

Copy link
Copy Markdown
Contributor

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

OSBotify pushed a commit that referenced this pull request Oct 16, 2026
…erPopupNative

[CP staging] Fix Merchant quick filter popup collapsing on native

(cherry picked from commit f5ed466)

(cherry-picked to staging by cristipaval)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Oct 16, 2026
@os-botify

os-botify Bot commented Oct 16, 2026

Copy link
Copy Markdown

🔁 Filed a Staging retest request for deploy blockers #104133 after this PR was cherry-picked to staging.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/cristipaval in version: 9.5.12-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This PR is a native layout bug fix: the Merchant quick filter popup now shows its input and match-type options as users already expect, so no article sentence becomes incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.12-1 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/cristipaval in version: 9.5.13-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This PR only fixes the layout of the Merchant quick filter popup on native, including the later keyboard and landscape fixes, so the popup now works the way users already expect and no article sentence becomes incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.5.13-6 🚀

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

CP Staging marks PRs that have been CP'd to staging Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants