diff --git a/CHANGELOG.md b/CHANGELOG.md index f23924f8..a2d728da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ * Correction of chatwoot functioning with admin flows * Fixed problem that did not generate qrcode with the chatwoot_conversation_pending option enabled * Fixed issue where CSAT opened a new ticket when reopen_conversation was disabled +* Fixed issue sending contact to Chatwoot via iOS ### Integrations diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index c33095b4..a995f367 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -1373,6 +1373,11 @@ export class ChatwootService { formattedContact += `\n**number ${numberCount}:** ${phoneNumber}`; numberCount++; } + if (key.includes('TEL')) { + const phoneNumber = contactInfo[key]; + formattedContact += `\n**number:** ${phoneNumber}`; + numberCount++; + } }); this.logger.verbose('message content: ' + formattedContact); @@ -1401,6 +1406,11 @@ export class ChatwootService { formattedContact += `\n**number ${numberCount}:** ${phoneNumber}`; numberCount++; } + if (key.includes('TEL')) { + const phoneNumber = contactInfo[key]; + formattedContact += `\n**number:** ${phoneNumber}`; + numberCount++; + } }); return formattedContact; @@ -1458,7 +1468,7 @@ export class ChatwootService { this.logger.verbose('get conversation message'); const bodyMessage = await this.getConversationMessage(body.message); - if (bodyMessage.includes('Por favor, classifique esta conversa, http')) { + if (bodyMessage && bodyMessage.includes('Por favor, classifique esta conversa, http')) { this.logger.verbose('conversation is closed'); return; } diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 9d21ed0e..618aa65b 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -1795,11 +1795,12 @@ export class WAStartupService { if ((this.localTypebot.enabled && type === 'notify') || typebotSessionRemoteJid) { if (!(this.localTypebot.listening_from_me === false && messageRaw.key.fromMe === true)) { - await this.typebotService.sendTypebot( - { instanceName: this.instance.name }, - messageRaw.key.remoteJid, - messageRaw, - ); + if (messageRaw.messageType !== 'reactionMessage') + await this.typebotService.sendTypebot( + { instanceName: this.instance.name }, + messageRaw.key.remoteJid, + messageRaw, + ); } }