From d91a4ef3a65e4e4a54e4679ee9ef4a68a6f117c0 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Wed, 28 Apr 2021 15:23:04 -0700
Subject: [PATCH] Allow forward of image attachment with no text

---
 ts/components/ForwardMessageModal.tsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ts/components/ForwardMessageModal.tsx b/ts/components/ForwardMessageModal.tsx
index dc79c230d41..d1b621fb205 100644
--- a/ts/components/ForwardMessageModal.tsx
+++ b/ts/components/ForwardMessageModal.tsx
@@ -118,8 +118,16 @@ export const ForwardMessageModal: FunctionComponent<PropsType> = ({
     [inputApiRef, onPickEmoji]
   );
 
+  const hasContactsSelected = Boolean(selectedContacts.length);
+
+  const canForwardMessage =
+    hasContactsSelected &&
+    (Boolean(messageBodyText) ||
+      isSticker ||
+      (attachmentsToForward && attachmentsToForward.length));
+
   const forwardMessage = React.useCallback(() => {
-    if (!messageBodyText) {
+    if (!canForwardMessage) {
       return;
     }
 
@@ -131,20 +139,13 @@ export const ForwardMessageModal: FunctionComponent<PropsType> = ({
     );
   }, [
     attachmentsToForward,
+    canForwardMessage,
     doForwardMessage,
     linkPreview,
     messageBodyText,
     selectedContacts,
   ]);
 
-  const hasContactsSelected = Boolean(selectedContacts.length);
-
-  const canForwardMessage =
-    hasContactsSelected &&
-    (Boolean(messageBodyText) ||
-      isSticker ||
-      (attachmentsToForward && attachmentsToForward.length));
-
   const normalizedSearchTerm = searchTerm.trim();
   useEffect(() => {
     const timeout = setTimeout(() => {