Fix duplicate chats being created by MonilBhavsar · Pull Request #21265 · Expensify/App

MonilBhavsar · 2023-06-21T20:27:28Z

Details

We are trying to retrieve existing reports by using participants accountID's, but we have no way to bridge the gap between email and accountID's. As a result, we are never able to find an exisiting chat.
While we're migrating, let's use logins/emails to find existing chat

Fixed Issues

https://expensify.slack.com/archives/C05E4M0QHLY/p1687356357691559
$ GH_LINK
PROPOSAL: #21184

Tests

DM

Go to + and new chat and enter completely new email
Send a message in that chat
Switch to another chat
Go to + and type the same email
Ensure you're redirected to old chat and not new chat

Group

Go to + and new group and enter two completely new email
Send a message in that chat
Switch to another chat
Go to + and new group and type the same emails
Ensure you're redirected to old chat and not new chat

Profile

In #admins or workspace chat, click on known user(domain or policy workspace )member's profile
Click on "message"
Ensure you're redirected to old chat and not new chat

Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-06-22.at.2.19.06.AM.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

Screen.Recording.2023-06-22.at.2.22.44.AM.mov

iOS

Android

luacmartins · 2023-06-21T20:32:37Z

+    participantsloginList.sort();
+    return _.find(allReports, (report) => {
+        // If the report has been deleted, or there are no participants (like an empty #admins room) then skip it
+        if (!report || !report.participants || isThread(report)) {


Could we add !isUserCreatedPolicyRoom(report) to this early return too instead of doing the check below?

I would just keep it as it is as we're partially reverting this commit 73cdf02#diff-65c096044d5f69b35bcdec14c99c4fda4580759df9b1a7c36650d58eea276f1dR1890

Update comment Co-authored-by: Carlos Martins <cmartins@expensify.com>

melvin-bot · 2023-06-21T20:57:13Z

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

github-actions · 2023-06-21T20:59:39Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

luacmartins · 2023-06-21T21:14:36Z

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

web.mov

Mobile Web - Chrome

chrome.mov

Mobile Web - Safari

safari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

…sify/App into monil-updateGetChatsByParticipants

…ipants Fix duplicate chats being created (cherry picked from commit 00f6216)

…-21265 🍒 Cherry pick PR #21265 to staging 🍒

OSBotify · 2023-06-21T22:25:36Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.3.30-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2023-06-22T16:53:21Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.30-5 🚀

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

OSBotify · 2023-06-23T21:05:52Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.31-3 🚀

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

OSBotify · 2023-06-23T21:25:37Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.31-3 🚀

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

OSBotify · 2023-06-23T22:17:19Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.32-1 🚀

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

OSBotify · 2023-06-26T20:47:56Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.32-5 🚀

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

Search for chats by emails

54caadb

MonilBhavsar self-assigned this Jun 21, 2023

luacmartins requested changes Jun 21, 2023

View reviewed changes

Address review

a9d61c3

Update comment Co-authored-by: Carlos Martins <cmartins@expensify.com>

puneetlath previously approved these changes Jun 21, 2023

View reviewed changes

MonilBhavsar marked this pull request as ready for review June 21, 2023 20:56

MonilBhavsar requested a review from a team as a code owner June 21, 2023 20:56

MonilBhavsar requested a review from luacmartins June 21, 2023 20:56

melvin-bot Bot requested review from aldo-expensify and removed request for a team June 21, 2023 20:57

MonilBhavsar added the CP Staging label Jun 21, 2023

luacmartins previously approved these changes Jun 21, 2023

View reviewed changes

MonilBhavsar added 2 commits June 22, 2023 02:58

Format before comparing

f50e88e

Merge branch 'monil-updateGetChatsByParticipants' of github.com:Expen…

26bbe59

…sify/App into monil-updateGetChatsByParticipants

MonilBhavsar dismissed stale reviews from luacmartins and puneetlath via 26bbe59 June 21, 2023 21:29

luacmartins previously approved these changes Jun 21, 2023

View reviewed changes

Lint fix

398b636

MonilBhavsar dismissed luacmartins’s stale review via 398b636 June 21, 2023 21:34

luacmartins approved these changes Jun 21, 2023

View reviewed changes

luacmartins merged commit 00f6216 into main Jun 21, 2023

luacmartins deleted the monil-updateGetChatsByParticipants branch June 21, 2023 21:40

OSBotify pushed a commit that referenced this pull request Jun 21, 2023

Merge pull request #21265 from Expensify/monil-updateGetChatsByPartic…

66c487f

…ipants Fix duplicate chats being created (cherry picked from commit 00f6216)

OSBotify mentioned this pull request Jun 21, 2023

🍒 Cherry pick PR #21265 to staging 🍒 #21273

Merged

OSBotify added a commit that referenced this pull request Jun 21, 2023

Merge pull request #21273 from Expensify/OSBotify-cherry-pick-staging…

e2080f2

…-21265 🍒 Cherry pick PR #21265 to staging 🍒

OSBotify mentioned this pull request Jun 21, 2023

Deploy Checklist: New Expensify 2023-06-21 #21172

Closed

67 tasks

youssef-lr mentioned this pull request Jun 22, 2023

Chat - Creating a new chat with the same email while offline creates duplicate chats #21303

Closed

6 tasks

OSBotify mentioned this pull request Jun 22, 2023

Deploy Checklist: New Expensify 2023-06-22 #21330

Closed

39 tasks

OSBotify mentioned this pull request Jun 24, 2023

Deploy Checklist: New Expensify 2023-06-24 #21477

Closed

45 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix duplicate chats being created#21265

Fix duplicate chats being created#21265
luacmartins merged 5 commits into
mainfrom
monil-updateGetChatsByParticipants

MonilBhavsar commented Jun 21, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

luacmartins Jun 21, 2023 •

edited

Loading

Uh oh!

MonilBhavsar Jun 21, 2023

Uh oh!

melvin-bot Bot commented Jun 21, 2023

Uh oh!

github-actions Bot commented Jun 21, 2023

Uh oh!

luacmartins commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 22, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

MonilBhavsar commented Jun 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

DM

Group

Profile

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

luacmartins Jun 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar Jun 21, 2023

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Jun 21, 2023

Uh oh!

github-actions Bot commented Jun 21, 2023

Uh oh!

luacmartins commented Jun 21, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Jun 21, 2023

Uh oh!

OSBotify commented Jun 22, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 23, 2023

Uh oh!

OSBotify commented Jun 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MonilBhavsar commented Jun 21, 2023 •

edited

Loading

luacmartins Jun 21, 2023 •

edited

Loading