Fix/buggy contacts and messages (#310)

* fix: buggy messages * fix: buggy contacts
nmshd · Oct 23, 2024 · aa2400f · aa2400f
1 parent c424599
commit aa2400f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/apps/enmeshed/lib/account/contacts/contact_detail_screen.dart b/apps/enmeshed/lib/account/contacts/contact_detail_screen.dart
@@ -40,10 +40,7 @@ class _ContactDetailScreenState extends State<ContactDetailScreen> with ContactS
 
     _session = GetIt.I.get<EnmeshedRuntime>().getSession(widget.accountId);
 
-    _reloadContact().then((_) {
-      _loadShowSendCertificateButton();
-      _reloadMessages();
-    });
+    _reload();
 
     final runtime = GetIt.I.get<EnmeshedRuntime>();
     _subscriptions
@@ -52,7 +49,8 @@ class _ContactDetailScreenState extends State<ContactDetailScreen> with ContactS
       ..add(runtime.eventBus.on<MessageWasReadAtChangedEvent>().listen((_) => _reloadMessages()))
       ..add(runtime.eventBus.on<IncomingRequestStatusChangedEvent>().listen((_) => _reloadMessages()))
       ..add(runtime.eventBus.on<RelationshipChangedEvent>().listen((_) => _reloadMessages()))
-      ..add(runtime.eventBus.on<DatawalletSynchronizedEvent>().listen((_) => _reloadMessages()));
+      ..add(runtime.eventBus.on<DatawalletSynchronizedEvent>().listen((_) => _reloadMessages()))
+      ..add(runtime.eventBus.on<ContactNameUpdatedEvent>().listen((_) => _reload().catchError((_) {})));
   }
 
   @override
@@ -241,6 +239,13 @@ class _ContactDetailScreenState extends State<ContactDetailScreen> with ContactS
     );
   }
 
+  Future<void> _reload() async {
+    await _reloadContact();
+
+    unawaited(_loadShowSendCertificateButton());
+    unawaited(_reloadMessages());
+  }
+
   Future<void> _reloadContact() async {
     final contact = await _session.expander.expandAddress(widget.contactId);
 

diff --git a/apps/enmeshed/lib/core/widgets/message_dvo_renderer.dart b/apps/enmeshed/lib/core/widgets/message_dvo_renderer.dart
@@ -25,7 +25,7 @@ class MessageDVORenderer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      leading: ContactCircleAvatar(radius: 20, contact: message.peer),
+      leading: hideAvatar ? null : ContactCircleAvatar(radius: 20, contact: message.peer),
       title: _MessagesContent(message: message, query: query),
       onTap: () => _onTap(context),
     );
@@ -144,11 +144,13 @@ class _MessageHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final contactName = message.peer.name == unknownContactName ? context.l10n.contacts_unknown : message.peer.name;
+
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
         HighlightText(
-          text: message.peer.name,
+          text: contactName,
           query: query,
           textStyle: message.wasReadAt == null && !message.isOwn
               ? Theme.of(context).textTheme.labelMedium!.copyWith(