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.

Sign up for GitHub

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

Jump to bottom

fix: port migration 1 on 1 resolution for mls migration (WPB-15191) (WPB-11194) #3221

Merged
merged 5 commits into from
Jan 9, 2025
Merged

fix: port migration 1 on 1 resolution for mls migration (WPB-15191) (WPB-11194) #3221

merged 5 commits into from
Jan 9, 2025

Conversation

yamilmedina
Copy link
Contributor

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 SQPIT-764
    • 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

Port back fixes to 4.6 version

Causes (Optional)

Briefly describe the causes behind the issues. This could be helpful to understand the adopted solutions behind some nasty bugs or complex issues.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

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. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

yamilmedina and others added 4 commits January 9, 2025 14:33
@yamilmedina
fix: fallback to proteus if conversation already present but MLS is d…
768b5d4 
…efault (WPB-15191) (#3200)

* fix: fallback to proteus if conversation already present and no common protocol

* fix: test coverage

* fix: test coverage
@ohassine @yamilmedina
fix: Migration message not shown in 1:1 conversations (#3042)
43fbe32
@yamilmedina
fix: update common protocol resolution (#3208)
8768576
@yamilmedina
feat: detekt
869deb3
@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Jan 9, 2025
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Jan 9, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 9, 2025 •
edited
Loading

Test Results

3 073 tests   2 965 ✔️  3m 2s ⏱️
   526 suites     108 💤
   526 files           0 ❌

Results for commit b9998cb.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/port-migration-1-1-resolution
Commit report: 1558848
Test service: kalium-jvm

✅ 0 Failed, 2965 Passed, 108 Skipped, 24.76s Total Time

@yamilmedina yamilmedina enabled auto-merge (squash) January 9, 2025 15:10
@yamilmedina yamilmedina merged commit f9fcff1 into release/android-cycle-4.6 Jan 9, 2025
19 of 20 checks passed
@yamilmedina yamilmedina deleted the fix/port-migration-1-1-resolution branch January 9, 2025 15:13
@github-actions github-actions bot mentioned this pull request Jan 9, 2025
Closed
7 tasks
@echoes-hq echoes-hq bot added echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. and removed echoes: unplanned Any work item that isn’t part of the product or technical roadmap. labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ohassine ohassine ohassine approved these changes

@Garzas Garzas Garzas approved these changes

@MohamadJaara MohamadJaara Awaiting requested review from MohamadJaara

Assignees

@yamilmedina yamilmedina

Labels
echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. 🚨 Potential breaking changes 👕 size: M type: bug / fix 🐞
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yamilmedina @Garzas @ohassine