Decouple badge logic and consolidate policy loop in createTypeMenuSec… by szymonzalarski98 · Pull Request #82966 · Expensify/App

szymonzalarski98 · 2026-02-19T16:57:00Z

Remove reportCounts and draftTransactions params from createTypeMenuSections
Move badge text subscriptions to local consumers (SearchTypeMenu, useSearchTypeMenu)
Extract getItemBadgeText helper to avoid duplicated badge lookup logic
Consolidate double policy iteration: getSuggestedSearchesVisibility now returns hasGroupPoliciesWithExpenseChat, eliminating redundant getGroupPaidPoliciesWithExpenseChatEnabled call
Add formatBadgeText and getItemBadgeText unit tests

Explanation of Change

Fixed Issues

$ #82416
PROPOSAL:

Tests

Open the Search page — verify the left-side type menu shows correct badge counts next to Submit, Approve, Pay, Export items
Trigger a report count change (e.g. submit/approve an expense) — verify badge counts update in real time
Verify badge counts show 50+ when count exceeds 50
Verify badge counts are hidden (no badge) when count is 0
On smaller screens: open the search type popover menu — verify badge counts appear there too
Verify the Submit empty state "Create expense" button still works when no submitted reports exist
Verify all Todo, Accounting, Insights, and Explore sections render with correct visibility based on policy configuration

Offline tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…tions - Remove reportCounts and draftTransactions params from createTypeMenuSections - Move badge text subscriptions to local consumers (SearchTypeMenu, useSearchTypeMenu) - Extract getItemBadgeText helper to avoid duplicated badge lookup logic - Consolidate double policy iteration: getSuggestedSearchesVisibility now returns hasGroupPoliciesWithExpenseChat, eliminating redundant getGroupPaidPoliciesWithExpenseChatEnabled call - Add formatBadgeText and getItemBadgeText unit tests

melvin-bot · 2026-02-19T16:57:09Z

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

mkhutornyi · 2026-02-19T17:01:42Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

ios1.mov

ios2.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

codecov · 2026-02-19T17:08:54Z

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 Δ
src/hooks/useSearchTypeMenu.tsx	`70.12% <100.00%> (+0.39%)`	⬆️
src/hooks/useSearchTypeMenuSections.ts	`100.00% <ø> (ø)`
src/pages/Search/SearchTypeMenu.tsx	`0.00% <0.00%> (ø)`
src/libs/SearchUIUtils.ts	`67.67% <66.66%> (-0.15%)`	⬇️
... and 64 files with indirect coverage changes

luacmartins · 2026-02-19T18:06:54Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fb72406f23

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

chatgpt-codex-connector · 2026-02-19T18:16:12Z

src/libs/SearchUIUtils.ts

+        hasGroupPoliciesWithExpenseChat ||=
+            isPaidPolicy && !!policy.isPolicyExpenseChatEnabled && !policy.isJoinRequestPending && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!policy.role;


Preserve delete-with-error policies in chat eligibility

This eligibility check now hard-excludes any policy with pendingAction === DELETE, but the previous logic (getGroupPaidPoliciesWithExpenseChatEnabled() via shouldShowPolicy(..., false, ...)) intentionally keeps pending-delete policies when they have errors so users can still act in recoverable states. In that failure scenario, hasGroupPoliciesWithExpenseChat becomes false and the Submit empty state can incorrectly hide the “Create expense” action even though the workspace remains accessible.

Useful? React with 👍 / 👎.

mkhutornyi · 2026-02-20T16:36:12Z

@szymonzalarski98 please merge main

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 25e00d5a45

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

chatgpt-codex-connector · 2026-02-20T16:51:29Z

src/libs/SearchUIUtils.ts

+            isPaidPolicy &&
+            !!policy.isPolicyExpenseChatEnabled &&
+            !policy.isJoinRequestPending &&
+            (policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0) &&


Preserve delete-error policies in chat-enabled check

The new hasGroupPoliciesWithExpenseChat gate now depends on Object.keys(policy.errors ?? {}).length > 0 for pending-delete policies, but useSearchTypeMenuSections maps policies without the errors field, so this expression is always false for mapped data. In the failed-delete scenario (pendingAction === DELETE with policy errors), the Submit empty state will incorrectly lose its "Create expense" button even though these policies are still meant to be visible, so users can’t start an expense from that flow.

Useful? React with 👍 / 👎.

…adge-logic-consolidate-policy-loop

szymonzalarski98 · 2026-02-20T17:21:40Z

Main merged, all comments adressed

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 19473431ab

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

chatgpt-codex-connector · 2026-02-20T17:33:09Z

src/hooks/useSearchTypeMenuSections.ts

        isPolicyExpenseChatEnabled: policy.isPolicyExpenseChatEnabled,
