Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: No SystemMessage on new 1o1 conversation [WPB-8608] 🍒 #2759

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 14, 2024

BugWPB-8608 [Android] Wrong system message displayed when starting a new 1:1 conversation

This PR was automatically cherry-picked based on the following PR:

Original PR description:


What's new in this PR?

Issues

When user starts a new 1:1 conversation Android app shows a SystemMessage "You added User and you to the conversation", while there shouldn't be any message at all.

Causes (Optional)

MemberJoinEventHandler had the same implementation for 1:1 and group conversations.

Solutions

In MemberJoinEventHandler add checking if the conversation is 1:1 then no need to add a new SystemMessage about new members.
Also updated tests.

Copy link
Contributor Author

github-actions bot commented May 14, 2024

Test Results

3 040 tests   2 936 ✔️  3m 24s ⏱️
   528 suites     104 💤
   528 files           0

Results for commit 1b5c524.

♻️ This comment has been updated with latest results.

@borichellow borichellow enabled auto-merge (squash) May 14, 2024 11:53
@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/no-system-message-on-new-1o1-conversation-cherry-pick
Commit report: 85d274e
Test service: kalium-jvm

✅ 0 Failed, 2936 Passed, 104 Skipped, 11.67s Total Time

Copy link

sonarcloud bot commented May 15, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@borichellow borichellow merged commit 4184893 into release/candidate May 15, 2024
19 checks passed
@borichellow borichellow deleted the fix/no-system-message-on-new-1o1-conversation-cherry-pick branch May 15, 2024 09:29
github-actions bot added a commit that referenced this pull request May 15, 2024
* Commit with unresolved merge conflicts

* Fixed cherry-pick merging conflict

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request May 20, 2024
…2766)

* Commit with unresolved merge conflicts

* Fixed cherry-pick merging conflict

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants