handle removal for user peers only

AlaaElattar · AlaaElattar · commit abc3d7940b26 · 2025-09-19T22:09:08.000+03:00
diff --git a/lib/features/peers/peers_screen.dart b/lib/features/peers/peers_screen.dart
@@ -93,6 +93,8 @@ class _PeersDataScreenState extends ConsumerState<_PeersDataScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final peersNotifier = ref.read(peersProvider.notifier);
+    final userPeers = peersNotifier.userPeers;
     final filtered = query.isEmpty
         ? widget.peers
         : widget.peers
@@ -117,8 +119,7 @@ class _PeersDataScreenState extends ConsumerState<_PeersDataScreen> {
         Divider(
           height: 1,
           thickness: 1,
-          color: Theme.of(context)
-              .dividerColor, // You can use Theme.of(context).dividerColor for theme-aware color
+          color: Theme.of(context).dividerColor,
         ),
       ]),
       currentIndex: 1,
@@ -142,10 +143,12 @@ class _PeersDataScreenState extends ConsumerState<_PeersDataScreen> {
                   const SizedBox(height: AppSpacing.sm),
               itemBuilder: (_, index) {
                 final p = filtered[index];
+                final isUserPeer = userPeers.contains(p);
                 return _PeerTile(
                   ip: p,
                   country: "Unknown",
                   health: 0.8,
+                  isUserPeer: isUserPeer,
                 );
               },
             ),
