Merge branch 'trunk' into feat/WOOMOB-1609-catalog-api-behind-feature-flag

Author: jaclync

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.6
+This update improves app stability and usability. We’ve enhanced compatibility for stores using HTTP site addresses, optimized how tabs load based on saved states, and fixed an issue that prevented dismissing the keyboard when editing product titles.
+
 ## 23.5
 This update brings smoother store management and better control. You can now filter orders by source, and manage all POS orders directly within the POS interface. Plus, we fixed a scrolling issue on the Create Coupon screen for a more seamless experience.
 

Modules/Sources/PointOfSale/Presentation/Settings/POSSettingsHardwareDetailView.swift

@@ -6,13 +6,15 @@ struct POSSettingsHardwareDetailView: View {
     @Environment(\.posFeatureFlags) private var featureFlags
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize
     @Environment(\.posAnalytics) private var analytics
+    @Environment(\.posExternalViews) private var externalViews
 
     let settingsController: POSSettingsControllerProtocol
 
     @State private var navigationPath: [NavigationDestination] = []
     @State private var showBarcodeScanningSetupModal: Bool = false
     @State private var showBarcodeScanningDocumentationModal: Bool = false
     @State private var showCardReaderDocumentationModal: Bool = false
+    @State private var showSupport: Bool = false
 
     private var cardReaderName: String {
         if let cardReaderName = settingsController.connectedCardReader?.name {
@@ -88,6 +90,15 @@ struct POSSettingsHardwareDetailView: View {
                 PointOfSaleCardPresentPaymentAlert(alertType: alertType)
                     .posInteractiveDismissDisabled(alertType.isDismissDisabled)
             })
+            .posModal(item: $posModel.cardPresentPaymentOnboardingViewContainer, onDismiss: {
+                posModel.cancelCardPaymentsOnboarding()
+            }, content: { viewContainer in
+                paymentsOnboardingView(from: viewContainer)
+            })
+            .posSheet(isPresented: $showSupport) {
+                supportForm
+                    .interactiveDismissDisabled(true)
+            }
             .posModal(isPresented: $showBarcodeScanningSetupModal) {
                 POSBarcodeScannerSetup(isPresented: $showBarcodeScanningSetupModal, analytics: analytics)
             }
@@ -100,6 +111,36 @@ struct POSSettingsHardwareDetailView: View {
 
 // MARK: - Views
 private extension POSSettingsHardwareDetailView {
+    func paymentsOnboardingView(from onboardingViewContainer: CardPresentPaymentOnboardingViewContainer) -> some View {
+        onboardingViewContainer.configuration.showSupport = {
+            posModel.cancelCardPaymentsOnboarding()
+            showSupport = true
+        }
+
+        return PointOfSaleCardPresentPaymentOnboardingView(
+            viewModel: .init(onboardingViewContainer: onboardingViewContainer,
+                             onDismissTap: {
+                                 posModel.cancelCardPaymentsOnboarding()
+                             }))
+        .onAppear {
+            posModel.trackCardPaymentsOnboardingShown()
+        }
+    }
+
+    var supportForm: some View {
+        NavigationView {
+            externalViews.createSupportFormView(isPresented: $showSupport, sourceTag: Constants.supportTag)
+            .toolbar {
+                ToolbarItem(placement: .cancellationAction) {
+                    Button(Localization.supportCancel) {
+                        showSupport = false
+                    }
+                }
+            }
+        }
+        .navigationViewStyle(.stack)
+    }
+
     var legacyCardReadersView: some View {
         VStack(spacing: POSSpacing.none) {
             POSPageHeaderView(
@@ -354,6 +395,10 @@ private extension POSSettingsHardwareDetailView {
 
 // MARK: - Constants
 private extension POSSettingsHardwareDetailView {
+    enum Constants {
+        static let supportTag = "origin:point-of-sale"
+    }
+
     enum Localization {
         static let readerModelTitle = NSLocalizedString(
             "pointOfSaleSettingsHardwareDetailView.readerModelTitle",
@@ -466,6 +511,12 @@ private extension POSSettingsHardwareDetailView {
             value: "Connect your card reader and start accepting payments",
             comment: "Subtitle for card reader connect button when no reader is connected."
         )
+
+        static let supportCancel = NSLocalizedString(
+            "pointOfSaleSettingsHardwareDetailView.help.support.cancel",
+            value: "Cancel",
+            comment: "Button to dismiss the support form from POS settings."
+        )
     }
 }
 

Modules/Sources/Yosemite/Model/Payments/CardPresentPaymentsConfiguration.swift

@@ -95,9 +95,12 @@ public struct CardPresentPaymentsConfiguration: Equatable {
                 countryCode: country,
                 paymentMethods: [.cardPresent],
                 currencies: [.GBP],
-                paymentGateways: [WCPayAccount.gatewayID],
+                paymentGateways: [WCPayAccount.gatewayID, StripeAccount.gatewayID],
                 supportedReaders: [.wisepad3, .tapToPay],
-                supportedPluginVersions: [.init(plugin: .wcPay, minimumVersion: "4.4.0")],
+                supportedPluginVersions: [
+                    .init(plugin: .wcPay, minimumVersion: "4.4.0"),
+                    .init(plugin: .stripe, minimumVersion: "6.2.0")
+                ],
                 minimumAllowedChargeAmount: NSDecimalNumber(string: "0.3"),
                 stripeSmallestCurrencyUnitMultiplier: 100,
                 contactlessLimitAmount: 10000,

Modules/Tests/YosemiteTests/Model/CardPresentConfigurationTests.swift

@@ -44,7 +44,7 @@ class CardPresentConfigurationTests: XCTestCase {
         let configuration = CardPresentPaymentsConfiguration(country: .GB)
         XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [.GBP])
-        XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay])
+        XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay, Constants.PaymentGateway.stripe])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent])
         XCTAssertEqual(configuration.purchaseCardReaderUrl(utmProvider: MockUTMParameterProvider()).absoluteString, Constants.PurchaseURL.gb)
         assertEqual([.wisepad3, .tapToPay], configuration.supportedReaders)

RELEASE-NOTES.txt

@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update).
 
+23.7
+-----
+
+
 23.6
 -----
 - [*] Handle sites configured with `http` siteAddress. [https://github.com/woocommerce/woocommerce-ios/pull/16279]

WooCommerce/Classes/Bookings/BookingFilters/BookableProductListSyncable.swift

@@ -11,10 +11,14 @@ struct BookableProductListSyncable: ListSyncable {
 
     let title = Localization.title
 
-    let emptyStateMessage = Localization.noMembersFound
+    let emptyStateMessage = Localization.noServiceFound
     let emptyItemTitlePlaceholder: String? = nil
 
-    let searchConfiguration: ListSearchConfiguration? = nil
+    let searchConfiguration: ListSearchConfiguration? = ListSearchConfiguration(
+        searchPrompt: Localization.searchPrompt,
+        emptySearchTitle: Localization.noServiceFound,
+        emptySearchDescription: Localization.emptySearchDescription
+    )
 
     let selectionDisabledMessage: String? = nil
 
@@ -53,7 +57,19 @@ struct BookableProductListSyncable: ListSyncable {
 
     /// Creates the action to search items with keyword
     func createSearchAction(keyword: String, pageNumber: Int, pageSize: Int, completion: @escaping (Result<Bool, Error>) -> Void) -> Action {
-        fatalError("Searching is not supported")
+        ProductAction.searchProducts(
+            siteID: siteID,
+            keyword: keyword,
+            pageNumber: pageNumber,
+            pageSize: pageSize,
+            productType: .booking,
+            onCompletion: completion
+        )
+    }
+
+    /// Creates the predicate for filtering search results
+    func createSearchPredicate(keyword: String) -> NSPredicate? {
+        NSPredicate(format: "SUBQUERY(searchResults, $result, $result.keyword = %@).@count > 0", keyword)
     }
 
     // MARK: - Display Configuration
@@ -79,10 +95,20 @@ private extension BookableProductListSyncable {
             value: "Service / Event",
             comment: "Title of the booking service/event selector view"
         )
-        static let noMembersFound = NSLocalizedString(
+        static let noServiceFound = NSLocalizedString(
             "bookingServiceEventSelectorView.noMembersFound",
             value: "No service or event found",
             comment: "Text on the empty view of the booking service/event selector view"
         )
+        static let searchPrompt = NSLocalizedString(
+            "bookingServiceEventSelectorView.searchPrompt",
+            value: "Search service / event",
+            comment: "Prompt in the search bar of the booking service/event selector view"
+        )
+        static let emptySearchDescription = NSLocalizedString(
+            "bookingServiceEventSelectorView.emptySearchDescription",
+            value: "Try adjusting your search term to see more results",
+            comment: "Message on the empty search result view of the booking service/event selector view"
+        )
     }
 }

WooCommerce/Classes/Bookings/BookingFilters/CustomerListSyncable.swift

@@ -66,6 +66,12 @@ struct CustomerListSyncable: ListSyncable {
         )
     }
 
+    /// Creates the predicate for filtering search results
+    /// - Returns: nil because customer search handles filtering directly
+    func createSearchPredicate(keyword: String) -> NSPredicate? {
+        nil
+    }
+
     // MARK: - Display Configuration
 
     func displayName(for item: Customer) -> String {

WooCommerce/Classes/Bookings/BookingFilters/ListSyncable.swift

@@ -30,6 +30,11 @@ protocol ListSyncable {
     /// Creates the action to search items with keyword
     func createSearchAction(keyword: String, pageNumber: Int, pageSize: Int, completion: @escaping (Result<Bool, Error>) -> Void) -> Action
 
+    /// Creates the predicate for filtering search results
+    /// - Parameter keyword: The search keyword
+    /// - Returns: A predicate to filter storage objects by search results, or nil if search predicate is not needed
+    func createSearchPredicate(keyword: String) -> NSPredicate?
+
     // MARK: - Display Configuration
 
     /// Returns the display name for an item

WooCommerce/Classes/Bookings/BookingFilters/SyncableListSelectorView.swift

@@ -77,12 +77,16 @@ private extension SyncableListSelectorView {
                 }
             )
             .renderedIf(viewModel.searchQuery.isEmpty)
+            .listRowSeparator(.hidden, edges: .top)
 
-            ForEach(items, id: \.self) { item in
+            ForEach(Array(items.enumerated()), id: \.element) { (index, item) in
                 optionRow(text: syncable.displayName(for: item),
                           description: syncable.description(for: item),
                           isSelected: selectedItems.contains(where: { $0 == syncable.filterItem(for: item) }),
                           onSelection: { toggleSelectionIfPossible(for: item) })
+                .if(index == 0 && viewModel.searchQuery.isNotEmpty) {
+                    $0.listRowSeparator(.hidden, edges: .top)
+                }
             }
 
             InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)

WooCommerce/Classes/Bookings/BookingFilters/SyncableListSelectorViewModel.swift

@@ -81,8 +81,15 @@ final class SyncableListSelectorViewModel<Syncable: ListSyncable>: ObservableObj
 
     /// Handles search query changes by resetting pagination and triggering new search
     private func handleSearchQueryChange(_ query: String) {
-        syncState = .syncingFirstPage
         currentSearchKeyword = query
+
+        // Update the predicate to filter by search results if needed
+        var predicates = [syncable.createPredicate()]
+        if !query.isEmpty, let searchPredicate = syncable.createSearchPredicate(keyword: query) {
+            predicates.append(searchPredicate)
+        }
+        resultsController.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: predicates)
+
         paginationTracker.syncFirstPage()
     }