Remove onDismiss, trigger onModalHide on Android; fix early-unmount setReadyToFocus by huult · Pull Request #77104 · Expensify/App

huult · 2025-12-09T03:49:56Z

Explanation of Change

Removes the unreliable onDismiss callback and manually triggers onModalHide on Android. Also ensures setReadyToFocus is called when the modal unmounts before handleDismissModal runs, preventing stuck focus promises.

Fixed Issues

$ #72648
PROPOSAL: #72648 (comment)

Tests

Same QA step

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open the Expensify app.
Go to Account > Status > select an emoji.
Observe the blinking cursor and the message text.
Verify that there is no overlap between the blinking cursor and the message text.

#70912

Open the Expensify app.
Go to any chat.
Send a message.
Long-press the message and select Edit comment.
Verify that the edit composer is focused.

#71177

Open the Expensify app.
Sign in with a new account and create a new workspace.
Click the FAB and create a report.
Send any message in the report.
Right-click the message and choose Edit.
Navigate to any other chat and send a message.
Right-click the message and choose Edit.
Verify that the edit composer is focused.

#71760

Open the Expensify app.
Go to any chat.
Send a message that contains only emojis.
Edit the message.
Verify that the edit box is focused when editing the message.

#71938

Open the Expensify app.
Open any chat.
Open the emoji selector and select one.
Verify that after selecting an emoji, the compose box is focused so the user can continue typing

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-12-09.at.09.32.01.mp4

Android: mWeb Chrome

Screen.Recording.2025-12-09.at.09.32.41.mp4

iOS: Native

Screen.Recording.2025-12-09.at.09.34.46.mp4

iOS: mWeb Safari

Screen.Recording.2025-12-09.at.09.35.12.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-12-09.at.09.30.22.mp4

Double-check the issue: #70912

Android: Native

Screen.Recording.2025-12-09.at.10.21.23.mp4

Android: mWeb Chrome

Screen.Recording.2025-12-09.at.10.23.11.mp4

iOS: Native

Screen.Recording.2025-12-09.at.10.25.26.mp4

iOS: mWeb Safari

Screen.Recording.2025-12-09.at.10.26.14.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-12-09.at.10.22.13.mp4

Double-check the issue: #71177

Android: Native

Screen.Recording.2025-12-09.at.10.33.49.mp4

Android: mWeb Chrome

Screen.Recording.2025-12-09.at.10.34.49.mp4

iOS: Native

Screen.Recording.2025-12-09.at.10.36.28.mp4

iOS: mWeb Safari

Screen.Recording.2025-12-09.at.10.37.39.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-12-09.at.10.29.45.mp4

Double-check the issue: #71760

Android: Native

Screen.Recording.2025-12-09.at.10.42.54.mov

Android: mWeb Chrome

Screen.Recording.2025-12-09.at.10.42.17.mov

iOS: Native

Screen.Recording.2025-12-09.at.10.44.31.mov

iOS: mWeb Safari

Screen.Recording.2025-12-09.at.10.45.09.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-09.at.10.43.29.mov

Double-check the issue: #71938

Android: Native

Screen.Recording.2025-12-09.at.10.48.26.mov

Android: mWeb Chrome

Screen.Recording.2025-12-09.at.10.49.18.mov

iOS: Native

Screen.Recording.2025-12-09.at.10.46.59.mov

iOS: mWeb Safari

Screen.Recording.2025-12-09.at.10.46.34.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-09.at.10.47.24.mov

…etReadyToFocus

…cus after it fully closes

melvin-bot · 2025-12-09T03:50:03Z

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

huult · 2025-12-09T03:51:25Z

@huult please make sure to test below issues on all platforms.

#70912
#71177
#71760
#71938

@situchan Regarding this, I added screenshots for all platforms for each ticket

situchan · 2025-12-09T03:56:47Z

+        // When the modal becomes not visible, run dismiss logic to setReadyToFocus after it fully closes.
+        if (!(isVisible || !wasVisible)) {
+            handleDismissModal();
+        }


In your proposal, ComposerFocusManager.setReadyToFocus(uniqueModalId) is called on unmount
() => () => {}

