From e1ed792952a927a9ca3c35667cd9d866c41976ce Mon Sep 17 00:00:00 2001 From: Rafael Cunha Date: Sat, 6 Dec 2025 16:28:21 -0400 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20adicionar=20campo=20mergeBrazilCont?= =?UTF-8?q?acts=20no=20formul=C3=A1rio=20Chatwoot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/instance/Chatwoot/index.tsx | 1 + src/translate/languages/pt-BR.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/pages/instance/Chatwoot/index.tsx b/src/pages/instance/Chatwoot/index.tsx index f44a207..51a9b89 100644 --- a/src/pages/instance/Chatwoot/index.tsx +++ b/src/pages/instance/Chatwoot/index.tsx @@ -196,6 +196,7 @@ function Chatwoot() { /> + diff --git a/src/translate/languages/pt-BR.json b/src/translate/languages/pt-BR.json index 7943d44..8d9e0e1 100644 --- a/src/translate/languages/pt-BR.json +++ b/src/translate/languages/pt-BR.json @@ -349,6 +349,10 @@ "label": "Importar Contatos", "description": "Importar contatos da agenda do WhatsApp ao conectar o QR Code" }, + "mergeBrazilContacts": { + "label": "Mesclar Contatos Brasil", + "description": "Mescla contatos brasileiros com e sem código de país (55)" + }, "importMessages": { "label": "Importar Mensagens", "description": "Importar mensagens do WhatsApp ao conectar o QR Code" From 8015ff2ed991b863f827cd0fa4e2cb3ddbb708b7 Mon Sep 17 00:00:00 2001 From: Rafael Cunha Date: Sat, 6 Dec 2025 16:30:40 -0400 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20adicionar=20toast=20de=20sucesso/er?= =?UTF-8?q?ro=20no=20bot=C3=A3o=20Reiniciar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/instance/DashboardInstance/index.tsx | 3 +++ src/translate/languages/pt-BR.json | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/pages/instance/DashboardInstance/index.tsx b/src/pages/instance/DashboardInstance/index.tsx index cd11081..5bd3173 100644 --- a/src/pages/instance/DashboardInstance/index.tsx +++ b/src/pages/instance/DashboardInstance/index.tsx @@ -3,6 +3,7 @@ import { CircleUser, MessageCircle, RefreshCw, UsersRound } from "lucide-react"; import { useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import QRCode from "react-qr-code"; +import { toast } from "react-toastify"; import { InstanceStatus } from "@/components/instance-status"; import { InstanceToken } from "@/components/instance-token"; @@ -46,8 +47,10 @@ function DashboardInstance() { try { await restart(instanceName); await reloadInstance(); + toast.success(t("instance.dashboard.toast.restart.success")); } catch (error) { console.error("Error:", error); + toast.error(t("instance.dashboard.toast.restart.error")); } }; diff --git a/src/translate/languages/pt-BR.json b/src/translate/languages/pt-BR.json index 8d9e0e1..df64979 100644 --- a/src/translate/languages/pt-BR.json +++ b/src/translate/languages/pt-BR.json @@ -131,6 +131,12 @@ "restart": "Reiniciar", "disconnect": "Desconectar" }, + "toast": { + "restart": { + "success": "Instância reiniciada com sucesso", + "error": "Erro ao reiniciar instância" + } + }, "alert": "Para conectar, escaneie o QR Code com o WhatsApp", "contacts": "Contatos", "chats": "Chats", From b072bd69a12cd8c1db5d22a30541e0a5a89eb0c7 Mon Sep 17 00:00:00 2001 From: Rafael Cunha Date: Sun, 7 Dec 2025 00:41:58 -0400 Subject: [PATCH 3/5] feat(i18n): add mergeBrazilContacts translations for Chatwoot integration --- src/translate/languages/en-US.json | 4 ++++ src/translate/languages/es-ES.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/translate/languages/en-US.json b/src/translate/languages/en-US.json index f63d13e..7dacadf 100644 --- a/src/translate/languages/en-US.json +++ b/src/translate/languages/en-US.json @@ -369,6 +369,10 @@ "label": "Import Contacts", "description": "Import contacts from WhatsApp address book by connecting QR Code" }, + "mergeBrazilContacts": { + "label": "Merge Brazil Contacts", + "description": "Merge Brazilian contacts with and without country code (55)" + }, "importMessages": { "label": "Import Messages", "description": "Import messages from WhatsApp by connecting QR Code" diff --git a/src/translate/languages/es-ES.json b/src/translate/languages/es-ES.json index 1dc881f..e02ff86 100644 --- a/src/translate/languages/es-ES.json +++ b/src/translate/languages/es-ES.json @@ -349,6 +349,10 @@ "label": "Importar Contactos", "description": "Importar contactos del libro de direcciones de WhatsApp al conectar el Código QR" }, + "mergeBrazilContacts": { + "label": "Fusionar Contactos Brasil", + "description": "Fusiona contactos brasileños con y sin código de país (55)" + }, "importMessages": { "label": "Importar Mensajes", "description": "Importar mensajes de WhatsApp al conectar el Código QR" From 13b30464f9c6dd07ecbf8feadbe2c81adf38b68a Mon Sep 17 00:00:00 2001 From: Rafael Cunha Date: Sun, 7 Dec 2025 00:44:04 -0400 Subject: [PATCH 4/5] feat(i18n): add restart toast translations for en-US and es-ES --- src/translate/languages/en-US.json | 6 ++++++ src/translate/languages/es-ES.json | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/translate/languages/en-US.json b/src/translate/languages/en-US.json index 7dacadf..5539ff8 100644 --- a/src/translate/languages/en-US.json +++ b/src/translate/languages/en-US.json @@ -151,6 +151,12 @@ "restart": "Restart", "disconnect": "Disconnect" }, + "toast": { + "restart": { + "success": "Instance restarted successfully", + "error": "Error restarting instance" + } + }, "alert": "To connect, scan the QR code with your WhatsApp Web", "contacts": "Contacts", "chats": "Chats", diff --git a/src/translate/languages/es-ES.json b/src/translate/languages/es-ES.json index e02ff86..98c94a8 100644 --- a/src/translate/languages/es-ES.json +++ b/src/translate/languages/es-ES.json @@ -131,6 +131,12 @@ "restart": "Reiniciar", "disconnect": "Desconectar" }, + "toast": { + "restart": { + "success": "Instancia reiniciada con éxito", + "error": "Error al reiniciar instancia" + } + }, "alert": "Para conectar, escanea el Código QR con WhatsApp", "contacts": "Contactos", "chats": "Chats", From 88c1cc97c21d5e4ae1f2030ba2cf428518e7931a Mon Sep 17 00:00:00 2001 From: Rafael Cunha Date: Sun, 7 Dec 2025 01:03:27 -0400 Subject: [PATCH 5/5] fix(chatwoot): correct signDelimiter handling to prevent null values --- src/pages/instance/Chatwoot/index.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/instance/Chatwoot/index.tsx b/src/pages/instance/Chatwoot/index.tsx index 51a9b89..01a3e75 100644 --- a/src/pages/instance/Chatwoot/index.tsx +++ b/src/pages/instance/Chatwoot/index.tsx @@ -24,7 +24,10 @@ import { Chatwoot as ChatwootType } from "@/types/evolution.types"; const stringOrUndefined = z .string() .optional() - .transform((value) => (value === "" ? undefined : value)); + .transform((value) => { + const trimmed = value?.trim(); + return !trimmed || trimmed === "" ? undefined : trimmed; + }); const formSchema = z.object({ enabled: z.boolean(), @@ -117,7 +120,7 @@ function Chatwoot() { token: data.token, url: data.url, signMsg: data.signMsg || false, - signDelimiter: data.signDelimiter || "\\n", + signDelimiter: data.signDelimiter?.trim() || "\\n", nameInbox: data.nameInbox || "", organization: data.organization || "", logo: data.logo || "",