Fixed a few more QA issues

• Added some localised copy
• Added the helpdesk article URL for the deprecated groups banner
• Updated mentions to include the current user in groups, 1-1 and NTS conversations (also made the current user appear as "you")
• Fixed a layout issue with the deleted message view
• Fixed an issue where the "mark as unread" action would incorrectly appear for the Note to Self conversation
• Fixed an issue where we were incorrectly sending an ExpirationTimerUpdate in some cases

Session.xcodeproj/project.pbxproj

@@ -7916,7 +7916,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 528;
+				CURRENT_PROJECT_VERSION = 529;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -7992,7 +7992,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 528;
+				CURRENT_PROJECT_VERSION = 529;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

Session/Closed Groups/EditGroupViewModel.swift

@@ -626,10 +626,14 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
                                     self?.transitionToScreen(
                                         ConfirmationModal(
                                             info: ConfirmationModal.Info(
-                                                title: "Invitation Failed",//.localized(),
-                                                body: .text("An error occurred and the invitations were not successfully sent, would you like to try again?"),//.localized()),
-                                                confirmTitle: "retry".localized(),
-                                                cancelTitle: "dismiss".localized(),
+                                                title: "inviteFailed"
+                                                    .putNumber(memberInfo.count)
+                                                    .localized(),
+                                                body: .text("inviteFailedDescription"
+                                                    .putNumber(memberInfo.count)
+                                                    .localized()),
+                                                confirmTitle: "yes".localized(),
+                                                cancelTitle: "cancel".localized(),
                                                 cancelStyle: .alert_text,
                                                 dismissOnConfirm: false,
                                                 onConfirm: { modal in
@@ -692,10 +696,14 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
                                     self?.transitionToScreen(
                                         ConfirmationModal(
                                             info: ConfirmationModal.Info(
-                                                title: "Invitation Failed",//.localized(),
-                                                body: .text("An error occurred and the invitations were not successfully sent, would you like to try again?"),//.localized()),
-                                                confirmTitle: "retry".localized(),
-                                                cancelTitle: "dismiss".localized(),
+                                                title: "inviteFailed"
+                                                    .putNumber(memberIds.count)
+                                                    .localized(),
+                                                body: .text("inviteFailedDescription"
+                                                    .putNumber(memberIds.count)
+                                                    .localized()),
+                                                confirmTitle: "yes".localized(),
+                                                cancelTitle: "cancel".localized(),
                                                 cancelStyle: .alert_text,
                                                 dismissOnConfirm: false,
                                                 onConfirm: { modal in

Session/Conversations/ConversationVC+Interaction.swift

@@ -821,7 +821,12 @@ extension ConversationVC:
         // stringlint:ignore_start
         if lastCharacter == "@" && isCharacterBeforeLastWhiteSpaceOrStartOfLine {
             currentMentionStartIndex = lastCharacterIndex
-            snInputView.showMentionsUI(for: self.viewModel.mentions())
+            snInputView.showMentionsUI(
+                for: self.viewModel.mentions(),
+                currentUserSessionId: self.viewModel.threadData.currentUserSessionId,
+                currentUserBlinded15SessionId: self.viewModel.threadData.currentUserBlinded15SessionId,
+                currentUserBlinded25SessionId: self.viewModel.threadData.currentUserBlinded25SessionId
+            )
         }
         else if lastCharacter.isWhitespace || lastCharacter == "@" { // the lastCharacter == "@" is to check for @@
             currentMentionStartIndex = nil
@@ -830,7 +835,12 @@ extension ConversationVC:
         else {
             if let currentMentionStartIndex = currentMentionStartIndex {
                 let query = String(newText[newText.index(after: currentMentionStartIndex)...]) // + 1 to get rid of the @
-                snInputView.showMentionsUI(for: self.viewModel.mentions(for: query))
+                snInputView.showMentionsUI(
+                    for: self.viewModel.mentions(for: query),
+                    currentUserSessionId: self.viewModel.threadData.currentUserSessionId,
+                    currentUserBlinded15SessionId: self.viewModel.threadData.currentUserBlinded15SessionId,
+                    currentUserBlinded25SessionId: self.viewModel.threadData.currentUserBlinded25SessionId
+                )
             }
         }
         // stringlint:ignore_stop

Session/Conversations/ConversationViewModel.swift

@@ -850,7 +850,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
         let threadData: SessionThreadViewModel = self.internalThreadData
         
         return dependencies[singleton: .storage]
-            .read { [dependencies] db -> [MentionInfo] in
+            .read { [weak self, dependencies] db -> [MentionInfo] in
                 let userSessionId: SessionId = dependencies[cache: .general].sessionId
                 let pattern: FTS5Pattern? = try? SessionThreadViewModel.pattern(db, searchTerm: query, forTable: Profile.self)
                 let capabilities: Set<Capability.Variant> = (threadData.threadVariant != .community ?
@@ -873,6 +873,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                         threadId: threadData.threadId,
                         threadVariant: threadData.threadVariant,
                         targetPrefixes: targetPrefixes,
+                        currentUserBlinded15SessionId: self?.threadData.currentUserBlinded15SessionId,
+                        currentUserBlinded25SessionId: self?.threadData.currentUserBlinded25SessionId,
                         pattern: pattern
                     )?
                     .fetchAll(db))

Session/Conversations/Input View/InputView.swift

@@ -518,7 +518,15 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
         )
     }
 
-    func showMentionsUI(for candidates: [MentionInfo]) {
+    func showMentionsUI(
+        for candidates: [MentionInfo],
+        currentUserSessionId: String,
+        currentUserBlinded15SessionId: String?,
+        currentUserBlinded25SessionId: String?
+    ) {
+        mentionsView.currentUserSessionId = currentUserSessionId
+        mentionsView.currentUserBlinded15SessionId = currentUserBlinded15SessionId
+        mentionsView.currentUserBlinded25SessionId = currentUserBlinded25SessionId
         mentionsView.candidates = candidates
         
         let mentionCellHeight = (ProfilePictureView.Size.message.viewSize + 2 * Values.smallSpacing)

Session/Conversations/Input View/MentionSelectionView.swift

@@ -8,6 +8,9 @@ import SignalUtilitiesKit
 
 final class MentionSelectionView: UIView, UITableViewDataSource, UITableViewDelegate {
     private let dependencies: Dependencies
+    var currentUserSessionId: String?
+    var currentUserBlinded15SessionId: String?
+    var currentUserBlinded25SessionId: String?
     var candidates: [MentionInfo] = [] {
         didSet {
             tableView.isScrollEnabled = (candidates.count > 4)
@@ -92,6 +95,9 @@ final class MentionSelectionView: UIView, UITableViewDataSource, UITableViewDele
                 for: candidates[indexPath.row].openGroupRoomToken,
                 on: candidates[indexPath.row].openGroupServer
             ),
+            currentUserSessionId: currentUserSessionId,
+            currentUserBlinded15SessionId: currentUserBlinded15SessionId,
+            currentUserBlinded25SessionId: currentUserBlinded25SessionId,
             isLast: (indexPath.row == (candidates.count - 1)),
             using: dependencies
         )
@@ -187,10 +193,21 @@ private extension MentionSelectionView {
             with profile: Profile,
             threadVariant: SessionThread.Variant,
             isUserModeratorOrAdmin: Bool,
+            currentUserSessionId: String?,
+            currentUserBlinded15SessionId: String?,
+            currentUserBlinded25SessionId: String?,
             isLast: Bool,
             using dependencies: Dependencies
         ) {
-            displayNameLabel.text = profile.displayName(for: threadVariant)
+            let currentUserSessionIds: Set<String> = [
+                currentUserSessionId,
+                currentUserBlinded15SessionId,
+                currentUserBlinded25SessionId
+            ].compactMap { $0 }.asSet()
+            displayNameLabel.text = (currentUserSessionIds.contains(profile.id) ?
+                "you".localized() :
+                profile.displayName(for: threadVariant)
+            )
             profilePictureView.update(
                 publicKey: profile.id,
                 threadVariant: .contact,    // Always show the display picture in 'contact' mode

Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift

@@ -13,11 +13,11 @@ final class DeletedMessageView: UIView {
     
     // MARK: - Lifecycle
     
-    init(textColor: ThemeValue, variant: Interaction.Variant) {
+    init(textColor: ThemeValue, variant: Interaction.Variant, maxWidth: CGFloat) {
         super.init(frame: CGRect.zero)
         accessibilityIdentifier = "Deleted message"
         isAccessibilityElement = true
-        setUpViewHierarchy(textColor: textColor, variant: variant)
+        setUpViewHierarchy(textColor: textColor, variant: variant, maxWidth: maxWidth)
     }
     
     override init(frame: CGRect) {
@@ -28,7 +28,7 @@ final class DeletedMessageView: UIView {
         preconditionFailure("Use init(textColor:) instead.")
     }
     
-    private func setUpViewHierarchy(textColor: ThemeValue, variant: Interaction.Variant) {
+    private func setUpViewHierarchy(textColor: ThemeValue, variant: Interaction.Variant, maxWidth: CGFloat) {
         // Image view
         let imageContainerView: UIView = UIView()
         imageContainerView.set(.width, to: DeletedMessageView.iconImageViewSize)
@@ -45,6 +45,7 @@ final class DeletedMessageView: UIView {
         // Body label
         let titleLabel = UILabel()
         titleLabel.setContentHuggingPriority(.required, for: .vertical)
+        titleLabel.preferredMaxLayoutWidth = maxWidth - 6   // `6` for the `stackView.layoutMargins`
         titleLabel.font = .systemFont(ofSize: Values.smallFontSize)
         titleLabel.text = {
             switch variant {
@@ -66,8 +67,8 @@ final class DeletedMessageView: UIView {
         stackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 6)
         addSubview(stackView)
         
+        let calculatedSize: CGSize = stackView.systemLayoutSizeFitting(CGSize(width: maxWidth, height: 999))
         stackView.pin(to: self, withInset: Values.smallSpacing)
-        stackView.set(.height, to: .height, of: titleLabel)
-        titleLabel.set(.height, greaterThanOrEqualTo: .height, of: imageView)
+        stackView.set(.height, to: calculatedSize.height)
     }
 }

Session/Conversations/Message Cells/VisibleMessageCell.swift

@@ -451,13 +451,11 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
         lastSearchText: String?,
         using dependencies: Dependencies
     ) {
-        let isOutgoing: Bool = (
-            cellViewModel.variant == .standardOutgoing ||
-            cellViewModel.variant == .standardOutgoingDeleted ||
-            cellViewModel.variant == .standardOutgoingDeletedLocally
+        let bodyLabelTextColor: ThemeValue = (cellViewModel.variant.isOutgoing ?
+            .messageBubble_outgoingText :
+            .messageBubble_incomingText
         )
-        let bodyLabelTextColor: ThemeValue = (isOutgoing ? .messageBubble_outgoingText : .messageBubble_incomingText)
-        snContentView.alignment = (isOutgoing ? .trailing : .leading)
+        snContentView.alignment = (cellViewModel.variant.isOutgoing ? .trailing : .leading)
         
         for subview in snContentView.arrangedSubviews {
             snContentView.removeArrangedSubview(subview)
@@ -474,9 +472,11 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
         
         // Handle the deleted state first (it's much simpler than the others)
         guard !cellViewModel.variant.isDeletedMessage else {
+            let inset: CGFloat = 12
             let deletedMessageView: DeletedMessageView = DeletedMessageView(
                 textColor: bodyLabelTextColor,
-                variant: cellViewModel.variant
+                variant: cellViewModel.variant,
+                maxWidth: (VisibleMessageCell.getMaxWidth(for: cellViewModel) - 2 * inset)
             )
             bubbleView.addSubview(deletedMessageView)
             deletedMessageView.pin(to: bubbleView)
@@ -510,7 +510,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
                                     imageAttachment: cellViewModel.linkPreviewAttachment,
                                     using: dependencies
                                 ),
-                                isOutgoing: isOutgoing,
+                                isOutgoing: cellViewModel.variant.isOutgoing,
                                 delegate: self,
                                 cellViewModel: cellViewModel,
                                 bodyLabelTextColor: bodyLabelTextColor,
@@ -528,7 +528,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
                                 name: (linkPreview.title ?? ""),
                                 url: linkPreview.url,
                                 textColor: bodyLabelTextColor,
-                                isOutgoing: isOutgoing
+                                isOutgoing: cellViewModel.variant.isOutgoing
                             )
                             openGroupInvitationView.isAccessibilityElement = true
                             openGroupInvitationView.accessibilityIdentifier = "Community invitation"
@@ -555,7 +555,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
                             currentUserSessionId: cellViewModel.currentUserSessionId,
                             currentUserBlinded15SessionId: cellViewModel.currentUserBlinded15SessionId,
                             currentUserBlinded25SessionId: cellViewModel.currentUserBlinded25SessionId,
-                            direction: (isOutgoing ? .outgoing : .incoming),
+                            direction: (cellViewModel.variant.isOutgoing ? .outgoing : .incoming),
                             attachment: cellViewModel.quoteAttachment,
                             using: dependencies
                         )
@@ -610,7 +610,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
                     items: (cellViewModel.attachments?
                         .filter { $0.isVisualMedia })
                         .defaulting(to: []),
-                    isOutgoing: isOutgoing,
+                    isOutgoing: cellViewModel.variant.isOutgoing,
                     maxMessageWidth: maxMessageWidth,
                     using: dependencies
                 )

Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift

@@ -359,20 +359,6 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                     using: dependencies
                 )
             
-            // Send the ExpirationTimerUpdate message
-            let expirationTimerUpdateMessage: ExpirationTimerUpdate = ExpirationTimerUpdate()
-                .with(sentTimestampMs: UInt64(currentOffsetTimestampMs))
-                .with(updatedConfig)
-
-            try MessageSender.send(
-                db,
-                message: expirationTimerUpdateMessage,
-                interactionId: interactionId,
-                threadId: threadId,
-                threadVariant: threadVariant,
-                using: dependencies
-            )
-            
             // Update libSession
             switch threadVariant {
                 case .contact:

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -1002,12 +1002,15 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
                                     case .failure:
                                         viewModel?.transitionToScreen(
                                             ConfirmationModal(
-                                                // FIXME: Localise these
                                                 info: ConfirmationModal.Info(
-                                                    title: "Promotion Failed",
-                                                    body: .text("An error occurred and the promotions were not successfully sent, would you like to try again?"),
-                                                    confirmTitle: "retry".localized(),
-                                                    cancelTitle: "dismiss".localized(),
+                                                    title: "promotionFailed"
+                                                        .putNumber(memberInfo.count)
+                                                        .localized(),
+                                                    body: .text("promotionFailedDescription"
+                                                        .putNumber(memberInfo.count)
+                                                        .localized()),
+                                                    confirmTitle: "yes".localized(),
+                                                    cancelTitle: "cancel".localized(),
                                                     cancelStyle: .alert_text,
                                                     dismissOnConfirm: false,
                                                     onConfirm: { modal in

Session/Home/HomeVC.swift

@@ -780,10 +780,14 @@ public final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableVi
         
         switch section.model {
             case .threads:
-                // Cannot properly sync outgoing blinded message requests so don't provide the option
+                // Cannot properly sync outgoing blinded message requests so don't provide the option,
+                // the 'Note to Self' conversation also doesn't support 'mark as unread' so don't
+                // provide it there either
                 guard
-                    threadViewModel.threadVariant != .contact ||
-                    (try? SessionId(from: section.elements[indexPath.row].threadId))?.prefix == .standard
+                    threadViewModel.threadId != threadViewModel.currentUserSessionId && (
+                        threadViewModel.threadVariant != .contact ||
+                        (try? SessionId(from: section.elements[indexPath.row].threadId))?.prefix == .standard
+                    )
                 else { return nil }
                 
                 return UIContextualAction.configuration(

Session/Meta/Translations/Localizable.xcstrings

@@ -498,7 +498,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "اِقبَل"
+            "value" : "قبول"
           }
         },
         "az" : {
@@ -540,7 +540,7 @@
         "cs" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Přijmou"
+            "value" : "Přijmout"
           }
         },
         "cy" : {
@@ -6767,7 +6767,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "لايمكن ازاله الادمن."
+            "value" : "لا يمكن إزاله المشرف."
           }
         },
         "az" : {
@@ -10635,7 +10635,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "فشل الترقيه كمسئول"
+            "value" : "فشل الترقيه كمشرف"
           }
         },
         "az" : {
@@ -12586,7 +12586,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "تم إرسال الترقيه كمسئول"
+            "value" : "تم إرسال الترقية كمشرف"
           }
         },
         "az" : {
@@ -14040,7 +14040,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "لا يوجد مسؤولين في هذا المجتمع."
+            "value" : "لا يوجد مشرفين في هذا المجتمع."
           }
         },
         "az" : {
@@ -17452,7 +17452,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "اعدادات المسؤول"
+            "value" : "إعدادات المشرف"
           }
         },
         "az" : {
@@ -30942,7 +30942,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد مسح كافة المرفقات؟ سيتم أيضًا حذف الرسائل ذات المرفقات."
+            "value" : "هل أنت متأكد من حذف كافة المرفقات؟ سيتم أيضًا حذف الرسائل ذات المرفقات."
           }
         },
         "az" : {
@@ -36247,7 +36247,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "غير قادر على فتح الملف."
+            "value" : "تعذر فتح الملف."
           }
         },
         "az" : {
@@ -48246,7 +48246,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "انضغط لتنزيل {file_type}"
+            "value" : "انقر لتنزيل {file_type}"
           }
         },
         "az" : {
@@ -60287,7 +60287,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من حظر <b>{name}؟</b> المستخدمين المحظورين لايمكنهم إرسال طلبات الرسائل، دعوات المجموعات أو الإتصال بك."
+            "value" : "هل أنت متأكد من حظر <b>{name}؟</b> المستخدمين المحظورين لا يمكنهم إرسال طلبات الرسائل، دعوات المجموعات أو الاتصال بك."
           }
         },
         "az" : {
@@ -72087,7 +72087,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "{app_name} Call"
+            "value" : "مكالمة {app_name}"
           }
         },
         "az" : {
@@ -77841,7 +77841,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "{app_name} يحتاج إذن الوصول إلى الكاميرا لالتقاط الصور ومقاطع الفيديو، أو لمسح رموز الاستجابة السريعة."
+            "value" : "{app_name} يحتاج إذن الوصول إلى الكاميرا لالتقاط الصور ومقاطع الفيديو، أو لمسح رموز QR."
           }
         },
         "az" : {
@@ -78326,7 +78326,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "{app_name} يحتاج إذن الوصول إلى الكاميرا لمسح رموز الاستجابة السريعة"
+            "value" : "{app_name} يحتاج إذن الوصول إلى الكاميرا لمسح رموز QR"
           }
         },
         "az" : {
@@ -82203,6 +82203,48 @@
             }
           }
         },
+        "ar" : {
+          "variations" : {
+            "plural" : {
+              "few" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "لم يتم حذف البيانات بواسطة %lld من عقد الخدمة Service Nodes. معرفات عقد الخدمة Service Node IDs: {service_node_id}."
+                }
+              },
+              "many" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "لم يتم حذف البيانات بواسطة %lld من عقد الخدمة Service Nodes. معرفات عقد الخدمة Service Node IDs: {service_node_id}."
+                }
+              },
+              "one" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "لم يتم حذف البيانات بواسطة عقدة الخدمة (Service Node) %lld . معرف عقدة الخدمة (Service Node ID): {service_node_id}."
+                }
+              },
+              "other" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "لم يتم حذف البيانات بواسطة %lld من عقد الخدمة Service Nodes. معرفات عقد الخدمة Service Node IDs: {service_node_id}."
+                }
+              },
+              "two" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "لم يتم حذف البيانات بواسطة %lld من عقد الخدمة Service Nodes. معرفات عقد الخدمة Service Node IDs: {service_node_id}."
+                }
+              },
+              "zero" : {
+                "stringUnit" : {
+                  "state" : "translated",
+                  "value" : "لم يتم حذف البيانات بواسطة %lld من عقد الخدمة Service Nodes. معرفات عقد الخدمة Service Node IDs: {service_node_id}."
+                }
+              }
+            }
+          }
+        },
         "az" : {
           "variations" : {
             "plural" : {
@@ -85657,7 +85699,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل متأكد من رغبتك لمسح جهازك؟"
+            "value" : "هل متأكد من رغبتك بمسح جهازك؟"
           }
         },
         "az" : {
@@ -87112,7 +87154,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من مسح جميع الرسائل من محادثتك مع <b>{name}</b> من جهازك؟"
+            "value" : "هل أنت متأكد من مسح جميع الرسائل من محادثتك مع <b>{name}</b> من جهازك؟"
           }
         },
         "az" : {
@@ -87597,7 +87639,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد حذف كافة الرسائل <b>{community_name}؟</b> من جهازك."
+            "value" : "هل أنت متأكد من حذف كافة الرسائل <b>{community_name}؟</b> من جهازك."
           }
         },
         "az" : {
@@ -89052,7 +89094,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد حذف كافة الرسائل <b>{group_name}؟</b>"
+            "value" : "هل أنت متأكد من حذف كافة الرسائل <b>{group_name}؟</b>"
           }
         },
         "az" : {
@@ -89537,7 +89579,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد حذف كافة الرسائل <b>{group_name}؟</b> من جهازك."
+            "value" : "هل أنت متأكد من حذف كافة الرسائل <b>{group_name}؟</b> من جهازك."
           }
         },
         "az" : {
@@ -90022,7 +90064,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد حذف كافة رسائل ملاحظة لنفسي من جهازك؟"
+            "value" : "هل أنت متأكد من مسح كافة رسائل \"ملاحظة لنفسي\" من جهازك؟"
           }
         },
         "az" : {
@@ -94806,7 +94848,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "عذراً، حدث خطأ. حاول مرة أخرى لاحقاً."
+            "value" : "عفواً، حدث خطأ. الرجاء المحاولة مرة أخرى لاحقاً."
           }
         },
         "az" : {
@@ -102506,7 +102548,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد مسح <b>{name}؟</b> من قائمة جهات إتصالك؟ ستصل أي رسائل جديدة من <b>{name}</b> كطلب رسالة."
+            "value" : "هل أنت متأكد من حذف <b>{name}؟</b> من قائمة جهات إتصالك؟ ستصل أي رسائل جديدة من <b>{name}</b> كطلب رسالة."
           }
         },
         "az" : {
@@ -103470,7 +103512,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "اختر اتصالات"
+            "value" : "تحديد جهات الاتصال"
           }
         },
         "az" : {
@@ -116499,7 +116541,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "مراسلة جديدة"
+            "value" : "محادثة جديدة"
           }
         },
         "az" : {
@@ -128055,7 +128097,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "عند التمكين، سيتم إشعارك فقط بالرسائل التي تذكرك."
+            "value" : "عند التمكين، سيتم إشعارك بالرسائل التي تشير إليك فقط."
           }
         },
         "az" : {
@@ -135105,6 +135147,58 @@
     "deleteMessageConfirm" : {
       "extractionState" : "manual",
       "localizations" : {
+        "ar" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%#@arg1@"
+          },
+          "substitutions" : {
+            "arg1" : {
+              "argNum" : 1,
+              "formatSpecifier" : "lld",
+              "variations" : {
+                "plural" : {
+                  "few" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "هل أنت متأكد من حذف الرسائل؟"
+                    }
+                  },
+                  "many" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "هل أنت متأكد من حذف الرسائل؟"
+                    }
+                  },
+                  "one" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "هل أنت متأكد من حذف الرسالة؟"
+                    }
+                  },
+                  "other" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "هل أنت متأكد من حذف الرسائل؟"
+                    }
+                  },
+                  "two" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "هل أنت متأكد من حذف الرسائل؟"
+                    }
+                  },
+                  "zero" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "هل أنت متأكد من حذف الرسائل؟"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "cs" : {
           "stringUnit" : {
             "state" : "translated",
@@ -140766,6 +140860,58 @@
             }
           }
         },
+        "ar" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%#@arg1@"
+          },
+          "substitutions" : {
+            "arg1" : {
+              "argNum" : 1,
+              "formatSpecifier" : "lld",
+              "variations" : {
+                "plural" : {
+                  "few" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "فشل حذف الرسائل"
+                    }
+                  },
+                  "many" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "فشل حذف الرسائل"
+                    }
+                  },
+                  "one" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "فشل حذف الرسالة"
+                    }
+                  },
+                  "other" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "فشل حذف الرسائل"
+                    }
+                  },
+                  "two" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "فشل حذف الرسائل"
+                    }
+                  },
+                  "zero" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "فشل حذف الرسائل"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "az" : {
           "stringUnit" : {
             "state" : "translated",
@@ -143175,7 +143321,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد مسح هذه الرسائل لدى الجميع؟"
+            "value" : "هل أنت متأكد من حذف هذه الرسائل لدى الجميع؟"
           }
         },
         "az" : {
@@ -149088,7 +149234,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ينطبق هذا الإعداد على الجميع في هذه المحادثة.<br/>يمكن لمسؤولي المجموعة فقط تغيير هذا الإعداد."
+            "value" : "ينطبق هذا الإعداد على الجميع في هذه المحادثة.<br/>يمكن لمشرفي المجموعة فقط تغيير هذا الإعداد."
           }
         },
         "az" : {
@@ -169283,7 +169429,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "حيوانات & و طبيعة"
+            "value" : "حيوانات و طبيعة"
           }
         },
         "az" : {
@@ -173121,7 +173267,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد مسح كافة {emoji}؟"
+            "value" : "هل أنت متأكد من مسح كافة {emoji}؟"
           }
         },
         "az" : {
@@ -187595,7 +187741,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متيقِّن من أنك تريد مسح <b>{group_name}؟</b> سيؤدي ذلك إلى إزالة جميع الأعضاء وحذف كافة محتويات المجموعة."
+            "value" : "هل أنت متأكد من حذف <b>{group_name}؟</b> سيؤدي ذلك إلى إزالة جميع الأعضاء وحذف كافة محتويات المجموعة."
           }
         },
         "az" : {
@@ -188082,6 +188228,12 @@
     "groupDeletedMemberDescription" : {
       "extractionState" : "manual",
       "localizations" : {
+        "ar" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "{group_name} تم حذفه بواسطة مشرف المجموعة. لن تتمكن من إرسال أي رسائل أخرى."
+          }
+        },
         "cs" : {
           "stringUnit" : {
             "state" : "translated",
@@ -191497,7 +191649,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متأكد من أنك تريد حذف دعوة المجموعة هذه؟"
+            "value" : "هل أنت متأكد من حذف دعوة المجموعة؟"
           }
         },
         "az" : {
@@ -209021,6 +209173,17 @@
         }
       }
     },
+    "groupNotUpdatedWarning" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Group has not been updated in over 30 days. You may experience issues sending messages or viewing Group information."
+          }
+        }
+      }
+    },
     "groupOnlyAdmin" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -209030,6 +209193,12 @@
             "value" : "Jy is die enigste administrateur in <b>{group_name}</b>.<br/><br/>Groepslede en instellings kan nie verander word sonder 'n administrateur nie."
           }
         },
+        "ar" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "أنت المشرف الوحيد في\n<b>{group_name}</b>.<br/><br/>لا يمكن تغيير أعضاء المجموعة والإعدادات بدون المشرف."
+          }
+        },
         "az" : {
           "stringUnit" : {
             "state" : "translated",
@@ -209497,11 +209666,23 @@
     "groupPendingRemoval" : {
       "extractionState" : "manual",
       "localizations" : {
+        "cs" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Čeká na odebrání"
+          }
+        },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Pending removal"
           }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "In afwachting van verwijdering"
+          }
         }
       }
     },
@@ -229919,6 +230100,72 @@
         }
       }
     },
+    "inviteFailed" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%#@arg1@"
+          },
+          "substitutions" : {
+            "arg1" : {
+              "argNum" : 1,
+              "formatSpecifier" : "lld",
+              "variations" : {
+                "plural" : {
+                  "one" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "Invite Failed"
+                    }
+                  },
+                  "other" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "Invites Failed"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "inviteFailedDescription" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%#@arg1@"
+          },
+          "substitutions" : {
+            "arg1" : {
+              "argNum" : 1,
+              "formatSpecifier" : "lld",
+              "variations" : {
+                "plural" : {
+                  "one" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "The invite could not be sent. Would you like to try again?"
+                    }
+                  },
+                  "other" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "The invites could not be sent. Would you like to try again?"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "join" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -236613,7 +236860,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "غير قادر على تحميل معاينة الرابط"
+            "value" : "تعذر تحميل معاينة الرابط"
           }
         },
         "az" : {
@@ -268443,7 +268690,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متأكد من أنك تريد مسح كافة طلبات الرسائل ودعوات المجموعات؟"
+            "value" : "هل أنت متأكد من مسح كافة طلبات الرسائل ودعوات المجموعات؟"
           }
         },
         "az" : {
@@ -280417,7 +280664,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "تعيين الاسم"
+            "value" : "تعيين الاسم المستعار"
           }
         },
         "az" : {
@@ -283770,7 +284017,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "هل أنت متأكد من أنك تريد إخفاء الملاحظة لنفسي؟"
+            "value" : "هل أنت متأكد من إخفاء \"الملاحظة لنفسي\"؟"
           }
         },
         "az" : {
@@ -305307,7 +305554,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "{app_name} مصمم لحماية خصوصيتك."
+            "value" : "{app_name} مُصمم لحماية خصوصيتك."
           }
         },
         "az" : {
@@ -312516,7 +312763,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "افتح"
+            "value" : "فتح"
           }
         },
         "az" : {
@@ -330724,7 +330971,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "منح إحدى الأذونات مطلوب"
+            "value" : "الإذن مطلوب"
           }
         },
         "az" : {
@@ -333592,7 +333839,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ًًًُُثَبت"
+            "value" : "تثبيت"
           }
         },
         "az" : {
@@ -334550,7 +334797,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "الغ التثبيت"
+            "value" : "إلغاء التثبيت"
           }
         },
         "az" : {
@@ -339334,6 +339581,72 @@
         }
       }
     },
