Restore loading bookings upon switching tab and sort items by start date

Author: itsmeichigo

WooCommerce/Classes/Bookings/BookingList/BookingListContainerViewModel.swift

@@ -46,14 +46,14 @@ enum BookingListTab: Int, CaseIterable {
         }
     }
 
-    func startDateBefore(currentDate: Date = Date()) -> Date? {
+    func startDateBefore(currentDate: Date) -> Date? {
         switch self {
         case .today: currentDate.endOfDay(timezone: Self.utcTimeZone)
         case .upcoming, .all: nil
         }
     }
 
-    func startDateAfter(currentDate: Date = Date()) -> Date? {
+    func startDateAfter(currentDate: Date) -> Date? {
         switch self {
         case .today: currentDate.startOfDay(timezone: Self.utcTimeZone)
         case .upcoming: currentDate.endOfDay(timezone: Self.utcTimeZone)

WooCommerce/Classes/Bookings/BookingList/BookingListView.swift

@@ -24,10 +24,7 @@ struct BookingListView: View {
             }
         }
         .task {
-            // Only load first page if no content is available.
-            if viewModel.bookings.isEmpty {
-                viewModel.loadBookings()
-            }
+            viewModel.loadBookings()
         }
     }
 }

WooCommerce/Classes/Bookings/BookingList/BookingListViewModel.swift

@@ -35,7 +35,7 @@ final class BookingListViewModel: ObservableObject {
             predicates.append(NSPredicate(format: "startDate > %@", after as NSDate))
         }
         let combinedPredicate = NSCompoundPredicate(type: .and, subpredicates: predicates)
-        let sortDescriptorByDate = NSSortDescriptor(key: "dateCreated", ascending: false)
+        let sortDescriptorByDate = NSSortDescriptor(key: "startDate", ascending: false)
         let resultsController = ResultsController<StorageBooking>(storageManager: storage,
                                                                   matching: combinedPredicate,
                                                                   sortedBy: [sortDescriptorByDate])