From 2b1794519430abfe7c669c3ffb0d88b23a2920a4 Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Fri, 28 Feb 2025 14:37:57 -0500 Subject: [PATCH] chore: only run leave function if dialog result is yes (#2011) --- lib/pages/chat_list/chat_list.dart | 5 ++++- lib/pangea/chat_settings/pages/pangea_chat_details.dart | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 294472b1a..a94445e9e 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -933,7 +933,10 @@ class ChatListController extends State cancelLabel: L10n.of(context).cancel, isDestructive: true, ); - if (confirmed == OkCancelResult.cancel) return; + // #Pangea + // if (confirmed == OkCancelResult.cancel) return; + if (confirmed != OkCancelResult.ok) return; + // Pangea# if (!mounted) return; // #Pangea diff --git a/lib/pangea/chat_settings/pages/pangea_chat_details.dart b/lib/pangea/chat_settings/pages/pangea_chat_details.dart index 1b49fc3cc..1c0654504 100644 --- a/lib/pangea/chat_settings/pages/pangea_chat_details.dart +++ b/lib/pangea/chat_settings/pages/pangea_chat_details.dart @@ -420,7 +420,7 @@ class PangeaChatDetailsView extends StatelessWidget { : L10n.of(context).leaveRoomDescription, isDestructive: true, ); - if (confirmed == OkCancelResult.cancel) return; + if (confirmed != OkCancelResult.ok) return; final resp = await showFutureLoadingDialog( context: context, future: