refactor: Separate delete and flush actions

Author: valentinperignon

Mail/Utils/ShortcutModifier.swift

@@ -60,7 +60,7 @@ struct ShortcutModifier: ViewModifier {
             content
         }
         .customAlert(item: $destructiveAlert) { item in
-            DestructiveActionAlertView(destructiveAlert: item, folder: viewModel.frozenFolder)
+            DestructiveActionAlertView(destructiveAlert: item)
         }
     }
 

Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift

@@ -131,7 +131,7 @@ struct ActionsPanelViewModifier: ViewModifier {
             )
         }
         .customAlert(item: $destructiveAlert) { item in
-            DestructiveActionAlertView(destructiveAlert: item, folder: originFolder)
+            DestructiveActionAlertView(destructiveAlert: item)
         }
         .customAlert(item: $messagesToDownload) { messages in
             ConfirmationSaveThreadInKdrive(targetMessages: messages)

Mail/Views/Thread List/DestructiveActionAlertView.swift

@@ -25,50 +25,48 @@ import MailResources
 import SwiftUI
 
 extension DestructiveActionAlertState {
-    func title(in folder: Folder?) -> String {
+    var title: String {
         switch type {
-        case .delete:
-            if let impactedMessages {
-                return MailResourcesStrings.Localizable.threadListDeletionConfirmationAlertTitle(impactedMessages)
-            } else {
-                switch folder?.role {
-                case .spam:
-                    return MailResourcesStrings.Localizable.threadListEmptySpamButton
-                case .trash:
-                    return MailResourcesStrings.Localizable.threadListEmptyTrashButton
-                default:
-                    return ""
-                }
+        case .flushFolder(let frozenFolder):
+            switch frozenFolder?.role {
+            case .spam:
+                return MailResourcesStrings.Localizable.threadListEmptySpamButton
+            case .trash:
+                return MailResourcesStrings.Localizable.threadListEmptyTrashButton
+            default:
+                return ""
             }
 
+        case .permanentlyDelete(let impactedMessages):
+            return MailResourcesStrings.Localizable.threadListDeletionConfirmationAlertTitle(impactedMessages)
+
         case .deleteSnooze:
-            return "!TODO"
+            return MailResourcesStrings.Localizable.actionDelete
 
         case .archiveSnooze:
-            return "!TODO"
+            return MailResourcesStrings.Localizable.actionArchive
 
         case .moveSnooze:
-            return "!TODO"
+            return MailResourcesStrings.Localizable.actionMove
         }
     }
 
     var description: String {
         switch type {
-        case .delete:
-            if let impactedMessages {
-                return MailResourcesStrings.Localizable.threadListDeletionConfirmationAlertDescription(impactedMessages)
-            } else {
-                return MailResourcesStrings.Localizable.threadListEmptyFolderAlertDescription
-            }
+        case .flushFolder:
+            return MailResourcesStrings.Localizable.threadListEmptyFolderAlertDescription
 
-        case .deleteSnooze:
-            return "!TODO"
+        case .permanentlyDelete(let impactedMessages):
+            return MailResourcesStrings.Localizable.threadListDeletionConfirmationAlertDescription(impactedMessages)
 
-        case .archiveSnooze:
-            return "!TODO"
+        case .deleteSnooze(let impactedMessages):
+            return MailResourcesStrings.Localizable.snoozeDeleteConfirmAlertDescription(impactedMessages)
 
-        case .moveSnooze:
-            return "!TODO"
+        case .archiveSnooze(let impactedMessages):
+            return MailResourcesStrings.Localizable.snoozeArchiveConfirmAlertDescription(impactedMessages)
+
+        case .moveSnooze(let impactedMessages):
+            return MailResourcesStrings.Localizable.snoozeArchiveConfirmAlertDescription(impactedMessages)
         }
     }
 }
@@ -77,22 +75,20 @@ struct DestructiveActionAlertView: View {
     @LazyInjectService private var matomo: MatomoUtils
 
     let destructiveAlert: DestructiveActionAlertState
-    var frozenFolder: Folder?
 
-    init(destructiveAlert: DestructiveActionAlertState, folder: Folder? = nil) {
+    init(destructiveAlert: DestructiveActionAlertState) {
         self.destructiveAlert = destructiveAlert
-        frozenFolder = folder?.freezeIfNeeded()
     }
 
     var body: some View {
         VStack(alignment: .leading, spacing: IKPadding.large) {
-            Text(destructiveAlert.title(in: frozenFolder))
+            Text(destructiveAlert.title)
                 .textStyle(.bodyMedium)
             Text(destructiveAlert.description)
                 .textStyle(.body)
 
             ModalButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonConfirm) {
-                if let frozenFolder, destructiveAlert.impactedMessages == nil {
+                if case let .flushFolder(frozenFolder) = destructiveAlert.type, let frozenFolder {
                     matomo.track(eventWithCategory: .threadList, name: "empty\(frozenFolder.matomoName.capitalized)Confirm")
                 }
                 await destructiveAlert.completion()
@@ -102,5 +98,5 @@ struct DestructiveActionAlertView: View {
 }
 
 #Preview {
-    DestructiveActionAlertView(destructiveAlert: DestructiveActionAlertState(type: .delete) { /* Preview */ })
+    DestructiveActionAlertView(destructiveAlert: DestructiveActionAlertState(type: .deleteSnooze(10)) { /* Preview */ })
 }

Mail/Views/Thread List/FlushFolderView.swift

@@ -60,7 +60,7 @@ struct FlushFolderView: View {
                     matomo.track(eventWithCategory: .threadList, name: "empty\(folder.matomoName.capitalized)")
 
                     let frozenFolder = folder.freezeIfNeeded()
-                    destructiveAlert = DestructiveActionAlertState(type: .delete) {
+                    destructiveAlert = DestructiveActionAlertState(type: .flushFolder(frozenFolder)) {
                         await tryOrDisplayError {
                             _ = try await mailboxManager.flushFolder(folder: frozenFolder)
                         }

Mail/Views/Thread List/ThreadListView.swift

@@ -221,7 +221,7 @@ struct ThreadListView: View {
             updateFetchingTask()
         }
         .customAlert(item: $mainViewState.destructiveAlert) { item in
-            DestructiveActionAlertView(destructiveAlert: item, folder: viewModel.frozenFolder)
+            DestructiveActionAlertView(destructiveAlert: item)
         }
         .customAlert(isPresented: $isShowingUpdateAlert) {
             // swiftlint:disable:next trailing_closure

MailCore/Cache/Actions/ActionsManager.swift

@@ -114,8 +114,7 @@ public class ActionsManager: ObservableObject {
             guard origin.frozenFolder?.shouldWarnBeforeDeletion != true else {
                 Task { @MainActor in
                     origin.nearestDestructiveAlert?.wrappedValue = DestructiveActionAlertState(
-                        type: .delete,
-                        impactedMessages: messagesWithDuplicates.uniqueThreadsInFolder(origin.frozenFolder).count
+                        type: .permanentlyDelete(messagesWithDuplicates.uniqueThreadsInFolder(origin.frozenFolder).count)
                     ) {
                         await tryOrDisplayError { [weak self] in
                             try await self?.performDelete(

MailCore/Utils/DestructiveActionAlertState.swift

@@ -19,21 +19,20 @@
 import Foundation
 
 public enum DestructiveActionAlertType {
-    case delete
-    case deleteSnooze
-    case archiveSnooze
-    case moveSnooze
+    case permanentlyDelete(Int)
+    case flushFolder(Folder?)
+    case deleteSnooze(Int)
+    case archiveSnooze(Int)
+    case moveSnooze(Int)
 }
 
 public struct DestructiveActionAlertState: Identifiable, Equatable {
     public let id = UUID()
     public let type: DestructiveActionAlertType
-    public let impactedMessages: Int?
     public let completion: () async -> Void
 
-    public init(type: DestructiveActionAlertType, impactedMessages: Int? = nil, completion: @escaping () async -> Void) {
+    public init(type: DestructiveActionAlertType, completion: @escaping () async -> Void) {
         self.type = type
-        self.impactedMessages = impactedMessages
         self.completion = completion
     }