Forward: Ensure we get the latest attachments with hydrated data

signalapp · Jun 28, 2022 · 6a509ba · 6a509ba
1 parent 101d53c
commit 6a509ba
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ts/views/conversation_view.tsx b/ts/views/conversation_view.tsx
@@ -1289,7 +1289,12 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     if (!message) {
       throw new Error(`showForwardMessageModal: Message ${messageId} missing!`);
     }
-    const attachments = getAttachmentsForMessage(message.attributes);
+
+    // We need to give it a fresh object because it's memoized by the root object!
+    const rawAttachments = getAttachmentsForMessage({ ...message.attributes });
+    const attachments = rawAttachments.filter(attachment =>
+      Boolean(attachment.url)
+    );
 
     const doForwardMessage = async (
       conversationIds: Array<string>,