From 5ad48def7c85841559689e79d28641e4881c189f Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Wed, 8 May 2024 15:23:35 -0400
Subject: [PATCH 1/2] When adding a chat to a class, default to 'suggested' set
 to true

---
 lib/pangea/widgets/class/add_space_toggles.dart | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/pangea/widgets/class/add_space_toggles.dart b/lib/pangea/widgets/class/add_space_toggles.dart
index 307db42ef..cd875cd95 100644
--- a/lib/pangea/widgets/class/add_space_toggles.dart
+++ b/lib/pangea/widgets/class/add_space_toggles.dart
@@ -72,7 +72,7 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
       final activeSpace =
           Matrix.of(context).client.getRoomById(widget.activeSpaceId!);
       if (activeSpace != null && activeSpace.canIAddSpaceChild(null)) {
-        parents.add(SuggestionStatus(false, activeSpace));
+        parents.add(SuggestionStatus(true, activeSpace));
       } else {
         ErrorHandler.logError(
           e: Exception('activeSpaceId ${widget.activeSpaceId} not found'),
@@ -111,12 +111,13 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
     }
   }
 
-  Future<void> _addSingleSpace(String roomToAddId, Room newParent) {
+  Future<void> _addSingleSpace(String roomToAddId, Room newParent) async {
     GoogleAnalytics.addParent(roomToAddId, newParent.classCode);
-    return newParent.setSpaceChild(
+    await newParent.setSpaceChild(
       roomToAddId,
       suggested: isSuggestedInSpace(newParent),
     );
+    await setSuggested(true, newParent);
   }
 
   Future<void> addSpaces(String roomToAddId) async {
@@ -147,7 +148,7 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
 
     setState(
       () => add
-          ? parents.add(SuggestionStatus(false, possibleParent))
+          ? parents.add(SuggestionStatus(true, possibleParent))
           : parents.removeWhere(
               (suggestionStatus) =>
                   suggestionStatus.room.id == possibleParent.id,

From 8c108f670864901c808c7d398468f83e87ca3490 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Wed, 8 May 2024 15:36:11 -0400
Subject: [PATCH 2/2] When enabling the bot, the Language level of the bot
 should default to that of the class

---
 lib/pages/new_group/new_group_view.dart                  | 1 +
 .../conversation_bot/conversation_bot_settings.dart      | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart
index eb0fa605d..822b89214 100644
--- a/lib/pages/new_group/new_group_view.dart
+++ b/lib/pages/new_group/new_group_view.dart
@@ -86,6 +86,7 @@ class NewGroupView extends StatelessWidget {
             // ),
             ConversationBotSettings(
               key: controller.addConversationBotKey,
+              activeSpaceId: controller.activeSpaceId,
             ),
             const Divider(height: 1),
             AddToSpaceToggles(
diff --git a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
index 94214c8d2..0227c243a 100644
--- a/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
+++ b/lib/pangea/widgets/conversation_bot/conversation_bot_settings.dart
@@ -20,12 +20,14 @@ import '../../utils/error_handler.dart';
 class ConversationBotSettings extends StatefulWidget {
   final Room? room;
   final bool startOpen;
+  final String? activeSpaceId;
   // final ClassSettingsModel? initialSettings;
 
   const ConversationBotSettings({
     super.key,
     this.room,
     this.startOpen = false,
+    this.activeSpaceId,
     // this.initialSettings,
   });
 
@@ -37,6 +39,7 @@ class ConversationBotSettingsState extends State<ConversationBotSettings> {
   late BotOptionsModel botOptions;
   late bool isOpen;
   bool addBot = false;
+  Room? parentSpace;
 
   ConversationBotSettingsState({Key? key});
 
@@ -50,6 +53,12 @@ class ConversationBotSettingsState extends State<ConversationBotSettings> {
         addBot = isBotRoom;
       });
     });
+    parentSpace = widget.activeSpaceId != null
+        ? Matrix.of(context).client.getRoomById(widget.activeSpaceId!)
+        : null;
+    if (parentSpace != null && botOptions.languageLevel == null) {
+      botOptions.languageLevel = parentSpace?.classSettings?.languageLevel;
+    }
   }
 
   Future<void> updateBotOption(void Function() makeLocalChange) async {