From cffcca9722dc9d2236c07df44a9f103bd7dcdd3c Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Sat, 29 Jul 2023 11:30:37 -0300
Subject: [PATCH] fix: adjust in instance name in chatwoot

---
 src/whatsapp/controllers/instance.controller.ts |  2 +-
 src/whatsapp/services/whatsapp.service.ts       | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
index 096e6c2c..1434d5da 100644
--- a/src/whatsapp/controllers/instance.controller.ts
+++ b/src/whatsapp/controllers/instance.controller.ts
@@ -179,7 +179,7 @@ export class InstanceController {
           token: chatwoot_token,
           url: chatwoot_url,
           sign_msg: chatwoot_sign_msg || false,
-          name_inbox: instance.instanceName,
+          name_inbox: instance.instanceName.split('-cwId-')[0],
           number,
           reopen_conversation: chatwoot_reopen_conversation || false,
           conversation_pending: chatwoot_conversation_pending || false,
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index 46b909a0..8d1ca865 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -586,23 +586,6 @@ export class WAStartupService {
           statusReason: DisconnectReason.connectionClosed,
         });
 
-        this.logger.verbose('Sending data to webhook in event STATUS_INSTANCE');
-        this.sendDataWebhook(Events.STATUS_INSTANCE, {
-          instance: this.instance.name,
-          status: 'removed',
-        });
-
-        if (this.localChatwoot.enabled) {
-          this.chatwootService.eventWhatsapp(
-            Events.STATUS_INSTANCE,
-            { instanceName: this.instance.name },
-            {
-              instance: this.instance.name,
-              status: 'removed',
-            },
-          );
-        }
-
         this.logger.verbose('endSession defined as true');
         this.endSession = true;