From 5a3ff8998c6a437b2eb21a75ba41d232676ede25 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Fri, 7 Nov 2025 10:29:12 -0500
Subject: [PATCH] fix: on leave activity, if activity in course, redirect to
 course

---
 .../activity_session_popup_menu.dart                     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart
index 22c791e7f..c0826cace 100644
--- a/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart
+++ b/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart
@@ -30,6 +30,7 @@ class ActivitySessionPopupMenuState extends State<ActivitySessionPopupMenu>
       onSelected: (choice) async {
         switch (choice) {
           case ActivityPopupMenuActions.leave:
+            final parentSpaceId = widget.room.courseParent?.id;
             final router = GoRouter.of(context);
             final confirmed = await showOkCancelAlertDialog(
               context: context,
@@ -45,7 +46,11 @@ class ActivitySessionPopupMenuState extends State<ActivitySessionPopupMenu>
               future: () => widget.room.leave(),
             );
             if (result.error == null) {
-              router.go('/rooms');
+              router.go(
+                parentSpaceId != null
+                    ? '/rooms/spaces/$parentSpaceId'
+                    : '/rooms',
+              );
             }
             break;
           case ActivityPopupMenuActions.invite:
@@ -85,7 +90,7 @@ class ActivitySessionPopupMenuState extends State<ActivitySessionPopupMenu>
           value: ActivityPopupMenuActions.leave,
           child: Row(
             children: [
-              const Icon(Icons.delete_outlined),
+              const Icon(Icons.logout_outlined),
               const SizedBox(width: 12),
               Text(L10n.of(context).leave),
             ],