woocommerce · iamgabrielma · Nov 21, 2025 · Nov 13, 2025 · Nov 14, 2025 · Nov 14, 2025
diff --git a/Modules/Sources/PointOfSale/Controllers/PointOfSaleItemsController.swift b/Modules/Sources/PointOfSale/Controllers/PointOfSaleItemsController.swift
@@ -1,6 +1,7 @@
 import Foundation
 import Observation
 import enum Yosemite.POSItem
+import struct Yosemite.POSSimpleProduct
 import class Yosemite.PointOfSaleItemService
 import protocol Yosemite.PointOfSaleItemServiceProtocol
 import protocol Yosemite.PointOfSaleItemFetchStrategyFactoryProtocol

diff --git a/...ources/PointOfSale/Presentation/CardReaderConnection/CardReaderConnectionStatusView.swift b/...ources/PointOfSale/Presentation/CardReaderConnection/CardReaderConnectionStatusView.swift
@@ -34,6 +34,7 @@ struct CardReaderConnectionStatusView: View {
                     .padding(.horizontal, Constants.horizontalPadding)
                     .frame(maxHeight: .infinity)
                 }
+                .accessibilityIdentifier("pos-reader-connected")
             case .disconnecting:
                 progressIndicatingCardReaderStatus(title: Localization.readerDisconnecting)
             case .cancellingConnection:
@@ -55,6 +56,7 @@ struct CardReaderConnectionStatusView: View {
                     )
                     .padding(Constants.disconnectedBorderInset)
                 }
+                .accessibilityIdentifier("pos-connect-reader-button")
             }
         }
         .font(Constants.font)

diff --git a/...I States/Reader Messages/PointOfSaleCardPresentPaymentTapSwipeInsertCardMessageView.swift b/...I States/Reader Messages/PointOfSaleCardPresentPaymentTapSwipeInsertCardMessageView.swift
@@ -24,6 +24,7 @@ struct PointOfSaleCardPresentPaymentTapSwipeInsertCardMessageView: View {
             }
         }
         .multilineTextAlignment(.center)
+        .accessibilityIdentifier("pos-card-payment-message")
     }
 }
 

diff --git a/...tation/CardReaderConnection/UI States/Reader Messages/PointOfSalePaymentSuccessView.swift b/...tation/CardReaderConnection/UI States/Reader Messages/PointOfSalePaymentSuccessView.swift
@@ -31,6 +31,7 @@ struct PointOfSalePaymentSuccessView: View {
                 }
             }
         }
+        .accessibilityIdentifier("pos-payment-success-view")
         .onAppear {
             withAnimation(.spring(response: 0.6, dampingFraction: 0.8)) {
                 isViewLoaded = true

diff --git a/Modules/Sources/PointOfSale/Presentation/CartView.swift b/Modules/Sources/PointOfSale/Presentation/CartView.swift
@@ -80,6 +80,7 @@ struct CartView: View {
             })
             .background(backgroundColor.ignoresSafeArea(.all))
             .accessibilityElement(children: .contain)
+            .accessibilityIdentifier("pos-cart-view")
         }
     }
 }
@@ -175,6 +176,7 @@ private extension CartView {
         }
         .buttonStyle(POSFilledButtonStyle(size: .normal))
         .disabled(CartViewHelper().hasUnresolvedItems(cart: posModel.cart))
+        .accessibilityIdentifier("pos-checkout-button")
     }
 
     var backButtonConfiguration: POSPageHeaderBackButtonConfiguration? {

diff --git a/Modules/Sources/PointOfSale/Presentation/Item Selector/ItemList.swift b/Modules/Sources/PointOfSale/Presentation/Item Selector/ItemList.swift
@@ -156,6 +156,7 @@ struct ItemListRow: View {
             }, label: {
                 SimpleProductCardView(product: product)
             })
+            .accessibilityIdentifier("pos-product-card-\(product.productID)")
         case let .variableParentProduct(parentProduct):
             if #available(iOS 18.0, *) {
                 NavigationLink(value: item) {

diff --git a/Modules/Sources/PointOfSale/Presentation/POSFloatingControlView.swift b/Modules/Sources/PointOfSale/Presentation/POSFloatingControlView.swift
@@ -40,6 +40,7 @@ struct POSFloatingControlView: View {
                 }
                 .frame(width: Constants.size)
             }
+            .accessibilityIdentifier("pos-menu-button")
             .background(backgroundColor)
             .cornerRadius(Constants.cornerRadius)
             .disabled(posModel.paymentState.card == .processingPayment)
@@ -78,6 +79,7 @@ private extension POSFloatingControlView {
                 icon: { Image(systemName: "rectangle.portrait.and.arrow.forward") }
             )
         }
