diff --git a/client/src/components/chat-send-message/chat-send-message.component.jsx b/client/src/components/chat-send-message/chat-send-message.component.jsx index 9526dc91b..6eac70ca2 100644 --- a/client/src/components/chat-send-message/chat-send-message.component.jsx +++ b/client/src/components/chat-send-message/chat-send-message.component.jsx @@ -45,14 +45,14 @@ function ChatSendMessageComponent({ const { t } = useTranslation(); const handleEnter = () => { - if (message === "" || !message) return; - logImEXEvent("messaging_send_message"); const selectedImages = selectedMedia.filter((i) => i.isSelected); + if ((message === "" || !message) && selectedImages.length === 0) return; + logImEXEvent("messaging_send_message"); if (selectedImages.length < 11) { sendMessage({ to: conversation.phone_num, - body: message, + body: message || "", messagingServiceSid: bodyshop.messagingservicesid, conversationid: conversation.id, selectedMedia: selectedImages, @@ -93,7 +93,7 @@ function ChatSendMessageComponent({ { - const { to, messagingServiceSid, body, conversationid, selectedMedia, imexshopid } = - req.body; + const { + to, + messagingServiceSid, + body, + conversationid, + selectedMedia, + imexshopid, + } = req.body; logger.log("sms-outbound", "DEBUG", req.user.email, null, { messagingServiceSid: messagingServiceSid, @@ -34,7 +41,12 @@ exports.send = (req, res) => { req.body.selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : [], }); - if (!!to && !!messagingServiceSid && !!body && !!conversationid) { + if ( + !!to && + !!messagingServiceSid && + (!!body || !!selectedMedia.length > 0) && + !!conversationid + ) { client.messages .create({ body: body, @@ -67,10 +79,9 @@ exports.send = (req, res) => { const data = { type: "messaging-outbound", conversationid: newMessage.conversationid || "", - }; - admin.messaging().send({ + admin.messaging().send({ topic: `${imexshopid}-messaging`, data, });