Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

tsa321 · 2024-05-29T06:17:00Z

Fix back button arrow won't back when viewing attachment image and fix failure to open search page with shortcut when viewing some modals.

Details

Fixed Issues

$ #42368
PROPOSAL: #42368 (comment)

Tests

Open a report with 3 or more attachment images
View first attachment images
Press browser's back button (for non browser test, press back button on phone or tap on close modal button)
Verify the image modal is closed and report screen displayed properly
Open Fab menu, Three dots menu, Open search page, Request money, Profile page, preferences page, workspace page, Right click report actions, right click on LHN and other pages or popover
The pages/popover should open normally

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open a report with 3 or more attachment images
View first attachment images
Press browser's back button (for non browser test, press back button on phone or tap on close modal button)
Verify the image modal is closed and report screen displayed properly
Open Fab menu, Three dots menu, Open search page, Request money, Profile page, preferences page, workspace page, Right click report actions, right click on LHN and other pages or popover
The pages/popover should open normally

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

…x open search page with shortcut Signed-off-by: Tsaqif <[email protected]>

melvin-bot · 2024-05-29T06:17:05Z

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

tsa321 · 2024-05-29T07:07:36Z

@DylanDylann PR is ready for review

DylanDylann · 2024-05-30T08:25:06Z

@tsa321 Please also test other modals to ensure our change don't cause any regression

tsa321 · 2024-05-30T08:30:38Z

@DylanDylann yes, I have tested it on other modals too.

DylanDylann · 2024-06-03T10:29:24Z

It will take me a bit of time to ensure this change is safe

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

DylanDylann · 2024-06-04T09:32:01Z

@tsa321 I am about to request merging the latest main. Thanks for always keeping an eye on this PR

DylanDylann · 2024-06-04T09:53:53Z

src/components/Modal/BaseModal.tsx

@@ -141,6 +141,7 @@ function BaseModal(
    };

    const handleDismissModal = () => {
+        hideModal();


@tsa321 I can't reproduce #27237 on the latest main. Should we revert this change?

@DylanDylann I cannot reproduce it in staging, but I can reproduce it in latest main.
It is even more broken in latest main, even opening receipt modal -> cmd +k won't open search page. Could you check it?

Also my code depends on the hideModal function inside BaseModal, but when closing receipt modal the hideModal function is not executed. So I make that modification in BaseModal.
Could you check it thank you...

@tsa321 Try again and still can't reproduce on the latest main

Anyway, I think it is out of the scope of this PR, we should revert that to avoid delay processing

@DylanDylann alright. I will make minimal changes.
If I make modification in the beforeRemove I need the changes in baseModal, so the composer will re-focus after user close receipt modal.
But I will move the condition in shouldAutoFocus of ComposerWithSuggestions and revert the changes in BaseModal and AuthScreen. So the changes will be minimal.

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

tsa321 · 2024-06-05T06:20:03Z

@DylanDylann I have reverted the changes in basemodal and authscreen. I move the condition check inside composerwithsuggestion. The changes should be minimal now.

DylanDylann · 2024-06-05T07:29:01Z

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

Screen.Recording.2024-06-05.at.14.40.46.mov

Android: mWeb Chrome

Screen.Recording.2024-06-05.at.14.39.22.mov

iOS: Native

Screen.Recording.2024-06-05.at.14.40.21.mov

iOS: mWeb Safari

Screen.Recording.2024-06-05.at.14.36.18.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-05.at.14.36.01.mov

MacOS: Desktop

Screen.Recording.2024-06-05.at.14.41.18.mov

dangrous

awesome! this ended up cleaner than I expected

OSBotify · 2024-06-05T15:11:06Z

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

luacmartins · 2024-06-07T14:10:28Z

I think this PR caused this regression, more specifically commit 29992cf894d0ebcdcb2e20311435638ee1dedf58

luacmartins · 2024-06-07T14:10:46Z

@tsa321 I'll demote that blocker since it's a small issue, but can you take a look and work on a fix please?

luacmartins · 2024-06-07T14:14:12Z

FYI although there's no staging deploy message here, this PR is on the staging checklist #43168

OSBotify · 2024-06-11T23:32:49Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

Fix back button arrow won't back when viewing attachment image and fi…

85e3947

…x open search page with shortcut Signed-off-by: Tsaqif <[email protected]>

tsa321 requested a review from a team as a code owner May 29, 2024 06:17

melvin-bot bot requested review from DylanDylann and removed request for a team May 29, 2024 06:17

tsa321 added 2 commits June 3, 2024 20:59

Merge main and resolve conflict

0fdb94f

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

Another merge main and resolve conflict

961ead8

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

DylanDylann reviewed Jun 4, 2024

View reviewed changes

Move the areAllModalsHidden check into shouldAutoFocus of ComposerWit…

29992cf

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

tsa321 requested a review from DylanDylann June 5, 2024 06:29

DylanDylann approved these changes Jun 5, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous June 5, 2024 07:45

dangrous approved these changes Jun 5, 2024

View reviewed changes

dangrous merged commit e94199c into Expensify:main Jun 5, 2024
16 checks passed

github-actions bot mentioned this pull request Jun 6, 2024

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

luacmartins mentioned this pull request Jun 7, 2024

[$250] Chat - Edit box is not focused #43222

Closed

6 tasks

tsa321 mentioned this pull request Jun 7, 2024

revert fix 42738, back button on attachment view issue #43298

Closed

50 tasks

melvin-bot bot mentioned this pull request Jun 11, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [$250] Compose box - Browser's back arrow do not focus composer if first image preview open #42368

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

tsa321 commented May 29, 2024

melvin-bot bot commented May 29, 2024

tsa321 commented May 29, 2024

DylanDylann commented May 30, 2024

tsa321 commented May 30, 2024

DylanDylann commented Jun 3, 2024

DylanDylann commented Jun 4, 2024 •

edited

Loading

DylanDylann Jun 4, 2024

tsa321 Jun 4, 2024

DylanDylann Jun 5, 2024

DylanDylann Jun 5, 2024

tsa321 Jun 5, 2024

tsa321 commented Jun 5, 2024

DylanDylann commented Jun 5, 2024 •

edited

Loading

dangrous left a comment

OSBotify commented Jun 5, 2024

luacmartins commented Jun 7, 2024

luacmartins commented Jun 7, 2024

luacmartins commented Jun 7, 2024

OSBotify commented Jun 11, 2024

Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

Fix back button arrow won't back when viewing attachment image and additional fixes on modals #42738

Conversation

tsa321 commented May 29, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 29, 2024

tsa321 commented May 29, 2024

DylanDylann commented May 30, 2024

tsa321 commented May 30, 2024

DylanDylann commented Jun 3, 2024

DylanDylann commented Jun 4, 2024 • edited Loading

DylanDylann Jun 4, 2024

Choose a reason for hiding this comment

tsa321 Jun 4, 2024

Choose a reason for hiding this comment

DylanDylann Jun 5, 2024

Choose a reason for hiding this comment

DylanDylann Jun 5, 2024

Choose a reason for hiding this comment

tsa321 Jun 5, 2024

Choose a reason for hiding this comment

tsa321 commented Jun 5, 2024

DylanDylann commented Jun 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

dangrous left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 5, 2024

luacmartins commented Jun 7, 2024

luacmartins commented Jun 7, 2024

luacmartins commented Jun 7, 2024

OSBotify commented Jun 11, 2024

DylanDylann commented Jun 4, 2024 •

edited

Loading

DylanDylann commented Jun 5, 2024 •

edited

Loading