Didn't it work?

@situchan Yes, when I created the PR and hideModal was called, the cleanup function (() => () => {}) did not run in the case described in #70912

codecov · 2025-12-09T03:57:45Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/Modal/BaseModal.tsx	`86.50% <100.00%> (+1.02%)`	⬆️
src/components/Modal/ReanimatedModal/index.tsx	`82.75% <0.00%> (ø)`
... and 8 files with indirect coverage changes

JmillsExpensify

More so a design-focused PR, though testing steps look good and approved by product.

situchan · 2025-12-10T17:14:30Z

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.mov

Android: mWeb Chrome

mchrome.mov

iOS: HybridApp

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

web2.mov

situchan

Confirmed all 4 old issues are not reproducible.

situchan · 2025-12-10T17:26:04Z

-                    onModalHide();
+                    if (getPlatform() !== CONST.PLATFORM.ANDROID) {
+                        onModalHide();
+                    }


Confirmed changes in this file is straight revert of #71637

dangrous

One change, otherwise looks good.

Can we also add the QA steps for those 4 existing closed issues into this PR description please, so they can test as well?

Thanks!

…erlap-after-emoji

huult · 2025-12-11T05:13:48Z

@dangrous it's done

…erlap-after-emoji

OSBotify · 2025-12-11T19:24:33Z

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

OSBotify · 2025-12-12T22:29:02Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.2.78-0 🚀

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

OSBotify · 2025-12-16T22:25:57Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.78-8 🚀

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

huult added 2 commits December 9, 2025 09:24

Remove onDismiss, trigger onModalHide on Android; fix early-unmount s…

21ce20c

…etReadyToFocus

When the modal becomes not visible, run dismiss logic to setReadyToFo…

2f83c82

…cus after it fully closes

huult requested review from a team as code owners December 9, 2025 03:49

melvin-bot Bot assigned huult Dec 9, 2025

melvin-bot Bot requested review from situchan and removed request for a team December 9, 2025 03:50

melvin-bot Bot requested review from JmillsExpensify and removed request for a team December 9, 2025 03:50

situchan reviewed Dec 9, 2025

View reviewed changes

JmillsExpensify previously approved these changes Dec 10, 2025

View reviewed changes

situchan approved these changes Dec 10, 2025

View reviewed changes

melvin-bot Bot requested a review from dangrous December 10, 2025 17:52

dangrous suggested changes Dec 10, 2025

View reviewed changes

Comment thread src/components/Modal/BaseModal.tsx Outdated

huult added 2 commits December 11, 2025 12:01

Merge remote-tracking branch 'upstream/main' into 72648-fix-cursor-ov…

223abdb

…erlap-after-emoji

update condition

61d17e9

huult dismissed JmillsExpensify’s stale review via 61d17e9 December 11, 2025 05:07

Merge remote-tracking branch 'upstream/main' into 72648-fix-cursor-ov…

96059a3

…erlap-after-emoji

dangrous approved these changes Dec 11, 2025

View reviewed changes

dangrous merged commit 766d317 into Expensify:main Dec 11, 2025
30 checks passed

OSBotify mentioned this pull request Dec 12, 2025

Deploy Checklist: New Expensify 2025-12-12 #77578

Closed

melvin-bot Bot mentioned this pull request Dec 16, 2025

[Due for payment 2025-12-23] [$250] Status - Cursor overlaps with text after adding an emoji #72648

Closed

8 tasks

Conversation

huult commented Dec 9, 2025 • 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 Dec 9, 2025

Uh oh!

huult commented Dec 9, 2025

Uh oh!

situchan Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

huult Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Dec 9, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

situchan commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

situchan Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

huult commented Dec 11, 2025

Uh oh!

Uh oh!

OSBotify commented Dec 11, 2025

Uh oh!

OSBotify commented Dec 12, 2025

Uh oh!

OSBotify commented Dec 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

huult commented Dec 9, 2025 •

edited

Loading

codecov Bot commented Dec 9, 2025 •

edited by github-actions Bot

Loading

situchan commented Dec 10, 2025 •

edited

Loading