Fix: Leaving thread navigates to Concierge page #27127

tienifr · 2023-09-11T07:44:35Z

Details

Leaving thread navigates to Concierge page while it should be the parent report page.

Fixed Issues

$ #26250
PROPOSAL: #26250 (comment)

Tests

Reply a comment in thread
Press thread header >> Leave thread
Verify that it navigates to parent report

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Reply a comment in thread
Press thread header >> Leave thread
Verify that it navigates to parent report

Verify that no errors appear in the JS console

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 / Chrome
- iOS / native
- iOS / 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
- 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 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

Web

leave-thread-compressed.mov

Mobile Web - Chrome

Screen.Recording.2023-09-11.at.14.54.49.mov

Mobile Web - Safari

Screen.Recording.2023-09-11.at.14.51.38.mov

Desktop

Screen.Recording.2023-09-11.at.14.48.12.mov

iOS

Screen.Recording.2023-09-11.at.14.49.47.mov

Android

Screen.Recording.2023-09-11.at.14.58.17.mov

Ollyws · 2023-09-11T10:51:24Z

One issue here is that with the rooms beta if we leave a room, instead of being navigated to the concierge page we'll get a Hmm it's not here page:

VIDEO

Screen.Recording.2023-09-11.at.11.49.16.mov

tienifr · 2023-09-12T05:09:37Z

@Ollyws I forgot about rooms in the first place. Fixed that!

Ollyws · 2023-09-12T10:42:51Z

@tienifr Thanks for the update. I've come across another issue where if you leave a room then press the back button it will redirect you to a Hmm...it's not here page whereas on main it takes you to the LHN. Possibly related to the navigation type we're passing to Navigation.navigate()? :

VIDEO

Screen.Recording.2023-09-12.at.11.32.32.mov

tienifr · 2023-09-12T17:31:24Z

@Ollyws Agree that once we leave rooms/threads, we should navigate back to LHN on pressing back button. Updated to fix that.

This reverts commit 30e7690.

Ollyws · 2023-09-13T10:04:59Z

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

MacOS_Chrome.mp4

Mobile Web - Chrome

Android_Chrome.mp4

Mobile Web - Safari

iOS_Safari.mp4

Desktop

MacOS_Desktop.mp4

iOS

iOS_Native.mp4

Android

Android_Native.mp4

Ollyws

Thanks for the changes!
LGTM.

tienifr · 2023-09-15T03:33:19Z

Bump @roryabraham

tienifr · 2023-09-18T05:24:36Z

@roryabraham Can you take a look?

roryabraham · 2023-09-20T13:06:21Z

Sorry for the delay and thanks for resolving conflicts as they came up here.

OSBotify · 2023-09-20T13:16:18Z

✋ 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-09-22T14:01:54Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.73-0 🚀

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

OSBotify · 2023-09-25T09:36:44Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.73-1 🚀

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

OSBotify · 2023-09-25T10:08:54Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.74-0 🚀

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

OSBotify · 2023-09-28T18:51:15Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

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

This reverts commit f821a37, reversing changes made to 0df5586.

eVoloshchak · 2023-10-19T17:07:49Z

src/libs/actions/Report.js

@@ -1822,6 +1822,10 @@ function leaveRoom(reportID) {
    if (Navigation.getTopmostReportId() === reportID) {
        Navigation.goBack();
    }
+    if (report.parentReportID) {
+        Navigation.navigate(ROUTES.getReportRoute(report.parentReportID), CONST.NAVIGATION.TYPE.FORCED_UP);


Coming from #28087
CONST.NAVIGATION.TYPE.FORCED_UP has caused an edge case on web, where if you reply in a thread, refresh the page and select 'Leave the thread', LHN disappears from the screen

fix: leave thread navigates to concierge

c418112

tienifr marked this pull request as ready for review September 11, 2023 07:56

tienifr requested a review from a team as a code owner September 11, 2023 07:56

melvin-bot bot requested review from Ollyws and removed request for a team September 11, 2023 07:56

tienifr mentioned this pull request Sep 11, 2023

[HOLD for payment 2023-10-02] [$500] Leaving threads lands you in concierge chat #26250

Closed

6 tasks

dismiss modal

cf3bc06

navigate to concierge for rooms

61ed38f

tienifr added 2 commits September 12, 2023 17:53

Merge branch 'main' of https://github.com/tienifr/App into fix/26250

5c81ddb

navigate back to lhn

1164b34

tienifr added 2 commits September 13, 2023 02:04

fix: cannot edit money request transaction in offline

30e7690

Revert "fix: cannot edit money request transaction in offline"

486e1a3

This reverts commit 30e7690.

Ollyws approved these changes Sep 13, 2023

View reviewed changes

melvin-bot bot requested a review from roryabraham September 13, 2023 10:06

tienifr added 3 commits September 15, 2023 10:38

Merge branch 'main' of https://github.com/tienifr/App into fix/26250

11881cd

Merge branch 'main' of https://github.com/tienifr/App into fix/26250

41fd438

Merge branch 'main' of https://github.com/tienifr/App into fix/26250

8a111c4

Merge branch 'main' of https://github.com/tienifr/App into fix/26250

319365f

roryabraham approved these changes Sep 20, 2023

View reviewed changes

roryabraham merged commit f821a37 into Expensify:main Sep 20, 2023

OSBotify mentioned this pull request Sep 22, 2023

Deploy Checklist: New Expensify 2023-09-22 #28013

Closed

96 tasks

This was referenced Sep 25, 2023

Deploy Checklist: New Expensify DUPE 2023-09-25 #28118

Closed

Deploy Checklist: New Expensify 2023-09-25 #28119

Closed

hoangzinh mentioned this pull request Oct 1, 2023

[$500] Android - Thread - Back button is not responsive in the parent report after leaving thread #28522

Closed

6 tasks

hoangzinh added a commit to hoangzinh/Expensify-App that referenced this pull request Oct 2, 2023

Revert "Merge pull request Expensify#27127 from tienifr/fix/26250"

676871d

This reverts commit f821a37, reversing changes made to 0df5586.

wildan-m mentioned this pull request Oct 6, 2023

[HOLD for payment 2023-10-02] [HOLD for payment 2023-07-24] [$1000] Failed Room Termination: User Continues Chatting in Android App After Leaving Room on Web #21518

Closed

6 tasks

eVoloshchak reviewed Oct 19, 2023

View reviewed changes

eVoloshchak mentioned this pull request Oct 19, 2023

[HOLD for payment 2023-10-16] [$500] Chat - LHN disappears after leaving a thread #28087

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Leaving thread navigates to Concierge page #27127

Fix: Leaving thread navigates to Concierge page #27127

tienifr commented Sep 11, 2023 •

edited

Loading

Ollyws commented Sep 11, 2023 •

edited

Loading

tienifr commented Sep 12, 2023 •

edited

Loading

Ollyws commented Sep 12, 2023 •

edited

Loading

tienifr commented Sep 12, 2023 •

edited

Loading

Ollyws commented Sep 13, 2023

Ollyws left a comment

tienifr commented Sep 15, 2023

tienifr commented Sep 18, 2023

roryabraham commented Sep 20, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

eVoloshchak Oct 19, 2023

Fix: Leaving thread navigates to Concierge page #27127

Fix: Leaving thread navigates to Concierge page #27127

Conversation

tienifr commented Sep 11, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Ollyws commented Sep 11, 2023 • edited Loading

tienifr commented Sep 12, 2023 • edited Loading

Ollyws commented Sep 12, 2023 • edited Loading

tienifr commented Sep 12, 2023 • edited Loading

Ollyws commented Sep 13, 2023

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

tienifr commented Sep 15, 2023

tienifr commented Sep 18, 2023

roryabraham commented Sep 20, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 22, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

eVoloshchak Oct 19, 2023

Choose a reason for hiding this comment

tienifr commented Sep 11, 2023 •

edited

Loading

Ollyws commented Sep 11, 2023 •

edited

Loading

tienifr commented Sep 12, 2023 •

edited

Loading

Ollyws commented Sep 12, 2023 •

edited

Loading

tienifr commented Sep 12, 2023 •

edited

Loading