fix: removing unecessary reply content and fixing return

takenet · Nov 16, 2023 · ef5ab9c · ef5ab9c
1 parent aef600d
commit ef5ab9c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/lib/src/models/ds_message_item.model.dart b/lib/src/models/ds_message_item.model.dart
@@ -27,9 +27,6 @@ class DSMessageItemModel {
   /// Customer data
   Map<String, dynamic>? customer;
 
-  /// The message content
-  dynamic replyContent;
-
   /// Used to define if a message detail (typicament a messages date and time) should be displayed or not
   bool? hideMessageDetail;
 
@@ -44,7 +41,6 @@ class DSMessageItemModel {
     this.content,
     this.customer,
     this.hideMessageDetail,
-    this.replyContent,
   });
 
   factory DSMessageItemModel.fromJson(Map<String, dynamic> json) {
@@ -57,7 +53,6 @@ class DSMessageItemModel {
       content: json['content'],
       status: DSDeliveryReportStatus.unknown.getValue(json['status']),
       hideMessageDetail: json['hideMessageDetail'],
-      replyContent: json['replyContent'],
     );
 
     if (json.containsKey('customer')) {

diff --git a/lib/src/widgets/chat/ds_reply_container.widget.dart b/lib/src/widgets/chat/ds_reply_container.widget.dart
@@ -100,14 +100,10 @@ Widget _replyWidget(
   DSMessageBubbleStyle style,
   DSAlign align,
 ) {
-  final replyType =
-      replyContent != '' ? replyContent['content']['replied']['type'] : '';
-  switch (replyType) {
+  switch (replyContent['type']) {
     case DSMessageContentType.textPlain:
       return DSBodyText(
-        replyContent['content']['replied']['value'] is String
-            ? replyContent['content']['replied']['value']
-            : '**********',
+        replyContent['value'] is String ? replyContent['value'] : '**********',
         color: _color(align, style),
         overflow: TextOverflow.visible,
       );

diff --git a/lib/src/widgets/utils/ds_card.widget.dart b/lib/src/widgets/utils/ds_card.widget.dart
@@ -94,7 +94,7 @@ class DSCard extends StatelessWidget {
           onOpenLink: onOpenLink,
           messageId: messageId,
           customer: customer,
-          replyContent: replyContent,
+          replyContent: content['inReplyTo'],
         );
 
       case DSMessageContentType.mediaLink:

diff --git a/lib/src/widgets/utils/ds_group_card.widget.dart b/lib/src/widgets/utils/ds_group_card.widget.dart
@@ -261,7 +261,6 @@ class _DSGroupCardState extends State<DSGroupCard> {
             onOpenLink: widget.onOpenLink,
             messageId: message.id,
             customer: message.customer,
-            replyContent: message.replyContent,
           );
 
           final isLastMsg = msgCount == length;