From 0c8c303d086604da49c6e02aa1798a8e553526fd Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 27 Jan 2022 14:02:09 -0800
Subject: [PATCH] IO-1656 Allow images only to be sent via messaging.

---
 .../chat-send-message.component.jsx           |  8 +++----
 server/sms/send.js                            | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

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({
       </span>
       <SendOutlined
         className="imex-flex-row__margin"
-        disabled={message === "" || !message}
+        //  disabled={message === "" || !message}
         onClick={handleEnter}
       />
       <Spin
diff --git a/server/sms/send.js b/server/sms/send.js
index 916cc01aa..0c88c054e 100644
--- a/server/sms/send.js
+++ b/server/sms/send.js
@@ -13,13 +13,20 @@ const logger = require("../utils/logger");
 const client = twilio(
   process.env.TWILIO_AUTH_TOKEN,
   process.env.TWILIO_AUTH_KEY
-);const { admin } = require("../firebase/firebase-handler");
+);
+const { admin } = require("../firebase/firebase-handler");
 
 const gqlClient = require("../graphql-client/graphql-client").client;
 
 exports.send = (req, res) => {
-  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,
             });