Fix cannot open search page by shortcut if delete receipt confirm modal is visible #33203

tsa321 · 2023-12-17T06:42:09Z

Details

Fixed Issues

$ #29511
PROPOSAL:#29511 (comment)

Tests

Create money request then add receipt.
Open the receipt modal
Click three dots menu and click delete receipt
The delete confirm modal will appear
Press CMD + K to open search page
Verify the app close the delete confirmation modal and the receipt modal, then navigate to search page properly
Open the receipt modal, click three dots menu then three dots menu popover will appears
Press ESC
Verify only the three dots menu popover will be closed
Click the three dots menu button again -> click delete receipt -> the delete confirmation modal will appears
Press ESC
Verify only the delete confirmation modal will be closed.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create money request then add receipt.
Open the receipt modal
Click three dots menu and click delete receipt
The delete confirm modal will appear
Press CMD + K to open search page
Verify the app close the delete confirmation modal and the receipt modal, then navigate to search page properly
Open the receipt modal, click three dots menu then three dots menu popover will appears
Press ESC
Verify only the three dots menu popover will be closed
Click the three dots menu button again -> click delete receipt -> the delete confirmation modal will appears
Press ESC
Verify only the delete confirmation modal will be closed.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-native-d.mp4

Android: mWeb Chrome

android-mweb_d.mp4

iOS: Native

ios-native_d.mp4

iOS: mWeb Safari

ios-msfari_d.mp4

MacOS: Chrome / Safari

macos-web_d.mp4

MacOS: Desktop

macos-desktop_d.mp4

…al visible Signed-off-by: Tsaqif <[email protected]>

melvin-bot · 2023-12-17T06:42:15Z

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

Signed-off-by: Tsaqif <[email protected]>

tsa321 · 2023-12-17T08:47:59Z

Bugs found while testing in staging and base master:

In staging mweb, click on insert emoji button in `report action message edit` focus composer instead of displaying emoji picker:

bug-insert-emoji-ineditmessageaction-d.mp4

In my base master, double pressing ESC when user view attachment modal won't refocus composer:

bug-double-esc-wont-focus-composer-d.mp4

tsa321 · 2023-12-17T08:58:19Z

src/components/ThreeDotsMenu/index.js

@@ -96,6 +96,7 @@ function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, me
                                hidePopoverMenu();
                                return;
                            }
+                            buttonRef.current.blur();


This is needed to prevent react native modal to show blue border box (because of focused state) of threedots button on modal hide when user close modal by pressing esc:

Video:

blue-border-d.mp4

This is because of trap focus of react native modal.

I am not able to reproduce. Btw, if you reproduced, can you confirm also reproducible on staging/production?
If so, no need to fix here.

@aimane-chnaif Because I am using onBackButtonPress={Modal.closeTop} in BaseModal.tsx to fix an issue about: When user press three dots menu on attachment modal then press esc the attachment modal is closed. The current behavior in staging:

Pressing esc on three dots menu in attachment modal:

esc-on-staging-d.mp4

After using onBackButtonPress={Modal.closeTop} :

blue border appears:

blue-border-current-branch-d.mp4

tsa321 · 2023-12-19T23:56:07Z

@aimane-chnaif I am removing the isNavigating parameter. Should I preserve it instead?

aimane-chnaif · 2024-01-09T17:27:27Z

@aimane-chnaif I am removing the isNavigating parameter. Should I preserve it instead?

Are you sure that parameter isn't used anymore?

tsa321 · 2024-01-09T23:32:25Z

@aimane-chnaif yes, I am sure it is not used anymore.

aimane-chnaif · 2024-01-14T10:30:26Z

@tsa321 please merge main

tsa321 · 2024-01-16T00:56:17Z

@aimane-chnaif the branch is already up to date.

aimane-chnaif · 2024-01-16T02:40:10Z

@aimane-chnaif the branch is already up to date.

?

tsa321 · 2024-01-16T13:11:15Z

I am sorry @aimane-chnaif, done merging main.

aimane-chnaif · 2024-01-18T11:46:11Z

Please also fix author checklist.
Merge main again. Will review today/tomorrow

tsa321 · 2024-01-18T14:29:11Z

@aimane-chnaif author checklist fixed and main has been merged.

aimane-chnaif · 2024-01-21T19:02:23Z

src/components/ThreeDotsMenu/index.js

@@ -96,6 +96,7 @@ function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, me
                                hidePopoverMenu();
                                return;
                            }