+    "promotionFailed" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%#@arg1@"
+          },
+          "substitutions" : {
+            "arg1" : {
+              "argNum" : 1,
+              "formatSpecifier" : "lld",
+              "variations" : {
+                "plural" : {
+                  "one" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "Promotion Failed"
+                    }
+                  },
+                  "other" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "Promotions Failed"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "promotionFailedDescription" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%#@arg1@"
+          },
+          "substitutions" : {
+            "arg1" : {
+              "argNum" : 1,
+              "formatSpecifier" : "lld",
+              "variations" : {
+                "plural" : {
+                  "one" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "The promotion could not be applied. Would you like to try again?"
+                    }
+                  },
+                  "other" : {
+                    "stringUnit" : {
+                      "state" : "translated",
+                      "value" : "The promotions could not be applied. Would you like to try again?"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "qrCode" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -341262,7 +341575,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "عرض QR"
+            "value" : "عرض رمز QR"
           }
         },
         "az" : {
@@ -347962,7 +348275,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "الرجاء التحقق من كلمة المرور الخاصة بالاسترداد وحاول مرة أخرى."
+            "value" : "يرجى التحقق من كلمة مرور الاسترداد الخاصة بك وحاول مرة أخرى."
           }
         },
         "az" : {
@@ -352279,7 +352592,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "إخفاء كلمة المرور الخاصة بالاسترداد على هذا الجهاز بشكل دائم."
+            "value" : "قم بإخفاء كلمة مرور الاسترداد بشكل دائم على هذا الجهاز."
           }
         },
         "az" : {
@@ -366286,7 +366599,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "لم يتم العثور على أي نتيجة."
+            "value" : "لا توجد نتائج."
           }
         },
         "az" : {
@@ -368202,7 +368515,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "حدد"
+            "value" : "تحديد"
           }
         },
         "az" : {
@@ -368681,7 +368994,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "اختر الكل"
+            "value" : "تحديد الكل"
           }
         },
         "az" : {
@@ -370597,7 +370910,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "مظهر"
+            "value" : "المظهر"
           }
         },
         "az" : {
@@ -376842,7 +377155,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "شارك"
+            "value" : "مشاركة"
           }
         },
         "az" : {
@@ -379225,7 +379538,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "أظهر"
+            "value" : "إظهار"
           }
         },
         "az" : {
@@ -383548,7 +383861,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "حاول مرة أخرى"
+            "value" : "حاول مجدداً"
           }
         },
         "az" : {
@@ -391721,7 +392034,7 @@
         "ar" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "افتح الرابط"
+            "value" : "فتح الرابط"
           }
         },
         "az" : {

Session/Shared/FullConversationCell.swift

@@ -418,8 +418,10 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC
     public func update(with cellViewModel: SessionThreadViewModel, using dependencies: Dependencies) {
         let unreadCount: UInt = (cellViewModel.threadUnreadCount ?? 0)
         let threadIsUnread: Bool = (
-            unreadCount > 0 ||
-            cellViewModel.threadWasMarkedUnread == true
+            unreadCount > 0 || (
+                cellViewModel.threadId != cellViewModel.currentUserSessionId &&
+                cellViewModel.threadWasMarkedUnread == true
+            )
         )
         let themeBackgroundColor: ThemeValue = (threadIsUnread ?
             .conversationButton_unreadBackground :

SessionMessagingKit/Jobs/ConfigurationSyncJob.swift

@@ -33,11 +33,16 @@ public enum ConfigurationSyncJob: JobExecutor {
             return success(job, true)
         }
         
-        // It's possible for multiple ConfigSyncJob's with the same target (user/group) to try to run at the
-        // same time since as soon as one is started we will enqueue a second one, rather than adding dependencies
-        // between the jobs we just continue to defer the subsequent job while the first one is running in
-        // order to prevent multiple configurationSync jobs with the same target from running at the same time
+        /// It's possible for multiple ConfigSyncJob's with the same target (user/group) to try to run at the same time since as soon as
+        /// one is started we will enqueue a second one, rather than adding dependencies between the jobs we just continue to defer
+        /// the subsequent job while the first one is running in order to prevent multiple configurationSync jobs with the same target
+        /// from running at the same time
+        ///
+        /// **Note:** The one exception to this rule is when the job has `AdditionalSequenceRequests` because if we don't
+        /// run it immediately then the `AdditionalSequenceRequests` may not get run at all
         guard
+            (job.transientData as? AdditionalSequenceRequests)?.beforeSequenceRequests.isEmpty == false ||
+            (job.transientData as? AdditionalSequenceRequests)?.afterSequenceRequests.isEmpty == false ||
             dependencies[singleton: .jobRunner]
                 .jobInfoFor(state: .running, variant: .configurationSync)
                 .filter({ key, info in
@@ -73,9 +78,14 @@ public enum ConfigurationSyncJob: JobExecutor {
             return failure(job, StorageError.generic, false)
         }
         
-        // If there are no pending changes then the job can just complete (next time something
-        // is updated we want to try and run immediately so don't scuedule another run in this case)
-        guard !pendingChanges.pushData.isEmpty || !pendingChanges.obsoleteHashes.isEmpty else {
+        /// If there is no `pushData`, `obsoleteHashes` or additional sequence requests then the job can just complete (next time
+        /// something is updated we want to try and run immediately so don't scuedule another run in this case)
+        guard
+            !pendingChanges.pushData.isEmpty ||
+            !pendingChanges.obsoleteHashes.isEmpty ||
+            (job.transientData as? AdditionalSequenceRequests)?.beforeSequenceRequests.isEmpty == false ||
+            (job.transientData as? AdditionalSequenceRequests)?.afterSequenceRequests.isEmpty == false
+        else {
             Log.info(.cat, "For \(swarmPublicKey) completed with no pending changes")
             return success(job, true)
         }

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift

@@ -18,6 +18,7 @@ extension MessageReceiver {
         guard proto.hasExpirationType || proto.hasExpirationTimer else { return }
         guard
             threadVariant != .community,
+            threadVariant != .group,    // Handled via the GROUP_INFO config instead
             let sender: String = message.sender,
             let timestampMs: UInt64 = message.sentTimestampMs
         else { return }

SessionMessagingKit/Shared Models/MentionInfo.swift

@@ -27,10 +27,10 @@ public extension MentionInfo {
         threadId: String,
         threadVariant: SessionThread.Variant,
         targetPrefixes: [SessionId.Prefix],
+        currentUserBlinded15SessionId: String?,
+        currentUserBlinded25SessionId: String?,
         pattern: FTS5Pattern?
     ) -> AdaptedFetchRequest<SQLRequest<MentionInfo>>? {
-        guard threadVariant != .contact || userPublicKey != threadId else { return nil }
-        
         let profile: TypedTableAlias<Profile> = TypedTableAlias()
         let interaction: TypedTableAlias<Interaction> = TypedTableAlias()
         let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
@@ -40,6 +40,11 @@ public extension MentionInfo {
             .map { SQL("\(profile[.id]) LIKE '\(SQL(stringLiteral: "\($0.rawValue)%"))'") }
             .joined(operator: .or)
         let profileFullTextSearch: SQL = SQL(stringLiteral: Profile.fullTextSearchTableName)
+        let currentUserIds: Set<String> = [
+            userPublicKey,
+            currentUserBlinded15SessionId,
+            currentUserBlinded25SessionId
+        ].compactMap { $0 }.asSet()
         
         /// The query needs to differ depending on the thread variant because the behaviour should be different:
         ///
@@ -55,10 +60,8 @@ public extension MentionInfo {
                     FROM \(profileFullTextSearch)
                     JOIN \(Profile.self) ON (
                         \(Profile.self).rowid = \(profileFullTextSearch).rowid AND
-                        \(SQL("\(profile[.id]) != \(userPublicKey)")) AND (
-                            \(SQL("\(threadVariant) != \(SessionThread.Variant.community)")) OR
-                            \(prefixesLiteral)
-                        )
+                        \(SQL("\(threadVariant) != \(SessionThread.Variant.community)")) OR
+                        \(prefixesLiteral)
                     )
                 """
             }()
@@ -66,10 +69,8 @@ public extension MentionInfo {
                 guard let pattern: FTS5Pattern = pattern, pattern.rawPattern != "\"\"*" else {
                     return """
                         WHERE (
-                            \(SQL("\(profile[.id]) != \(userPublicKey)")) AND (
-                                \(SQL("\(threadVariant) != \(SessionThread.Variant.community)")) OR
-                                \(prefixesLiteral)
-                            )
+                            \(SQL("\(threadVariant) != \(SessionThread.Variant.community)")) OR
+                            \(prefixesLiteral)
                         )
                     """
                 }
@@ -87,7 +88,11 @@ public extension MentionInfo {
                             \(SQL("\(threadVariant) AS \(MentionInfo.Columns.threadVariant)"))
                     
                         \(targetJoin)
-                        \(targetWhere) AND \(SQL("\(profile[.id]) = \(threadId)"))
+                        \(targetWhere) AND (
+                            \(SQL("\(profile[.id]) = \(threadId)")) OR
+                            \(SQL("\(profile[.id]) IN \(currentUserIds)"))
+                        )
+                        ORDER BY \(SQL("\(profile[.id]) IN \(currentUserIds)")) DESC
                     """)
                     
                 case .legacyGroup, .group:
@@ -104,7 +109,9 @@ public extension MentionInfo {
                         )
                         \(targetWhere)
                         GROUP BY \(profile[.id])
-                        ORDER BY IFNULL(\(profile[.nickname]), \(profile[.name])) ASC
+                        ORDER BY
+                            \(SQL("\(profile[.id]) IN \(currentUserIds)")) DESC,
+                            IFNULL(\(profile[.nickname]), \(profile[.name])) ASC
                     """)
                     
                 case .community:
@@ -124,7 +131,9 @@ public extension MentionInfo {
                         JOIN \(OpenGroup.self) ON \(SQL("\(openGroup[.threadId]) = \(threadId)"))
                         \(targetWhere)
                         GROUP BY \(profile[.id])
-                        ORDER BY \(interaction[.timestampMs].desc)
+                        ORDER BY
+                            \(SQL("\(profile[.id]) IN \(currentUserIds)")) DESC,
+                            \(interaction[.timestampMs].desc)
                         LIMIT 20
                     """)
             }

SessionMessagingKit/Shared Models/MessageViewModel.swift

@@ -402,39 +402,26 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable,
             )
         }()
         let (positionInCluster, isOnlyMessageInCluster): (Position, Bool) = {
-            let isSenderVariantConsistent: Bool = (
-                (
-                    (
-                        self.variant == .standardOutgoing ||
-                        self.variant == .standardOutgoingDeleted ||
-                        self.variant == .standardOutgoingDeletedLocally
-                    ) && (
-                        prevModel?.variant != .standardOutgoing ||
-                        prevModel?.variant != .standardOutgoingDeleted ||
-                        prevModel?.variant != .standardOutgoingDeletedLocally
-                    )
-                ) || (
-                    (
-                        self.variant == .standardIncoming ||
-                        self.variant == .standardIncomingDeleted ||
-                        self.variant == .standardIncomingDeletedLocally
-                    ) && (
-                        prevModel?.variant != .standardIncoming &&
-                        prevModel?.variant != .standardIncomingDeleted &&
-                        prevModel?.variant != .standardIncomingDeletedLocally
-                    )
-                )
-            )
             let isFirstInCluster: Bool = (
                 prevModel == nil ||
-                shouldShowDateBeforeThisModel ||
-                isSenderVariantConsistent ||
+                shouldShowDateBeforeThisModel || (
+                    self.variant.isOutgoing &&
+                    prevModel?.variant.isOutgoing != true
+                ) || (
+                    self.variant.isIncoming &&
+                    prevModel?.variant.isIncoming != true
+                ) ||
                 self.authorId != prevModel?.authorId
             )
             let isLastInCluster: Bool = (
                 nextModel == nil ||
-                shouldShowDateBeforeNextModel ||
-                isSenderVariantConsistent ||
+                shouldShowDateBeforeNextModel || (
+                    self.variant.isOutgoing &&
+                    prevModel?.variant.isOutgoing != true
+                ) || (
+                    self.variant.isIncoming &&
+                    prevModel?.variant.isIncoming != true
+                ) ||
                 self.authorId != nextModel?.authorId
             )
 

SessionUtilitiesKit/General/Feature.swift

@@ -6,7 +6,7 @@ import Foundation
 
 public final class Features {
     public static let legacyGroupDepricationDate: Date = Date.distantFuture            // TODO: [GROUPS REBUILD] Set this date
-    public static let legacyGroupDepricationUrl: String = "https://getsession.org/faq" // TODO: [GROUPS REBUILD] Set this url
+    public static let legacyGroupDepricationUrl: String = "https://getsession.org/groups"
 }
 
 public extension FeatureStorage {