+        .accessibilityIdentifier("pos-exit-menu-item")
         Button {
             analytics.track(.pointOfSaleSettingsMenuItemTapped)
             showSettings = true

diff --git a/Modules/Sources/PointOfSale/Presentation/PointOfSaleCollectCashView.swift b/Modules/Sources/PointOfSale/Presentation/PointOfSaleCollectCashView.swift
@@ -97,6 +97,7 @@ struct PointOfSaleCollectCashView: View {
                             buttonFrame = $0
                         }
                         .buttonStyle(POSFilledButtonStyle(size: .normal, isLoading: isLoading))
+                        .accessibilityIdentifier("pos-mark-payment-complete-button")
                         .frame(maxWidth: .infinity)
                         .dynamicTypeSize(...DynamicTypeSize.accessibility1)
                         .disabled(!isButtonEnabled)

diff --git a/Modules/Sources/PointOfSale/Presentation/PointOfSaleDashboardView.swift b/Modules/Sources/PointOfSale/Presentation/PointOfSaleDashboardView.swift
@@ -150,16 +150,13 @@ struct PointOfSaleDashboardView: View {
             }
         }
         .onChange(of: posModel.entryPointController.eligibilityState) { oldValue, newValue in
-            guard newValue == .eligible else { return }
-            Task { @MainActor in
-                await posModel.purchasableItemsController.loadItems(base: .root)
-                await posModel.couponsController.loadItems(base: .root)
-                await posModel.popularPurchasableItemsController.loadItems(base: .root)
-            }
+            guard case .eligible = newValue, oldValue != newValue else { return }
+            loadItemsWhenEligible()
         }
         .ignoresSafeArea(.keyboard)
         .onAppear {
             trackTimeForInitialLoadingState()
+            loadItemsWhenEligible()
         }
         .onChange(of: viewState) { oldValue, newValue in
             if newValue == .content && oldValue != newValue {
@@ -249,6 +246,14 @@ private extension PointOfSaleDashboardView {
             self.waitingTimeTracker = nil
         }
     }
+
+    func loadItemsWhenEligible() {
+        Task { @MainActor in
+            await posModel.purchasableItemsController.loadItems(base: .root)
+            await posModel.couponsController.loadItems(base: .root)
+            await posModel.popularPurchasableItemsController.loadItems(base: .root)
+        }
+    }
 }
 
 struct FloatingControlAreaSizeKey: EnvironmentKey {

diff --git a/Modules/Sources/PointOfSale/Presentation/PointOfSaleEntryPointView.swift b/Modules/Sources/PointOfSale/Presentation/PointOfSaleEntryPointView.swift
@@ -15,6 +15,7 @@ import class Yosemite.PointOfSaleItemService
 import protocol Yosemite.PointOfSaleSettingsServiceProtocol
 import struct Yosemite.SiteSetting
 import protocol Yosemite.PointOfSaleCouponFetchStrategyFactoryProtocol
+import protocol Yosemite.PointOfSaleItemServiceProtocol
 
 /// periphery: ignore - public in preparation of move to POS module
 public struct PointOfSaleEntryPointView: View {
@@ -67,9 +68,12 @@ public struct PointOfSaleEntryPointView: View {
          grdbManager: GRDBManagerProtocol?,
          catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?,
          isLocalCatalogEligible: Bool,
-         services: POSDependencyProviding) {
+         services: POSDependencyProviding,
+         itemProvider: PointOfSaleItemServiceProtocol? = nil) {
         self.onPointOfSaleModeActiveStateChange = onPointOfSaleModeActiveStateChange
 
+        let selectedItemProvider = itemProvider ?? PointOfSaleItemService(currencySettings: services.currency.currencySettings)
+
         // Use observable controller with GRDB if local catalog is eligible,
         // otherwise fall back to standard controller.
         if isLocalCatalogEligible, let grdbManager = grdbManager, let catalogSyncCoordinator {
@@ -81,13 +85,13 @@ public struct PointOfSaleEntryPointView: View {
             )
         } else {
             self.itemsController = PointOfSaleItemsController(
-                itemProvider: PointOfSaleItemService(currencySettings: services.currency.currencySettings),
+                itemProvider: selectedItemProvider,
                 itemFetchStrategyFactory: itemFetchStrategyFactory,
                 analyticsProvider: services.analytics
             )
         }
         self.purchasableItemsSearchController = PointOfSaleItemsController(
-            itemProvider: PointOfSaleItemService(currencySettings: services.currency.currencySettings),
+            itemProvider: selectedItemProvider,
             itemFetchStrategyFactory: itemFetchStrategyFactory,
             initialState: .init(containerState: .content,
                                 itemsStack: .init(root: .loaded([], hasMoreItems: true), itemStates: [:])),
@@ -121,7 +125,7 @@ public struct PointOfSaleEntryPointView: View {
         self.collectOrderPaymentAnalyticsTracker = collectOrderPaymentAnalyticsTracker
         self.searchHistoryService = searchHistoryService
         self.popularPurchasableItemsController = PointOfSaleItemsController(
-            itemProvider: PointOfSaleItemService(currencySettings: services.currency.currencySettings),
+            itemProvider: selectedItemProvider,
             itemFetchStrategyFactory: popularItemFetchStrategyFactory,
             analyticsProvider: services.analytics
         )

diff --git a/Modules/Sources/PointOfSale/Presentation/PointOfSaleExitPosAlertView.swift b/Modules/Sources/PointOfSale/Presentation/PointOfSaleExitPosAlertView.swift
@@ -19,6 +19,7 @@ struct PointOfSaleExitPosAlertView: View {
                     Text(Image(systemName: "xmark"))
                         .font(.posButtonSymbolLarge)
                 }
+                .accessibilityIdentifier("pos-exit-modal-close-button")
                 .foregroundColor(Color.posOnSurfaceVariantLowest)
             }
             Text(Localization.exitTitle)
@@ -33,6 +34,7 @@ struct PointOfSaleExitPosAlertView: View {
             } label: {
                 Text(Localization.exitButton)
             }
+            .accessibilityIdentifier("pos-exit-confirm-button")
             .buttonStyle(POSFilledButtonStyle(size: .normal))
         }
         .padding(Constants.padding)

diff --git a/Modules/Sources/PointOfSale/Presentation/TotalsView.swift b/Modules/Sources/PointOfSale/Presentation/TotalsView.swift
@@ -67,6 +67,7 @@ struct TotalsView: View {
             case .error(.other(let message), let handler):
                 PointOfSaleOrderSyncErrorMessageView(message: message, retryHandler: handler)
                     .transition(.opacity)
+
             case .error(.invalidCoupon(let message), let handler):
                 PointOfSaleOrderSyncCouponsErrorMessageView(message: message, retryHandler: handler)
                     .transition(.opacity)
@@ -411,6 +412,7 @@ private struct TotalFieldView: View {
             }
             .accessibilityElement(children: .combine)
             .accessibilityAddTraits(.isHeader)
+            .accessibilityIdentifier("pos-total-field")
             .foregroundColor(Color.posOnSurface)
         }
     }
@@ -508,7 +510,7 @@ private struct CardPaymentView: View {
 
     var body: some View {
         if viewHelper.shouldShowDisconnectedMessage(readerConnectionStatus: cardReaderConnectionStatus,
-                                                   paymentState: paymentState) {
+                                                    paymentState: paymentState) {
             PointOfSaleCardPresentPaymentReaderDisconnectedMessageView {
                 connectCardReaderAction()
             }
@@ -547,6 +549,7 @@ private struct CashPaymentButton: View {
         .layoutPriority(1)
         .dynamicTypeSize(...DynamicTypeSize.accessibility1)
         .buttonStyle(POSOutlinedButtonStyle(size: .normal))
+        .accessibilityIdentifier("pos-cash-payment-button")
         .padding(.horizontal, TotalsView.Constants.buttonHorizontalPadding)
         .safeAreaPadding(.bottom, TotalsView.Constants.cashButtonBottomPadding)
         .renderedIf(viewHelper.shouldShowCollectCashPaymentButton(

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/GetStartedScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/GetStartedScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/HelpScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/HelpScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LinkOrPasswordScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LinkOrPasswordScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginCheckMagicLinkScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginCheckMagicLinkScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginEmailScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginEmailScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginEpilogueScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginEpilogueScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginOnboardingScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginOnboardingScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginPasswordScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginPasswordScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 import XCUITestHelpers

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginSiteAddressScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginSiteAddressScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/LoginUsernamePasswordScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/LoginUsernamePasswordScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/PasswordScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/PasswordScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/PrologueScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/PrologueScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Login/TwoFAScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Login/TwoFAScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Menu/MenuScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Menu/MenuScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift b/Modules/Sources/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/AddCustomAmountScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/AddCustomAmountScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/AddCustomerDetailsScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/AddCustomerDetailsScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/AddProductScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/AddProductScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/AddShippingScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/AddShippingScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/CardPresentPaymentsModalScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/CardPresentPaymentsModalScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerNoteScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/CustomerNoteScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/OrderSearchScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/OrderSearchScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/OrderStatusScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/OrderStatusScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/OrdersScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/OrdersScreen.swift
@@ -1,3 +1,4 @@
+// periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/PaymentMethodsScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/PaymentMethodsScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/SingleOrderScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/SingleOrderScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
 
@@ -82,6 +83,7 @@ public final class SingleOrderScreen: ScreenObject {
         return try PaymentMethodsScreen()
     }
 
+    @discardableResult
     public func goBackToOrdersScreen() throws -> OrdersScreen {
         let orderDetailTableView = app.tables["order-details-table-view"]
 

diff --git a/Modules/Sources/UITestsFoundation/Screens/Orders/UnifiedOrderScreen.swift b/Modules/Sources/UITestsFoundation/Screens/Orders/UnifiedOrderScreen.swift
@@ -1,3 +1,4 @@
+//periphery:ignore:all
 import ScreenObject
 import XCTest
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
             .multilineTextAlignment(.center)
+            .accessibilityIdentifier("pos-card-payment-message")
         }
     }
@@ Expand Down @@