Fixed build issues from merge

Session.xcodeproj/project.pbxproj

@@ -578,9 +578,6 @@
 		FD245C6B2850667400B966DD /* VisibleMessage+Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = C300A5B12554AF9800555489 /* VisibleMessage+Profile.swift */; };
 		FD245C6C2850669200B966DD /* MessageReceiveJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = C352A31225574F5200338F3E /* MessageReceiveJob.swift */; };
 		FD245C6D285066A400B966DD /* NotifyPushServerJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = C352A32E2557549C00338F3E /* NotifyPushServerJob.swift */; };
-		FD26FA5E291CAFF9005801D8 /* (null) in Sources */ = {isa = PBXBuildFile; };
-		FD26FA6D291DADAE005801D8 /* (null) in Sources */ = {isa = PBXBuildFile; };
-		FD26FA7B291DF8F3005801D8 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		FD2AAAED28ED3E1000A49611 /* MockGeneralCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFD645C27F273F300808CA1 /* MockGeneralCache.swift */; };
 		FD2AAAEE28ED3E1100A49611 /* MockGeneralCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFD645C27F273F300808CA1 /* MockGeneralCache.swift */; };
 		FD2AAAF028ED57B500A49611 /* SynchronousStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD2AAAEF28ED57B500A49611 /* SynchronousStorage.swift */; };
@@ -4604,8 +4601,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = C3C2A6F925539DE700C340D1 /* Build configuration list for PBXNativeTarget "SessionMessagingKit" */;
 			buildPhases = (
-				FDFC4E1729F14F7A00992FB6 /* Validate pre-build actions */,
 				2014435DF351DF6C60122751 /* [CP] Check Pods Manifest.lock */,
+				FDFC4E1729F14F7A00992FB6 /* Validate pre-build actions */,
 				C3C2A6EB25539DE700C340D1 /* Headers */,
 				C3C2A6EC25539DE700C340D1 /* Sources */,
 				C3C2A6ED25539DE700C340D1 /* Frameworks */,
@@ -5547,7 +5544,6 @@
 				FDF848D129405C5B007DCAE5 /* SnodeSwarmItem.swift in Sources */,
 				FDF848DD29405C5B007DCAE5 /* LegacySendMessageRequest.swift in Sources */,
 				FDF848BD29405C5A007DCAE5 /* GetMessagesRequest.swift in Sources */,
-				FD26FA7B291DF8F3005801D8 /* (null) in Sources */,
 				FDF848DB29405C5B007DCAE5 /* DeleteMessagesResponse.swift in Sources */,
 				FDF848E629405D6E007DCAE5 /* OnionRequestAPIDestination.swift in Sources */,
 				FDF848CC29405C5B007DCAE5 /* SnodeReceivedMessage.swift in Sources */,
@@ -5557,7 +5553,6 @@
 				FDF848D229405C5B007DCAE5 /* LegacyGetMessagesRequest.swift in Sources */,
 				FDF848CB29405C5B007DCAE5 /* SnodePoolResponse.swift in Sources */,
 				FDF848C429405C5A007DCAE5 /* RevokeSubkeyResponse.swift in Sources */,
-				FD26FA6D291DADAE005801D8 /* (null) in Sources */,
 				FDF848E529405D6E007DCAE5 /* SnodeAPIError.swift in Sources */,
 				FDF848D529405C5B007DCAE5 /* DeleteAllMessagesResponse.swift in Sources */,
 				FDF848E329405D6E007DCAE5 /* OnionRequestAPIVersion.swift in Sources */,
@@ -5691,7 +5686,6 @@
 				FDF8488929405B27007DCAE5 /* Data+Utilities.swift in Sources */,
 				FD09797227FAA2F500936362 /* Optional+Utilities.swift in Sources */,
 				FD7162DB281B6C440060647B /* TypedTableAlias.swift in Sources */,
-				FD26FA5E291CAFF9005801D8 /* (null) in Sources */,
 				FD7115F828C8151C00B47552 /* DisposableBarButtonItem.swift in Sources */,
 				FD17D7E727F6A16700122BE0 /* _003_YDBToGRDBMigration.swift in Sources */,
 			);

Session/Closed Groups/NewClosedGroupVC.swift

@@ -349,7 +349,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
                                     targetView: self?.view,
                                     info: ConfirmationModal.Info(
                                         title: "GROUP_CREATION_ERROR_TITLE".localized(),
-                                        explanation: "GROUP_CREATION_ERROR_MESSAGE".localized(),
+                                        body: .text("GROUP_CREATION_ERROR_MESSAGE".localized()),
                                         cancelTitle: "BUTTON_OK".localized(),
                                         cancelStyle: .alert_text
                                     )

Session/Conversations/ConversationViewModel.swift

@@ -67,7 +67,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
             
             // If we have a specified 'focusedInteractionInfo' then use that, otherwise retrieve the oldest
             // unread interaction and start focused around that one
