Fix navigation to concierge after leaving the group #42020

Nodebrute · 2024-05-11T18:22:47Z

Details

Fixed Issues

$ #41128
PROPOSAL: #41128 (comment)

Tests

Visit a few reports.
Go to FAB > Start chat.
Create a group chat.
Click on the chat header.
Click Leave.

Test steps for rooms

Create a public room as an admin
Copy the public room URL
Paste the URL and signin as other user
Leave the room

Test steps for android/small screen devices

Create a public room from user A
from user B, open android app on a specific report (to be last report) and then close it completely.
from user B, open the room from deep link in android native.
leave the room.

When a user leaves a room/group, Verify that they are navigated to their last opened report
If it's a new user who opens the link from incognito mode and then leaves the room, verify that they are directed to the concierge

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Visit a few reports.
Go to FAB > Start chat.
Create a group chat.
Click on the chat header.
Click Leave.

Test steps for rooms

Create a public room as an admin
Copy the public room URL
Paste the URL and signin as other user
Leave the room

Test steps for android/small screen devices

Create a public room from user A
from user B, open android app on a specific report (to be last report) and then close it completely.
from user B, open the room from deep link in android native.
leave the room.

When a user leaves a room/group, Verify that they are navigated to their last opened report
If it's a new user who opens the link from incognito mode and then leaves the room, verify that they are directed to the concierge

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-11.at.11.18.34.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-05-11.at.11.21.15.PM.mov

iOS: Native

Screen.Recording.2024-05-11.at.8.17.10.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-05-11.at.10.41.54.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-11.at.7.52.10.PM.mov

MacOS: Desktop

Screen.Recording.2024-05-11.at.2.34.50.PM.mov

melvin-bot · 2024-05-11T18:22:52Z

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

ahmedGaber93 · 2024-05-13T18:36:19Z

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

a.mp4

Android: mWeb Chrome

aw.mp4

iOS: Native

i.mp4

iOS: mWeb Safari

iw.mp4

MacOS: Chrome / Safari

w.mp4

MacOS: Desktop

d.mp4

ahmedGaber93 · 2024-05-13T18:41:25Z

src/libs/actions/Report.ts

