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: new 1on1 conversation not visible on list [WPB-5551] #2238

Merged
merged 2 commits into from
Nov 21, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

New 1on1 conversations are not visible on conversation list until the user sends any message.

Causes (Optional)

After some recent updates with implementing protocols migration, it's now necessary for the user's field to match the 1on1 conversation id, otherwise it's not added to the list.
Resolving 1on1 conversations that executes protocol migration and results in filling in this field is executed when syncing conversations, creating a new one, accepting connection request or handling new connection, receiving MLS event, but has been missing for Proteus event.
The conversation was appearing after the user sent a message because then it executes which also resolves one on one conversation if can't be found (which also means when is not set properly).

Solutions

Execute also when Proteus event is received.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

  • user A and B have no conversation
  • user A and B use Proteus protocol and at least one does not support MLS protocol (so that MLS can't be used for their 1on1 conversation)
  • user B finds user A, opens 1on1 conversation with user A and sends a message
  • user A can see this new 1on1 conversation on the conversation list even before he/she writes anything in this conversation

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. .

* fix: new 1on1 conversation not visible on list [WPB-5551]

* remove unneeded observation and add tests
@github-actions github-actions bot added the cherry-pick PR is cherry-picking changes from another banch label Nov 20, 2023
Copy link
Contributor Author

github-actions bot commented Nov 20, 2023

Unit Test Results

   342 files   - 130     342 suites   - 130   8s ⏱️ - 2m 40s
1 858 tests  - 777  1 828 ✔️  - 703  30 💤  - 74  0 ±0 

Results for commit a768a24. ± Comparison against base commit b80ce0f.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Nov 20, 2023

Datadog Report

All test runs b0d22b5 🔗

2 Total Test Services: 0 Failed, 0 with New Flaky, 2 Passed

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Wall Time Branch View
kalium-ios 0 0 0 1828 30 9s Link
kalium-jvm 0 0 0 2533 104 7m 22.08s Link

@saleniuk saleniuk requested review from a team, alexandreferris, vitorhugods, mchenani, Garzas and ohassine and removed request for a team November 20, 2023 16:55
@MohamadJaara MohamadJaara added this pull request to the merge queue Nov 21, 2023
Merged via the queue into develop with commit 35c87b5 Nov 21, 2023
15 checks passed
@MohamadJaara MohamadJaara deleted the fix/invisible-new-1on1-conversation-cherry-pick branch November 21, 2023 08:46
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.

4 participants