@@ -262,12 +265,13 @@ class _PeerTile extends StatelessWidget {
   final String ip;
   final String country;
   final double health;
+  final bool isUserPeer;
 
-  const _PeerTile({
-    required this.ip,
-    required this.country,
-    required this.health,
-  });
+  const _PeerTile(
+      {required this.ip,
+      required this.country,
+      required this.health,
+      required this.isUserPeer});
 
   @override
   Widget build(BuildContext context) {
@@ -315,9 +319,11 @@ class _PeerTile extends StatelessWidget {
                     showDragHandle: true,
                     builder: (_) => PeerDetailsSheet(
                       country: country,
+                      ip: ip,
                       city: "",
                       latency: "",
                       status: "",
+                      isUserPeer: isUserPeer,
                     ),
                   );
                 },
@@ -415,7 +421,9 @@ void _showAddPeerDialog(BuildContext context, WidgetRef ref) {
       title: const Text('Add Peer'),
       content: TextField(
         controller: controller,
-        decoration: const InputDecoration(hintText: 'Enter peer IP'),
+        decoration: const InputDecoration(
+          hintText: 'Enter peer IP (e.g. 185.69.166.7)',
+        ),
         keyboardType: TextInputType.url,
       ),
       actions: [
@@ -427,7 +435,10 @@ void _showAddPeerDialog(BuildContext context, WidgetRef ref) {
           onPressed: () async {
             final ip = controller.text.trim();
             if (ip.isNotEmpty) {
-              await peersNotifier.addPeer(ip);
+              final formattedPeer =
+                  ip.startsWith('tcp://') ? ip : 'tcp://$ip:9651';
+
+              await peersNotifier.addPeer(formattedPeer);
             }
             Navigator.of(context).pop();
           },
diff --git a/lib/features/peers/widgets/peer_details_sheet.dart b/lib/features/peers/widgets/peer_details_sheet.dart
@@ -1,49 +1,76 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../../app/theme/tokens.dart';
-import '../../../app/widgets/app_card.dart';
+import '../../../state/mycelium_providers.dart';
 
-class PeerDetailsSheet extends StatelessWidget {
+class PeerDetailsSheet extends ConsumerWidget {
+  final String ip;
   final String country;
   final String city;
   final String latency;
   final String status;
+  final bool isUserPeer;
 
-  const PeerDetailsSheet({super.key, required this.country, required this.city, required this.latency, required this.status});
+  const PeerDetailsSheet(
+      {super.key,
+      required this.country,
+      required this.city,
+      required this.latency,
+      required this.status,
+      required this.ip,
+      this.isUserPeer = false});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final peersNotifier = ref.read(peersProvider.notifier);
     return Padding(
       padding: const EdgeInsets.all(AppSpacing.lg),
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Container(height: 4, width: 40, margin: const EdgeInsets.only(bottom: AppSpacing.lg), decoration: BoxDecoration(color: Theme.of(context).colorScheme.outline, borderRadius: BorderRadius.circular(2))),
+          Container(
+              height: 4,
+              width: 40,
+              margin: const EdgeInsets.only(bottom: AppSpacing.lg),
+              decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.outline,
+                  borderRadius: BorderRadius.circular(2))),
           Row(children: [
             const CircleAvatar(radius: 16, child: Text('US')),
             const SizedBox(width: AppSpacing.lg),
-            Expanded(child: Text(country, style: Theme.of(context).textTheme.titleMedium, overflow: TextOverflow.ellipsis)),
+            Expanded(
+                child: Text(country,
+                    style: Theme.of(context).textTheme.titleMedium,
+                    overflow: TextOverflow.ellipsis)),
             const SizedBox(width: AppSpacing.lg),
             Text(latency, style: Theme.of(context).textTheme.labelMedium),
           ]),
-          const SizedBox(height: AppSpacing.xxl),
-          AppCard(
-            child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-              Text('Health Check', style: Theme.of(context).textTheme.titleMedium),
-              const SizedBox(height: AppSpacing.lg),
-              Row(children: [
-                _Kpi(title: 'Ping Status', value: 'Reachable'),
+          const SizedBox(height: AppSpacing.lg),
+          Row(
+            children: [
+              Expanded(
+                child: OutlinedButton(
+                  onPressed: () {},
+                  child: const Text('Ping Test'),
+                ),
+              ),
+              if (isUserPeer) ...[
                 const SizedBox(width: AppSpacing.lg),
-                _Kpi(title: 'Latency', value: latency),
-              ]),
-            ]),
+                Expanded(
+                  child: FilledButton.tonal(
+                    onPressed: () async {
+                      await peersNotifier.removePeer(ip);
+                      if (context.mounted) {
+                        Navigator.of(context).pop();
+                      }
+                    },
+                    child: const Text('Remove Peer'),
+                  ),
+                ),
+              ],
+            ],
           ),
           const SizedBox(height: AppSpacing.lg),
-          Row(children: [
-            Expanded(child: OutlinedButton(onPressed: () {}, child: const Text('Ping Test'))),
-            const SizedBox(width: AppSpacing.lg),
-            Expanded(child: FilledButton.tonal(onPressed: () {}, child: const Text('Remove Peer'))),
-          ]),
-          const SizedBox(height: AppSpacing.lg),
         ],
       ),
     );
@@ -59,7 +86,9 @@ class _Kpi extends StatelessWidget {
   Widget build(BuildContext context) {
     return Expanded(
       child: Container(
-        decoration: BoxDecoration(color: Theme.of(context).colorScheme.surfaceContainerHighest, borderRadius: BorderRadius.circular(AppRadii.md)),
+        decoration: BoxDecoration(
+            color: Theme.of(context).colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(AppRadii.md)),
         padding: const EdgeInsets.all(AppSpacing.lg),
         child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
           Text(title, style: Theme.of(context).textTheme.labelMedium),
@@ -70,5 +99,3 @@ class _Kpi extends StatelessWidget {
     );
   }
 }
-
-
diff --git a/lib/state/mycelium_providers.dart b/lib/state/mycelium_providers.dart
@@ -20,13 +20,17 @@ class PeersNotifier extends StateNotifier<AsyncValue<List<String>>> {
   final PeersService _service;
   final PeersRepository _repo;
 
+  List<String> _userPeers = [];
+
+  List<String> get userPeers => _userPeers;
+
   PeersNotifier(this._service, this._repo) : super(const AsyncLoading()) {
     _fetchPeers();
   }
 
   Future<void> _fetchPeers() async {
     try {
-      final userPeers = await _repo.loadPeers();
+      _userPeers = await _repo.loadPeers();
       final fetchedPeers = await _service.fetchPeers();
 
       final allPeers = {...userPeers, ...fetchedPeers}.toList();
@@ -38,6 +42,7 @@ class PeersNotifier extends StateNotifier<AsyncValue<List<String>>> {
 
   Future<void> addPeer(String peer) async {
     await _repo.addPeer(peer);
+    _userPeers.add(peer);
     final current = state.value ?? [];
     if (!current.contains(peer)) {
       state = AsyncData([...current, peer]);
@@ -46,6 +51,7 @@ class PeersNotifier extends StateNotifier<AsyncValue<List<String>>> {
 
   Future<void> removePeer(String peer) async {
     await _repo.removePeer(peer);
+    _userPeers.remove(peer); 
     final current = state.value ?? [];
     state = AsyncData(current.where((p) => p != peer).toList());
   }
