feat: Add PendingSessionsScreen and integrate pending session handling in ConversationsScreen

Author: AdamLBS

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.35.7"
+}

.gitignore

@@ -43,3 +43,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# FVM Version Cache
+.fvm/

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "dart.flutterSdkPath": ".fvm\\versions\\3.35.7"
+}

lib/models/pending_sessions.dart

@@ -1,3 +1,5 @@
+import 'package:hushnet_frontend/models/users.dart';
+
 class PendingSession {
   final String id;
   final String senderDeviceId;
@@ -6,14 +8,16 @@ class PendingSession {
   final String ciphertext; // base64
   final String? senderPrekeyPub; // base64 (nécessaire pour DH1)
   final String createdAt;
-
+  User? senderUser;
+  
   PendingSession({
     required this.id,
     required this.senderDeviceId,
     required this.recipientDeviceId,
     required this.ephemeralPubkey,
     required this.ciphertext,
     required this.createdAt,
+    this.senderUser,
     this.senderPrekeyPub,
   });
 

lib/screens/conversations_screen.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hushnet_frontend/data/node/sessions/create_session.dart';
 import 'package:hushnet_frontend/models/chat_view.dart';
 import 'package:hushnet_frontend/screens/chat_view_screen.dart';
+import 'package:hushnet_frontend/screens/pending_sessions_screen.dart';
 import 'package:hushnet_frontend/screens/user_list_screen.dart';
 import 'package:hushnet_frontend/services/chat_service.dart';
 import 'package:hushnet_frontend/services/node_service.dart';
@@ -26,8 +27,7 @@ class _ConversationsScreenState extends State<ConversationsScreen> {
       nodeService.stream.listen((event) {
         if (!mounted) return;
         if (event['event_type'] == 'session') {
-          setState(() {
-        });
+          setState(() {});
         }
       });
     });
@@ -52,14 +52,22 @@ class _ConversationsScreenState extends State<ConversationsScreen> {
                   children: [
                     _buildHeader(),
                     Expanded(
-                      child: FutureBuilder<List<ChatView>>(
-                        future: chatService.getChats(),
+                      child: FutureBuilder(
+                        future: Future.wait([
+                          chatService.getChats(),
+                          SessionService()
+                              .getPendingSessionsCount(), // 🧠 nouvelle méthode simple
+                        ]),
                         builder: (context, snapshot) {
-                          if (snapshot.connectionState == ConnectionState.waiting) {
+                          if (snapshot.connectionState ==
+                              ConnectionState.waiting) {
                             return const Center(
-                              child: CircularProgressIndicator(color: Colors.greenAccent),
+                              child: CircularProgressIndicator(
+                                color: Colors.greenAccent,
+                              ),
                             );
                           }
+
                           if (snapshot.hasError) {
                             return Center(
                               child: Text(
@@ -68,13 +76,35 @@ class _ConversationsScreenState extends State<ConversationsScreen> {
                               ),
                             );
                           }
-                          _chats = snapshot.data ?? [];
-                          if (_chats.isEmpty) {
+
+                          List<ChatView> chats = snapshot.data?[0] as List<ChatView>? ?? [];
+                          int pendingCount = snapshot.data?[1] as int? ?? 0;
+
+                          if (chats.isEmpty && pendingCount == 0) {
                             return const Center(
-                              child: Text("No conversations yet", style: TextStyle(color: Colors.grey)),
+                              child: Text(
+                                "No conversations yet",
+                                style: TextStyle(color: Colors.grey),
+                              ),
                             );
                           }
-                          return _buildConversationList(_chats);
+
+                          return Column(
+                            children: [
+                              if (pendingCount > 0)
+                                Padding(
+                                  padding: const EdgeInsets.symmetric(
+                                    horizontal: 12,
+                                    vertical: 6,
+                                  ),
+                                  child: _buildPendingButton(
+                                    context,
+                                    pendingCount,
+                                  ),
+                                ),
+                              Expanded(child: _buildConversationList(chats)),
+                            ],
+                          );
                         },
                       ),
                     ),
@@ -123,15 +153,14 @@ class _ConversationsScreenState extends State<ConversationsScreen> {
           const Spacer(),
           IconButton(
             onPressed: () {
-              Navigator.of(context).push(MaterialPageRoute(
-                builder: (_) => const UserListScreen(),
-              ));
+              Navigator.of(
+                context,
+              ).push(MaterialPageRoute(builder: (_) => const UserListScreen()));
             },
             icon: const Icon(Icons.add, color: Colors.white),
           ),
           IconButton(
             onPressed: () {
-              SessionService().processPendingSessions();
             },
             icon: const Icon(Icons.settings, color: Colors.white),
           ),
@@ -151,6 +180,38 @@ class _ConversationsScreenState extends State<ConversationsScreen> {
     );
   }
 
+  Widget _buildPendingButton(BuildContext context, int count) {
+    return GestureDetector(
+      onTap: () {
+        Navigator.of(context).push(
+          MaterialPageRoute(builder: (_) => const PendingSessionsScreen()),
+        );
+      },
+      child: Container(
+        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
+        decoration: BoxDecoration(
+          color: const Color(0xFF222222),
+          borderRadius: BorderRadius.circular(10),
+          border: Border.all(color: Colors.greenAccent.withOpacity(0.3)),
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const Icon(Icons.key, color: Colors.greenAccent, size: 20),
+            const SizedBox(width: 8),
+            Text(
+              "Pending sessions ($count)",
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   Widget _buildConversationList(List<ChatView> chats) {
     return ListView.builder(
       itemCount: chats.length,
@@ -197,10 +258,13 @@ class _ConversationsScreenState extends State<ConversationsScreen> {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text(chat.displayName,
-                          style: const TextStyle(
-                              color: Colors.white,
-                              fontWeight: FontWeight.w600)),
+                      Text(
+                        chat.displayName,
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
                       const SizedBox(height: 4),
                       Text(
                         chat.previewText,