Merge branch 'trunk' into WOOMOB-1653-handle-order-details-re-selection-issue

RafaelKayumov · RafaelKayumov · commit 89992efce692 · 2025-11-10T16:42:13.000+03:00
diff --git a/Modules/Sources/Experiments/DefaultFeatureFlagService.swift b/Modules/Sources/Experiments/DefaultFeatureFlagService.swift
@@ -99,7 +99,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .ciabBookings:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleSurveys:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .pointOfSaleCatalogAPI:
             return false
         default:
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -7,6 +7,7 @@
 - [*] Improve card payments onboarding error handling to show network errors correctly [https://github.com/woocommerce/woocommerce-ios/pull/16304]
 - [*] Authenticate the admin page automatically for sites with SSO enabled in custom fields, in-person payment setup, and editing tax rates flows. [https://github.com/woocommerce/woocommerce-ios/pull/16318]
 - [*] Fix order details presentation when opened from booking details [https://github.com/woocommerce/woocommerce-ios/pull/16331]
+- [*] Show POS feedback surveys for eligible merchants [https://github.com/woocommerce/woocommerce-ios/pull/16325]
 
 23.6
 -----
diff --git a/WooCommerce/Classes/Bookings/BookingList/BookingListContainerView.swift b/WooCommerce/Classes/Bookings/BookingList/BookingListContainerView.swift
@@ -16,19 +16,12 @@ struct BookingListContainerView: View {
     }
 
     var body: some View {
-        VStack(spacing: 0) {
+        BookingListView(
+            viewModel: viewModel.listViewModel(for: viewModel.selectedTab),
+            searchViewModel: viewModel.searchViewModel(for: viewModel.selectedTab),
+            selectedBooking: $selectedBooking
+        ) {
             headerView
-            TabView(selection: $viewModel.selectedTab) {
-                ForEach(BookingListTab.allCases, id: \.rawValue) { tab in
-                    BookingListView(
-                        viewModel: viewModel.listViewModel(for: tab),
-                        searchViewModel: viewModel.searchViewModel(for: tab),
-                        selectedBooking: $selectedBooking
-                    )
-                    .tag(tab)
-                }
-            }
-            .tabViewStyle(.page(indexDisplayMode: .never))
         }
         .navigationTitle(Localization.viewTitle)
         .if(isSearching, transform: { view in
diff --git a/WooCommerce/Classes/Bookings/BookingList/BookingListView.swift b/WooCommerce/Classes/Bookings/BookingList/BookingListView.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import struct Yosemite.Booking
 
-struct BookingListView: View {
+struct BookingListView<Header: View>: View {
     @ObservedObject private var viewModel: BookingListViewModel
     @ObservedObject private var searchViewModel: BookingSearchViewModel
 
@@ -10,12 +10,16 @@ struct BookingListView: View {
 
     @Binding var selectedBooking: Booking?
 
+    private let header: Header
+
     init(viewModel: BookingListViewModel,
          searchViewModel: BookingSearchViewModel,
-         selectedBooking: Binding<Booking?>) {
+         selectedBooking: Binding<Booking?>,
+         @ViewBuilder header: () -> Header) {
         self.viewModel = viewModel
         self.searchViewModel = searchViewModel
         self._selectedBooking = selectedBooking
+        self.header = header()
     }
 
     var body: some View {
@@ -98,20 +102,25 @@ private extension BookingListView {
                      onNextPage: @escaping () -> Void,
                      onRefresh: @escaping () async -> Void) -> some View {
         List(selection: $selectedBooking) {
-            ForEach(bookings) { item in
-                bookingItem(item)
-                    .tag(item)
-            }
-
-            InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
-                .padding(.top, Layout.viewPadding)
-                .onAppear {
-                    onNextPage()
+            Section {
+                ForEach(bookings) { item in
+                    bookingItem(item)
+                        .tag(item)
                 }
+
+                InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
+                    .padding(.top, BookingListViewLayout.viewPadding)
+                    .onAppear {
+                        onNextPage()
+                    }
+            } header: {
+                header
+                    .listRowInsets(EdgeInsets())
+            }
         }
         .listStyle(.plain)
+        .listSectionSeparator(.hidden, edges: .top)
         .background(Color(.listBackground))
-        .accentColor(Color(.listSelectedBackground))
         .refreshable {
             await onRefresh()
         }
@@ -140,50 +149,20 @@ private extension BookingListView {
                 }
             }
         }
+        .listRowBackground(booking == selectedBooking ? Color(.listSelectedBackground) : Color(.listForeground(modal: false)))
     }
 
     func emptyStateView(isSearching: Bool, onRefresh: @escaping () async -> Void) -> some View {
         GeometryReader { proxy in
             ScrollView {
-                VStack(spacing: Layout.emptyStatePadding) {
-                    Spacer()
-                    Image(uiImage: isSearching ? .magnifyingGlassNotFound : .noBookings)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width: Layout.emptyStateImageWidth * scale)
-                        .padding(.bottom, Layout.viewPadding)
-                    if isSearching {
-                        Text(Localization.emptySearchText)
-                            .font(.body)
-                            .foregroundStyle(Color.secondary)
-                    } else {
-                        VStack(spacing: Layout.textVerticalPadding) {
-                            Text(viewModel.emptyStateTitle)
-                                .font(.title2)
-                                .fontWeight(.semibold)
-                                .foregroundStyle(.primary)
-                            Text(viewModel.emptyStateDescription)
-                                .font(.title3)
-                                .foregroundStyle(.secondary)
-                        }
-                        if viewModel.hasFilters {
-                            VStack(spacing: Layout.textVerticalPadding) {
-                                Button("Change filters") {
-                                    // TODO
-                                }
-                                .buttonStyle(PrimaryButtonStyle())
-                                Button("Clear filters") {
-                                    // TODO
-                                }
-                                .buttonStyle(SecondaryButtonStyle())
-                            }
-                        }
+                LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
+                    Section {
+                        emptyStateContent(isSearching: isSearching)
+                            .frame(minWidth: proxy.size.width, minHeight: proxy.size.height)
+                    } header: {
+                        header
                     }
-                    Spacer()
                 }
-                .multilineTextAlignment(.center)
-                .padding(.horizontal, Layout.emptyStatePadding)
-                .frame(minWidth: proxy.size.width, minHeight: proxy.size.height)
             }
             .refreshable {
                 await onRefresh()
@@ -192,41 +171,79 @@ private extension BookingListView {
         .background(Color(.systemBackground))
     }
 
+    func emptyStateContent(isSearching: Bool) -> some View {
+        VStack(spacing: BookingListViewLayout.emptyStatePadding) {
+            Spacer()
+            Image(uiImage: isSearching ? .magnifyingGlassNotFound : .noBookings)
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: BookingListViewLayout.emptyStateImageWidth * scale)
+                .padding(.bottom, BookingListViewLayout.viewPadding)
+            if isSearching {
+                Text(BookingListViewLocalization.emptySearchText)
+                    .font(.body)
+                    .foregroundStyle(Color.secondary)
+            } else {
+                VStack(spacing: BookingListViewLayout.textVerticalPadding) {
+                    Text(viewModel.emptyStateTitle)
+                        .font(.title2)
+                        .fontWeight(.semibold)
+                        .foregroundStyle(.primary)
+                    Text(viewModel.emptyStateDescription)
+                        .font(.title3)
+                        .foregroundStyle(.secondary)
+                }
+                if viewModel.hasFilters {
+                    VStack(spacing: BookingListViewLayout.textVerticalPadding) {
+                        Button("Change filters") {
+                            // TODO
+                        }
+                        .buttonStyle(PrimaryButtonStyle())
+                        Button("Clear filters") {
+                            // TODO
+                        }
+                    }
+                }
+            }
+            Spacer()
+        }
+        .multilineTextAlignment(.center)
+        .padding(.horizontal, BookingListViewLayout.emptyStatePadding)
+    }
+
     func errorSnackBar(onTap: @escaping () -> Void) -> some View {
-        Text(Localization.errorMessage)
+        Text(BookingListViewLocalization.errorMessage)
             .foregroundStyle(Color(.listForeground(modal: false)))
             .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(Layout.viewPadding)
+            .padding(BookingListViewLayout.viewPadding)
             .background {
-                RoundedRectangle(cornerRadius: Layout.cornerRadius)
+                RoundedRectangle(cornerRadius: BookingListViewLayout.cornerRadius)
                     .fill(Color(.text))
             }
-            .padding(Layout.viewPadding)
+            .padding(BookingListViewLayout.viewPadding)
             .padding(.bottom, connectivityMonitor.isOffline ? OfflineBannerView.height : 0)
             .contentShape(Rectangle())
             .onTapGesture { onTap() }
     }
 }
 
-private extension BookingListView {
-    enum Layout {
-        static let textVerticalPadding: CGFloat = 8
-        static let viewPadding: CGFloat = 16
-        static let emptyStatePadding: CGFloat = 24
-        static let emptyStateImageWidth: CGFloat = 67
-        static let cornerRadius: CGFloat = 8
-    }
+fileprivate enum BookingListViewLayout {
+    static let textVerticalPadding: CGFloat = 8
+    static let viewPadding: CGFloat = 16
+    static let emptyStatePadding: CGFloat = 24
+    static let emptyStateImageWidth: CGFloat = 67
+    static let cornerRadius: CGFloat = 8
+}
 
-    enum Localization {
-        static let errorMessage = NSLocalizedString(
-            "bookingList.errorMessage",
-            value: "Error fetching bookings",
-            comment: "Error message when fetching bookings fails"
-        )
-        static let emptySearchText = NSLocalizedString(
-            "bookingList.emptySearchText",
-            value: "We couldn’t find any bookings with that name — try adjusting your search term to see more results.",
-            comment: "Message displayed when searching bookings by keyword yields no results."
-        )
-    }
+fileprivate enum BookingListViewLocalization {
+    static let errorMessage = NSLocalizedString(
+        "bookingList.errorMessage",
+        value: "Error fetching bookings",
+        comment: "Error message when fetching bookings fails"
+    )
+    static let emptySearchText = NSLocalizedString(
+        "bookingList.emptySearchText",
+        value: "We couldn't find any bookings with that name — try adjusting your search term to see more results.",
+        comment: "Message displayed when searching bookings by keyword yields no results."
+    )
 }
diff --git a/WooCommerce/Classes/Extensions/Booking+Helpers.swift b/WooCommerce/Classes/Extensions/Booking+Helpers.swift
@@ -2,14 +2,18 @@ import Foundation
 import struct Yosemite.Booking
 
 extension Booking {
+    var productName: String? {
+        orderInfo?.productInfo?.name
+    }
+
+    var customerName: String {
+        guard let name = orderInfo?.customerInfo?.billingAddress.fullName else {
+            return Localization.guest
+        }
+        return name.isEmpty ? Localization.guest : name
+    }
+
     var summaryText: String {
-        let productName = orderInfo?.productInfo?.name
-        let customerName: String = {
-            guard let name = orderInfo?.customerInfo?.billingAddress.fullName else {
-                return Localization.guest
-            }
-            return name.isEmpty ? Localization.guest : name
-        }()
         return [productName, customerName]
             .compactMap { $0 }
             .joined(separator: "  •  ")
diff --git a/WooCommerce/Classes/POS/POSNotificationScheduler.swift b/WooCommerce/Classes/POS/POSNotificationScheduler.swift
@@ -3,12 +3,10 @@ import UserNotifications
 import Yosemite
 import Experiments
 
-// periphery: ignore - work in progress
 protocol POSNotificationScheduling {
     func scheduleLocalNotificationIfEligible(for merchantType: POSNotificationScheduler.MerchantType) async
 }
 
-// periphery: ignore - work in progress
 final class POSNotificationScheduler: POSNotificationScheduling {
     enum MerchantType {
         case potentialMerchant
@@ -64,7 +62,7 @@ final class POSNotificationScheduler: POSNotificationScheduling {
     func scheduleLocalNotificationIfEligible(for merchantType: POSNotificationScheduler.MerchantType) async {
         guard featureFlagService.isFeatureFlagEnabled(.pointOfSaleSurveys) else { return }
 
-        let isScheduled = await isNotificationScheduled(for: merchantType)
+        let isScheduled = await isNotificationAlreadyScheduled(for: merchantType)
         guard !isScheduled else { return }
         guard isCountryEligible() else { return }
 
@@ -86,7 +84,23 @@ final class POSNotificationScheduler: POSNotificationScheduling {
         }
     }
 
-    private func isNotificationScheduled(for merchantType: MerchantType) async -> Bool {
+    private func isNotificationAlreadyScheduled(for merchantType: MerchantType) async -> Bool {
+        // Check if the specific notification type is already scheduled
+        let isCurrentMerchantTypeScheduled = await checkIfScheduled(for: merchantType)
+        if isCurrentMerchantTypeScheduled {
+            return true
+        }
+
+        // Don't schedule notification for potential merchant if the user is already marked as current merchant
+        guard merchantType == .potentialMerchant else {
+            return false
+        }
+
+        let isCurrentMerchantScheduled = await checkIfScheduled(for: .currentMerchant)
+        return isCurrentMerchantScheduled
+    }
+
+    private func checkIfScheduled(for merchantType: MerchantType) async -> Bool {
         await withCheckedContinuation { continuation in
             let action: AppSettingsAction
             switch merchantType {
diff --git a/WooCommerce/Classes/ViewModels/Booking Details/HeaderContent.swift b/WooCommerce/Classes/ViewModels/Booking Details/HeaderContent.swift
@@ -11,15 +11,17 @@ extension BookingDetailsViewModel {
         @Published private(set) var bookingDate: String = ""
         @Published private(set) var attendanceStatus: BookingAttendanceStatus = .unknown
         @Published private(set) var bookingStatus: BookingStatus = .unknown
-        @Published private(set) var serviceAndCustomerLine: String = ""
+        @Published private(set) var serviceLine: String = ""
+        @Published private(set) var customerLine: String = ""
 
         func update(with booking: Booking) {
             bookingDate = booking.startDate.toString(
                 dateStyle: .short,
                 timeStyle: .short,
                 timeZone: BookingListTab.utcTimeZone
             )
-            serviceAndCustomerLine = booking.summaryText
+            serviceLine = booking.productName ?? ""
+            customerLine = booking.customerName
             attendanceStatus = booking.attendanceStatus
             bookingStatus = booking.bookingStatus
         }
diff --git a/WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift b/WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift
@@ -14,8 +14,8 @@ struct BookingDetailsView: View {
     enum Layout {
         static let contentSidePadding: CGFloat = 16
         static let contentVerticalPadding: CGFloat = 16
-        static let headerContentVerticalPadding: CGFloat = 6
-        static let headerBadgesAdditionalTopPadding: CGFloat = 4
+        static let headerContentVerticalPadding: CGFloat = 2
+        static let headerBadgesAdditionalTopPadding: CGFloat = 6
         static let sectionFooterTextVerticalPadding: CGFloat = 8
         static let rowTextVerticalPadding: CGFloat = 11
     }
diff --git a/WooCommerce/Classes/ViewRelated/Bookings/Booking Details/HeaderView.swift b/WooCommerce/Classes/ViewRelated/Bookings/Booking Details/HeaderView.swift
@@ -11,9 +11,14 @@ extension BookingDetailsView {
                         .font(TextFont.bodyMedium)
                         .foregroundColor(.primary)
                 }
-                if !content.serviceAndCustomerLine.isEmpty {
-                    Text(content.serviceAndCustomerLine)
-                        .font(.footnote.weight(.medium))
+                if !content.serviceLine.isEmpty {
+                    Text(content.serviceLine)
+                        .font(.body)
+                        .foregroundColor(.secondary)
+                }
+                if !content.customerLine.isEmpty {
+                    Text(content.customerLine)
+                        .font(.body)
                         .foregroundColor(.secondary)
                 }
                 HStack {
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift
@@ -1044,6 +1044,9 @@ final class EditableOrderViewModel: ObservableObject {
             guard let self else { return }
             self.collectPayment(for: order)
             self.trackCreateOrderSuccess(usesGiftCard: usesGiftCard)
+            Task {
+                await self.posNotificationScheduler.scheduleLocalNotificationIfEligible(for: .potentialMerchant)
+            }
         } onFailure: { [weak self] error, usesGiftCard in
             guard let self else { return }
             self.fixedNotice = NoticeFactory.createOrderErrorNotice(error, order: self.orderSynchronizer.order)
diff --git a/WooCommerce/WooCommerceTests/POS/POSNotificationSchedulerTests.swift b/WooCommerce/WooCommerceTests/POS/POSNotificationSchedulerTests.swift
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Bookings/BookingDetailsViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Bookings/BookingDetailsViewModelTests.swift
