From 4493f3f439df254bf99ca33fec5bb15684f78fb8 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Wed, 13 Aug 2025 07:23:44 -0700
Subject: [PATCH] Fix attachment key in AttachmentList

---
 ts/components/conversation/AttachmentList.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ts/components/conversation/AttachmentList.tsx b/ts/components/conversation/AttachmentList.tsx
index 7f38f9b46f..5dfe1bcc5a 100644
--- a/ts/components/conversation/AttachmentList.tsx
+++ b/ts/components/conversation/AttachmentList.tsx
@@ -99,7 +99,12 @@ export function AttachmentList<
           const url = getUrl(attachment);
           const forUI = attachmentsForUI[index];
 
-          const key = url || attachment.path || attachment.fileName || index;
+          const key =
+            attachment.clientUuid ||
+            url ||
+            attachment.path ||
+            attachment.fileName ||
+            index;
 
           const isImage = isImageAttachment(attachment);
           const isVideo = isVideoAttachment(attachment);