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 ( - -
{badge.name}
-

{displayDescription}

- - } - > - {badge.name} -
- ) - })} + {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 ( + +
{badge.name}
+

{displayDescription}

+ + } + > + {badge.name} +
+ ) + })} {/* 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,