Merge commit '7d798c57704cc38a39df3cd21be17d8ae52230b3' into fluffychat-merge

lib/widgets/chat_settings_popup_menu.dart

@@ -56,6 +56,7 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
           onSelected: (choice) async {
             switch (choice) {
               case ChatPopupMenuActions.leave:
+                final router = GoRouter.of(context);
                 final confirmed = await showOkCancelAlertDialog(
                   context: context,
                   title: L10n.of(context).areYouSure,
@@ -67,15 +68,15 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
                   cancelLabel: L10n.of(context).cancel,
                   isDestructive: true,
                 );
-                if (confirmed == OkCancelResult.ok) {
+                if (confirmed != OkCancelResult.ok) return;
-                  final success = await showFutureLoadingDialog(
+                final result = await showFutureLoadingDialog(
-                    context: context,
+                  context: context,
-                    future: () => widget.room.leave(),
+                  future: () => widget.room.leave(),
-                  );
+                );
-                  if (success.error == null) {
+                if (result.error == null) {
-                    context.go('/rooms');
+                  router.go('/rooms');
-                  }
                 }
+
                 break;
               case ChatPopupMenuActions.mute:
                 await showFutureLoadingDialog(