From 058f876146a4792d9eb7a49806b8a94515beabf3 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Wed, 23 Oct 2024 12:46:16 -0400
Subject: [PATCH] copyeditting and updated order of main menu options

---
 assets/l10n/intl_en.arb                       |  2 +-
 .../chat_list/client_chooser_button.dart      | 51 ++++++++++---------
 lib/pages/new_group/new_group_view.dart       |  5 +-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 51ab9d1d7..87e134d03 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -3095,7 +3095,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "learningSettings": "My Learning Settings",
+  "learningSettings": "Learning settings",
   "classNameRequired": "Please enter a space name",
   "@classNameRequired": {
     "type": "text",
diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index b22512bbe..6073034bd 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -41,44 +41,41 @@ class ClientChooserButton extends StatelessWidget {
           ],
         ),
       ),
-      PopupMenuItem(
-        value: SettingsAction.learning,
-        child: Row(
-          children: [
-            const Icon(Icons.psychology_outlined),
-            const SizedBox(width: 18),
-            Expanded(child: Text(L10n.of(context)!.learningSettings)),
-          ],
-        ),
-      ),
+      // PopupMenuItem(
+      //   value: SettingsAction.newGroup,
+      //   child: Row(
+      //     children: [
+      //       const Icon(Icons.group_add_outlined),
+      //       const SizedBox(width: 18),
+      //       Text(L10n.of(context)!.createGroup),
+      //     ],
+      //   ),
+      // ),
       // Pangea#
       PopupMenuItem(
-        value: SettingsAction.newGroup,
+        value: SettingsAction.newSpace,
         child: Row(
           children: [
-            const Icon(Icons.group_add_outlined),
+            const Icon(Icons.workspaces_outlined),
             const SizedBox(width: 18),
             // #Pangea
-            Expanded(child: Text(L10n.of(context)!.createGroup)),
-            // Text(L10n.of(context)!.createGroup),
+            Text(L10n.of(context)!.createNewSpace),
+            // Text(L10n.of(context)!.createNewSpace),
             // Pangea#
           ],
         ),
       ),
+      // #Pangea
       PopupMenuItem(
-        value: SettingsAction.newSpace,
+        value: SettingsAction.learning,
         child: Row(
           children: [
-            const Icon(Icons.workspaces_outlined),
+            const Icon(Icons.psychology_outlined),
             const SizedBox(width: 18),
-            // #Pangea
-            Text(L10n.of(context)!.createNewSpace),
-            // Text(L10n.of(context)!.createNewSpace),
-            // Pangea#
+            Expanded(child: Text(L10n.of(context)!.learningSettings)),
           ],
         ),
       ),
-      // #Pangea
       // PopupMenuItem(
       //   value: SettingsAction.setStatus,
       //   child: Row(
@@ -306,9 +303,11 @@ class ClientChooserButton extends StatelessWidget {
           if (consent != OkCancelResult.ok) return;
           context.go('/rooms/settings/addaccount');
           break;
-        case SettingsAction.newGroup:
-          context.go('/rooms/newgroup');
-          break;
+        // #Pangea
+        // case SettingsAction.newGroup:
+        //   context.go('/rooms/newgroup');
+        //   break;
+        // Pangea#
         case SettingsAction.newSpace:
           controller.createNewSpace();
           break;
@@ -416,7 +415,9 @@ class ClientChooserButton extends StatelessWidget {
 
 enum SettingsAction {
   addAccount,
-  newGroup,
+  // #Pangea
+  // newGroup,
+  // Pangea#
   newSpace,
   // #Pangea
   // setStatus,
diff --git a/lib/pages/new_group/new_group_view.dart b/lib/pages/new_group/new_group_view.dart
index addf7b5f7..7ea7f9de5 100644
--- a/lib/pages/new_group/new_group_view.dart
+++ b/lib/pages/new_group/new_group_view.dart
@@ -24,7 +24,10 @@ class NewGroupView extends StatelessWidget {
             onPressed: controller.loading ? null : Navigator.of(context).pop,
           ),
         ),
-        title: Text(L10n.of(context)!.createGroup),
+        // #Pangea
+        // title: Text(L10n.of(context)!.createGroup),
+        title: Text(L10n.of(context)!.newChat),
+        // Pangea#
       ),
       body: MaxWidthBody(
         child: Column(