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: It shows Proteus then MLS conversation after enabling MLS for team - WPB-15027 #2288

Merged
merged 5 commits into from
Dec 16, 2024

Conversation

KaterinaWire
Copy link
Contributor

@KaterinaWire KaterinaWire commented Dec 13, 2024

BugWPB-15027 [iOS] Opening 1:1 shows proteus then mls conversation

Issue

"It shows briefly the former proteus conversation before it opens the MLS version, minus the proteus messages"
The messages from the Proteus conversation were not moved to the MLS conversation, and the other user still has a link to the previous Proteus conversation.

Solution

  • log an error when resolving 1:1 conversations failed
  • always try to migrate messages from the Proteus conversation to MLS and link the MLS conversation to other user if it's needed.
  • add more comments.

Testing

steps are in the Jira ticket


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.

@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Dec 13, 2024
Copy link
Contributor

github-actions bot commented Dec 13, 2024

Test Results

    7 files      8 suites   12m 5s ⏱️
6 932 tests 6 904 ✅ 28 💤 0 ❌
6 942 runs  6 914 ✅ 28 💤 0 ❌

Results for commit f7e650d.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Dec 13, 2024

Datadog Report

Branch report: fix/shows-proteus-then-mls-conversation
Commit report: 4fe6287
Test service: wire-ios-mono

✅ 0 Failed, 6632 Passed, 28 Skipped, 5m 32.06s Total Time

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.

just left a small improvement

@KaterinaWire KaterinaWire added this pull request to the merge queue Dec 16, 2024
Merged via the queue into develop with commit 5665ba4 Dec 16, 2024
18 of 19 checks passed
@KaterinaWire KaterinaWire deleted the fix/shows-proteus-then-mls-conversation branch December 16, 2024 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: unplanned Any work item that isn’t part of the product or technical roadmap. release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants