ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: allow users in un-started activities to leave (#4714)

Browse source
This commit is contained in:
ggurdin 2025-11-20 13:00:11 -05:00 • committed by GitHub
parent 196318d0e7
commit 4ee9dd7c49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/pangea/activity_sessions/activity_session_start/activity_session_start_page.dart
View file

@ -116,13 +116,21 @@ class ActivitySessionStartController extends State<ActivitySessionStartPage>
false;
SessionState get state {
if (activityRoom?.hasPickedRole == true) return SessionState.confirmedRole;
if (_selectedRoleId != null) return SessionState.selectedRole;
if (activityRoom == null) {
if (activityRoom?.membership == Membership.join &&
activityRoom?.hasPickedRole == true) {
return SessionState.confirmedRole;
}
if (_selectedRoleId != null) {
return SessionState.selectedRole;
}
if (activityRoom == null || activityRoom!.membership != Membership.join) {
return widget.roomId != null || widget.launch
? SessionState.notSelectedRole
: SessionState.notStarted;
}
return SessionState.notSelectedRole;
}

2
lib/pangea/chat_settings/widgets/chat_context_menu_action.dart
View file

@ -161,7 +161,7 @@ void chatContextMenuAction(
],
),
),
if (!room.isActivitySession || room.ownRole == null)
if (!room.isActivitySession || !room.isActivityStarted)
PopupMenuItem(
value: ChatContextAction.leave,
child: Row(