From 0df4504a11d535c0ec2a1f3ef3652ab4daa7cdd4 Mon Sep 17 00:00:00 2001
From: Vitor Duggen <zduggem@gmail.com>
Date: Wed, 4 Mar 2026 15:54:13 -0300
Subject: [PATCH 1/2] refactor(channel): remove unused pushName field

---
 src/api/services/channel.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts
index 2d7ec8c60..ecc9edb26 100644
--- a/src/api/services/channel.service.ts
+++ b/src/api/services/channel.service.ts
@@ -818,7 +818,6 @@ export class ChannelStartupService {
               to_timestamp("Message"."messageTimestamp"::double precision),
               "Contact"."updatedAt"
             ) as "updatedAt",
-            "Chat"."name" as "pushName",
             "Chat"."createdAt" as "windowStart",
             "Chat"."createdAt" + INTERVAL '24 hours' as "windowExpires",
             "Chat"."unreadMessages" as "unreadMessages",

From b84d95144cef945f07728e549207b21ad5146256 Mon Sep 17 00:00:00 2001
From: Vitor Duggen <zduggem@gmail.com>
Date: Wed, 4 Mar 2026 16:23:36 -0300
Subject: [PATCH 2/2] refactor(channel): simplify pushName assignment logic

---
 src/api/services/channel.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts
index ecc9edb26..1cd578282 100644
--- a/src/api/services/channel.service.ts
+++ b/src/api/services/channel.service.ts
@@ -811,7 +811,7 @@ export class ChannelStartupService {
             "Message"."key"->>'remoteJid' as "remoteJid",
             CASE
               WHEN "Message"."key"->>'remoteJid' LIKE '%@g.us' THEN COALESCE("Chat"."name", "Contact"."pushName")
-              ELSE COALESCE("Contact"."pushName", "Message"."pushName")
+              ELSE "Contact"."pushName"
             END as "pushName",
             "Contact"."profilePicUrl",
             COALESCE(