From 1eddf252e170b95f3479e01b0378e5f83cfef822 Mon Sep 17 00:00:00 2001
From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
Date: Tue, 25 Apr 2023 14:54:59 -0700
Subject: [PATCH] Update drafts when removing attachments in forward modal

---
 ts/components/ForwardMessagesModal.tsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ts/components/ForwardMessagesModal.tsx b/ts/components/ForwardMessagesModal.tsx
index ac56fafcb..954d46032 100644
--- a/ts/components/ForwardMessagesModal.tsx
+++ b/ts/components/ForwardMessagesModal.tsx
@@ -318,6 +318,9 @@ export function ForwardMessagesModal({
               onChange={(messageBody, bodyRanges) => {
                 onChange([{ ...lonelyDraft, messageBody, bodyRanges }]);
               }}
+              onChangeAttachments={attachments => {
+                onChange([{ ...lonelyDraft, attachments }]);
+              }}
               removeLinkPreview={removeLinkPreview}
               theme={theme}
               i18n={i18n}
@@ -437,6 +440,7 @@ type ForwardMessageEditorProps = Readonly<{
     bodyRanges: HydratedBodyRangesType,
     caretLocation?: number
   ) => unknown;
+  onChangeAttachments: (attachments: ReadonlyArray<AttachmentType>) => unknown;
   onSubmit: () => unknown;
   theme: ThemeType;
   i18n: LocalizerType;
@@ -449,13 +453,11 @@ function ForwardMessageEditor({
   RenderCompositionTextArea,
   removeLinkPreview,
   onChange,
+  onChangeAttachments,
   onSubmit,
   theme,
 }: ForwardMessageEditorProps): JSX.Element {
-  const [attachmentsToForward, setAttachmentsToForward] = useState<
-    ReadonlyArray<AttachmentType>
-  >(draft.attachments ?? []);
-
+  const { attachments } = draft;
   return (
     <div className="module-ForwardMessageModal__main-body">
       {linkPreview ? (
@@ -472,15 +474,15 @@ function ForwardMessageEditor({
           />
         </div>
       ) : null}
-      {attachmentsToForward && attachmentsToForward.length ? (
+      {attachments != null && attachments.length > 0 ? (
         <AttachmentList
-          attachments={attachmentsToForward}
+          attachments={attachments}
           i18n={i18n}
           onCloseAttachment={(attachment: AttachmentType) => {
-            const newAttachments = attachmentsToForward.filter(
+            const newAttachments = attachments.filter(
               currentAttachment => currentAttachment !== attachment
             );
-            setAttachmentsToForward(newAttachments);
+            onChangeAttachments(newAttachments);
           }}
         />
       ) : null}