Skip to content

fix: handling federation conflict when creating MLS conversation (WPB-26348) - #5239

Merged
sbakhtiarov merged 1 commit into
developfrom
fix/create-group-federation-conflict
Sep 7, 2026
Merged

fix: handling federation conflict when creating MLS conversation (WPB-26348)#5239
sbakhtiarov merged 1 commit into
developfrom
fix/create-group-federation-conflict

Conversation

@sbakhtiarov

@sbakhtiarov sbakhtiarov commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

https://wearezeta.atlassian.net/browse/WPB-26348

https://wearezeta.atlassian.net/browse/WPB-26348


What's new in this PR?

Issues

Federation conflicts during initial or retried MLS group creation were not handled consistently, and Discard could close the flow while leaving a pending local conversation.

Solutions

Route initial and retry conflicts to the existing “Conversation can’t be created” dialog. Clear pending creation state, retry local cleanup only when Kalium returns a fallback conversation ID, and close the creation flow only after discard succeeds.

@codecov

codecov Bot commented Sep 1, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 86.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 53.11%. Comparing base (47da8ec) to head (7a2fedc).

Files with missing lines Patch % Lines
...i/home/newconversation/NewConversationViewModel.kt 86.66% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #5239      +/-   ##
===========================================
+ Coverage    53.07%   53.11%   +0.03%     
===========================================
  Files          745      745              
  Lines        25858    25873      +15     
  Branches      4246     4249       +3     
===========================================
+ Hits         13724    13742      +18     
+ Misses       10794    10791       -3     
  Partials      1340     1340              
Files with missing lines Coverage Δ
...i/home/newconversation/NewConversationViewModel.kt 76.23% <86.66%> (+3.63%) ⬆️

... and 1 file with indirect coverage changes


Continue to review full report in Codecov by Harness.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 47da8ec...7a2fedc. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Test Results

2 676 tests  +3   2 676 ✅ +3   1m 27s ⏱️ -7s
  338 suites ±0       0 💤 ±0 
  338 files   ±0       0 ❌ ±0 

Results for commit 7a2fedc. ± Comparison against base commit 47da8ec.

♻️ This comment has been updated with latest results.

@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@sbakhtiarov
sbakhtiarov marked this pull request as ready for review September 1, 2026 10:08

@yamilmedina yamilmedina left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ltgm 🚀

@sbakhtiarov
sbakhtiarov force-pushed the fix/create-group-federation-conflict branch from 1c69be1 to 7a2fedc Compare September 7, 2026 18:36
@sbakhtiarov
sbakhtiarov added this pull request to the merge queue Sep 7, 2026
@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

Merged via the queue into develop with commit 3307efb Sep 7, 2026
21 checks passed
@sbakhtiarov
sbakhtiarov deleted the fix/create-group-federation-conflict branch September 7, 2026 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants