| commit | fef9d5fbf95d43da1099be94e9185c921bdf8382 | [log] [tgz] |
|---|---|---|
| author | Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> | Tue Feb 13 11:22:50 2024 -0500 |
| committer | Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> | Tue Feb 13 11:22:50 2024 -0500 |
| tree | 2cab539328f61e1e0b48ec3af1c1c3829a704b2b | |
| parent | 0dd3a4d065afce5f8f477bf94f0ea100ab63714c [diff] |
UI: fix messages sequence for emoji only text Change-Id: I03d792f3afded0870585d0cdb208c4a9307ecd77
diff --git a/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/ViewModels/MessagesListVM.swift b/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/ViewModels/MessagesListVM.swift index c54bfd5..2a58241 100644 --- a/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/ViewModels/MessagesListVM.swift +++ b/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/ViewModels/MessagesListVM.swift
@@ -697,11 +697,10 @@ let messageTypeCheck = message.type == .contact || message.type == .initial let differentAuthor = message.authorId != secondMessage.authorId let isReplyCheck = message.isReply() || secondMessage.isReply() - let containsEmoji = message.content.containsOnlyEmoji || secondMessage.content.containsOnlyEmoji let hasReactions = !message.reactions.isEmpty || !secondMessage.reactions.isEmpty return differentUri || messageTypeCheck || differentAuthor || - isReplyCheck || containsEmoji || hasReactions + isReplyCheck || hasReactions } private func shouldDisplayName(message: MessageContainerModel) -> Bool {
diff --git a/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/Views/MessageStackView.swift b/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/Views/MessageStackView.swift index 293b6f2..d904d88 100644 --- a/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/Views/MessageStackView.swift +++ b/Ring/Ring/Features/Conversations/Conversation/MessageSwiftUI/Views/MessageStackView.swift
@@ -31,7 +31,7 @@ VStack(alignment: model.horizontalAllignment) { if model.shouldDisplayName { Text(model.username) - .font(model.styling.secondaryFont) + .font(.caption) .foregroundColor(model.styling.secondaryTextColor) .frame(maxWidth: .infinity, alignment: .leading) Spacer()