Feat: drop user to last chat after leaving a room #31097

eh2077 · 2023-11-09T05:44:47Z

Details

Fixed Issues

$ #30778
PROPOSAL: #30778 (comment)

Tests

=== Preparation ===

Login App with User B and create 4 rooms, like room-1, room-2, room-3 and room-4
Invite User A to the 4 rooms
Login App with User A

=== Case 1 ===

Open DM with User B
Open room-1
Leave room-1
Verify dropping to DM with User B

=== Case 2 ===

Open DM with User B
Open room-2
Open room-3
Leave #room-3
Verify dropping to #room-2
Leave #room-2
Verify dropping to DM with User B

=== case 3 (Web only) ===

Open DM with User B
Open room-4
Reload the page
Leave room-4
Verify dropping to DM with User B

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

0-android.mp4

Android: mWeb Chrome

0-mobile-chrome.mp4

iOS: Native

0-ios.mp4

iOS: mWeb Safari

0-mobile-safari.mp4

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

0-desktop.mp4

melvin-bot · 2023-11-09T05:44:52Z

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

eh2077 · 2023-11-09T05:49:35Z

In small screen, if we want to just return to the home page, we can let method leaveRoom accept parameter isSmallScreenWidth (which can be derived from withWindowDimensions) and navigate to home page if isSmallScreenWidth is true. This can be a possible follow up.

src/libs/actions/Report.js

src/CONST.ts

getusha · 2023-11-10T08:59:20Z

Thanks for the updates @eh2077, the Perf. tests are failing i wonder why, can you check?

eh2077 · 2023-11-10T09:08:56Z

@getusha I think the Pef. tests just fail occasionally. The previous PR #31094 has same issue.

src/libs/actions/Report.js

getusha · 2023-11-10T09:25:01Z

I noticed this strange behavior.

Screen.Recording.2023-11-10.at.12.20.46.PM.online-video-cutter.com.mp4

eh2077 · 2023-11-10T09:54:33Z

@getusha Interesting finding. I think it's because we broadcast event when leaving a room, see

App/src/libs/actions/Report.js

Line 2035 in 358e4b1

broadcastUserIsLeavingRoom(reportID);

and navigate to concierge page here

App/src/pages/home/ReportScreen.js

Line 322 in 358e4b1

Report.navigateToConciergeChat();

Not sure if we should try to drop to last chat in this case?

cc @techievivek

src/libs/actions/Report.js

techievivek · 2023-11-13T08:06:56Z

@eh2077

Coming from your comment here: #31097 (comment), I agree that we should have the logic here as well that will try to drop the user to the previous chat they were on.

eh2077 · 2023-11-13T13:00:35Z

@techievivek @getusha I found several issues related to this change

~~[HOLD for payment 2023-12-15] [$500]Thread - Undefined displayed in header offline when opening left thread #28997~~
~~Hold #28997 [$500] Mweb/Chrome - Thread - Tapping leave thread, displays "U" for a second instead of Room name in header #31220~~
[HOLD for payment 2024-01-09] [$500] Web - Chat- A different group chat appears when refreshing the page #30868
[HOLD #31097 ] Chat - User taken to concierge chat page when start chat with same user from 2nd time onwards #31216
Maybe there're more

Not sure if we need to hold them for this PR?

getusha · 2023-11-13T13:06:45Z

@eh2077 i think yes we should put them on HOLD. could you tell me how 1st and 2nd relate to this?

eh2077 · 2023-11-13T13:10:45Z

@eh2077 i think yes we should put them on HOLD. could you tell me how 1st and 2nd relate to this?

Based on @techievivek 's #31097 (comment), I agree the 1st and 2nd are not related this change.

techievivek · 2023-11-13T14:59:28Z

@eh2077 QQ: How is the 4th issue related to the changes we are making here?

eh2077 · 2023-11-13T16:26:34Z

@techievivek Because I'm going to change this line

App/src/pages/home/ReportScreen.js

Line 322 in 55cede1

Report.navigateToConciergeChat();

to

            const lastAccessedReportID = Report.updateRecentlyAccessedReportID('');
            if (lastAccessedReportID) {
                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID));
            } else {
                Report.navigateToConciergeChat();
            }

which will change the bug report effect of that issue.

getusha · 2023-11-13T16:43:52Z

Commented on the issue, @eh2077 is this ready to be tested again?

eh2077 · 2023-11-13T16:49:35Z

@getusha Thanks. Yeah, I just push new changes. With the new changes, below is the demo for this case #31097 (comment)

0-multi-tab-leave-room.mp4

Note: After leaving room, the LHN won't be updated automatically. We need to revisit the room to let the left room disappear from LHN. Same behaviour in production.

eh2077 · 2023-11-15T08:59:42Z

@getusha This is ready for review again, see the comment above ^

getusha · 2023-11-15T09:34:47Z

src/libs/actions/Report.js

