Merge remote-tracking branch 'RyanFork/disappearing-message-redesign' into feature/groups-rebuild

# Conflicts:
#	_SharedTestUtilities/MockJobRunner.swift

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -802,12 +802,13 @@ class ThreadSettingsViewModel: SessionTableViewModel<ThreadSettingsViewModel.Nav
                 )
                 
                 // Trigger disappear after read
-                dependencies.jobRunner.upsert(
+                dependencies[singleton: .jobRunner].upsert(
                     db,
                     job: DisappearingMessagesJob.updateNextRunIfNeeded(
                         db,
                         interaction: interaction,
-                        startedAtMs: TimeInterval(SnodeAPI.currentOffsetTimestampMs())
+                        startedAtMs: TimeInterval(SnodeAPI.currentOffsetTimestampMs(using: dependencies)),
+                        using: dependencies
                     ),
                     canStartJob: true,
                     using: dependencies

SessionMessagingKit/Shared Models/SessionThreadViewModel.swift

@@ -26,7 +26,6 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
         case threadMemberNames
         
         case threadIsNoteToSelf
-        case contactLastKnownClientVersion
         case threadIsMessageRequest
         case threadRequiresApproval
         case threadShouldBeVisible