Merge branch 'main' into blue-branch

.gitignore

@@ -13,6 +13,8 @@
 prime
 *.env
 !/public/.env
+*.env.local_choreo
+*.env.prod
 
 # libolm package
 /assets/js/package

lib/main.dart

@@ -22,7 +22,7 @@ void main() async {
 
   // #Pangea
   try {
-    await dotenv.load(fileName: ".env");
+    await dotenv.load(fileName: ".env.local_choreo");
   } catch (e) {
     Logs().e('Failed to load .env file', e);
   }

lib/pages/chat/chat_view.dart

@@ -89,19 +89,17 @@ class ChatView extends StatelessWidget {
               }
             },
             itemBuilder: (context) => [
-              // #Pangea
-              // PopupMenuItem(
-              //   value: _EventContextAction.info,
-              //   child: Row(
-              //     mainAxisSize: MainAxisSize.min,
-              //     children: [
-              //       const Icon(Icons.info_outlined),
-              //       const SizedBox(width: 12),
-              //       Text(L10n.of(context)!.messageInfo),
-              //     ],
-              //   ),
-              // ),
-              // Pangea#
+              PopupMenuItem(
+                value: _EventContextAction.info,
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const Icon(Icons.info_outlined),
+                    const SizedBox(width: 12),
+                    Text(L10n.of(context)!.messageInfo),
+                  ],
+                ),
+              ),
               if (controller.selectedEvents.single.status.isSent)
                 PopupMenuItem(
                   value: _EventContextAction.report,
@@ -442,7 +440,8 @@ class ChatView extends StatelessWidget {
                                             children: [
                                               const ConnectionStatusHeader(),
                                               ITBar(
-                                                choreographer: controller.choreographer,
+                                                choreographer:
+                                                    controller.choreographer,
                                               ),
                                               ReactionsPicker(controller),
                                               ReplyDisplay(controller),

lib/pangea/models/lemma.dart

@@ -16,14 +16,15 @@ class Lemma {
 
   /// [morph] ex {} - morphological features of the lemma
   /// https://universaldependencies.org/u/feat/
-  final Map<String, String> morph;
+  final Map<String, dynamic> morph;
 
-  Lemma(
-      {required this.text,
-      required this.saveVocab,
-      required this.form,
-      this.pos = '',
-      this.morph = const {}});
+  Lemma({
+    required this.text,
+    required this.saveVocab,
+    required this.form,
+    this.pos = '',
+    this.morph = const {},
+  });
 
   factory Lemma.fromJson(Map<String, dynamic> json) {
     return Lemma(
@@ -31,7 +32,7 @@ class Lemma {
       saveVocab: json['save_vocab'] ?? json['saveVocab'] ?? false,
       form: json["form"] ?? json['text'],
       pos: json['pos'] ?? '',
-      morph: json['morph'] ?? {},
+      morph: json['morph'] ?? '{}',
     );
   }
 
@@ -41,7 +42,7 @@ class Lemma {
       'save_vocab': saveVocab,
       'form': form,
       'pos': pos,
-      'morph': morph
+      'morph': morph,
     };
   }
 

pubspec.yaml

@@ -151,6 +151,8 @@ flutter:
     # causes error with github actions
     # - .env
     # - assets/.env
+    - .env.local_choreo
+    - assets/.env.local_choreo
     - assets/pangea/
     - assets/pangea/bot_faces/
     # Pangea#