Skip to content

feat: 1:1 proteus is not migrated to MLS - WPB-17393 #2973

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

Merged
merged 3 commits into from
May 6, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 6, 2025

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

Original PR description:


BugWPB-17393 [iOS] Should-be MLS Conversation created as Proteus and not migrated to MLS

Issue

We have an issue with one user that his 1:1 with a user from another team is still proteus on iOS, however it's MLS on Web. The result is a conversation on Web (and Android for another user) with a history, but an empty proteus conversation on iOS.

The logs from DD say that tis conversation resolve 1-1 conversation failed: alreadyMigrated. From all the logs and the fact that MLS conversation exists, but for some reason doesn't show up in the conversation list, we suspect that 1:1 MLS conversation is marked as migratedToMLS, but otherUser.oneOnOneConversation is still Proteus.
Why or how this happened is unknown. Most likely the conversation was migrated, but something overrode otherUser.oneOnOneConversation and set it back to the proteus conversation.
In this PR I added one more condition to trigger messages migration and MLS conversation linking:
if mlsConversation.migratedToMLS is false and otherUser.oneOnOneConversation is not mlsConversation,
we should attempt to migrate.
Also, since we have an insane amount of error logs like resolve 1-1 conversation failed: alreadyMigrated which are not an error but rather info, I changed their logging a bit.

Testing

Checklist

  • Title contains a reference JIRA issue number like [WPB-XXX].
  • Description is filled and free of optional paragraphs.
  • Adds/updates automated tests.

UI accessibility checklist

If your PR includes UI changes, please utilize this checklist:

  • Make sure you use the API for UI elements that support large fonts.
  • All colors are taken from WireDesign.ColorTheme or constructed using WireDesign.BaseColorPalette.
  • New UI elements have Accessibility strings for VoiceOver.

@KaterinaWire KaterinaWire requested review from netbe and johnxnguyen May 6, 2025 15:04
@KaterinaWire KaterinaWire enabled auto-merge May 6, 2025 15:06
Copy link
Collaborator

@netbe netbe left a comment

Choose a reason for hiding this comment

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

lgtm;)

Copy link
Contributor Author

github-actions bot commented May 6, 2025

Test Results

2 778 tests   2 777 ✅  4m 54s ⏱️
  369 suites      1 💤
    3 files        0 ❌

Results for commit ce1bbe5.

@KaterinaWire KaterinaWire added this pull request to the merge queue May 6, 2025
@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/link-mls-conversation-cherry-pick
Commit report: 6539792
Test service: wire-ios-mono

✅ 0 Failed, 2777 Passed, 1 Skipped, 4m 37.85s Total Time

Merged via the queue into develop with commit 6f24e17 May 6, 2025
11 checks passed
@KaterinaWire KaterinaWire deleted the fix/link-mls-conversation-cherry-pick branch May 6, 2025 16:01
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