From c10b6433b05efb295ac7cfd9c35f2e50d87b2b2b Mon Sep 17 00:00:00 2001
From: kushagrasarathe <76868364+kushagrasarathe@users.noreply.github.com>
Date: Thu, 6 Nov 2025 22:11:55 -0300
Subject: [PATCH] fix: remove devconnect badge from ui

---
 src/app/(mobile-ui)/history/page.tsx |  2 +
 src/components/Badges/BadgesRow.tsx  | 57 +++++++++++++++-------------
 src/components/Badges/index.tsx      | 12 +++---
 src/components/Home/HomeHistory.tsx  |  2 +
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/app/(mobile-ui)/history/page.tsx b/src/app/(mobile-ui)/history/page.tsx
index 079ab2275..dd67ea4c0 100644
--- a/src/app/(mobile-ui)/history/page.tsx
+++ b/src/app/(mobile-ui)/history/page.tsx
@@ -162,6 +162,8 @@ const HistoryPage = () => {
         const badges = user?.user?.badges ?? []
         badges.forEach((b) => {
             if (!b.earnedAt) return
+            // dev-note: dev-connect badge to be shown in ui after post devconnect marketing campaign
+            if (b.code.toLowerCase() === 'devconnect_ba_2025') return
             entries.push({
                 isBadge: true,
                 uuid: b.id,
diff --git a/src/components/Badges/BadgesRow.tsx b/src/components/Badges/BadgesRow.tsx
index 4519f98bc..9490d55bf 100644
--- a/src/components/Badges/BadgesRow.tsx
+++ b/src/components/Badges/BadgesRow.tsx
@@ -97,33 +97,36 @@ export function BadgesRow({ badges, className, isSelfProfile = true }: BadgesRow
                     role="region"
                     aria-label="Badge collection"
                 >
-                    {visibleBadges.map((badge, idx) => {
-                        // use public description if viewing someone else's profile, otherwise use original
-                        const displayDescription = isSelfProfile
-                            ? badge.description
-                            : getPublicBadgeDescription(badge.code) || badge.description
-
-                        return (
-                            <Tooltip
-                                key={badge.code}
-                                content={
-                                    <div className="flex flex-col items-center justify-center gap-1">
-                                        <div className="relative text-sm font-bold">{badge.name}</div>
-                                        <p className="text-center font-normal">{displayDescription}</p>
-                                    </div>
-                                }
-                            >
-                                <Image
-                                    src={getBadgeIcon(badge.code)}
-                                    alt={badge.name}
-                                    className="min-h-10 min-w-10 object-contain"
-                                    height={48}
-                                    width={48}
-                                    unoptimized
-                                />
-                            </Tooltip>
-                        )
-                    })}
+                    {visibleBadges
+                        // dev-note: dev-connect badge to be shown in ui after post devconnect marketing campaign
+                        .filter((badge) => badge.code.toLowerCase() !== 'devconnect_ba_2025')
+                        .map((badge) => {
+                            // use public description if viewing someone else's profile, otherwise use original
+                            const displayDescription = isSelfProfile
+                                ? badge.description
+                                : getPublicBadgeDescription(badge.code) || badge.description
+
+                            return (
+                                <Tooltip
+                                    key={badge.code}
+                                    content={
+                                        <div className="flex flex-col items-center justify-center gap-1">
+                                            <div className="relative text-sm font-bold">{badge.name}</div>
+                                            <p className="text-center font-normal">{displayDescription}</p>
+                                        </div>
+                                    }
+                                >
+                                    <Image
+                                        src={getBadgeIcon(badge.code)}
+                                        alt={badge.name}
+                                        className="min-h-10 min-w-10 object-contain"
+                                        height={48}
+                                        width={48}
+                                        unoptimized
+                                    />
+                                </Tooltip>
+                            )
+                        })}
                 </div>
 
                 {/* Right navigation button */}
diff --git a/src/components/Badges/index.tsx b/src/components/Badges/index.tsx
index bda718f16..eec90e10c 100644
--- a/src/components/Badges/index.tsx
+++ b/src/components/Badges/index.tsx
@@ -25,11 +25,13 @@ export const Badges = () => {
     const badges: BadgeView[] = useMemo(() => {
         // get badges from user object and map to card fields
         const raw = authUser?.user?.badges || []
-        return raw.map((b) => ({
-            title: b.name,
-            description: b.description || '',
-            logo: getBadgeIcon(b.code),
-        }))
+        return raw
+            .filter((b) => b.code.toLowerCase() !== 'devconnect_ba_2025')
+            .map((b) => ({
+                title: b.name,
+                description: b.description || '',
+                logo: getBadgeIcon(b.code),
+            }))
     }, [authUser?.user?.badges])
 
     if (!badges.length) {
diff --git a/src/components/Home/HomeHistory.tsx b/src/components/Home/HomeHistory.tsx
index 3d5424a0b..73ebe745f 100644
--- a/src/components/Home/HomeHistory.tsx
+++ b/src/components/Home/HomeHistory.tsx
@@ -100,6 +100,8 @@ const HomeHistory = ({ isPublic = false, username }: { isPublic?: boolean; usern
                     const badges = user?.user?.badges ?? []
                     badges.forEach((b) => {
                         if (!b.earnedAt) return
+                        // dev-note: dev-connect badge to be shown in ui after post devconnect marketing campaign
+                        if (b.code.toLowerCase() === 'devconnect_ba_2025') return
                         entries.push({
                             isBadge: true,
                             uuid: b.id,