From 99d56205363b6f5b345fbcb4c90cc17a2b20356f Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Mon, 23 Oct 2023 11:28:49 +1100
Subject: [PATCH] minor refactor and clean up

---
 ...isappearingMessagesSettingsViewModel.swift | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
index f59f2ce74..fc64e03c1 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
@@ -55,16 +55,14 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
     
     public enum Section: SessionTableSection {
         case type
-        case timerDisappearAfterSend
-        case timerDisappearAfterRead
+        case timer
         case noteToSelf
         case group
         
         var title: String? {
             switch self {
                 case .type: return "DISAPPERING_MESSAGES_TYPE_TITLE".localized()
-                case .timerDisappearAfterSend: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
-                case .timerDisappearAfterRead: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
+                case .timer: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
                 case .noteToSelf: return nil
                 case .group: return nil
             }
@@ -258,12 +256,12 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                         ),
                         (currentSelection.isEnabled == false ? nil :
                             SectionModel(
-                                model: (currentSelection.type == .disappearAfterSend ?
-                                    .timerDisappearAfterSend :
-                                    .timerDisappearAfterRead
-                                ),
+                                model: .timer,
                                 elements: DisappearingMessagesConfiguration
-                                    .validDurationsSeconds(currentSelection.type ?? .disappearAfterSend)
+                                    .validDurationsSeconds({
+                                        guard Features.useNewDisappearingMessagesConfig else { return .disappearAfterSend }
+                                        return currentSelection.type ?? .disappearAfterSend
+                                    }())
                                     .map { duration in
                                         let title: String = duration.formatted(format: .long)
 
@@ -371,12 +369,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                         (!Features.useNewDisappearingMessagesConfig && currentSelection.isEnabled == false ? nil :
                             SectionModel(
                                 model: {
-                                    guard Features.useNewDisappearingMessagesConfig else {
-                                        return (currentSelection.type == .disappearAfterSend ?
-                                            .timerDisappearAfterSend :
-                                            .timerDisappearAfterRead
-                                        )
-                                    }
+                                    guard Features.useNewDisappearingMessagesConfig else { return .timer }
 
                                     return (isNoteToSelf ? .noteToSelf : .group)
                                 }(),