Merge pull request #407 from ricardoapaes/hotfix/error-on-send-message

🐛 Fixing error when sending messages

backend/src/services/MessageServices/CreateMessageService.ts

@@ -1,6 +1,7 @@
 import { getIO } from "../../libs/socket";
 import Message from "../../models/Message";
 import Ticket from "../../models/Ticket";
+import Whatsapp from "../../models/Whatsapp";
 
 interface MessageData {
   id: string;
@@ -27,7 +28,14 @@ const CreateMessageService = async ({
       {
         model: Ticket,
         as: "ticket",
-        include: ["contact", "queue"]
+        include: [
+          "contact", "queue",
+          {
+            model: Whatsapp,
+            as: "whatsapp",
+            attributes: ["name"]
+          }
+        ]
       },
       {
         model: Message,

backend/src/services/TicketServices/ShowTicketService.ts

@@ -3,6 +3,7 @@ import AppError from "../../errors/AppError";
 import Contact from "../../models/Contact";
 import User from "../../models/User";
 import Queue from "../../models/Queue";
+import Whatsapp from "../../models/Whatsapp";
 
 const ShowTicketService = async (id: string | number): Promise<Ticket> => {
   const ticket = await Ticket.findByPk(id, {
@@ -22,6 +23,11 @@ const ShowTicketService = async (id: string | number): Promise<Ticket> => {
         model: Queue,
         as: "queue",
         attributes: ["id", "name", "color"]
+      },
+      {
+        model: Whatsapp,
+        as: "whatsapp",
+        attributes: ["name"]
       }
     ]
   });

frontend/src/components/TicketListItem/index.js

@@ -102,9 +102,9 @@ const useStyles = makeStyles(theme => ({
 
 	userTag: {
 		position: "absolute",
-		marginRight: 5,
+		marginRight: 35,
-		right: 5,
+		right: 10,
-		bottom: 5,
+		bottom: 9,
 		background:"#2576D2",
 		color: "#ffffff",
 		border:"1px solid #CCC",
@@ -112,7 +112,7 @@ const useStyles = makeStyles(theme => ({
 		paddingLeft: 5,
 		paddingRight: 5,
 		borderRadius: 10,
-		fontSize: "1em"
+		fontSize: "0.9em"
 	},
 }));
 
@@ -211,7 +211,7 @@ const TicketListItem = ({ ticket }) => {
 									)}
 								</Typography>
 							)}
-							{ticket.whatsappId && (
+							{ticket?.whatsapp && (
 								<div className={classes.userTag} title={i18n.t("ticketsList.connectionTitle")}>{ticket.whatsapp.name}</div>
 							)}
 						</span>