-            let targetInteractionInfo: Int64? = (focusedInteractionInfo != nil ? focusedInteractionInfo :
+            let targetInteractionInfo: Interaction.TimestampInfo? = (focusedInteractionInfo != nil ? focusedInteractionInfo :
                 try Interaction
                     .select(.id, .timestampMs)
                     .filter(interaction[.wasRead] == false)
@@ -76,7 +76,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
                     .asRequest(of: Interaction.TimestampInfo.self)
                     .fetchOne(db)
             )
-            let threadIsBlocked: Bool= (threadVariant != .contact ? false :
+            let threadIsBlocked: Bool = (threadVariant != .contact ? false :
                 try Contact
                     .filter(id: threadId)
                     .select(.isBlocked)
@@ -85,7 +85,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
                     .defaulting(to: false)
             )
             let currentUserIsClosedGroupMember: Bool? = (![.legacyGroup, .group].contains(threadVariant) ? nil :
-                try GroupMember
+                GroupMember
                     .filter(groupMember[.groupId] == threadId)
                     .filter(groupMember[.profileId] == getUserHexEncodedPublicKey(db))
                     .filter(groupMember[.role] == GroupMember.Role.standard)
@@ -115,12 +115,12 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
         
         self.threadId = threadId
         self.initialThreadVariant = threadVariant
-        self.focusedInteractionInfo = targetInteractionInfo
+        self.focusedInteractionInfo = initialData?.targetInteractionInfo
         self.threadData = SessionThreadViewModel(
             threadId: threadId,
             threadVariant: threadVariant,
             threadIsNoteToSelf: (self.threadId == getUserHexEncodedPublicKey()),
-            threadIsBlocked: threadIsBlocked,
+            threadIsBlocked: initialData?.threadIsBlocked,
             currentUserIsClosedGroupMember: initialData?.currentUserIsClosedGroupMember,
             openGroupPermissions: initialData?.openGroupPermissions
         ).populatingCurrentUserBlindedKey(currentUserBlindedPublicKeyForThisThread: initialData?.blindedKey)
@@ -143,7 +143,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             // If we don't have a `initialFocusedInfo` then default to `.pageBefore` (it'll query
             // from a `0` offset)
-            guard let initialFocusedInfo: Interaction.TimestampInfo = targetInteractionInfo else {
+            guard let initialFocusedInfo: Interaction.TimestampInfo = initialData?.targetInteractionInfo else {
                 self?.pagedDataObserver?.load(.pageBefore)
                 return
             }

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -818,11 +818,11 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
                                     format: "BLOCK_LIST_VIEW_BLOCKED_ALERT_MESSAGE_FORMAT".localized(),
                                     displayName
                                 )
-                            ),
+                            )),
                             accessibility: Accessibility(
                                 identifier: "Test_name",
                                 label: (oldBlockedState == false ? "User blocked" : "Confirm unblock")
-                            )),
+                            ),
                             cancelTitle: "BUTTON_OK".localized(),
                             cancelAccessibility: Accessibility(identifier: "OK_BUTTON"),
                             cancelStyle: .alert_text

Session/Home/New Conversation/NewDMVC.swift

@@ -183,7 +183,7 @@ final class NewDMVC: BaseVC, UIPageViewControllerDataSource, UIPageViewControlle
                         targetView: self.view,
                         info: ConfirmationModal.Info(
                             title: "ALERT_ERROR_TITLE".localized(),
-                            explanation: "DM_ERROR_DIRECT_BLINDED_ID".localized(),
+                            body: .text("DM_ERROR_DIRECT_BLINDED_ID".localized()),
                             cancelTitle: "BUTTON_OK".localized(),
                             cancelStyle: .alert_text
                         )
@@ -195,7 +195,7 @@ final class NewDMVC: BaseVC, UIPageViewControllerDataSource, UIPageViewControlle
                         targetView: self.view,
                         info: ConfirmationModal.Info(
                             title: "ALERT_ERROR_TITLE".localized(),
-                            explanation: "DM_ERROR_INVALID".localized(),
+                            body: .text("DM_ERROR_INVALID".localized()),
                             cancelTitle: "BUTTON_OK".localized(),
                             cancelStyle: .alert_text
                         )

Session/Settings/SettingsViewModel.swift

@@ -535,7 +535,7 @@ class SettingsViewModel: SessionTableViewModel<SettingsViewModel.NavButton, Sett
                     value: {
                         switch avatarUpdate {
                             case .uploadImage(let image): return image
-                            case .uploadFilePath(let filePath): UIImage(contentsOfFile: filePath)
+                            case .uploadFilePath(let filePath): return UIImage(contentsOfFile: filePath)
                             default: return nil
                         }
                     }(),

Session/Utilities/UIContextualAction+Utilities.swift

@@ -149,7 +149,7 @@ public extension UIContextualAction {
                                     let confirmationModal: ConfirmationModal = ConfirmationModal(
                                         info: ConfirmationModal.Info(
                                             title: "hide_note_to_self_confirmation_alert_title".localized(),
-                                            attributedExplanation: confirmationModalExplanation,
+                                            body: .attributedText(confirmationModalExplanation),
                                             confirmTitle: "TXT_HIDE_TITLE".localized(),
                                             confirmAccessibility: Accessibility(
                                                 identifier: "Hide"