From 985ccfe30d0e0c613408681fcffd4c69aa6d845c Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Tue, 22 Oct 2024 14:54:42 -0400
Subject: [PATCH] better error handling if originalSent is null in
 _fetchActivity

---
 .../practice_activity_card.dart               | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/pangea/widgets/practice_activity/practice_activity_card.dart b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
index 277a8bed9..82d3c0a17 100644
--- a/lib/pangea/widgets/practice_activity/practice_activity_card.dart
+++ b/lib/pangea/widgets/practice_activity/practice_activity_card.dart
@@ -4,7 +4,6 @@ import 'dart:developer';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/enum/activity_type_enum.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart';
-import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_representation_event.dart';
 import 'package:fluffychat/pangea/matrix_event_wrappers/practice_activity_event.dart';
 import 'package:fluffychat/pangea/models/analytics/constructs_model.dart';
 import 'package:fluffychat/pangea/models/practice_activities.dart/message_activity_request.dart';
@@ -119,13 +118,25 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
         return null;
       }
 
+      if (widget.pangeaMessageEvent.originalSent == null) {
+        debugger(when: kDebugMode);
+        _updateFetchingActivity(false);
+        ErrorHandler.logError(
+          e: Exception('No original message found in _fetchNewActivity'),
+          data: {
+            'event': widget.pangeaMessageEvent.event.toJson(),
+          },
+        );
+        return null;
+      }
+
       final PracticeActivityModel? ourNewActivity = await pangeaController
           .practiceGenerationController
           .getPracticeActivity(
         MessageActivityRequest(
           userL1: pangeaController.languageController.userL1!.langCode,
           userL2: pangeaController.languageController.userL2!.langCode,
-          messageText: representation!.text,
+          messageText: widget.pangeaMessageEvent.originalSent!.text,
           tokensWithXP: await targetTokensController.targetTokens(
             context,
             widget.pangeaMessageEvent,
@@ -256,11 +267,6 @@ class MessagePracticeActivityCardState extends State<PracticeActivityCard> {
     });
   }
 
-  RepresentationEvent? get representation =>
-      widget.pangeaMessageEvent.originalSent;
-
-  String get messsageText => representation!.text;
-
   PangeaController get pangeaController => MatrixState.pangeaController;
 
   /// The widget that displays the current activity.