TEST_SERVER1/whats/app.js

@@ -885,15 +885,11 @@ async function handleMessage(msg) {
 
     if (msg.fromMe) {
 
-        console.log('MSG FROM ME')
-
         msgContact = await client.getContactById(msg.to)
 
     }
     else {
 
-        console.log('MSG FROM CLIENT')
-
         console.log('#################  RECEIVING MESSAGE FROM: ', msg.from, ' to ', msg.to)
 
         msgContact = await msg.getContact()
@@ -916,10 +912,10 @@ async function handleMessage(msg) {
         msgContact: msgContact,
         chat: chat,
         quotedMsg: quotedMsg ? quotedMsg.id.id : null,
-        media: media,
+        media: media
-        getContactById: msg.fromMe ? await client.getContactById(msg.to) : await client.getContactById(msg.from)
     }
 
+
     socketIo.emit("message_create", data)
 
 }

backend/src/controllers/TicketController.ts

@@ -114,7 +114,7 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
       withUnreadMessages,
       unlimited,
       searchParamContent
-    }); 
+    });
 
   return res
     .status(200)

backend/src/services/TicketServices/FindOrCreateTicketService.ts

@@ -60,11 +60,10 @@ const FindOrCreateTicketService = async (
         order: [["updatedAt", "DESC"]]
       });
 
-      if (ticket) { 
+      if (ticket) {
         await ticket.update({
           status: "pending",
           userId: null,
-          queueId: null,
           unreadMessages
         });
       }
@@ -97,12 +96,7 @@ const FindOrCreateTicketService = async (
     if (!ticket) {
       let status = "pending";
 
-      if (
+      if (queues.length > 1 && !botInfo.isOnQueue && !queueId) {
-        queues.length > 1 &&
-        !botInfo.isOnQueue &&
-        !queueId &&
-        !groupContact
-      ) {
         status = "queueChoice";
       }
 

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -372,12 +372,6 @@ const verifyQueue = async (
   ticket: Ticket,
   contact: Contact
 ) => {
-
-  if(ticket?.isGroup){
-
-    return
-  }
-
   const { queues, greetingMessage } = await ShowWhatsAppService(wbot.id!);
 
   let selectedOption = null;
@@ -709,7 +703,7 @@ const handleMessage = async (
 
   try {
     let msgContact: any = wbot.msgContact;
-    let groupContact: Contact | undefined;
+    // let groupContact: Contact | undefined;
 
     if (msg.fromMe) {
       // messages sent automatically by wbot have a special character in front of it
@@ -749,21 +743,18 @@ const handleMessage = async (
 
     // console.log('----------> chat: ', JSON.parse(JSON.stringify(chat)))
 
+    // if (chat.isGroup) {
+    //   let msgGroupContact;
 
-    console
+    //   if (msg.fromMe) {
+    //     msgGroupContact = await wbot.getContactById(msg.to);
+    //   } else {
+    //     msgGroupContact = await wbot.getContactById(msg.from);
+    //   }
 
-    if (chat.isGroup) {
+    //   groupContact = await verifyContact(msgGroupContact);
-      // let msgGroupContact;
+    // }
 
-      // if (msg.fromMe) {
-      //   msgGroupContact = await wbot.getContactById(msg.to);
-      // } else {
-      //   msgGroupContact = await wbot.getContactById(msg.from);
-      // }
-
-      groupContact = await verifyContact(wbot.getContactById);
-    }
-  
     const whatsapp = await ShowWhatsAppService(wbot.id!);
 
     const unreadMessages = msg.fromMe ? 0 : chat.unreadCount;
@@ -786,12 +777,12 @@ const handleMessage = async (
 
     const _botInfo = await BotIsOnQueue("botqueue");
 
-    if (_botInfo.isOnQueue && !chat.isGroup) {
+    if (_botInfo.isOnQueue) {
       let ticket_obj: any = await FindOrCreateTicketServiceBot(
         contact,
         wbot.id!,
-        unreadMessages,
+        unreadMessages
-        groupContact
+        // groupContact
       );
 
       ticket = ticket_obj.ticket;
@@ -810,8 +801,8 @@ const handleMessage = async (
       ticket = await FindOrCreateTicketService(
         contact,
         wbot.id!,
-        unreadMessages,
+        unreadMessages
-        groupContact
+        // groupContact
       );
     }
 

frontend/src/components/NotificationsPopOver/index.js

@@ -387,10 +387,10 @@ const NotificationsPopOver = () => {
 					vertical: "top",
 					horizontal: "right",
 				}}
-				classes={{ paper: classes?.popoverPaper }}
+				classes={{ paper: classes.popoverPaper }}
 				onClose={handleClickAway}
 			>
-				<List dense className={classes?.tabContainer}>
+				<List dense className={classes.tabContainer}>
 					{notifications.length === 0 ? (
 						<ListItem>
 							<ListItemText>{i18n.t("notifications.noTickets")}</ListItemText>

frontend/src/components/TicketListItem/index.js

@@ -229,7 +229,7 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 									variant="body2"
 									color="textPrimary"
 								>
-									{ticket?.contact?.name}
+									{ticket.contact.name}
 								</Typography>
 								{ticket.status === "closed" && (
 									<Badge