+ * @returns {String} Returns the most recent accessed reportID
+ */
+function getMostRecentlyAccessedReportID() {
+    return recentlyAccessedReportIDs.length > 0 ? recentlyAccessedReportIDs[recentlyAccessedReportIDs.length - 1] : '';


I think it would be more cleaner if we return all report ids and use the last one on the place where we want to use it.

updateRecentlyAccessedReportID(reportID, true); const recentlyAccessedReportIDs = getMostRecentlyAccessedReportIDs(); const recentlyAccessedReportID = _.last(recentlyAccessedReportIDs);

and use it like that instead of returning a value from updateRecentlyAccessedReportID, what do you think?

Hmm, I'd prefer not returning the reportID list because we don't want the reportID array to be potentially modified by client.

and use it like that instead of returning a value from updateRecentlyAccessedReportID, what do you think?

I think let method updateRecentlyAccessedReportID update the stack and return most recently accessed reportID is clean like the use case in method leaveRoom

I'd prefer not returning the reportID list because we don't want the reportID array to be potentially modified by client.

I am not sure i understood this, could you explain it further?

This kind of feels wrong to me returning the same thing from two functions making it duplicate and very limited, i think this will be more cleaner. what do you think @techievivek

Hmm, I think the current two methods are clean enough. See below 3 use cases

In method leaveRoom, we make a single method call

const lastAccessedReportID = updateRecentlyAccessedReportID(reportID, true);

to remove the reportID from stack and return the most recently accessed reportID.
2. In the event listener, we call

Report.updateRecentlyAccessedReportID(reportID);

to update the reportID in the stack and omit the return value.
3. In ReportScreen, we don't need to update reportID in the stack. So we just call method

const lastAccessedReportID = Report.getMostRecentlyAccessedReportID();

to read the most recently accessed reportID.

Still, it doesn't make sense to me to have two separate functions returning the same value, and i don'
t expect to have a value to be returned from updateRecentlyAccessedReportID.

Update the recently accessed report id stack and get the value

updateRecentlyAccessedReportID(reportID, true); const recentlyAccessedReportIDs = getMostRecentlyAccessedReportIDs(); const recentlyAccessedReportID = _.last(recentlyAccessedReportIDs);

Get recently accessed report id without updating the value

const recentlyAccessedReportIDs = getMostRecentlyAccessedReportIDs(); const recentlyAccessedReportID = _.last(recentlyAccessedReportIDs);

I'll let @techievivek weigh #31097 (comment)

I got your point. I'm also fine to

let method updateRecentlyAccessedReportID not return value

let method getMostRecentlyAccessedReportID to return the most recently accessed reportID. I think it makes more sense the hide the logic to extract the reportID inside the method.

What do you think?

getusha · 2023-11-15T14:08:24Z

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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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-01-18.at.3.05.24.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-01-16.at.6.47.46.PM.mov

iOS: Native

Screen.Recording.2024-01-16.at.7.03.06.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-01-16.at.6.55.57.PM.mov

MacOS: Chrome / Safari

Case 1

Screen.Recording.2024-01-16.at.5.33.19.PM.mov

Case 2

Screen.Recording.2024-01-16.at.5.36.33.PM.mov

Case 3

Screen.Recording.2024-01-16.at.5.38.30.PM.mov

MacOS: Desktop

Screen.Recording.2024-01-18.at.3.13.29.PM.mov

techievivek · 2023-11-16T07:41:15Z

@eh2077 Hey Eric, sorry for the trouble here but it looks like we have agreed on a different solution that utilizes a new key on the reports object (lastVisitedTime), which will be implemented as part of this GH: #30868, and it seems like we will need to HOLD this PR for a bit.

eh2077 · 2024-01-18T05:41:06Z

@getusha Updated to skip empty chats. Kindly have another look, thanks!

src/libs/actions/Report.ts

eh2077 · 2024-01-18T13:07:12Z

@getusha CI passed and please have another look.

getusha

LGTM, all cases work well. @techievivek all yours!

eh2077 · 2024-01-23T09:35:17Z

@techievivek Gentle bump!

src/libs/actions/Report.ts

eh2077 · 2024-01-24T14:31:28Z

Solved conflicts from TS migration and re-tested all use cases.

getusha · 2024-01-24T14:37:36Z

src/libs/actions/Report.ts

+
+    // We want to filter out the current report, hidden reports and empty chats
+    const filteredReportsByLastRead = sortedReportsByLastRead.filter(
+        (report) =>


wouldn't this be easier if we just rename this to sortedReport instead of renaming the above report variable?

Ah, yes sortedReport is definitely better!

luacmartins

Left a comment about the rename. Also, let's avoid force pushing code as that makes reviews harder and get rid of commit history.

luacmartins · 2024-01-24T16:17:56Z

src/libs/actions/Report.ts

+
+    // We want to filter out the current report, hidden reports and empty chats
+    const filteredReportsByLastRead = sortedReportsByLastRead.filter(
+        (report) =>


luacmartins · 2024-01-26T16:08:10Z

@getusha all yours

getusha

LGTM

OSBotify · 2024-01-26T16:35:49Z

✋ 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-01-29T19:23:18Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.33-0 🚀

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

OSBotify · 2024-01-31T02:30:09Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.33-5 🚀

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

Santhosh-Sellavel · 2024-04-17T16:36:19Z

src/libs/actions/Report.ts

+                policies: {},
+                excludeEmptyChats: true,
+                doesReportHaveViolations: false,
+            }),


We missed to consider Selfdm here, which led to this bug

This was merged before we introduced selfDMs 😄 So I would say we should have handled this in the design doc rather.

eh2077 requested a review from a team as a code owner November 9, 2023 05:44

melvin-bot bot requested review from getusha and removed request for a team November 9, 2023 05:44

getusha reviewed Nov 9, 2023

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

getusha suggested changes Nov 9, 2023

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/CONST.ts Outdated Show resolved Hide resolved

eh2077 requested a review from getusha November 10, 2023 03:40

getusha reviewed Nov 10, 2023

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

eh2077 commented Nov 11, 2023

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

eh2077 requested review from techievivek and getusha November 13, 2023 13:04

getusha mentioned this pull request Nov 13, 2023

[HOLD #31097 ] Chat - User taken to concierge chat page when start chat with same user from 2nd time onwards #31216

Closed

6 tasks

techievivek assigned eh2077 Nov 15, 2023

getusha reviewed Nov 15, 2023

View reviewed changes

getusha reviewed Jan 18, 2024

View reviewed changes

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

eh2077 requested a review from getusha January 18, 2024 12:19

getusha approved these changes Jan 18, 2024

View reviewed changes

luacmartins requested changes Jan 23, 2024

View reviewed changes

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

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

drop user to the last visited chat when leaving a room

756876a

eh2077 force-pushed the feat-30778-drop-user-to-last-chat-after-leaving-room branch from 65c759c to 756876a Compare January 24, 2024 14:25

eh2077 requested review from getusha and luacmartins January 24, 2024 14:31

getusha reviewed Jan 24, 2024

View reviewed changes

luacmartins requested changes Jan 24, 2024

View reviewed changes

improve naming

41aac82

eh2077 requested review from getusha and luacmartins January 25, 2024 05:59

luacmartins approved these changes Jan 25, 2024

View reviewed changes

getusha approved these changes Jan 26, 2024

View reviewed changes

luacmartins merged commit e485d9c into Expensify:main Jan 26, 2024
18 checks passed

github-actions bot mentioned this pull request Jan 29, 2024

Deploy Checklist: New Expensify 2024-01-29 #35328

Closed

francoisl mentioned this pull request Jan 30, 2024

Room - Room does not disappear from LHN after leaving the room #35338

Closed

6 tasks

dukenv0307 mentioned this pull request Feb 1, 2024

[HOLD for payment 2024-02-09] [$250] Room - Tapping on "Leave" room directed to previously visited page for an second #35579

Closed

6 tasks

Santhosh-Sellavel reviewed Apr 17, 2024

View reviewed changes

Feat: drop user to last chat after leaving a room #31097

Feat: drop user to last chat after leaving a room #31097

Conversation

eh2077 commented Nov 9, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 9, 2023

eh2077 commented Nov 9, 2023

getusha commented Nov 10, 2023

eh2077 commented Nov 10, 2023

getusha commented Nov 10, 2023

eh2077 commented Nov 10, 2023 • edited Loading

techievivek commented Nov 13, 2023

eh2077 commented Nov 13, 2023 • edited Loading

getusha commented Nov 13, 2023

eh2077 commented Nov 13, 2023

techievivek commented Nov 13, 2023

eh2077 commented Nov 13, 2023

getusha commented Nov 13, 2023

eh2077 commented Nov 13, 2023 • edited Loading

eh2077 commented Nov 15, 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

eh2077 Nov 15, 2023 • edited Loading

Choose a reason for hiding this comment

getusha commented Nov 15, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

techievivek commented Nov 16, 2023

eh2077 commented Jan 18, 2024

eh2077 commented Jan 18, 2024

getusha left a comment

Choose a reason for hiding this comment

eh2077 commented Jan 23, 2024

eh2077 commented Jan 24, 2024

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

luacmartins left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luacmartins commented Jan 26, 2024

getusha left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 26, 2024

OSBotify commented Jan 29, 2024

OSBotify commented Jan 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eh2077 commented Nov 9, 2023 •

edited

Loading

eh2077 commented Nov 10, 2023 •

edited

Loading

eh2077 commented Nov 13, 2023 •

edited

Loading

eh2077 commented Nov 13, 2023 •

edited

Loading

eh2077 Nov 15, 2023 •

edited

Loading

getusha commented Nov 15, 2023 •

edited

Loading