Merge remote-tracking branch 'origin/issue-fix-channel-edit-delete-actions' into combined-prs

lib/screens/channels_screen.dart

@@ -489,12 +489,13 @@ class _ChannelsScreenState extends State<ChannelsScreen>
     ChannelMessageStore channelMessageStore,
     Channel channel,
   ) {
+    final parentContext = context;
     final settingsService = context.read<AppSettingsService>();
     final isMuted = settingsService.isChannelMuted(channel.name);
 
     showModalBottomSheet(
-      context: context,
-      builder: (context) => SafeArea(
+      context: parentContext,
+      builder: (sheetContext) => SafeArea(
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
@@ -502,10 +503,10 @@ class _ChannelsScreenState extends State<ChannelsScreen>
               leading: const Icon(Icons.edit_outlined),
               title: Text(context.l10n.channels_editChannel),
               onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                 await Future.delayed(const Duration(milliseconds: 100));
-                if (context.mounted) {
-                  _showEditChannelDialog(context, connector, channel);
+                if (parentContext.mounted) {
+                  _showEditChannelDialog(parentContext, connector, channel);
                 }
               },
             ),
@@ -521,7 +522,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                     : context.l10n.channels_muteChannel,
               ),
               onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                 if (isMuted) {
                   await settingsService.unmuteChannel(channel.name);
                 } else {
@@ -536,9 +537,9 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                 style: const TextStyle(color: Colors.red),
               ),
               onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                 await Future.delayed(const Duration(milliseconds: 100));
-                if (context.mounted) {
+                if (parentContext.mounted) {
                   _confirmDeleteChannel(
                     context,
                     connector,
@@ -1454,7 +1455,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
               child: Text(dialogContext.l10n.common_cancel),
             ),
             FilledButton(
-              onPressed: () {
+              onPressed: () async {
                 final name = nameController.text.trim();
                 final pskHex = pskController.text.trim();
 
@@ -1471,13 +1472,25 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                 }
 
                 Navigator.pop(dialogContext);
-                connector.setChannel(channel.index, name, psk);
-                connector.setChannelSmazEnabled(channel.index, smazEnabled);
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(context.l10n.channels_channelUpdated(name)),
-                  ),
-                );
+                try {
+                  await connector.setChannel(channel.index, name, psk);
+                  await connector.setChannelSmazEnabled(
+                    channel.index,
+                    smazEnabled,
+                  );
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(context.l10n.channels_channelUpdated(name)),
+                    ),
+                  );
+                } catch (e, st) {
+                  debugPrint(st.toString());
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(content: Text('Failed to update channel: $e')),
+                  );
+                }
               },
               child: Text(dialogContext.l10n.common_save),
             ),
@@ -1506,17 +1519,36 @@ class _ChannelsScreenState extends State<ChannelsScreen>
             child: Text(dialogContext.l10n.common_cancel),
           ),
           TextButton(
-            onPressed: () {
+            onPressed: () async {
               Navigator.pop(dialogContext);
-              connector.deleteChannel(channel.index);
-              channelMessageStore.clearChannelMessages(channel.index);
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text(
-                    context.l10n.channels_channelDeleted(channel.name),
+              try {
+                await connector.deleteChannel(channel.index);
+
+                channelMessageStore.clearChannelMessages(channel.index);
+
+                if (!context.mounted) return;
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      context.l10n.channels_channelDeleted(channel.name),
+                    ),
                   ),
-                ),
-              );
+                );
+              } catch (e, st) {
+                if (!context.mounted) return;
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      context.l10n.channels_channelDeleteFailed(channel.name),
+                    ),
+                  ),
+                );
+
+                // Preserve existing logging (if it was there)
+                debugPrint('Failed to delete channel: $e\n$st');
+              }
             },
             child: Text(
               dialogContext.l10n.common_delete,