From c5ebafb9398e17cf239d399a3a31277df4d714be Mon Sep 17 00:00:00 2001
From: Berg Pinheiro <berg.pinheiro2009@gmail.com>
Date: Sun, 29 Mar 2026 12:28:38 -0300
Subject: [PATCH] [core] ChatWoot: conditional agent name prefix in WA to
 WhatsApp templates

Fix empty **: prefix when Add Agent Name is on but chatwoot.sender.name is empty (e.g. system/automated messages). Applies Mustache conditionals to default i18n for chatwoot.to.whatsapp.message.text and chatwoot.to.whatsapp.message.media.caption across all locales (fixes devlikeapro/waha#1983).
---
 src/apps/chatwoot/i18n/locales/ar-AE.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/bn-BD.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/de-DE.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/en-US.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/es-ES.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/fa-IR.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/fr-FR.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/he-IL.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/hi-IN.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/id-ID.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/it-IT.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/pa-PK.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/pt-BR.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/ru-RU.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/tr-TR.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/uk-UA.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/ur-PK.yaml | 6 ++++--
 src/apps/chatwoot/i18n/locales/zh-CN.yaml | 6 ++++--
 18 files changed, 72 insertions(+), 36 deletions(-)

diff --git a/src/apps/chatwoot/i18n/locales/ar-AE.yaml b/src/apps/chatwoot/i18n/locales/ar-AE.yaml
index 448ae9fa1..7ba1d363c 100644
--- a/src/apps/chatwoot/i18n/locales/ar-AE.yaml
+++ b/src/apps/chatwoot/i18n/locales/ar-AE.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 ادعمنا**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/bn-BD.yaml b/src/apps/chatwoot/i18n/locales/bn-BD.yaml
index 57f88ba63..e88d2900e 100644
--- a/src/apps/chatwoot/i18n/locales/bn-BD.yaml
+++ b/src/apps/chatwoot/i18n/locales/bn-BD.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 আমাদের সমর্থন করুন**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/de-DE.yaml b/src/apps/chatwoot/i18n/locales/de-DE.yaml
index 144585ed6..38feb30f0 100644
--- a/src/apps/chatwoot/i18n/locales/de-DE.yaml
+++ b/src/apps/chatwoot/i18n/locales/de-DE.yaml
@@ -338,12 +338,14 @@ waha.core.version.used: |-
   [**🎁 Unterstützen Sie uns**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/en-US.yaml b/src/apps/chatwoot/i18n/locales/en-US.yaml
index ac0efde81..235b33df5 100644
--- a/src/apps/chatwoot/i18n/locales/en-US.yaml
+++ b/src/apps/chatwoot/i18n/locales/en-US.yaml
@@ -116,12 +116,14 @@ whatsapp.contact.broadcast.suffix: 'Broadcast List'
 whatsapp.contact.status.name: 'Status'
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/es-ES.yaml b/src/apps/chatwoot/i18n/locales/es-ES.yaml
index 3247cbf47..599896886 100644
--- a/src/apps/chatwoot/i18n/locales/es-ES.yaml
+++ b/src/apps/chatwoot/i18n/locales/es-ES.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 Apóyanos**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/fa-IR.yaml b/src/apps/chatwoot/i18n/locales/fa-IR.yaml
index 6ea70279f..560b3313e 100644
--- a/src/apps/chatwoot/i18n/locales/fa-IR.yaml
+++ b/src/apps/chatwoot/i18n/locales/fa-IR.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 از ما حمایت کنید**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/fr-FR.yaml b/src/apps/chatwoot/i18n/locales/fr-FR.yaml
index 42d235ce4..679164632 100644
--- a/src/apps/chatwoot/i18n/locales/fr-FR.yaml
+++ b/src/apps/chatwoot/i18n/locales/fr-FR.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 Soutenez-nous**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/he-IL.yaml b/src/apps/chatwoot/i18n/locales/he-IL.yaml
index f20c8aec6..ffa1c77e6 100644
--- a/src/apps/chatwoot/i18n/locales/he-IL.yaml
+++ b/src/apps/chatwoot/i18n/locales/he-IL.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 תמוך בנו**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/hi-IN.yaml b/src/apps/chatwoot/i18n/locales/hi-IN.yaml
index fc8fe5803..9718af006 100644
--- a/src/apps/chatwoot/i18n/locales/hi-IN.yaml
+++ b/src/apps/chatwoot/i18n/locales/hi-IN.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 हमें समर्थन दें**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/id-ID.yaml b/src/apps/chatwoot/i18n/locales/id-ID.yaml
index 05be670eb..17b01b04d 100644
--- a/src/apps/chatwoot/i18n/locales/id-ID.yaml
+++ b/src/apps/chatwoot/i18n/locales/id-ID.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 Dukung Kami**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/it-IT.yaml b/src/apps/chatwoot/i18n/locales/it-IT.yaml
index 40fe3f0d4..41a297191 100644
--- a/src/apps/chatwoot/i18n/locales/it-IT.yaml
+++ b/src/apps/chatwoot/i18n/locales/it-IT.yaml
@@ -116,12 +116,14 @@ whatsapp.contact.broadcast.suffix: 'Lista Broadcast'
 whatsapp.contact.status.name: 'Stato'
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/pa-PK.yaml b/src/apps/chatwoot/i18n/locales/pa-PK.yaml
index e392454a3..8ddc18677 100644
--- a/src/apps/chatwoot/i18n/locales/pa-PK.yaml
+++ b/src/apps/chatwoot/i18n/locales/pa-PK.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 ਸਾਡਾ ਸਮਰਥਨ ਕਰੋ**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/pt-BR.yaml b/src/apps/chatwoot/i18n/locales/pt-BR.yaml
index e4a4f0e1e..09052fc44 100644
--- a/src/apps/chatwoot/i18n/locales/pt-BR.yaml
+++ b/src/apps/chatwoot/i18n/locales/pt-BR.yaml
@@ -336,12 +336,14 @@ waha.core.version.used: |-
   [**🎁 Apoie-nos**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/ru-RU.yaml b/src/apps/chatwoot/i18n/locales/ru-RU.yaml
index 602c19f82..df4acab76 100644
--- a/src/apps/chatwoot/i18n/locales/ru-RU.yaml
+++ b/src/apps/chatwoot/i18n/locales/ru-RU.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 Поддержать нас**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/tr-TR.yaml b/src/apps/chatwoot/i18n/locales/tr-TR.yaml
index 265b9d8d6..e859c6b7e 100644
--- a/src/apps/chatwoot/i18n/locales/tr-TR.yaml
+++ b/src/apps/chatwoot/i18n/locales/tr-TR.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 Bizi Destekleyin**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/uk-UA.yaml b/src/apps/chatwoot/i18n/locales/uk-UA.yaml
index 626801238..8f2821b15 100644
--- a/src/apps/chatwoot/i18n/locales/uk-UA.yaml
+++ b/src/apps/chatwoot/i18n/locales/uk-UA.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 Підтримайте нас**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/ur-PK.yaml b/src/apps/chatwoot/i18n/locales/ur-PK.yaml
index a8b4a5674..872893469 100644
--- a/src/apps/chatwoot/i18n/locales/ur-PK.yaml
+++ b/src/apps/chatwoot/i18n/locales/ur-PK.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 ہماری حمایت کریں**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}
 
diff --git a/src/apps/chatwoot/i18n/locales/zh-CN.yaml b/src/apps/chatwoot/i18n/locales/zh-CN.yaml
index 0ad7eed08..3bf522779 100644
--- a/src/apps/chatwoot/i18n/locales/zh-CN.yaml
+++ b/src/apps/chatwoot/i18n/locales/zh-CN.yaml
@@ -335,12 +335,14 @@ waha.core.version.used: |-
   [**🎁 支持我们**]({{{supportUrl}}})
 
 chatwoot.to.whatsapp.message.text: |-
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
 
 chatwoot.to.whatsapp.message.media.caption: |-
   {{#singleAttachment}}
   {{#content}}
-  {{{ content }}}
+  {{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
+  {{/chatwoot.sender.name}}{{{ content }}}
   {{/content}}
   {{/singleAttachment}}