fix go back from flag comment page to report #30289

suneox · 2023-10-24T17:57:14Z

Details

Fixed Issues

$ #30101
PROPOSAL: #30101 (comment)

Tests

Go to any #announce public room for exam this room
Hold touch on any chat message select "Flag as offensive"
Reload page
Select back button

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to any #announce public room for exam this room
Hold touch on any chat message select "Flag as offensive"
Reload page
Select back button

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  - 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

30101-android-native.mp4

Android: mWeb Chrome

30101-android-chrome.mp4

iOS: Native

30101-ios-native.MP4

iOS: mWeb Safari

30101-ios-safari.mp4

MacOS: Chrome / Safari

30101-mac-mSafari.mp4

30101-mac-mChrome.mp4

MacOS: Desktop

30101-mac-desktop.mp4

melvin-bot · 2023-10-24T17:57:19Z

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

suneox · 2023-10-25T12:48:09Z

@mananjadhav Please help me review this PR thanks

mananjadhav · 2023-10-25T18:06:36Z

@suneox I was testing this and it looks like for Web we're reloading the report because of this change.

Behavior after our change. Notice the report reloads.

web-back-button-press-flag-as-offensive.mov

Behavior on staging and main

staging-back-button-press-flag-as-offensive.mov

suneox · 2023-10-25T18:09:28Z

@mananjadhav It only happens on mobile browser, could you please check it again on mobile?

suneox · 2023-10-25T18:17:15Z

Ah I saw a difference for transition so should we only check for Browser mobile by 'Browser.isMobile()'

suneox · 2023-10-26T00:40:57Z

Hi @mananjadhav this issue only happens on mobile browsers so I have added a condition check is Browser mobile at onBackButtonPress, and the transition behavior same as staging, prod, could you please help me review again? thanks

30101-go-back-from-web.mp4

suneox · 2023-10-27T15:26:39Z

@mananjadhav could you please checkout current change and verify?

suneox · 2023-10-31T01:06:41Z

@mananjadhav do you still work on this ticket?

suneox · 2023-11-16T02:18:33Z

Hi @mananjadhav as a confirmed with this approach so could you please review this PR? Thanks!

…rom-flag-as-offensive-page

mananjadhav · 2023-11-18T16:55:30Z

src/pages/FlagCommentPage.js

