fix: duplicate 1-1 conversations - WPB-10260 #2006
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
echoes-hq
bot
added
the
echoes: unplanned
netbe
force-pushed
the
fix/duplicate-1-1-conversations-WPB-10260
branch
from
0bee456 to
fd72b45
Compare
6 tasks
netbe
changed the base branch from
develop
to
chore/cleanup-phone-number-WPB-11437
Test Results4 872 tests 4 872 ✅ 11m 50s ⏱️ Results for commit 4948cf3. ♻️ This comment has been updated with latest results. |
johnxnguyen
reviewed
Oct 11, 2024
...odel/Source/ManagedObjectContext/Migration/113-114/OneOnOneConversationMigrationAction.swift
Show resolved
Hide resolved
.../Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift
Outdated
Show resolved
Hide resolved
.../Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift
Outdated
Show resolved
Hide resolved
.../Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift
Show resolved
Hide resolved
samwyndham
approved these changes
Oct 16, 2024
.../Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift
Show resolved
Hide resolved
netbe
force-pushed
the
chore/cleanup-phone-number-WPB-11437
branch
from
de7da4c to
d6bb78d
Compare
Base automatically changed from
chore/cleanup-phone-number-WPB-11437
to
develop
October 25, 2024 15:47
# Conflicts: # wire-ios-data-model/Resources/Databases Changelog.md # wire-ios-data-model/Source/Public/ZMUser.h # wire-ios-data-model/Support/Sources/ModelHelper.swift # wire-ios-data-model/WireDataModel.xcodeproj/project.pbxproj
…m:wireapp/wire-ios into fix/duplicate-1-1-conversations-WPB-10260 # Conflicts: # WireAPI/Sources/WireAPI/Network/NetworkService/NetworkServiceError.swift # WireAPI/Sources/WireAPI/Network/PushChannel/PushChannelServiceError.swift # wire-ios-build-assets # wire-ios-data-model/Source/ManagedObjectContext/Migration/118-119/FixDuplicateOneOnOneConversationsAction.swift # wire-ios-data-model/Source/Public/ZMUser.h
netbe
changed the title
johnxnguyen
approved these changes
Oct 30, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
Note: this PR is based on #2017, so preferably start with #2017 first.
Due to some race condition, an user could end up with duplicate proteus team 1-1 conversation. This PR aims to fix this, by showing only one same on all platforms 1-1 conversation.
Testing
Checklist
[WPB-XXX].