badge style fixes by abzokhattab · Pull Request #84385 · Expensify/App

abzokhattab · 2026-03-06T10:22:52Z

Explanation of Change

Badge outline invisible on selected row (#84358):

Added a ListItemFocusContext that InviteMemberListItem provides with the actual isFocused state from the list. MemberRightIcon consumes this context and applies styles.badgeDefaultActive (uses buttonHoveredBG) when the row is focused, preventing the badge from blending into the activeComponentBG highlight.
No changes needed at any call site — the focus state flows automatically via context.

Done action badge color mismatch (#84360):

Updated BadgeActionCell to explicitly map DONE → reportStatusBadge.closed (pink) instead of falling through to reportStatusBadge.approved (teal), matching the color used by StatusCell for Done reports.

Fixed Issues

$ #84358
$ #84360

Tests

Badge visibility on selected rows (#84358):

Go to a workspace with Workflows enabled
Navigate to Workspace Settings > Workflows
Click on a workflow > Click Approver > Approver
Select an approver from the list
Verify the badge (Admin/Owner/Auditor) is visible on the selected (highlighted) row

Done action badge color (#84360):

Have a report in Done status
Go to Reports search
Verify the "Done" action badge color (pink) matches the "Done" status badge color
Verify the "Paid" action badge still shows the correct green color

Offline tests

N/A — these are purely visual/styling changes with no network dependency.

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-06.at.11.50.59.mov

Screen.Recording.2026-03-06.at.11.53.08.mov

codecov · 2026-03-06T10:32:28Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ts/SelectionList/ListItem/InviteMemberListItem.tsx	`91.17% <100.00%> (ø)`
...components/SelectionList/ListItem/UserListItem.tsx	`77.27% <100.00%> (ø)`
.../components/SelectionList/ListItemFocusContext.tsx	`100.00% <100.00%> (ø)`
...ponents/SelectionListWithSections/UserListItem.tsx	`77.27% <100.00%> (ø)`
src/pages/workspace/MemberRightIcon.tsx	`100.00% <100.00%> (ø)`
...SelectionListWithSections/InviteMemberListItem.tsx	`0.00% <0.00%> (ø)`
...WithSections/Search/ActionCell/BadgeActionCell.tsx	`0.00% <0.00%> (ø)`
... and 87 files with indirect coverage changes

- Add ListItemFocusContext so InviteMemberListItem can propagate isFocused to rightElement children. MemberRightIcon consumes this context to apply badgeDefaultActive when the row is focused, preventing the badge from blending into the activeComponentBG highlight. - Map DONE action to reportStatusBadge.closed in BadgeActionCell so the Done action badge matches the Done status badge color (pink).

Only PAID and DONE reach this component, so replace the three-way branch with a simple ternary: PAID → paid, else → closed.

melvin-bot · 2026-03-06T10:55:27Z

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

UserListItem also applies activeComponentBG on focused rows via BaseListItem, causing the same badge color collision. Wrap rightElement with ListItemFocusContext.Provider so MemberRightIcon picks up isFocused and switches to badgeDefaultActive automatically.

abzokhattab · 2026-03-06T11:16:55Z

cc @dukenv0307 @puneetlath

src/components/SelectionList/ListItemFocusContext.tsx

src/components/SelectionList/ListItem/InviteMemberListItem.tsx

src/components/SelectionList/ListItem/UserListItem.tsx

src/components/SelectionListWithSections/UserListItem.tsx

src/components/SelectionListWithSections/InviteMemberListItem.tsx

- Make isFocused optional in ListItemFocusContextValue type - Use shorthand {isFocused} instead of {isFocused: !!isFocused} in all four ListItemFocusContext providers

dukenv0307 · 2026-03-06T14:49:32Z

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

iOS: mWeb Safari

MacOS: Chrome / Safari

abzokhattab · 2026-03-06T14:49:54Z

@dukenv0307 Addressed the review comments ... thanks for those suggestions

github-actions · 2026-03-06T15:00:40Z

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

github-actions · 2026-03-06T15:04:46Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-22aa3d2-5430cbd-9eba66f84415d5769f4f6c4deadc0b5869c2bc16/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-22aa3d2-5430cbd-40aca5860ad240782784277d27d7a632bce92337/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-06T15:08:01Z

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

…e-regressions badge style fixes (cherry picked from commit 22aa3d2) (cherry-picked to staging by puneetlath)

OSBotify · 2026-03-06T16:33:01Z

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

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

OSBotify · 2026-03-06T22:47:10Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

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

OSBotify · 2026-03-06T23:03:44Z

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

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

abzokhattab changed the title ~~Fix badge style regressions from #82210~~ Fix badge style fixes Mar 6, 2026

abzokhattab changed the title ~~Fix badge style fixes~~ badge style fixes Mar 6, 2026

abzokhattab force-pushed the abzokhattab/fix-badge-style-regressions branch from ae03481 to b1ae310 Compare March 6, 2026 10:40

abzokhattab added 2 commits March 6, 2026 11:44

Add missing sentryLabel to PressableWithFeedback in InviteMemberListItem

ba0aa89

Simplify BadgeActionCell theme to ternary

52d52e9

Only PAID and DONE reach this component, so replace the three-way branch with a simple ternary: PAID → paid, else → closed.

abzokhattab marked this pull request as ready for review March 6, 2026 10:55

abzokhattab requested review from a team as code owners March 6, 2026 10:55

melvin-bot bot requested review from huult and joekaufmanexpensify and removed request for a team March 6, 2026 10:55

melvin-bot bot removed the request for review from a team March 6, 2026 10:55

This was referenced Mar 6, 2026

Workflows - Badge outline is not visible when user is selected #84358

Closed

Reports - "Done" action has different color as "Done" status #84360

Closed