Fix usage of refreshable

Author: itsmeichigo

Modules/Sources/Yosemite/Stores/BookingStore.swift

@@ -57,7 +57,12 @@ private extension BookingStore {
                 let bookings = try await remote.loadAllBookings(for: siteID,
                                                                 pageNumber: pageNumber,
                                                                 pageSize: pageSize)
-                await upsertStoredBookingsInBackground(readOnlyBookings: bookings, siteID: siteID)
+                let shouldDeleteExistingBookings = pageNumber == Default.firstPageNumber
+                await upsertStoredBookingsInBackground(
+                    readOnlyBookings: bookings,
+                    siteID: siteID,
+                    shouldDeleteExistingBookings: shouldDeleteExistingBookings
+                )
                 let hasNextPage = bookings.count == pageSize
                 onCompletion(.success(hasNextPage))
             } catch {

WooCommerce/Classes/Bookings/BookingList/BookingListView.swift

@@ -5,6 +5,8 @@ struct BookingListView: View {
     @ObservedObject private var viewModel: BookingListViewModel
     @State private var selectedTabIndex = 0
 
+    @Namespace var topID
+
     private let tabs = [Localization.today, Localization.upcoming, Localization.all]
 
     init(viewModel: BookingListViewModel) {
@@ -28,6 +30,7 @@ struct BookingListView: View {
                 }
             }
             .navigationTitle(Localization.viewTitle)
+            .toolbarBackground(Color(.listForeground(modal: false)), for: .navigationBar)
             .toolbar {
                 ToolbarItem(placement: .confirmationAction) {
                     Button {
@@ -99,26 +102,30 @@ private extension BookingListView {
     }
 
     var bookingList: some View {
-        ScrollView {
-            LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
-                Section {
-                    ForEach(viewModel.bookings) { item in
-                        bookingItem(item)
+        ScrollViewReader { proxy in
+            ScrollView {
+                LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
+                    Section {
+                        ForEach(viewModel.bookings) { item in
+                            bookingItem(item)
+                        }
+                    } header: {
+                        headerView
                     }
-                } header: {
-                    headerView
+                    .id(topID)
+
+                    InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
+                        .padding(.top, Layout.viewPadding)
+                        .onAppear {
+                            viewModel.onLoadNextPageAction()
+                        }
                 }
-                InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
-                    .padding(.top, Layout.viewPadding)
-                    .onAppear {
-                        viewModel.onLoadNextPageAction()
-                    }
             }
-        }
-        .refreshable {
-            viewModel.onRefreshAction(completion: {
-                // TODO: show/hide ghost animation if needed
-            })
+            .refreshable {
+                await viewModel.onRefreshAction()
+                // workaround as navigation bar is not snapped back after refreshing
+                proxy.scrollTo(topID, anchor: .top)
+            }
         }
     }
 

WooCommerce/Classes/Bookings/BookingList/BookingListViewModel.swift

@@ -55,10 +55,12 @@ final class BookingListViewModel: ObservableObject {
     }
 
     /// Called when the user pulls down the list to refresh.
-    /// - Parameter completion: called when the refresh completes.
-    func onRefreshAction(completion: @escaping () -> Void) {
-        paginationTracker.resync(reason: nil) {
-            completion()
+    @MainActor
+    func onRefreshAction() async {
+        await withCheckedContinuation { continuation in
+            paginationTracker.resync(reason: nil) {
+                continuation.resume(returning: ())
+            }
         }
     }
 }