+                    <HeaderWithBackButton
+                        title={props.translate('reportActionContextMenu.flagAsOffensive')}
+                        onBackButtonPress={() => {
+                            const topMostReportID = Navigation.getTopmostReportId();


@suneox I can see this is exactly same as ReportDetailsPage. Why not move this to a util? so that we can use it again?

I think we should add props link shouldAwareTopMostReport default is false into HeaderWithBackButton and move logic

const topMostReportID = Navigation.getTopmostReportId(); if (topMostReportID) { Navigation.goBack(ROUTES.HOME); return; }

before onBackButtonPress callback
Change current to

<PressableWithoutFeedback onPress={() => { if (isKeyboardShown) { Keyboard.dismiss(); } const topMostReportID = Navigation.getTopmostReportId(); if (shouldAwareTopMostReport && topMostReportID) { Navigation.goBack(ROUTES.HOME); } else { onBackButtonPress(); } }}

Then add props shouldAwareTopMostReport to ReportDetailsPage and FlagCommentPage
@mananjadhav What do you think about this change?

Can we modify the condition so that topMostReportID is fetched only if shouldAwareTopMostReport is set true?

Yes so the condition look like this if (shouldAwareTopMostReport && Navigation.getTopmostReportId())

I have updated the condition and synced it with the latest main

@mananjadhav i have updated condition before get topMostReportID

mananjadhav · 2023-11-18T17:27:45Z

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(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

Android: Native

android-flag-as-offensive-go-back.mov

Android: mWeb Chrome

mweb-chrome-flag-as-offensive-go-back.mov

iOS: Native

ios-flag-as-offensive-go-back.mov

iOS: mWeb Safari

mweb-safari-flag-as-offensive-go-back.mov

MacOS: Chrome / Safari

web-flag-as-offensive-go-back.mov

MacOS: Desktop

desktop-flag-as-offensive-go-back.mov

Tests well, waiting for the refactor to make the logic as a DRY code.

…rom-flag-as-offensive-page

suneox · 2023-11-23T05:27:09Z

@mananjadhav i have updated PR to resolve DRY code, have you got any feedback?

mananjadhav

The change looks good to me. I'll have it tested in a while.

mananjadhav

Retested this. Thanks for addressing the changes.

iwiznia · 2023-11-27T19:59:24Z

src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js

@@ -93,6 +93,9 @@ const propTypes = {

    /** Single execution function to prevent concurrent navigation actions */
    singleExecution: PropTypes.func,
+
+    /** Whether we should navigate to home when the route have a topMostReport  */
+    shouldAwareTopMostReport: PropTypes.bool,


This name is not great, why not navigateToTopMostReport?

Also, isn't this really navigating to home and not to the topmost report?

I have updated prop name

Also, isn't this really navigating to home and not to the topmost report?

Because the home page has loaded topmost report so when we navigate to home the report is also already but to avoid confusion for this case I have updated the function to navigate the report page with topMostReportId.

OSBotify · 2023-11-28T19:56:35Z

✋ 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-11-30T12:14:57Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.5-7 🚀

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

fix go back from flag comment page to report

174679d

suneox requested a review from a team as a code owner October 24, 2023 17:57

melvin-bot bot requested review from mananjadhav and removed request for a team October 24, 2023 17:57

suneox mentioned this pull request Oct 24, 2023

[HOLD for payment 2023-12-07] [$500] Go back from Flag as offensive doesn't display correct report page #30101

Closed

6 tasks

only update for browser mobile

2f925fb

suneox added 3 commits October 27, 2023 00:57

update navigation back to navigate

0ea8d0d

fix code lint

2db535b

handle go back by topMostReportID

e61f16f

suneox added 4 commits November 11, 2023 22:10

Merge branch 'main' into fix/30101-go-back-from-flag-as-offensive-page

2953212

run prettier

d776642

Merge branch 'main' into fix/30101-go-back-from-flag-as-offensive-page

c60ccfc

Merge branch 'main' into fix/30101-go-back-from-flag-as-offensive-page

e1ae94c

Merge remote-tracking branch 'upstream/main' into fix/30101-go-back-f…

8f4a229

…rom-flag-as-offensive-page

mananjadhav reviewed Nov 18, 2023

View reviewed changes

suneox added 2 commits November 19, 2023 23:15

Merge remote-tracking branch 'upstream/main' into fix/30101-go-back-f…

ea1e8e2

…rom-flag-as-offensive-page

move condition check topMostReportID to HeaderWithBackButton

0f164c7

mananjadhav reviewed Nov 23, 2023

View reviewed changes

mananjadhav approved these changes Nov 26, 2023

View reviewed changes

melvin-bot bot requested a review from iwiznia November 26, 2023 18:05

iwiznia requested changes Nov 27, 2023

View reviewed changes

rename props

e43e3db

iwiznia approved these changes Nov 28, 2023

View reviewed changes

iwiznia merged commit fb39883 into Expensify:main Nov 28, 2023
16 checks passed

github-actions bot mentioned this pull request Nov 29, 2023

Deploy Checklist: New Expensify 2023-11-29 #32175

Closed

55 tasks

ntdiary mentioned this pull request Jan 19, 2024

[HOLD for payment 2024-02-26] [$500] Workspace name in Distance request flow is wrong color #33976

Closed

6 tasks

rayane-djouah mentioned this pull request May 12, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [$250] Chat - Unable to navigate to LHN, back button loops between WS details & main chat page #41514

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix go back from flag comment page to report #30289

fix go back from flag comment page to report #30289

suneox commented Oct 24, 2023 •

edited by github-actions bot

Loading

melvin-bot bot commented Oct 24, 2023

suneox commented Oct 25, 2023 •

edited

Loading

mananjadhav commented Oct 25, 2023

suneox commented Oct 25, 2023

suneox commented Oct 25, 2023

suneox commented Oct 26, 2023

suneox commented Oct 27, 2023

suneox commented Oct 31, 2023 •

edited

Loading

suneox commented Nov 16, 2023

mananjadhav Nov 18, 2023

suneox Nov 19, 2023

mananjadhav Nov 19, 2023

suneox Nov 20, 2023

suneox Nov 20, 2023

suneox Nov 21, 2023

mananjadhav commented Nov 18, 2023 •

edited

Loading

suneox commented Nov 23, 2023

mananjadhav left a comment

mananjadhav left a comment

iwiznia Nov 27, 2023

iwiznia Nov 27, 2023

suneox Nov 28, 2023 •

edited

Loading

OSBotify commented Nov 28, 2023

OSBotify commented Nov 30, 2023

fix go back from flag comment page to report #30289

fix go back from flag comment page to report #30289

Conversation

suneox commented Oct 24, 2023 • edited by github-actions bot Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 24, 2023

suneox commented Oct 25, 2023 • edited Loading

mananjadhav commented Oct 25, 2023

suneox commented Oct 25, 2023

suneox commented Oct 25, 2023

suneox commented Oct 26, 2023

suneox commented Oct 27, 2023

suneox commented Oct 31, 2023 • edited Loading

suneox commented Nov 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mananjadhav commented Nov 18, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

suneox commented Nov 23, 2023

mananjadhav left a comment

Choose a reason for hiding this comment

mananjadhav left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suneox Nov 28, 2023 • edited Loading

Choose a reason for hiding this comment

OSBotify commented Nov 28, 2023

OSBotify commented Nov 30, 2023

suneox commented Oct 24, 2023 •

edited by github-actions bot

Loading

suneox commented Oct 25, 2023 •

edited

Loading

suneox commented Oct 31, 2023 •

edited

Loading

mananjadhav commented Nov 18, 2023 •

edited

Loading

suneox Nov 28, 2023 •

edited

Loading