clean

Session/Home/HomeVC.swift

@@ -708,8 +708,8 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi
                 }
                 mute.themeBackgroundColor = .conversationButton_swipeSecondary
             
-                switch threadViewModel.threadVariant {
+                switch (threadViewModel.threadVariant, threadViewModel.currentUserIsClosedGroupMember) {
-                    case .contact:
+                    case (.contact, _):
                         let delete: UIContextualAction = UIContextualAction(
                             title: "TXT_DELETE_TITLE".localized(),
                             icon: UIImage(named: "icon_bin")?.resizedImage(to: CGSize(width: Values.mediumFontSize, height: Values.mediumFontSize)),
@@ -763,8 +763,7 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi
                         
                         return UISwipeActionsConfiguration(actions: [ delete, mute, pin ])
                     
-                    case .openGroup, .closedGroup:
+                    case (.closedGroup, false):
-                        if threadViewModel.currentUserIsClosedGroupMember == false {
                         let delete: UIContextualAction = UIContextualAction(
                             title: "TXT_DELETE_TITLE".localized(),
                             icon: UIImage(named: "icon_bin")?.resizedImage(to: CGSize(width: Values.mediumFontSize, height: Values.mediumFontSize)),
@@ -786,8 +785,8 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi
                         }
                         
                         return UISwipeActionsConfiguration(actions: [ delete, mute, pin ])
-                        }
                     
+                    default:
                         let leave: UIContextualAction = UIContextualAction(
                             title: "LEAVE_BUTTON_TITLE".localized(),
                             icon: UIImage(systemName: "rectangle.portrait.and.arrow.right"),

Session/Home/HomeViewModel.swift

@@ -310,21 +310,16 @@ public class HomeViewModel {
         }
         
         Storage.shared.writeAsync { db in
-            switch threadVariant {
+            switch (threadVariant, force) {
-                case .closedGroup:
+                case (.closedGroup, false):
-                    if force {
-                        try delete(db, threadId: threadId)
-                    } else {
                     try MessageSender.leave(
                         db,
                         groupPublicKey: threadId,
                         deleteThread: true
                     )
-                    }
                     
-                case .openGroup:
+                case (.openGroup, _):
                     OpenGroupManager.shared.delete(db, openGroupId: threadId)
-                    try delete(db, threadId: threadId)
                     
                 default:
                     try delete(db, threadId: threadId)