UI FIX and TEST

Author: Nzettodess

firestore.rules

@@ -58,6 +58,16 @@ service cloud.firestore {
       return isAuthenticated();
     }
 
+    // Check if target user has a pending join request to a group where current user is admin
+    // NOTE: This cannot be done efficiently in rules (would require querying join_requests).
+    // Instead, we embed the requester's name IN the join_request document at creation time,
+    // so admins don't need to read the user document directly.
+    // This function is a placeholder for documentation purposes.
+    function hasPendingJoinRequestToMyGroup(targetUserId) {
+      // Cannot be implemented efficiently in rules - handled at app level
+      return false;
+    }
+    
     // ============================================
     // 1. USERS COLLECTION
     // ============================================
@@ -169,9 +179,9 @@ service cloud.firestore {
       // Read: Strictly limited to group members
       allow read: if isAuthenticated() && isGroupMember(resource.data.groupId);
 
-      // Only Owner can create
+      // Owner or Admin can create
       allow create: if isAuthenticated() && 
-                       isGroupOwner(request.resource.data.groupId);
+                       isGroupAdmin(request.resource.data.groupId);
 
       // Owner or Admin can update
       allow update: if isAuthenticated() && 
@@ -282,6 +292,7 @@ service cloud.firestore {
                        request.resource.data.status == 'pending';
 
       // Only Owner/Admin can process (approve/reject)
+      // Restrict changes to specific fields only
       allow update: if isAuthenticated() && 
                        isGroupAdmin(resource.data.groupId) &&
                        request.resource.data.diff(resource.data).affectedKeys()
@@ -306,5 +317,20 @@ service cloud.firestore {
       // No updates or deletes
       allow update, delete: if false;
     }
+    
+    // ============================================
+    // 10. NOTIFICATIONS COLLECTION (Top-level)
+    // ============================================
+    match /notifications/{notificationId} {
+      // User can read their own notifications (userId field matches)
+      allow read: if isAuthenticated() && resource.data.userId == userId();
+      
+      // Any authenticated user can create or update notifications
+      // (needed for batch.set with merge:true for deduplication)
+      allow create, update: if isAuthenticated();
+      
+      // User can delete their own notifications
+      allow delete: if isAuthenticated() && resource.data.userId == userId();
+    }
   }
 }

lib/add_event_modal.dart

@@ -309,15 +309,14 @@ class _AddEventModalState extends State<AddEventModal> {
     final changes = <String>[];
 
     if (oldEvent.title != newEvent.title) {
-      changes.add("Title: ${oldEvent.title} -> ${newEvent.title}");
+      changes.add("Title Updated");
     }
 
     if (oldEvent.venue != newEvent.venue) {
-      final oldV = oldEvent.venue != null && oldEvent.venue!.isNotEmpty ? oldEvent.venue! : 'None';
-      final newV = newEvent.venue != null && newEvent.venue!.isNotEmpty ? newEvent.venue! : 'None';
-      // Only show if actually changed
+      final oldV = oldEvent.venue != null && oldEvent.venue!.isNotEmpty ? oldEvent.venue! : '';
+      final newV = newEvent.venue != null && newEvent.venue!.isNotEmpty ? newEvent.venue! : '';
       if (oldV != newV) {
-        changes.add("Venue: $oldV -> $newV");
+        changes.add("Venue Updated");
       }
     }
 
@@ -326,28 +325,28 @@ class _AddEventModalState extends State<AddEventModal> {
     final newDateStr = DateFormat('yyyy-MM-dd').format(newEvent.date);
 
     if (oldDateStr != newDateStr) {
-       changes.add("Date: $oldDateStr -> $newDateStr");
+       changes.add("Date Updated");
     }
 
-    // Compare times if hasTime changed or time value changed
+    // Compare times
     if (oldEvent.hasTime != newEvent.hasTime || 
        (oldEvent.hasTime && newEvent.hasTime && oldEvent.date != newEvent.date)) {
         if (newEvent.hasTime) {
-           final oldTime = oldEvent.hasTime ? DateFormat('HH:mm').format(oldEvent.date) : 'No time';
+           final oldTime = oldEvent.hasTime ? DateFormat('HH:mm').format(oldEvent.date) : '';
            final newTime = DateFormat('HH:mm').format(newEvent.date);
            if (oldTime != newTime) {
-             changes.add("Time: $oldTime -> $newTime");
+             changes.add("Time Updated");
            }
         } else {
-           changes.add("Time removed");
+           changes.add("Time Removed");
         }
     }
 
     if (oldEvent.description != newEvent.description) {
-      changes.add("Description updated");
+      changes.add("Description Updated");
     }
 
     if (changes.isEmpty) return null;
-    return changes.join("\n");
+    return changes.join(", ");
   }
 }

