[CP Staging] Guard against false-positive focus match in FAB menu items by MelvinBot · Pull Request #85715 · Expensify/App

MelvinBot · 2026-03-18T22:00:19Z

Explanation of Change

When the FAB menu's focusedIndex is at its initial/reset value of -1 and an item hasn't been registered yet (registeredItems.indexOf() also returns -1), the equality check focusedIndex === itemIndex incorrectly evaluates to true (-1 === -1). This causes the item to render in a focused state with green icon color on Android when reopening the FAB.

This adds an explicit guard (focusedIndex !== -1) so that isFocused is only true when focusedIndex is a valid non-negative index, preventing the false positive match.

Fixed Issues

$ #85685
PROPOSAL: #85685 (comment)

Tests

Open the Expensify app on Android
Open FAB (tap the green + button)
Close FAB (tap outside the menu)
Open FAB again
Verify menu item icons remain their normal color (not green)

Verify that no errors appear in the JS console

Offline tests

N/A — this change is purely visual/UI state and does not involve network calls.

QA Steps

Open the Expensify app on Android
Open FAB
Close FAB
Open FAB again
Verify menu item icons remain their normal gray/white color and do not turn green

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

When focusedIndex is -1 (initial/reset state) and an unregistered item also has itemIndex -1, the equality check incorrectly marks the item as focused. Add an explicit guard so isFocused is only true when focusedIndex is a valid non-negative index. Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

aimane-chnaif · 2026-03-18T22:07:17Z

@MelvinBot review

MelvinBot · 2026-03-18T22:11:38Z

Code Review

Change: One-line guard in useFABMenuItem.ts — adds focusedIndex !== -1 && before the equality check.

Analysis

The fix is correct and minimal. Here's why the bug occurs:

focusedIndex is initialized to -1 (via useArrowKeyFocusManager({ initialFocusedIndex: -1 })) and reset to -1 on close/item press
When the FAB reopens, during the first render cycle before useLayoutEffect fires registerItem, registeredItems.indexOf(itemId) returns -1 for items not yet registered
The old check focusedIndex === itemIndex evaluates to -1 === -1 → true, incorrectly marking items as focused
This causes getItemBackgroundColorStyle to apply hoverComponentBG, producing the green icon visual bug

The guard focusedIndex !== -1 is the right fix — -1 is a sentinel meaning "no item focused", and it should never match any item index.

Verdict

LGTM — The fix is clean, targeted, and addresses the root cause without side effects. No concerns.

Note on CI: The failing test (job 8) is unrelated to this PR — it's canEditFieldOfMoneyRequestTest.ts testing expense field editing permissions, not FAB menu behavior.

MelvinBot · 2026-03-18T22:14:14Z

The failing check is unrelated to this PR.

Analysis: The only failure is in test (job 8) — specifically 2 tests in tests/unit/canEditFieldOfMoneyRequestTest.ts (lines 215, 231) related to "move expense" editing permissions. This PR only modifies src/pages/inbox/sidebar/FABPopoverContent/useFABMenuItem.ts (FAB menu focus state), which has no connection to money request field editing logic.

Evidence:

PR diff is a single 1-line change in useFABMenuItem.ts
The same test passes on the latest main CI run (run 23226563794)
This appears to be a flaky test failure

You can re-run the failing job to unblock the PR.

aimane-chnaif · 2026-03-18T22:14:32Z

@MelvinBot mark as ready for review

MelvinBot · 2026-03-18T22:15:56Z

PR marked as ready for review.

melvin-bot · 2026-03-18T22:15:58Z

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

aimane-chnaif · 2026-03-18T22:16:48Z

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

fix.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-03-19T12:47:30Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../inbox/sidebar/FABPopoverContent/useFABMenuItem.ts	`100.00% <100.00%> (ø)`
... and 9 files with indirect coverage changes

mountiny

Thanks!

[CP Staging] Guard against false-positive focus match in FAB menu items (cherry picked from commit 5308dad) (cherry-picked to staging by mountiny)

OSBotify · 2026-03-19T13:14:23Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.40-6 🚀

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

OSBotify · 2026-03-19T13:16:15Z

✋ 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-03-19T13:21:45Z

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

github-actions · 2026-03-19T13:26:59Z

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

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the Android build failed	The QR code can't be generated, because the iOS build failed

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-19T18:36:12Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.40-10 🚀

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

OSBotify · 2026-03-19T20:27:21Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-23T09:31:13Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

MelvinBot assigned aimane-chnaif Mar 18, 2026

MelvinBot requested a review from a team March 18, 2026 22:00

MelvinBot mentioned this pull request Mar 18, 2026

[Due for payment 2026-03-30] Android - FAB - Menu item icons become green when reopening FAB #85685

Closed

7 tasks

MelvinBot marked this pull request as ready for review March 18, 2026 22:15

MelvinBot requested a review from a team as a code owner March 18, 2026 22:15

melvin-bot bot requested review from aimane-chnaif and removed request for a team March 18, 2026 22:15

melvin-bot bot requested review from trjExpensify and removed request for a team March 18, 2026 22:15

aimane-chnaif approved these changes Mar 18, 2026

View reviewed changes

melvin-bot bot requested a review from mountiny March 18, 2026 22:18

adhorodyski approved these changes Mar 19, 2026

View reviewed changes

mountiny changed the title ~~Guard against false-positive focus match in FAB menu items~~ [CP Staging] Guard against false-positive focus match in FAB menu items Mar 19, 2026

mountiny approved these changes Mar 19, 2026

View reviewed changes

cristipaval merged commit 5308dad into main Mar 19, 2026
55 of 56 checks passed

cristipaval deleted the claude-fixFABIconColorOnReopen branch March 19, 2026 13:05

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 19, 2026

OSBotify mentioned this pull request Mar 19, 2026

Deploy Checklist: New Expensify 2026-03-18 #85646

Closed

100 tasks

Conversation

MelvinBot commented Mar 18, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Mar 18, 2026

Uh oh!

MelvinBot commented Mar 18, 2026

Code Review

Analysis

Verdict

Uh oh!

MelvinBot commented Mar 18, 2026

Uh oh!

aimane-chnaif commented Mar 18, 2026

Uh oh!

MelvinBot commented Mar 18, 2026

Uh oh!

melvin-bot bot commented Mar 18, 2026

Uh oh!

aimane-chnaif commented Mar 18, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Mar 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!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

github-actions bot commented Mar 19, 2026

Uh oh!

github-actions bot commented Mar 19, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov bot commented Mar 19, 2026 •

edited by github-actions bot

Loading