fix: conversation sorted after backup import - WPB-21925 #4060
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
During restoring backup process, conversation timestamp is set with its latest message timestamp.
JaCaLlaSchwarz
changed the title
David-Henner
approved these changes
Jan 5, 2026
David-Henner
changed the title
netbe
reviewed
Jan 5, 2026
Collaborator
netbe
left a comment
netbe
left a comment
There was a problem hiding this comment.
left a question before approving
WireDomain/Sources/WireDomain/Synchronization/PullAllConversationsSync.swift
Outdated
Show resolved
Hide resolved
Contributor
Test Results 2 files 433 suites 2m 38s ⏱️ Results for commit d7ade63. ♻️ This comment has been updated with latest results. |
Co-authored-by: Jullian Mercier <31648126+jullianm@users.noreply.github.com>
…lable - WPB-22784 🍒 (#4115) Co-authored-by: Jullian Mercier <31648126+jullianm@users.noreply.github.com>
| await store.storeConversation( | ||
| conversation.toDomainModel(), | ||
| timestamp: .now, | ||
| timestamp: Date.distantPast, |
Contributor
There was a problem hiding this comment.
Suggested change
| timestamp: Date.distantPast, | |
| timestamp: conversation.lastEventTime ?? Date.distantPast, |
Contributor
There was a problem hiding this comment.
To be in line with Android, we should do this 👆
@JaCaLlaSchwarz you'd need to update the tests
…-backup-import-WPB-21925
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
During restoring backup process, conversation timestamp is set with its latest message timestamp.
Issue
When user is logged in empty conversations are pulled from server and its .lastModifiedDate is set to login time, so all conversations are at the same timestamp. On recovering backup messages, no order can be set on adding messages to conversations because all message timestamps are earlier to login timestamp, so is not possible set an order in the conversations.
SOLUTION: On pulling conversations, timestamp is set to minimum (instead of current), and when messages are added to conversations conversation timestamp is set when message time is greater than conversation time, in that way most recent conversations are presented at the beginning of the list.
Testing
Pre: Select Staging environment and Login in with provided credentials
Video:
https://github.com/user-attachments/assets/1ead3aef-cc2d-4cf2-9793-46c5bcdc5f25
Unit test
Checklist
[WPB-XXX].UI accessibility checklist
If your PR includes UI changes, please utilize this checklist: