Allow forward of image attachment with no text

This commit is contained in:
Josh Perez 2021-04-28 15:23:04 -07:00 committed by GitHub
parent a76534ed45
commit d91a4ef3a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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