+                            buttonRef.current.blur();


I am not able to reproduce. Btw, if you reproduced, can you confirm also reproducible on staging/production?
If so, no need to fix here.

aimane-chnaif · 2024-01-21T19:18:24Z

src/libs/actions/Modal.ts

 /**
 * Close modal in other parts of the app
 */
-function close(onModalCloseCallback: () => void, isNavigating = true) {
+function close(onModalCloseCallback: () => void) {


isNavigating is still needed.

As you see, composer is briefly focused

Screen.Recording.2024-01-21.at.8.13.56.PM.mov

this logic was added here

used in

App/src/components/EmojiPicker/EmojiPicker.js

Lines 85 to 88 in 52adf77

const hideEmojiPicker = (isNavigating) => {

if (isNavigating) {

onModalHide.current = () => {};

}

@aimane-chnaif done preserving the isNavigating parameter

Signed-off-by: Tsaqif <[email protected]>

aimane-chnaif

There's no logic to reset isNavigate after closeTop

Signed-off-by: Tsaqif <[email protected]>

tsa321 · 2024-01-22T08:16:56Z

@aimane-chnaif done adding a line to reset isNavigate value.

The Reassure Performance Tests is failing, but I am not sure why it fails

aimane-chnaif · 2024-01-22T09:19:05Z

The Reassure Performance Tests is failing, but I am not sure why it fails

That seems caused by this PR. We should fix that

Signed-off-by: Tsaqif <[email protected]>

tsa321 · 2024-01-22T10:38:13Z

@aimane-chnaif previously commit c2547ef without the reset isNavigate variable passes the performance test.
But latest commit e15c964 exactly same code (after reverting the reset isNavigate) the performance test fails.
Same code but different test result...

aimane-chnaif · 2024-01-22T10:40:03Z

@aimane-chnaif previously commit c2547ef without the reset isNavigate variable passes the performance test. But latest commit e15c964 exactly same code (after reverting the reset isNavigate) the performance test fails. Same code but different test result...

can you revert all code to be same as main and see still fails?

aimane-chnaif · 2024-01-22T15:07:05Z

@tsa321 I confirmed tests are sometimes failing (on other PRs). Please merge main and see if fails again

Signed-off-by: Tsaqif <[email protected]>

tsa321 · 2024-01-23T00:57:19Z

@aimane-chnaif , now the performance test is successful.

aimane-chnaif · 2024-01-23T04:38:46Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

Signed-off-by: Tsaqif <[email protected]>

OSBotify · 2024-01-25T18:14:45Z

✋ 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-01-29T19:23:36Z

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 1.4.33-0 🚀

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

OSBotify · 2024-01-31T02:30:27Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.33-5 🚀

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

Fix cannot open search page by shortcut if delete receipt confirm mod…

e5de1c7

…al visible Signed-off-by: Tsaqif <[email protected]>

tsa321 requested a review from a team as a code owner December 17, 2023 06:42

melvin-bot bot requested review from aimane-chnaif and removed request for a team December 17, 2023 06:42

Remove isNavigating parameter

d8d31f9

Signed-off-by: Tsaqif <[email protected]>

tsa321 commented Dec 17, 2023

View reviewed changes

Merge branch 'main' into seashortc-drconfirm

8055f3c

jasperhuangg mentioned this pull request Jan 17, 2024

[HOLD for payment 2024-02-07] [$500] Search Page opens in Background when delete Reciept Confirm Modal is visible #29511

Closed

6 tasks

Merge branch 'main' into seashortc-drconfirm

cc393f3

aimane-chnaif suggested changes Jan 21, 2024

View reviewed changes

Preserve the isNavigating parameter

c2547ef

Signed-off-by: Tsaqif <[email protected]>

aimane-chnaif reviewed Jan 22, 2024

View reviewed changes

add Reset isNavigate value

cf7c98d

Signed-off-by: Tsaqif <[email protected]>

revert resetting isNavigate

e15c964

Signed-off-by: Tsaqif <[email protected]>

tsa321 added 2 commits January 23, 2024 07:21

Merge branch 'main' into seashortc-drconfirm

76c565a

add reset for isNavigate

d0f1991

Signed-off-by: Tsaqif <[email protected]>

aimane-chnaif approved these changes Jan 23, 2024

View reviewed changes

melvin-bot bot requested a review from jasperhuangg January 23, 2024 04:39

tsa321 added 2 commits January 25, 2024 10:37

Merge 'main' and resolve conflict

bf23434

Fix typecheck

dd7a6f1

Signed-off-by: Tsaqif <[email protected]>

jasperhuangg approved these changes Jan 25, 2024

View reviewed changes

jasperhuangg merged commit bba406b into Expensify:main Jan 25, 2024
15 checks passed

github-actions bot mentioned this pull request Jan 29, 2024

Deploy Checklist: New Expensify 2024-01-29 #35328

Closed

bi-kash mentioned this pull request Feb 21, 2024

[$500] Chat - Pressing ESC closes the video preview modal instead of Download and Playback modal #36902

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix cannot open search page by shortcut if delete receipt confirm modal is visible #33203

Fix cannot open search page by shortcut if delete receipt confirm modal is visible #33203

tsa321 commented Dec 17, 2023 •

edited

Loading

melvin-bot bot commented Dec 17, 2023

tsa321 commented Dec 17, 2023 •

edited

Loading

tsa321 Dec 17, 2023 •

edited

Loading

aimane-chnaif Jan 21, 2024

tsa321 Jan 22, 2024

tsa321 commented Dec 19, 2023

aimane-chnaif commented Jan 9, 2024

tsa321 commented Jan 9, 2024

aimane-chnaif commented Jan 14, 2024

tsa321 commented Jan 16, 2024

aimane-chnaif commented Jan 16, 2024

tsa321 commented Jan 16, 2024 •

edited

Loading

aimane-chnaif commented Jan 18, 2024

tsa321 commented Jan 18, 2024

aimane-chnaif Jan 21, 2024

aimane-chnaif Jan 21, 2024

tsa321 Jan 22, 2024

aimane-chnaif left a comment

tsa321 commented Jan 22, 2024 •

edited

Loading

aimane-chnaif commented Jan 22, 2024

tsa321 commented Jan 22, 2024 •

edited

Loading

aimane-chnaif commented Jan 22, 2024

aimane-chnaif commented Jan 22, 2024

tsa321 commented Jan 23, 2024

aimane-chnaif commented Jan 23, 2024

OSBotify commented Jan 25, 2024

OSBotify commented Jan 29, 2024

OSBotify commented Jan 31, 2024

	const hideEmojiPicker = (isNavigating) => {
	if (isNavigating) {
	onModalHide.current = () => {};
	}

Fix cannot open search page by shortcut if delete receipt confirm modal is visible #33203

Fix cannot open search page by shortcut if delete receipt confirm modal is visible #33203

Conversation

tsa321 commented Dec 17, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 17, 2023

tsa321 commented Dec 17, 2023 • edited Loading

tsa321 Dec 17, 2023 • edited Loading

Choose a reason for hiding this comment

aimane-chnaif Jan 21, 2024

Choose a reason for hiding this comment

tsa321 Jan 22, 2024

Choose a reason for hiding this comment

tsa321 commented Dec 19, 2023

aimane-chnaif commented Jan 9, 2024

tsa321 commented Jan 9, 2024

aimane-chnaif commented Jan 14, 2024

tsa321 commented Jan 16, 2024

aimane-chnaif commented Jan 16, 2024

tsa321 commented Jan 16, 2024 • edited Loading

aimane-chnaif commented Jan 18, 2024

tsa321 commented Jan 18, 2024

aimane-chnaif Jan 21, 2024

Choose a reason for hiding this comment

aimane-chnaif Jan 21, 2024

Choose a reason for hiding this comment

tsa321 Jan 22, 2024

Choose a reason for hiding this comment

aimane-chnaif left a comment

Choose a reason for hiding this comment

tsa321 commented Jan 22, 2024 • edited Loading

aimane-chnaif commented Jan 22, 2024

tsa321 commented Jan 22, 2024 • edited Loading

aimane-chnaif commented Jan 22, 2024

aimane-chnaif commented Jan 22, 2024

tsa321 commented Jan 23, 2024

aimane-chnaif commented Jan 23, 2024

Reviewer Checklist

Screenshots/Videos

OSBotify commented Jan 25, 2024

OSBotify commented Jan 29, 2024

OSBotify commented Jan 31, 2024

tsa321 commented Dec 17, 2023 •

edited

Loading

tsa321 commented Dec 17, 2023 •

edited

Loading

tsa321 Dec 17, 2023 •

edited

Loading

tsa321 commented Jan 16, 2024 •

edited

Loading

tsa321 commented Jan 22, 2024 •

edited

Loading

tsa321 commented Jan 22, 2024 •

edited

Loading