fix(phase/4-5-6): resolve all bugs in badge system combined PR

- ProfileSidebar: define missing clanBadgeCount from unlocked chief badges
- Badges.jsx: normalize featuredBadgeId to string (handles populated objects)
- Badges.jsx: fix isFeatured comparison with .toString()
- Badges.jsx: remove unused userProfile query (dead code)
- NotificationListener: replace dynamic CJS require() with top-level ESM import
- NotificationListener: fix unused variable lint errors
- badge.routes.js: remove stray 'Trigger nodemon restart' comment
- auth.controller: populate featuredBadge in getMe so /api/auth/me returns it

Author: FOX-KNIGHT

client/src/components/NotificationListener.jsx

@@ -3,6 +3,7 @@ import toast from 'react-hot-toast';
 import { useNavigate } from 'react-router-dom';
 import { useSocket } from '../hooks/useSocket';
 import { FiZap, FiAward } from 'react-icons/fi';
+import { api } from '../lib/api';
 import { useAuth } from '../context/useAuth';
 
 const NotificationListener = () => {
@@ -33,7 +34,7 @@ const NotificationListener = () => {
   });
 
   // Listen for leaderboard updates (optional: show a generic toast or just let the page handle it)
-  useSocket('leaderboard_update', (data) => {
+  useSocket('leaderboard_update', () => {
     // Other components (like Leaderboard/Clans) will refetch automatically
   });
 
@@ -47,7 +48,6 @@ const NotificationListener = () => {
   const checkBadges = React.useCallback(async (notify = false) => {
     if (!user) return;
     try {
-      const { api } = require('../lib/api');
       const res = await api.get('/api/badges');
       const badges = res.data?.data || [];
       const newlyUnlocked = [];
@@ -90,6 +90,7 @@ const NotificationListener = () => {
           });
         });
       }
+    // eslint-disable-next-line no-unused-vars
     } catch (e) {
       // ignore
     }

client/src/components/ProfileSidebar.jsx

@@ -165,6 +165,10 @@ const ProfileSidebar = ({ user, summary, profile, badges }) => {
     });
   };
 
+  const clanBadgeCount = React.useMemo(() => {
+    return (badges || []).filter(b => b.isChiefBadge && b.isUnlocked).length;
+  }, [badges]);
+
   const sortedBadges = React.useMemo(() => {
     const baseBadges = badges?.length
       ? badges

client/src/pages/Badges.jsx

@@ -197,7 +197,7 @@ const CategorySection = ({ category, badges, index, onSetFeatured, featuredBadge
             badge={badge} 
             index={i} 
             onSetFeatured={onSetFeatured}
-            isFeatured={featuredBadgeId === badge._id}
+            isFeatured={featuredBadgeId === badge._id?.toString()}
           />
         ))}
       </div>
@@ -220,16 +220,7 @@ const Badges = () => {
     staleTime: 60000,
   });
 
-  const { data: userProfile } = useQuery({
-    queryKey: ['user-profile'],
-    queryFn: async () => {
-      const res = await api.get('/api/users/me'); // Or standard route
-      return res.data.data;
-    },
-    staleTime: 60000,
-  });
-
-  // We actually need the user's featuredBadge ID. 
+  // We actually need the user's featuredBadge ID.
   // We can fetch it via /api/profile/stats which returns user info or /api/auth/me
   // Wait, the currently logged in user is in auth context. But we can just use the auth/me endpoint or profile
   const { data: authUser } = useQuery({
@@ -241,7 +232,10 @@ const Badges = () => {
     staleTime: 60000,
   });
 
-  const featuredBadgeId = authUser?.featuredBadge;
+  // featuredBadge may be a populated object or a raw ID string
+  const featuredBadgeId = authUser?.featuredBadge?._id
+    ? authUser.featuredBadge._id.toString()
+    : authUser?.featuredBadge?.toString() || null;
 
   const setFeaturedMutation = useMutation({
     mutationFn: async (badgeId) => {

server/src/features/auth/auth.controller.js

@@ -549,7 +549,7 @@ const logoutAll = async (req, res, next) => {
 
 const getMe = async (req, res, next) => {
   try {
-    const user = await User.findById(req.user.id).populate('clan', 'name').lean();
+    const user = await User.findById(req.user.id).populate('clan', 'name').populate('featuredBadge').lean();
     if (!user) {
       res.status(404);
       throw new Error('User not found');

server/src/features/badges/badge.routes.js

@@ -19,4 +19,3 @@ router.post('/award/:userId', protect, awardBadge);
 router.delete('/revoke/:userId/:badgeId', protect, revokeBadge);
 
 module.exports = router;
-// Trigger nodemon restart