Skip to content

Conversation

@github-actions
Copy link
Contributor

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

Original PR description:


EpicWPB-22499 Triggering MLS resets for a federated conversation will establish a broken group

Issue

Cherry pick of #4039


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.

Comment on lines +77 to +90
<<<<<<< HEAD
attributes = [.conversationId: qualifiedID.safeForLoggingDescription]
=======
guard qualifiedID.domain == selfDomain else {
WireLogger.mls.warn("Can't initiate reset broken MLS conversation for other domains")
return
}

attributes = [
.public: true,
.conversationId: qualifiedID.safeForLoggingDescription,
.mlsGroupID: groupID.safeForLoggingDescription
]
>>>>>>> e2853ef371 (fix: don't reset federated conversations - WPB-22499 🍒 (#4048))
Copy link
Contributor

Choose a reason for hiding this comment

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

merge conflicts

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.

3 participants