@@ -2517,10 +2517,12 @@ function navigateToMostRecentReport(currentReport: OnyxEntry<Report>) {
    const isChatThread = ReportUtils.isChatThread(currentReport);
    if (lastAccessedReportID) {
        const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID ?? '');
+        const isFirstRoute = navigationRef?.current?.getState().index === 1;


Suggested change

const isFirstRoute = navigationRef?.current?.getState().index === 1;

const isFirstRoute = navigationRef?.current?.getState()?.index === 1;

I think we need to add a comment here to explain why we use === 1 not === 0

ahmedGaber93 · 2024-05-13T18:44:32Z

src/libs/actions/Report.ts

        // If it is not a chat thread we should call Navigation.goBack to pop the current route first before navigating to last accessed report.
        if (!isChatThread) {
-            // Fallback to the lastAccessedReportID route, if this is first route in the navigator
-            Navigation.goBack(lastAccessedReportRoute);
+            if (!isFirstRoute) {


I think we can combine this condition with the above if (!isChatThread && !isFirstRoute)

ahmedGaber93 · 2024-05-13T20:21:19Z

Bug: Leave room opened from deeplink redirect to concierge.

create a public room from web as a user A and copy its URL.
from user B, open android app on a specific report (to be last report) and then close it completely.
from user B, open the room from deep link in android native.
leave the room.

User is redirect to concierge and if he clicks GoBack, it will redirect to last report, another clicks again on GoBack user go back to home screen.

20240513235055320.mp4

ahmedGaber93 · 2024-05-13T20:26:24Z

@Nodebrute for testing purpose, we need to merge main into this branch as latest main now use different version of node, I do the merge locally to be able to test.

Leave groups work fine, but I faced this issue while testing leave room from deeplink. Are you able to reproduce it?

Nodebrute · 2024-05-14T13:39:05Z

@ahmedGaber93 This bug isn't specific to Android; it can easily be reproduced on any small screen, such as a small browser window. It existed before these two PRs #39757 #40701. It's because didReportClose returns true in this case.

App/src/pages/home/ReportScreen.tsx

Line 518 in a6cb60c

    
           const didReportClose = wasReportRemoved && prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;

ahmedGaber93 · 2024-05-14T13:45:22Z

@Nodebrute well, are we able to fix it?

Nodebrute · 2024-05-14T14:10:05Z

@ahmedGaber93 After some further digging, it appears that in this case, the closed report is still being passed to the ReportScreen, which triggers the navigateToConcierge function. Do we need to address this here? I haven't come up with a solution yet.

ahmedGaber93 · 2024-05-14T14:25:21Z

Do we need to address this here?

I will check it again after one hour as I am in break now. If it has a different root cause and different fix not related to this issue fix, we can ask jules to fix it in a separate issue.

ahmedGaber93 · 2024-05-14T16:22:39Z

@Nodebrute I checked it, and I think we need to fix it here as it comes from the same place in ReportScreen.tsx that redirect to concierge.

I am thinking about using isFocused with didReportClose to prevent go to concierge after our fix call goBack as we call goBack before setting the optimisticData that will set didReportClose to true, but I am not sure about if this will affect on other scenarios. What do you think about that?

Nodebrute · 2024-05-14T16:53:50Z

@ahmedGaber93 The isFocused solution isn't functioning as expected. Consequently, the room reappears in the LHN. I've logged the report to the console. Upon leaving the room, this is the state of the console.

In wide screens with no bug

In small screens with bug

In wide screens, when leaving the report, we don't pass the closed report to the ReportScreen. This is not the case on screens where this bug gets reproduced.

ahmedGaber93 · 2024-05-14T19:03:15Z

@Nodebrute I agree with you analytics here, but I think this what is isFocused will try to fix.

In small screen we have transition between screens which end in 300ms, during this time ReportScreen.tsx will handle the optimisticData and redirect the user to concierge.

So in small screen we can see this issue, and this what I think it happened in small screen:

we call goBack.
transition will start, but ReportScreen.tsx is not unmounted yet as transition is still not ended.
after setting the optimisticData, and the ReportScreen.tsx is not unmounted yet, ReportScreen.tsx will handle the optimisticData and the didReportClose will be true, then didReportClose with true value will redirect the user to concierge.
transition is completed now and navigation completely goBack to last report.

In wide screen:

we call goBack.
ReportScreen.tsx will be unmounted as there is no transition between screens.
after setting the optimisticData, ReportScreen.tsx is already unmounted and not fire any redirectToConcierge

The isFocused here should fix the issue as it will be false during the transition, so not redirectToConcierge will call during the transition.

Do you agree with that? Or I missed something.

Nodebrute · 2024-05-15T09:01:26Z

@ahmedGaber93 I have made the following changes

 (didReportClose && isFocused)

You can see that after leaving the room it reappears in LHN

Screen.Recording.2024-05-15.at.1.58.38.PM.mov

Am I adding it incorrectly?

ahmedGaber93 · 2024-05-15T09:08:44Z

@Nodebrute, what is the result without isFocused on a small and wide screen? and are you seeing relations between this and LHN can lead to this behavior?

Nodebrute · 2024-05-15T09:10:29Z

User is redirect to concierge and if he clicks GoBack, it will redirect to last report, another clicks again on GoBack user go back to home screen.

Without isFocused we have this result on small screen and on Wide screens everything is working fine.

ahmedGaber93 · 2024-05-15T09:15:28Z

@Nodebrute well!, what do you think we should do to fix leaving from deeplink issue?

Nodebrute · 2024-05-15T09:20:26Z

@ahmedGaber93 I'm working on it. I'll update you in a few minutes.

Nodebrute · 2024-05-15T10:20:11Z

@ahmedGaber93 Hey, thanks for your patience. The only solution that's working here is an early return from this useEffect before navigating to the concierge.

App/src/pages/home/ReportScreen.tsx

Lines 522 to 545 in 76846da

    
           if ( 
        
               // non-optimistic case 
        
               (!prevUserLeavingStatus && !!userLeavingStatus) || 
        
               didReportClose || 
        
               isRemovalExpectedForReportType || 
        
               isClosedTopLevelPolicyRoom 
        
           ) { 
        
               Navigation.dismissModal(); 
        
               if (Navigation.getTopmostReportId() === prevOnyxReportID) { 
        
                   Navigation.setShouldPopAllStateOnUP(); 
        
                   Navigation.goBack(undefined, false, true); 
        
               } 
        
               if (prevReport.parentReportID) { 
        
                   // Prevent navigation to the IOU/Expense Report if it is pending deletion. 
        
                   const parentReport = ReportUtils.getReport(prevReport.parentReportID); 
        
                   if (ReportUtils.isMoneyRequestReportPendingDeletion(parentReport)) { 
        
                       return; 
        
                   } 
        
                   Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(prevReport.parentReportID)); 
        
                   return; 
        
               } 
        
               Report.navigateToConciergeChat(); 
        
               return; 
        
           }

I have added the following code block and it's working fine. I think we can also use !isFocused here too instead of isOptimisticDelete. I haven't tested all cases yet.

   if(didReportClose && isOptimisticDelete){
                return
            }

ahmedGaber93 · 2024-05-15T11:17:41Z

src/pages/home/ReportScreen.tsx

+            if (!isFocused) {
+                return;
+            }


I think the return early should be in the first line in the block of code, there is no need for any navigation call if navigation is not focused. I think this is more clean. What do you think?

ahmedGaber93 · 2024-05-15T11:43:07Z

Thanks @Nodebrute 👍, I am reviewing now. Just please update "QA Steps" to include all cases available.

ahmedGaber93

LGTM!

Julesssss · 2024-05-15T12:59:13Z

src/pages/home/ReportScreen.tsx

@@ -526,6 +525,10 @@ function ReportScreen({
            isRemovalExpectedForReportType ||
            isClosedTopLevelPolicyRoom
        ) {
+            // If the report isn't focused, navigation to Concierge Chat should be avoided.


Can you please edit this slightly to explain WHY we shouldn't navigate depending on the focus state

We need here to prevent ReportScreen.tsx from handling "leaving room optimisticData" during the transition time to prevent undesired redirect to concierge when user leaves a room from the same device.

I think we can say it like this:

// We shouldn't redirect to Concierge Chat when report screen is not focused, like during the transition time, // As this can cause undesired redirection to Concierge Chat when user leaves a room from the same device.

src/libs/actions/Report.ts

Julesssss

Changes look good. It would be great to add a few more details to the comments though.

OSBotify · 2024-05-16T08:19:02Z

✋ 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-05-23T00:39:54Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.4.75-0 🚀

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

OSBotify · 2024-05-27T14:03:02Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.75-1 🚀

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

Fix navigation to concierge after leaving the group

573a159

Nodebrute requested a review from a team as a code owner May 11, 2024 18:22

melvin-bot bot requested review from ahmedGaber93 and removed request for a team May 11, 2024 18:22

ahmedGaber93 reviewed May 13, 2024

View reviewed changes

Merge branch 'Expensify:main' into navigation

87d2be5

Nodebrute added 2 commits May 14, 2024 19:10

add comment

6ca77b0

fix lint error

1b7f1a8

Merge branch 'Expensify:main' into navigation

2c4917b

fix small screen navigation

beee045

ahmedGaber93 reviewed May 15, 2024

View reviewed changes

cleanup

c1eb93d

ahmedGaber93 approved these changes May 15, 2024

View reviewed changes

melvin-bot bot requested a review from Julesssss May 15, 2024 12:32

Julesssss assigned Nodebrute May 15, 2024

Julesssss reviewed May 15, 2024

View reviewed changes

src/libs/actions/Report.ts Show resolved Hide resolved

Julesssss reviewed May 15, 2024

View reviewed changes

add comment

6a0e24f

Julesssss approved these changes May 16, 2024

View reviewed changes

Julesssss merged commit 5bfa295 into Expensify:main May 16, 2024
18 checks passed

github-actions bot mentioned this pull request May 22, 2024

Deploy Checklist: New Expensify 2024-05-22 #42496

Closed

45 tasks

izarutskaya mentioned this pull request May 23, 2024

[$250] Room - App opens random chat after leaving public room when logging in via public room link #42522

Closed

6 tasks

melvin-bot bot mentioned this pull request May 27, 2024

[HOLD for payment 2024-06-03] [$250] Group chat - App redirects to Concierge chat when leaving group chat and room #41128

Closed

6 tasks

Nodebrute deleted the navigation branch September 16, 2024 00:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix navigation to concierge after leaving the group #42020

Fix navigation to concierge after leaving the group #42020

Nodebrute commented May 11, 2024 •

edited

Loading

melvin-bot bot commented May 11, 2024

ahmedGaber93 commented May 13, 2024 •

edited

Loading

ahmedGaber93 May 13, 2024

ahmedGaber93 May 13, 2024

ahmedGaber93 May 13, 2024

ahmedGaber93 commented May 13, 2024 •

edited

Loading

ahmedGaber93 commented May 13, 2024 •

edited

Loading

Nodebrute commented May 14, 2024

ahmedGaber93 commented May 14, 2024 •

edited

Loading

Nodebrute commented May 14, 2024

ahmedGaber93 commented May 14, 2024

ahmedGaber93 commented May 14, 2024 •

edited

Loading

Nodebrute commented May 14, 2024

ahmedGaber93 commented May 14, 2024 •

edited

Loading

Nodebrute commented May 15, 2024

ahmedGaber93 commented May 15, 2024 •

edited

Loading

Nodebrute commented May 15, 2024 •

edited

Loading

ahmedGaber93 commented May 15, 2024

Nodebrute commented May 15, 2024

Nodebrute commented May 15, 2024 •

edited

Loading

ahmedGaber93 May 15, 2024

ahmedGaber93 commented May 15, 2024

ahmedGaber93 left a comment

Julesssss May 15, 2024

ahmedGaber93 May 15, 2024

Julesssss left a comment

OSBotify commented May 16, 2024

OSBotify commented May 23, 2024

OSBotify commented May 27, 2024

	const isFirstRoute = navigationRef?.current?.getState().index === 1;
	const isFirstRoute = navigationRef?.current?.getState()?.index === 1;

Fix navigation to concierge after leaving the group #42020

Fix navigation to concierge after leaving the group #42020

Conversation

Nodebrute commented May 11, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 11, 2024

ahmedGaber93 commented May 13, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ahmedGaber93 May 13, 2024

Choose a reason for hiding this comment

ahmedGaber93 May 13, 2024

Choose a reason for hiding this comment

ahmedGaber93 May 13, 2024

Choose a reason for hiding this comment

ahmedGaber93 commented May 13, 2024 • edited Loading

ahmedGaber93 commented May 13, 2024 • edited Loading

Nodebrute commented May 14, 2024

ahmedGaber93 commented May 14, 2024 • edited Loading

Nodebrute commented May 14, 2024

ahmedGaber93 commented May 14, 2024

ahmedGaber93 commented May 14, 2024 • edited Loading

Nodebrute commented May 14, 2024

ahmedGaber93 commented May 14, 2024 • edited Loading

Nodebrute commented May 15, 2024

ahmedGaber93 commented May 15, 2024 • edited Loading

Nodebrute commented May 15, 2024 • edited Loading

ahmedGaber93 commented May 15, 2024

Nodebrute commented May 15, 2024

Nodebrute commented May 15, 2024 • edited Loading

ahmedGaber93 May 15, 2024

Choose a reason for hiding this comment

ahmedGaber93 commented May 15, 2024

ahmedGaber93 left a comment

Choose a reason for hiding this comment

Julesssss May 15, 2024

Choose a reason for hiding this comment

ahmedGaber93 May 15, 2024

Choose a reason for hiding this comment

Julesssss left a comment

Choose a reason for hiding this comment

OSBotify commented May 16, 2024

OSBotify commented May 23, 2024

OSBotify commented May 27, 2024

Nodebrute commented May 11, 2024 •

edited

Loading

ahmedGaber93 commented May 13, 2024 •

edited

Loading

ahmedGaber93 commented May 13, 2024 •

edited

Loading

ahmedGaber93 commented May 13, 2024 •

edited

Loading

ahmedGaber93 commented May 14, 2024 •

edited

Loading

ahmedGaber93 commented May 14, 2024 •

edited

Loading

ahmedGaber93 commented May 14, 2024 •

edited

Loading

ahmedGaber93 commented May 15, 2024 •

edited

Loading

Nodebrute commented May 15, 2024 •

edited

Loading

Nodebrute commented May 15, 2024 •

edited

Loading