Fix: Web/Desktop - On back button press navigates to Confirm task screen instead of hide modal by Pujan92 · Pull Request #24055 · Expensify/App

Pujan92 · 2023-08-02T13:14:50Z

Details

#21200

Fixed Issues

$ #21200
PROPOSAL: #21200 (comment)

Tests

On a Web/Desktop, Open task report chat
Click on fab icon and select Assign task option
Click on backdrop to close assign task modal
In task report chat view click on the Assignee menu item
In the opened assignee selector modal click on the back icon
Verify that it dismisses/close the modal and does not shows confirm task modal

Verify that no errors appear in the JS console

Offline tests

On a Web/Desktop, Open task report chat
Click on fab icon and select Assign task option
Click on backdrop to close assign task modal
In task report chat view click on the Assignee menu item
In the opened assignee selector modal click on the back icon
Verify that it dismisses/close the modal and does not shows confirm task modal

QA Steps

On a Web/Desktop, Open task report chat
Click on fab icon and select Assign task option
Click on backdrop to close assign task modal
In task report chat view click on the Assignee menu item
In the opened assignee selector modal click on the back icon
Verify that it dismisses/close the modal and does not shows confirm task modal

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-08-02.at.6.32.22.PM.mov

Mobile Web - Chrome

d.webm

Mobile Web - Safari

Simulator.Screen.Recording.-.iPhone.14.-.2023-08-02.at.18.40.04.mp4

Desktop

Screen.Recording.2023-08-02.at.6.37.37.PM.mov

iOS

Simulator.Screen.Recording.-.iPhone.14.-.2023-08-02.at.18.38.21.mp4

Android

ab.webm

melvin-bot · 2023-08-02T13:14:55Z

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

Pujan92 · 2023-08-04T09:52:23Z

Bump @eVoloshchak :)

eVoloshchak · 2023-08-04T13:45: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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

Screen.Recording.2023-08-04.at.16.58.14.mov

Mobile Web - Chrome

screen-20230804-171240.mp4

Mobile Web - Safari

Screen.Recording.2023-08-04.at.17.30.42.mov

Desktop

Screen.Recording.2023-08-04.at.17.00.47.mov

iOS

Screen.Recording.2023-08-04.at.17.02.20.mov

Android

screen-20230804-171633.mp4

eVoloshchak · 2023-08-04T13:48:30Z

                    <HeaderWithBackButton
                        title={props.translate('task.assignee')}
-                        onBackButtonPress={() => (lodashGet(props.task.report, 'isExistingTaskReport') ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}
+                        onBackButtonPress={() => (props.route.params && props.route.params.reportID ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}


Suggested change

onBackButtonPress={() => (props.route.params && props.route.params.reportID ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}

onBackButtonPress={() => (lodashGet(props.route.params, 'reportID') ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}

Can we use lodashGet here instead?

Yes, updated!

eVoloshchak

Looks good and tests well!

melvin-bot · 2023-08-04T14:37:34Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #21200 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

Pujan92 · 2023-08-07T10:45:39Z

Gentle bump @pecanoro

pecanoro

LGTM! I also tested it and it seems to be working as expected

OSBotify · 2023-08-07T13:36:13Z

✋ 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 · 2023-08-07T18:54:31Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.3.51-0 🚀

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

OSBotify · 2023-08-09T08:43:39Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.51-2 🚀

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

OSBotify · 2023-08-09T09:12:35Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.3.52-0 🚀

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

OSBotify · 2023-08-09T09:51:18Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.3.52-0 🚀

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

OSBotify · 2023-08-10T20:09:44Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.52-5 🚀

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

back flow fix from task assigne modal

1df7986

Pujan92 requested a review from a team as a code owner August 2, 2023 13:14

melvin-bot bot requested review from eVoloshchak and removed request for a team August 2, 2023 13:14

Pujan92 mentioned this pull request Aug 2, 2023

[HOLD for payment 2023-08-16] [$1000] Web - On back button press navigates to Confirm task screen instead of hide modal #21200

Closed

6 tasks

eVoloshchak reviewed Aug 4, 2023

View reviewed changes

used lodashGet for reportID

c48049d

eVoloshchak approved these changes Aug 4, 2023

View reviewed changes

melvin-bot bot requested a review from pecanoro August 4, 2023 14:37

pecanoro approved these changes Aug 7, 2023

View reviewed changes

pecanoro merged commit 2b49a5f into Expensify:main Aug 7, 2023

pecanoro mentioned this pull request Aug 7, 2023

Fix: cannot change assignee after task created #23530

Merged

58 tasks

OSBotify mentioned this pull request Aug 7, 2023

Deploy Checklist: New Expensify 2023-08-07 #24230

Closed

98 tasks

OSBotify mentioned this pull request Aug 9, 2023

Deploy Checklist: New Expensify 2023-08-09 #24307

Closed

87 tasks

	onBackButtonPress={() => (props.route.params && props.route.params.reportID ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}
	onBackButtonPress={() => (lodashGet(props.route.params, 'reportID') ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}

Conversation

Pujan92 commented Aug 2, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 2, 2023

Uh oh!

Pujan92 commented Aug 4, 2023

Uh oh!

eVoloshchak commented Aug 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak Aug 4, 2023

Choose a reason for hiding this comment

Uh oh!

Pujan92 Aug 4, 2023

Choose a reason for hiding this comment

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Aug 4, 2023

Uh oh!

Pujan92 commented Aug 7, 2023

Uh oh!

pecanoro left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 7, 2023

Uh oh!

OSBotify commented Aug 7, 2023

Uh oh!

OSBotify commented Aug 9, 2023

Uh oh!

OSBotify commented Aug 9, 2023

Uh oh!

OSBotify commented Aug 9, 2023

Uh oh!

OSBotify commented Aug 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

eVoloshchak commented Aug 4, 2023 •

edited

Loading