+        isJoinRequestPending: policy.isJoinRequestPending,
+        pendingAction: policy.pendingAction,


Include policy errors in mapped search policies

policyMapper now forwards pendingAction, and createTypeMenuSections relies on getSuggestedSearchesVisibility's check (pendingAction !== DELETE || Object.keys(policy.errors ?? {}).length > 0) to decide whether a workspace still counts as expense-chat-enabled. Because this mapper does not pass through errors, any paid workspace with pendingAction: DELETE but backend errors is treated as hidden, so the Submit empty state can incorrectly lose its "Create expense" button in that failure state.

Useful? React with 👍 / 👎.

mkhutornyi · 2026-02-20T17:45:11Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 19473431ab

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

src/hooks/useSearchTypeMenuSections.ts

mkhutornyi · 2026-02-20T17:57:37Z

Please check bot reviews above

szymonzalarski98 · 2026-02-20T18:14:18Z

PR updated according to bot review, @codex review

luacmartins

LGTM

chatgpt-codex-connector · 2026-02-20T18:25:46Z

Codex Review: Didn't find any major issues. Hooray!

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

OSBotify · 2026-02-20T18:32:53Z

✋ 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 · 2026-02-20T18:47:32Z

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

github-actions · 2026-02-20T18:52:00Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #82966.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f3f5d3e-9662e6d-0b304ae9602e19d93b4aa54dd667bb1177735c6d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f3f5d3e-9662e6d-0dc897430d4f2bb621ef258702be275bdf0960fa/index.html

Web 🕸️
https://82966.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-24T01:18:50Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.25-0 🚀

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

OSBotify · 2026-02-25T15:52:24Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.25-13 🚀

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

szymonzalarski98 requested review from a team as code owners February 19, 2026 16:57

melvin-bot bot assigned szymonzalarski98 Feb 19, 2026

melvin-bot bot requested review from heyjennahay and mkhutornyi and removed request for a team February 19, 2026 16:57

melvin-bot bot removed the request for review from a team February 19, 2026 16:57

szymonzalarski98 mentioned this pull request Feb 19, 2026

[Due for payment 2026-03-04] [$250] [Performance] Optimize performance of NavigationTabBar #82416

Closed

luacmartins previously approved these changes Feb 19, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Feb 19, 2026

View reviewed changes

Enhance policy checks in getSuggestedSearchesVisibility function

25e00d5

szymonzalarski98 dismissed luacmartins’s stale review via 25e00d5 February 20, 2026 12:39

chatgpt-codex-connector bot reviewed Feb 20, 2026

View reviewed changes

Merge branch 'main' into callstack-internal/szymonzalarski/decouple-b…

1947343

…adge-logic-consolidate-policy-loop

szymonzalarski98 requested a review from luacmartins February 20, 2026 17:32

chatgpt-codex-connector bot reviewed Feb 20, 2026

View reviewed changes

mkhutornyi approved these changes Feb 20, 2026

View reviewed changes

szymonzalarski98 mentioned this pull request Feb 20, 2026

Optimize NavigationTabBar Performance by Decoupling Search Menu #82939

Closed

chatgpt-codex-connector bot reviewed Feb 20, 2026

View reviewed changes

src/hooks/useSearchTypeMenuSections.ts Show resolved Hide resolved

Fix policy errors

79d94a3

luacmartins approved these changes Feb 20, 2026

View reviewed changes

luacmartins merged commit f3f5d3e into Expensify:main Feb 20, 2026
29 checks passed

OSBotify mentioned this pull request Feb 23, 2026

Deploy Checklist: New Expensify 2026-02-23 #83247

Closed

szymonzalarski98 mentioned this pull request Feb 24, 2026

Attachments carousel loading optimizations #83185

Merged

51 tasks

		hasGroupPoliciesWithExpenseChat \|\|=
		isPaidPolicy && !!policy.isPolicyExpenseChatEnabled && !policy.isJoinRequestPending && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!policy.role;

Conversation

szymonzalarski98 commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 19, 2026

Uh oh!

mkhutornyi commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Feb 19, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

luacmartins commented Feb 19, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented Feb 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

szymonzalarski98 commented Feb 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi commented Feb 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

mkhutornyi commented Feb 20, 2026

Uh oh!

szymonzalarski98 commented Feb 20, 2026

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot commented Feb 20, 2026

Uh oh!

Uh oh!

OSBotify commented Feb 20, 2026

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

OSBotify commented Feb 24, 2026

Uh oh!

OSBotify commented Feb 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

szymonzalarski98 commented Feb 19, 2026 •

edited

Loading

mkhutornyi commented Feb 19, 2026 •

edited

Loading

codecov bot commented Feb 19, 2026 •

edited by github-actions bot

Loading