[CP Staging] Refactor BottomDockedModal ESC and back button logic by blazejkustra · Pull Request #59799 · Expensify/App

blazejkustra · 2025-04-08T10:19:40Z

Explanation of Change

The culprit was that the back handler was registered with a function that always returned true which stops the propagation and users couldn't navigate with back button.

Fixed Issues

$ #59769
$ #59775
PROPOSAL: N/A

Tests

Verify that ESCAPE button closes the bottom modal on web
Verify that on Android back button works well after the message context menu is closed
Verify that on Android back button works well from the Refer a friend page
Verify that on other platforms the modal works as before (especially on mobile web/web/android)

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

and.webm

Android: mWeb Chrome

and-web.webm

iOS: Native

Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-04-08.at.12.21.03.mp4

MacOS: Chrome / Safari

web.mov

…ling and reorganize device event listener logic

melvin-bot · 2025-04-08T10:19:46Z

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

ZhenjaHorbach · 2025-04-08T10:23:43Z

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: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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: Native

Screenrecorder-2025-04-08-13-40-41-896.mp4

Android: mWeb Chrome

Screenrecorder-2025-04-08-13-46-03-821.mp4

iOS: Native

2025-04-08.14.00.22.mp4

iOS: mWeb Safari

2025-04-08.14.00.19.mp4

MacOS: Chrome / Safari

2025-04-08.13.33.30.mov

MacOS: Desktop

2025-04-08.13.33.30.mov

github-actions · 2025-04-08T10:26:58Z

🚧 @mountiny has triggered a test app build. You can view the workflow run here.

github-actions · 2025-04-08T11:08:53Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
Android 🤖🔄	iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/59799-hybrid/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/59799-hybrid/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/59799/NewExpensify.dmg	https://59799.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

mollfpr

LGTM 👍

This also fix #59775

blazejkustra · 2025-04-08T11:55:37Z

LGTM 👍

This also fix #59775

Nice! I added it to the 'Fixed Issues' section

ZhenjaHorbach · 2025-04-08T12:09:24Z

Yeah
Everything works good !
LGTM !

ZhenjaHorbach · 2025-04-08T12:11:08Z

Nice! I added it to the 'Fixed Issues' section

In that case, it might be better to add tests as well !

OSBotify · 2025-04-08T12:44:38Z

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

…-button [CP Staging] Refactor BottomDockedModal ESC and back button logic (cherry picked from commit 5f590ac) (CP triggered by Beamanator)

github-actions · 2025-04-08T14:03:49Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.1.24-3 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-04-09T02:16:14Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

github-actions · 2025-04-09T04:34:35Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

blazejkustra added 2 commits April 8, 2025 12:09

Refactor BottomDockedModal to use isVisibleState for back button hand…

c24db03

…ling and reorganize device event listener logic

Remove unnecessary change

c332c6e

blazejkustra requested a review from a team as a code owner April 8, 2025 10:19

melvin-bot Bot requested review from ZhenjaHorbach and removed request for a team April 8, 2025 10:19

blazejkustra mentioned this pull request Apr 8, 2025

[Due for payment 2025-04-17] [Due for payment 2025-04-16] Android - Device back button is not responsive after closing context menu #59769

Closed

8 tasks

mountiny assigned blazejkustra Apr 8, 2025

mollfpr mentioned this pull request Apr 8, 2025

[Due for payment 2025-04-17] [Due for payment 2025-04-16] [$250] android-IOU-From Refer a Friend page, tapping device back button is not responsive #59775

Closed

8 tasks

mollfpr approved these changes Apr 8, 2025

View reviewed changes

ZhenjaHorbach approved these changes Apr 8, 2025

View reviewed changes

melvin-bot Bot requested a review from mollfpr April 8, 2025 12:09

mollfpr changed the title ~~Refactor BottomDockedModal ESC and back button logic~~ [CP Staging] Refactor BottomDockedModal ESC and back button logic Apr 8, 2025

mollfpr approved these changes Apr 8, 2025

View reviewed changes

mollfpr merged commit 5f590ac into Expensify:main Apr 8, 2025

github-actions Bot added the CP Staging marks PRs that have been CP'd to staging label Apr 8, 2025

github-actions Bot mentioned this pull request Apr 8, 2025

Deploy Checklist: New Expensify 2025-04-07 #59756

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Refactor BottomDockedModal ESC and back button logic#59799

[CP Staging] Refactor BottomDockedModal ESC and back button logic#59799
mollfpr merged 2 commits into
Expensify:mainfrom
software-mansion-labs:fix/android-back-button

blazejkustra commented Apr 8, 2025 •

edited by mollfpr

Loading

Uh oh!

melvin-bot Bot commented Apr 8, 2025

Uh oh!

ZhenjaHorbach commented Apr 8, 2025 •

edited

Loading

Uh oh!

github-actions Bot commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 8, 2025

Uh oh!

mollfpr left a comment

Uh oh!

blazejkustra commented Apr 8, 2025

Uh oh!

ZhenjaHorbach commented Apr 8, 2025

Uh oh!

ZhenjaHorbach commented Apr 8, 2025

Uh oh!

OSBotify commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 9, 2025

Uh oh!

github-actions Bot commented Apr 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

blazejkustra commented Apr 8, 2025 • edited by mollfpr 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 Apr 8, 2025

Uh oh!

ZhenjaHorbach commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

github-actions Bot commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 8, 2025

Uh oh!

mollfpr left a comment

Choose a reason for hiding this comment

Uh oh!

blazejkustra commented Apr 8, 2025

Uh oh!

ZhenjaHorbach commented Apr 8, 2025

Uh oh!

ZhenjaHorbach commented Apr 8, 2025

Uh oh!

OSBotify commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 8, 2025

Uh oh!

github-actions Bot commented Apr 9, 2025

Uh oh!

github-actions Bot commented Apr 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

blazejkustra commented Apr 8, 2025 •

edited by mollfpr

Loading

ZhenjaHorbach commented Apr 8, 2025 •

edited

Loading