Fix user is navigated to IOU report when dismissing receipt modal with ESC key #41472

bernhardoj · 2024-05-02T03:33:41Z

Details

When we close the 3-dot menu in receipt page, it will set the modal visibility to false. If we close the receipt modal with an ESC key, it will navigate the user back to the IOU report. This PR fix it.

Fixed Issues

$ #40801
PROPOSAL: #40801 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Submit a manual expense with a receipt to a user
Open the transaction thread
Press the receipt image to open the preview modal
Press the 3-dot
Press outside the popover to close the 3-dot menu
Press ESC to close the receipt preview modal
Verify you stays at the transaction thread

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-02.at.11.06.13.mov

Android: mWeb Chrome

Screen.Recording.2024-05-02.at.11.10.48.mov

iOS: Native

Screen.Recording.2024-05-02.at.11.07.16.mov

iOS: mWeb Safari

Screen.Recording.2024-05-02.at.11.04.15.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-02.at.11.02.06.mov

MacOS: Desktop

Screen.Recording.2024-05-02.at.11.03.00.mov

melvin-bot · 2024-05-02T03:33:45Z

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

eVoloshchak · 2024-05-06T18:58:12Z

src/libs/actions/Modal.ts

@@ -85,4 +85,8 @@ function willAlertModalBecomeVisible(isVisible: boolean, isPopover = false) {
    Onyx.merge(ONYXKEYS.MODAL, {willAlertModalBecomeVisible: isVisible, isPopover});
 }

-export {setCloseModal, close, onModalDidClose, setModalVisibility, willAlertModalBecomeVisible, setDisableDismissOnEscape, closeTop};
+function getModalVisibleCount() {


I propose we call this something like allModalsHidden and make it return closeModals.length === 0, since we don't care about the number of visible modals, all we care about is whether there's at least one modal visible

Also please add a comment explaining what this function does

Good idea, but I prefer to not give it a comment since the name itself is already self-explanatory.

…achment-modal

eVoloshchak · 2024-05-07T18:27:42Z

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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

24-05-07-21-24-43.mp4

Android: mWeb Chrome

Screen.Recording.2024-05-07.at.21.27.05.mov

iOS: Native

Screen.Recording.2024-05-07.at.21.26.43.mov

iOS: mWeb Safari

Screen.Recording.2024-05-07.at.21.21.30.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-07.at.21.12.22.mov

MacOS: Desktop

Screen.Recording.2024-05-07.at.21.13.01.mov

eVoloshchak

LGTM!

OSBotify · 2024-05-10T22:39:27Z

✋ 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 · 2024-05-13T08:42:25Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.4.73-0 🚀

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

OSBotify · 2024-05-15T09:50:34Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.73-7 🚀

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

bernhardoj added 2 commits May 2, 2024 11:14

don't set modal visibility when there is another modal still visible

3c24ca4

change fallback route

2be8399

bernhardoj requested a review from a team as a code owner May 2, 2024 03:33

melvin-bot bot removed the request for review from a team May 2, 2024 03:33

melvin-bot bot requested a review from eVoloshchak May 2, 2024 03:33

eVoloshchak suggested changes May 6, 2024

View reviewed changes

bernhardoj added 2 commits May 7, 2024 10:34

Merge branch 'main' into fix/40801-double-navigation-when-closing-att…

2581344

…achment-modal

rework the function

c970341

eVoloshchak approved these changes May 7, 2024

View reviewed changes

melvin-bot bot requested a review from marcochavezf May 7, 2024 19:32

marcochavezf approved these changes May 10, 2024

View reviewed changes

marcochavezf merged commit 390e2a8 into Expensify:main May 10, 2024
16 of 17 checks passed

github-actions bot mentioned this pull request May 13, 2024

Deploy Checklist: New Expensify 2024-05-13 #42040

Closed

74 tasks

melvin-bot bot mentioned this pull request May 15, 2024

[HOLD for payment 2024-05-22] [VIP-billpay-invoicing] [$250] IOU - App lands on IOU report and details RHP opens when dismissing receipt via ESC key #40801

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix user is navigated to IOU report when dismissing receipt modal with ESC key #41472

Fix user is navigated to IOU report when dismissing receipt modal with ESC key #41472

bernhardoj commented May 2, 2024

melvin-bot bot commented May 2, 2024

eVoloshchak May 6, 2024

bernhardoj May 7, 2024

eVoloshchak commented May 7, 2024 •

edited

Loading

eVoloshchak left a comment

OSBotify commented May 10, 2024

OSBotify commented May 13, 2024

OSBotify commented May 15, 2024

Fix user is navigated to IOU report when dismissing receipt modal with ESC key #41472

Fix user is navigated to IOU report when dismissing receipt modal with ESC key #41472

Conversation

bernhardoj commented May 2, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 2, 2024

eVoloshchak May 6, 2024

Choose a reason for hiding this comment

bernhardoj May 7, 2024

Choose a reason for hiding this comment

eVoloshchak commented May 7, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak left a comment

Choose a reason for hiding this comment

OSBotify commented May 10, 2024

OSBotify commented May 13, 2024

OSBotify commented May 15, 2024

eVoloshchak commented May 7, 2024 •

edited

Loading