fix: Compute hasSubFolders in mailboxManager

Author: Ambrdctr

Mail/Views/Menu Drawer/Folders/FolderCell.swift

@@ -63,8 +63,7 @@ struct FolderCell: View {
                         frozenFolder: folder.frozenContent,
                         level: level,
                         isCurrentFolder: isCurrentFolder,
-                        canCollapseSubFolders: canCollapseSubFolders,
-                        shouldHaveChevron: folder.hasSubFolders
+                        canCollapseSubFolders: canCollapseSubFolders
                     )
                 }
                 .accessibilityAction(.default) {
@@ -87,8 +86,7 @@ struct FolderCell: View {
                             frozenFolder: folder.frozenContent,
                             level: level,
                             isCurrentFolder: isCurrentFolder,
-                            canCollapseSubFolders: canCollapseSubFolders,
-                            shouldHaveChevron: folder.hasSubFolders
+                            canCollapseSubFolders: canCollapseSubFolders
                         )
                     }
                 }
@@ -97,9 +95,9 @@ struct FolderCell: View {
                 }
             }
 
-            if (folder.frozenContent.isExpanded && folder.hasSubFolders) || cellType == .move {
+            if (folder.frozenContent.isExpanded && folder.frozenContent.hasSubFolders) || cellType == .move {
                 ForEach(folder.children) { child in
-                    if child.frozenContent.role == nil || child.hasSubFolders {
+                    if child.frozenContent.role == nil || child.frozenContent.hasSubFolders {
                         FolderCell(
                             folder: child,
                             level: level + 1,
@@ -158,13 +156,13 @@ struct FolderCellContent: View {
 
     private var shouldHaveChevron: Bool
 
-    init(frozenFolder: Folder, level: Int, isCurrentFolder: Bool, canCollapseSubFolders: Bool = false, shouldHaveChevron: Bool) {
+    init(frozenFolder: Folder, level: Int, isCurrentFolder: Bool, canCollapseSubFolders: Bool = false) {
         assert(frozenFolder.isFrozen, "expecting frozenFolder to be frozen")
         self.frozenFolder = frozenFolder
         self.level = min(level, Self.maximumSubFolderLevel)
         self.isCurrentFolder = isCurrentFolder
         self.canCollapseSubFolders = canCollapseSubFolders
-        self.shouldHaveChevron = shouldHaveChevron && level == 0
+        shouldHaveChevron = frozenFolder.hasSubFolders && level == 0
     }
 
     var body: some View {

Mail/Views/Menu Drawer/Folders/FoldersListView.swift

@@ -32,7 +32,7 @@ struct FoldersListView: View {
     private let hasSubFolders: Bool
     init(folders: [NestableFolder]) {
         self.folders = folders
-        hasSubFolders = folders.contains { $0.hasSubFolders }
+        hasSubFolders = folders.contains { $0.frozenContent.hasSubFolders }
     }
 
     var body: some View {

MailCore/Cache/MailboxManager/MailboxManager+Folders.swift

@@ -24,6 +24,19 @@ import RealmSwift
 // MARK: - Folders
 
 public extension MailboxManager {
+    func hasSubFolders(folder: Folder) -> Bool {
+        let filteredChild = folder.children.filter { $0.role == nil }
+        if !filteredChild.isEmpty {
+            return true
+        }
+        for child in folder.children {
+            if hasSubFolders(folder: child) {
+                return true
+            }
+        }
+        return false
+    }
+
     /// Get all remote folders in DB
     func refreshAllFolders() async throws {
         guard ReachabilityListener.instance.currentStatus != .offline else {
@@ -32,7 +45,11 @@ public extension MailboxManager {
 
         let folderResult = try await apiFetcher.folders(mailbox: mailbox)
         let filteredFolderResult = filterOutUnknownFolders(folderResult)
+
         let newFolders = getSubFolders(from: filteredFolderResult)
+        for folder in newFolders {
+            folder.hasSubFolders = hasSubFolders(folder: folder)
+        }
 
         try? writeTransaction { writableRealm in
             let foldersByRole = Dictionary(grouping: newFolders, by: \.role)

MailCore/Models/Folder.swift

@@ -188,6 +188,7 @@ public class Folder: Object, Codable, Comparable, Identifiable {
     @Persisted public var threadsSource: Folder?
     @Persisted public var associatedFolders: RealmSwift.List<Folder>
 
+    @Persisted public var hasSubFolders = false
     @Persisted public var isAcceptingMove = true
 
     public var listChildren: AnyRealmCollection<Folder>? {

MailCore/Models/NestableFolder.swift

@@ -31,19 +31,6 @@ public struct NestableFolder: Identifiable {
     /// `NestableFolder` childs
     public let children: [NestableFolder]
 
-    public var hasSubFolders: Bool {
-        let filteredChild = children.filter { $0.frozenContent.role == nil }
-        if !filteredChild.isEmpty {
-            return true
-        }
-        for child in children {
-            if child.hasSubFolders {
-                return true
-            }
-        }
-        return false
-    }
-
     public init(content: Folder, children: [NestableFolder]) {
         frozenContent = content.freezeIfNeeded()
         self.children = children