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

# Conflicts: # _SharedTestUtilities/MockJobRunner.swift
2 years ago · 691acf2a42
parent d8b0f76902 e4357f153e
commit 691acf2a42
2 changed files with 3 additions and 3 deletions
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/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
--- a/Models/SessionThreadViewModel.swift
+++ b/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