lib/birthday_baby_dialog.dart

@@ -112,7 +112,7 @@ class BirthdayBabyDialog extends StatelessWidget {
                                       color: Colors.indigo,
                                       shape: BoxShape.circle,
                                     ),
-                                    child: const Text('🌙', style: TextStyle(fontSize: 10)),
+                                    child: const Text('🏮', style: TextStyle(fontSize: 10)),
                                   ),
                                 ),
                             ],

lib/detail_modal.dart

@@ -1367,7 +1367,13 @@ class _DetailModalState extends State<DetailModal> {
                       : 'Unknown';
                   return Builder(
                     builder: (context) {
+                      final isDark = Theme.of(context).brightness == Brightness.dark;
                       return Card(
+                        color: isDark ? Colors.grey.shade900 : null,
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(8),
+                          side: isDark ? BorderSide(color: Colors.grey.shade700) : BorderSide.none,
+                        ),
                         child: Padding(
                           padding: const EdgeInsets.all(12),
                           child: Row(

lib/firestore_service.dart

@@ -507,6 +507,32 @@ class FirestoreService {
     await _db.collection('notifications').doc(notificationId).update({'read': true});
   }
 
+  Future<void> markNotificationUnread(String notificationId) async {
+    await _db.collection('notifications').doc(notificationId).update({'read': false});
+  }
+
+  Future<void> deleteNotification(String notificationId) async {
+    await _db.collection('notifications').doc(notificationId).delete();
+  }
+
+  Future<void> deleteAllNotifications(String userId) async {
+    final snapshot = await _db.collection('notifications').where('userId', isEqualTo: userId).get();
+    final batch = _db.batch();
+    for (final doc in snapshot.docs) {
+      batch.delete(doc.reference);
+    }
+    await batch.commit();
+  }
+
+  Future<void> markAllAsUnread(String userId) async {
+    final snapshot = await _db.collection('notifications').where('userId', isEqualTo: userId).get();
+    final batch = _db.batch();
+    for (final doc in snapshot.docs) {
+      batch.update(doc.reference, {'read': false});
+    }
+    await batch.commit();
+  }
+
   // --- Events ---
 
   Future<void> createEvent(GroupEvent event) async {
@@ -555,19 +581,8 @@ class FirestoreService {
 
     await _db.collection('events').doc(event.id).update(updateData);
 
-    // Notify members
-    final groupDoc = await _db.collection('groups').doc(event.groupId).get();
-    if (groupDoc.exists) {
-      final group = Group.fromFirestore(groupDoc);
-      debugPrint('[FirestoreService] Notifying ${group.members.length} members for event update: ${event.title}');
-      await NotificationService().notifyEventUpdated(
-        memberIds: group.members,
-        editorId: editedByUserId,
-        eventId: event.id,
-        eventTitle: event.title,
-        groupId: event.groupId,
-      );
-    }
+    // NOTE: Notification is handled by add_event_modal.dart with changeSummary
+    // Do NOT send notification here to avoid duplicates
   }
 
   Future<void> deleteEvent(String eventId, String deleterId) async {
@@ -990,7 +1005,7 @@ class FirestoreService {
       final group = Group.fromFirestore(groupDoc);
 
       await NotificationService().notifyInheritanceRequest(
-        adminIds: group.admins, // admins includes owner usually
+        adminIds: [...group.admins, group.ownerId], // Include owner explicitly
         requesterId: requesterId,
         requesterName: userName,
         placeholderName: phName,
@@ -1224,8 +1239,12 @@ class FirestoreService {
       await _db.collection('groups').doc(request.groupId).update({
         'members': FieldValue.arrayUnion([request.requesterId]),
       });
-      // Note: We used to update user's joinedGroupIds here, but Admins can't write to other Users.
-      // The user must sync their own group list on next app launch.
+      
+      // Force sync the new member's joinedGroupIds immediately
+      // This allows them to read other group members' profiles right away
+      await _db.collection('users').doc(request.requesterId).update({
+        'joinedGroupIds': FieldValue.arrayUnion([request.groupId]),
+      });
 
       // Get group name for notification
       final groupDoc = await _db.collection('groups').doc(request.groupId).get();