Revert removal of ServiceLocator in CardPresentPaymentCollectOrderPaymentUseCaseAdaptor

Author: staskus

WooCommerce/Classes/POS/Adaptors/Card Present Payments/CardPresentPaymentCollectOrderPaymentUseCaseAdaptor.swift

@@ -13,11 +13,11 @@ final class CardPresentPaymentCollectOrderPaymentUseCaseAdaptor {
     private let stores: StoresManager
     private let collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking
 
-    init(currencySettings: CurrencySettings,
+    init(currencyFormatter: CurrencyFormatter = .init(currencySettings: ServiceLocator.currencySettings),
          paymentEventPublisher: AnyPublisher<CardPresentPaymentEvent, Never>,
          stores: StoresManager = ServiceLocator.stores,
          collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking) {
-        self.currencyFormatter = .init(currencySettings: currencySettings)
+        self.currencyFormatter = currencyFormatter
         self.stores = stores
         self.collectOrderPaymentAnalyticsTracker = collectOrderPaymentAnalyticsTracker
         paymentEventPublisher.assign(to: &$latestPaymentEvent)

WooCommerce/Classes/POS/Adaptors/Card Present Payments/CardPresentPaymentService.swift

@@ -27,7 +27,6 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
     private let siteID: Int64
     private let stores: StoresManager
     private let collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking
-    private let currencySettings: CurrencySettings
 
     private var cardPresentPaymentsConfiguration: CardPresentPaymentsConfiguration {
         CardPresentConfigurationLoader().configuration
@@ -36,18 +35,14 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
     private var paymentTask: Task<CardPresentPaymentAdaptedCollectOrderPaymentResult, Error>?
 
     @MainActor
-    init(siteID: Int64,
-         stores: StoresManager = ServiceLocator.stores,
-         collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking,
-         currencySettings: CurrencySettings) async {
+    init(siteID: Int64, stores: StoresManager = ServiceLocator.stores, collectOrderPaymentAnalyticsTracker: CollectOrderPaymentAnalyticsTracking) async {
         self.siteID = siteID
         let onboardingAdaptor = CardPresentPaymentsOnboardingPresenterAdaptor()
         self.onboardingAdaptor = onboardingAdaptor
         let paymentAlertsPresenterAdaptor = CardPresentPaymentsAlertPresenterAdaptor()
         self.paymentAlertsPresenterAdaptor = paymentAlertsPresenterAdaptor
         self.stores = stores
         self.collectOrderPaymentAnalyticsTracker = collectOrderPaymentAnalyticsTracker
-        self.currencySettings = currencySettings
 
         connectionControllerManager = CardPresentPaymentsConnectionControllerManager(
             siteID: siteID,
@@ -145,9 +140,7 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
 
         // TODO: Update the connected reader subject when we get a connection here.
 
-        let paymentTask = CardPresentPaymentCollectOrderPaymentUseCaseAdaptor(currencySettings: currencySettings,
-                                                                              paymentEventPublisher: paymentEventPublisher,
-                                                                              stores: stores,
+        let paymentTask = CardPresentPaymentCollectOrderPaymentUseCaseAdaptor(paymentEventPublisher: paymentEventPublisher,
                                                                               collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker
         ).collectPaymentTask(
             for: order,

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -97,8 +97,7 @@ private extension POSTabCoordinator {
             let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics(analytics: serviceAdaptor.analytics)
             let cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
                                                                             stores: storesManager,
-                                                                            collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker,
-                                                                            currencySettings: serviceAdaptor.currency)
+                                                                            collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
             if let receiptService = POSReceiptService(siteID: siteID,
                                                       credentials: credentials),
                let orderService = POSOrderService(siteID: siteID,