From d270bd685f2819dc6c3f1746735c5101443c6368 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 15 Nov 2023 11:09:16 +0800
Subject: [PATCH] Improve loading of labels view

---
 .../App/Views/Labels/ApplyLabelsView.swift    | 37 ++++++++-----------
 .../App/Views/Labels/LabelsViewModel.swift    |  3 --
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift b/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift
index 4d5c54d66..da5a7d903 100644
--- a/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift
@@ -104,24 +104,6 @@ struct ApplyLabelsView: View {
     }
     .navigationTitle(mode.navTitle)
     .background(Color.extensionBackground)
-    #if os(iOS)
-      .navigationBarTitleDisplayMode(.inline)
-      .toolbar {
-        ToolbarItem(placement: .navigationBarLeading) {
-          cancelButton
-        }
-        ToolbarItem(placement: .navigationBarTrailing) {
-          saveItemChangesButton
-        }
-      }
-    #else
-      .toolbar {
-        ToolbarItemGroup {
-          cancelButton
-          saveItemChangesButton
-        }
-      }
-    #endif
     .sheet(isPresented: $viewModel.showCreateLabelModal) {
       CreateLabelView(viewModel: viewModel, newLabelName: viewModel.labelSearchFilter)
     }
@@ -181,14 +163,25 @@ struct ApplyLabelsView: View {
     Group {
       #if os(iOS)
         NavigationView {
-          if viewModel.labels.isEmpty, viewModel.isLoading {
-            EmptyView()
-          } else {
             innerBody
-          }
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+              ToolbarItem(placement: .navigationBarLeading) {
+                cancelButton
+              }
+              ToolbarItem(placement: .navigationBarTrailing) {
+                saveItemChangesButton
+              }
+            }
         }
       #elseif os(macOS)
         innerBody
+          .toolbar {
+            ToolbarItemGroup {
+              cancelButton
+              saveItemChangesButton
+            }
+          }
           .frame(minWidth: 400, minHeight: 600)
       #endif
     }
diff --git a/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsViewModel.swift
index 98b5dd8e2..569014ab3 100644
--- a/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsViewModel.swift
+++ b/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsViewModel.swift
@@ -29,7 +29,6 @@ import SwiftUI
     highlight: Highlight? = nil,
     initiallySelectedLabels: [LinkedItemLabel]? = nil
   ) async {
-    isLoading = true
     let selLabels = initiallySelectedLabels ?? item?.sortedLabels ?? highlight?.sortedLabels ?? []
 
     await loadLabelsFromStore(dataService: dataService)
@@ -42,7 +41,6 @@ import SwiftUI
         unselectedLabels.insert(label)
       }
     }
-    isLoading = false
 
     Task.detached(priority: .userInitiated) {
       if let labelIDs = try? await dataService.labels() {
@@ -59,7 +57,6 @@ import SwiftUI
               self.unselectedLabels.insert(label)
             }
           }
-          self.isLoading = false
         }
       }
     }