diff --git a/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs index ff2a193af8..6acd1cfc9d 100644 --- a/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs +++ b/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs @@ -563,24 +563,24 @@ public sealed partial class NanoChatUiFragment : BoxContainer string? senderName = null; if (isGroupChat && !isOwnMessage) { - // Try to get sender name from contacts first, then recipients - if (_contacts != null) + // Funky Station - Try to get sender name from contacts first, then recipients + if (_recipients.TryGetValue(message.SenderId, out var senderRecipient)) + { + senderName = senderRecipient.Name; + } + + // If not in recipients, try contacts list (station-wide directory) + if (senderName == null && _contacts != null) { var contact = _contacts.FirstOrDefault(c => c.Number == message.SenderId); if (contact.Number != 0) senderName = contact.Name; } - // If not found in contacts, try recipients - if (senderName == null && _recipients.TryGetValue(message.SenderId, out var senderRecipient)) - { - senderName = senderRecipient.Name; - } - - // Fallback to number if name not found + // Fallback to "Unknown" with number if name not found if (senderName == null) { - senderName = $"#{message.SenderId:D4}"; + senderName = $"{Loc.GetString("nano-chat-unknown-sender")}#{message.SenderId:D4}"; // Funky Station } } diff --git a/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl b/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl index 6542916a3c..66b914174e 100644 --- a/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl +++ b/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl @@ -36,3 +36,4 @@ nano-chat-emoji-search = Search emojis... # Department sorting nano-chat-other-department = Other +nano-chat-unknown-sender = Unknown