1 files changed, 2 insertions, 14 deletions
diff --git a/Sora/Views/Generic/GenericListView.swift b/Sora/Views/Generic/GenericListView.swift
index accd816..3e5154f 100644
--- a/Sora/Views/Generic/GenericListView.swift
+++ b/Sora/Views/Generic/GenericListView.swift
@@ -52,22 +52,10 @@ struct GenericListView<T: Identifiable & Hashable & GenericItem>: View {
       return item.folder == folderIdentifier
 
     case .topLevelFolder(let topLevelName):
-      guard let itemFolderIdentifier = item.folder,
-        let itemFolder = folderHierarchy.folder(for: itemFolderIdentifier)
-      else {
-        return false
-      }
-
-      return itemFolder.topLevelName == topLevelName
+      return folderHierarchy.isInTopLevelFolder(item.folder, named: topLevelName)
 
     case .topLevelUncategorized(let topLevelName):
-      guard let itemFolderIdentifier = item.folder,
-        let itemFolder = folderHierarchy.folder(for: itemFolderIdentifier)
-      else {
-        return false
-      }
-
-      return itemFolder.name == topLevelName
+      return folderHierarchy.isInTopLevelUncategorized(item.folder, named: topLevelName)
     }
   }