Fix Screen Reader issue preventing bottom sheet from closing without selection

[marufsharifi]

Explanation of Change

Fixed Issues

$ #77459
PROPOSAL: #77459 (comment)

Tests

1. Using VoiceOver on iOS or TalkBack on Android, open the app
2. Swipe right to focus on any chat and double-tap to activate it
3. Swipe right to focus the "+" button and double-tap to activate it
4. Dismiss the drawer dialog using the drawer handle button.

• Verify that no errors appear in the JS console

Offline tests

Same as the tests.

QA Steps

Same as the tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

• 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 there are no new alerts related to the canBeMissing param for useOnyx
• I followed proper code patterns (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
    • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • 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 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)
• 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
• I verified that if a function's arguments changed that all usages have also been updated correctly
• 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 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 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.
• 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-native-dismiss-order.mp4

Android: mWeb Chrome

android-web-dsmiss-order.mp4

iOS: Native

Screen.Recording.1404-12-14.at.9.18.25.PM.mov

iOS: mWeb Safari

Screen.Recording.1404-12-14.at.9.21.52.PM.mov

MacOS: Chrome / Safari

Not applicable.

[melvin-bot]

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

1. Look at the code and make sure there are no malicious changes.
2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

[codecov]

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/components/FocusableMenuItem.tsx	100.00% <100.00%> (ø)
...debar/FABPopoverContent/FABFirstItemRefContext.tsx	100.00% <100.00%> (ø)
src/styles/index.ts	49.00% <ø> (ø)
...sidebar/FABPopoverContent/FABFocusableMenuItem.tsx	0.00% <0.00%> (ø)
src/components/Modal/BaseModal.tsx	86.66% <81.81%> (+0.15%)	⬆️
...libs/Accessibility/moveAccessibilityFocus/index.ts	0.00% <0.00%> (ø)
...cessibility/moveAccessibilityFocus/index.native.ts	14.28% <0.00%> (-10.72%)	⬇️
...inbox/sidebar/FABPopoverContent/FABPopoverMenu.tsx	65.67% <62.26%> (-18.54%)	⬇️
src/components/PopoverMenu.tsx	75.00% <58.22%> (-6.87%)	⬇️
... and 7 files with indirect coverage changes

[melvin-bot]

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

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c02c0a7e81

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[marufsharifi]

@truph01, kindly bump. thanks.

[truph01]

Requested to create adhoc.

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e5014bd-587c999-f15650b91f02e586de8083d9cfa5a9e1a8bccee6/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e5014bd-587c999-09d1a8f36c1e339a044c667b758c807763b1b261/index.html

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

---

👀 View the workflow run that generated this build 👀

[dubielzyk-expensify]

I get stuck on the opening screen here without a way to move past:

[truph01]

I get stuck on the opening screen here without a way to move past:

@dubielzyk-expensify Could you give it another try?

[truph01]

@marufsharifi Conflicts here

[dubielzyk-expensify]

Still having the same issue

[marufsharifi]

@truph01, what's next for this pr? thanks.

[truph01]

@marufsharifi, could you merge main and request to build a new adhoc?

[marufsharifi]

@truph01, main merged, but I can't request to build a new adhoc, could you please do it? thanks.

[truph01]

@truph01, main merged, but I can't request to build a new adhoc, could you please do it? thanks.

I requested here.

[dubielzyk-expensify]

Running build 👍

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-cccac98-d0bcd8b-c3aa1c88bedff0120e342f1de6274c7d05939833/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-cccac98-d0bcd8b-d0acb0dd1d6a8c354379954c33da7ec1cc7477e5/index.html

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

---

👀 View the workflow run that generated this build 👀

[dubielzyk-expensify]

It still focuses on the dismiss button as soon as the dialog opens. Recreated this issue by clicking the (+) button close to the navigation.

[truph01]

@marufsharifi Could you check it again?

[marufsharifi]

Working on it

[marufsharifi]

@truph01, could you please take another look? I've fixed it.

[marufsharifi]

The lint failure is not related to our changes. btw.

[truph01]

@marufsharifi Could you merge main to fix the lint issue?

[truph01]

@marufsharifi Could you explain why:

It still focuses on the dismiss button as soon as the dialog opens. Recreated this issue by clicking the (+) button close to the navigation.

Although it works well when testing in the Android simulator?
And what did you do to resolve it?

[marufsharifi]

@truph01 I rechecked this in detail. The issue was not caused by one specific review comment, but by the fact that the earlier version of the fix was broader and covered the FAB flow indirectly through shared modal behavior.

Concretely:

• In the earlier version (e800de4bcf3), the changes were spread across shared files such as BaseModal, PopoverMenu, and FocusableMenuItem. Because BaseModal is shared by bottom-docked modals, the FAB modal was also benefiting from that broader behavior indirectly.
• Later, while aligning the implementation to the reviewed PopoverMenu-based path (f6a1939097b and 2d3bfbc66d5), the fix became effectively scoped to the PopoverMenu flow: the chat/create path remained fixed because it uses PopoverMenu, but the inbox navigation (+) flow uses a different path (FloatingActionButtonAndPopover -> FABPopoverMenu), so it no longer had its own first-item focus handoff.
• That gap became visible when @dubielzyk-expensify tested the navigation (+) flow here: Fix Screen Reader issue preventing bottom sheet from closing without selection #81536 (comment)

For the second point, I re-tested the updated fix and it is now working as expected on Android real device (native and web) and on iOS web on a real device.

To resolve it, I kept the same approach already used in PopoverMenu, but applied it to the FAB path as well:

• attach a ref to the first visible FAB item
• move focus there when the FAB modal opens
• keep Android’s existing viewHoverEnter behavior
• on iOS, keep dismiss inaccessible until the first FAB item actually receives focus, with a small bounded retry to handle the native timing race

This fixes the FAB modal without broadening the behavior back into shared modal code.

[marufsharifi]

@truph01, The ESLint failure shown in the check appears unrelated to this PR’s changed files.
Thanks.