From bcd6d18d6f31d98fb3b9d12731905decab99cd20 Mon Sep 17 00:00:00 2001 From: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com> Date: Mon, 2 Mar 2026 09:58:15 -0800 Subject: [PATCH] Fix chat folder sync with serviceIdBinary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Hužva --- ts/services/storageRecordOps.preload.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ts/services/storageRecordOps.preload.ts b/ts/services/storageRecordOps.preload.ts index dc00708e2b..b87d8d55c9 100644 --- a/ts/services/storageRecordOps.preload.ts +++ b/ts/services/storageRecordOps.preload.ts @@ -2554,7 +2554,12 @@ function recipientToConversationId( ): string { let match: ConversationModel | undefined; if (recipient.contact != null) { - match = window.ConversationController.get(recipient.contact.serviceId); + const serviceId = fromServiceIdBinaryOrString( + recipient.contact.serviceIdBinary, + recipient.contact.serviceId, + `${logPrefix}.recipientToConversationId` + ); + match = window.ConversationController.get(serviceId); match ??= window.ConversationController.get(recipient.contact.e164); } else if ( recipient.groupMasterKey != null &&