diff --git a/lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart b/lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart index a4bcc65f..bc166ee8 100644 --- a/lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart +++ b/lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart @@ -41,7 +41,11 @@ class _LastMessageTimeCompState extends State { _actionSubscription = null; if (widget.message != null) { - targetTime = widget.message!.openedAt ?? widget.message!.createdAt; + if (widget.message!.senderId == null) { + targetTime = widget.message!.openedAt ?? widget.message!.createdAt; + } else { + targetTime = widget.message!.createdAt; + } _updateSeconds(); } else if (widget.dateTime != null) { targetTime = widget.dateTime; diff --git a/lib/src/visual/views/chats/message_info.view.dart b/lib/src/visual/views/chats/message_info.view.dart index be6f5161..5503711d 100644 --- a/lib/src/visual/views/chats/message_info.view.dart +++ b/lib/src/visual/views/chats/message_info.view.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:twonly/locator.dart'; import 'package:twonly/src/database/daos/contacts.dao.dart'; @@ -206,7 +207,15 @@ class _MessageInfoViewState extends State { '${context.lang.received}: ${friendlyDateTime(context, widget.message.ackByServer!)}', ), if (userService.currentUser.isDeveloper) - Text('ID: ${widget.message.messageId}'), + GestureDetector( + onTap: () async { + await Clipboard.setData( + ClipboardData(text: widget.message.messageId), + ); + await HapticFeedback.heavyImpact(); + }, + child: Text('ID: ${widget.message.messageId}'), + ), if (messageHistory.isNotEmpty) ...[ const SizedBox(height: 10), const Divider(),