Merge branch 'new-merge' into combine-into-spaces

This commit is contained in:
ggurdin 2024-06-20 11:18:37 -04:00
commit 0830c093b3
2 changed files with 2 additions and 2 deletions

View file

@ -63,7 +63,7 @@ class StartIGCButtonState extends State<StartIGCButton>
(itEnabled || igcEnabled) && canSendStatus == CanSendStatus.subscribed;
if (!grammarCorrectionEnabled ||
!widget.controller.choreographer.isAutoIGCEnabled ||
widget.controller.choreographer.isAutoIGCEnabled ||
widget.controller.choreographer.choreoMode == ChoreoMode.it) {
return const SizedBox.shrink();
}

View file

@ -78,7 +78,7 @@ Future<void> unlockSpace(Room space, Client client) async {
for (final spaceChild in space.spaceChildren) {
if (spaceChild.roomId == null) continue;
final Room? child = client.getRoomById(spaceChild.roomId!);
if (child == null) continue;
if (child == null || child.isArchived || child.isAnalyticsRoom) continue;
child.isSpace
? await unlockSpace(child, client)
: await unlockChat(child, client);