Merge branch 'trunk' into issue/8189-loading-state

# Conflicts:
#	WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsReportCard.swift

Author: ealeksandrov

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalSelectSearchType.swift

@@ -0,0 +1,90 @@
+import UIKit
+import Yosemite
+
+final class CardPresentModalSelectSearchType: CardPresentPaymentsModalViewModel {
+    var textMode: PaymentsModalTextMode
+
+    var actionsMode: PaymentsModalActionsMode
+
+    var topTitle: String = Localization.title
+
+    var topSubtitle: String? = nil
+
+    var image: UIImage = .paymentsLoading
+
+    var primaryButtonTitle: String?
+
+    var secondaryButtonTitle: String?
+
+    var auxiliaryButtonTitle: String? = nil
+
+    var bottomTitle: String? = Localization.description
+
+    var bottomSubtitle: String? = nil
+
+    var accessibilityLabel: String? = nil
+
+    private var tapOnIphoneAction: (() -> Void)
+
+    private var bluetoothProximityAction: (() -> Void)
+
+    private var cancelAction: (() -> Void)
+
+    func didTapPrimaryButton(in viewController: UIViewController?) {
+        tapOnIphoneAction()
+    }
+
+    func didTapSecondaryButton(in viewController: UIViewController?) {
+        bluetoothProximityAction()
+    }
+
+    func didTapAuxiliaryButton(in viewController: UIViewController?) {
+        cancelAction()
+    }
+
+    init(tapOnIPhoneAction: @escaping () -> Void,
+         bluetoothAction: @escaping () -> Void,
+         cancelAction: @escaping () -> Void) {
+        textMode = .fullInfo
+        actionsMode = .twoActionAndAuxiliary
+        primaryButtonTitle = CardReaderDiscoveryMethod.localMobile.name
+        self.tapOnIphoneAction = tapOnIPhoneAction
+        secondaryButtonTitle = CardReaderDiscoveryMethod.bluetoothProximity.name
+        self.bluetoothProximityAction = bluetoothAction
+        auxiliaryButtonTitle = Localization.cancel
+        self.cancelAction = cancelAction
+    }
+}
+
+private extension CardPresentModalSelectSearchType {
+    enum Localization {
+        static let title = NSLocalizedString(
+            "Select reader type",
+            comment: "The title for the alert shown when connecting a card reader, asking the user to choose a " +
+            "reader type. Only shown when supported on their device.")
+
+        static let description = NSLocalizedString(
+            "Your iPhone can be used as a card reader, or you can connect to an external reader via bluetooth.",
+            comment: "The description on the alert shown when connecting a card reader, asking the user to choose a " +
+            "reader type. Only shown when supported on their device.")
+
+        static let cancel = NSLocalizedString(
+            "Cancel",
+            comment: "Cancel button title")
+    }
+}
+
+private extension CardReaderDiscoveryMethod {
+    var name: String {
+        switch self {
+        case .bluetoothProximity:
+            return NSLocalizedString(
+                "Bluetooth Reader",
+                comment: "The button title on the reader type alert, for the user to choose a bluetooth reader.")
+        case .localMobile:
+            return NSLocalizedString(
+                "Tap to Pay on iPhone",
+                comment: "The button title on the reader type alert, for the user to choose the built-in reader.")
+        }
+    }
+}

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentPreflightController.swift

@@ -1,6 +1,9 @@
 import Foundation
 import Yosemite
 import Combine
+#if !targetEnvironment(simulator)
+import ProximityReader
+#endif
 
 enum CardReaderConnectionResult {
     case connected(CardReader)
@@ -20,9 +23,9 @@ final class CardPresentPaymentPreflightController {
     ///
     private let configuration: CardPresentPaymentsConfiguration
 
-    /// View Controller used to present alerts.
+    /// Alerts presenter to send alert view models
     ///
-    private var rootViewController: UIViewController
+    private var alertsPresenter: CardPresentPaymentAlertsPresenting
 
     /// Stores manager.
     ///
@@ -40,30 +43,43 @@ final class CardPresentPaymentPreflightController {
     ///
     private var connectionController: CardReaderConnectionController
 
+    /// Controller to connect a card reader.
+    ///
+    private var builtInConnectionController: CardReaderConnectionController
+
 
     private(set) var readerConnection = CurrentValueSubject<CardReaderConnectionResult?, Never>(nil)
 
     init(siteID: Int64,
          paymentGatewayAccount: PaymentGatewayAccount,
          configuration: CardPresentPaymentsConfiguration,
-         rootViewController: UIViewController,
+         alertsPresenter: CardPresentPaymentAlertsPresenting,
          stores: StoresManager = ServiceLocator.stores,
          analytics: Analytics = ServiceLocator.analytics) {
         self.siteID = siteID
         self.paymentGatewayAccount = paymentGatewayAccount
         self.configuration = configuration
-        self.rootViewController = rootViewController
+        self.alertsPresenter = alertsPresenter
         self.stores = stores
         self.analytics = analytics
         self.connectedReader = nil
         let analyticsTracker = CardReaderConnectionAnalyticsTracker(configuration: configuration,
                                                                     stores: stores,
                                                                     analytics: analytics)
-        // TODO: Replace this with a refactored (New)CardReaderConnectionController
+        // TODO: Replace this with a refactored (New)LegacyCardReaderConnectionController
         self.connectionController = CardReaderConnectionController(
             forSiteID: siteID,
+            discoveryMethod: .bluetoothProximity,
             knownReaderProvider: CardReaderSettingsKnownReaderStorage(),
-            alertsProvider: CardReaderSettingsAlerts(),
+            alertsPresenter: alertsPresenter,
+            configuration: configuration,
+            analyticsTracker: analyticsTracker)
+
+        self.builtInConnectionController = CardReaderConnectionController(
+            forSiteID: siteID,
+            discoveryMethod: .localMobile,
+            knownReaderProvider: CardReaderSettingsKnownReaderStorage(),
+            alertsPresenter: alertsPresenter,
             configuration: configuration,
             analyticsTracker: analyticsTracker)
     }
@@ -78,31 +94,63 @@ final class CardPresentPaymentPreflightController {
 
         // TODO: Run onboarding if needed
 
-        // TODO: Ask for a Reader type if supported by device
-
-        // Attempt to find a reader and connect
-        connectionController.searchAndConnect(from: rootViewController) { result in
-            let connectionResult = result.map { connection in
-                switch connection {
-                case .connected:
-                    // TODO: pass the reader from the (New)CardReaderConnectionController
-                    guard let connectedReader = self.connectedReader else { return CardReaderConnectionResult.canceled }
-                    return CardReaderConnectionResult.connected(connectedReader)
-                case .canceled:
-                    return CardReaderConnectionResult.canceled
-                }
-            }
+        // Ask for a Reader type if supported by device/in country
+        guard localMobileReaderSupported(),
+              configuration.supportedReaders.contains(.appleBuiltIn)
+        else {
+            // Attempt to find a bluetooth reader and connect
+            connectionController.searchAndConnect(onCompletion: handleConnectionResult)
+            return
+        }
 
-            switch connectionResult {
-            case .success(let unwrapped):
-                self.readerConnection.send(unwrapped)
-            default:
-                break
-            }
+        alertsPresenter.present(viewModel: CardPresentModalSelectSearchType(
+            tapOnIPhoneAction: { [weak self] in
+                guard let self = self else { return }
+                self.builtInConnectionController.searchAndConnect(
+                    onCompletion: self.handleConnectionResult)
+            },
+            bluetoothAction: { [weak self] in
+                guard let self = self else { return }
+                self.connectionController.searchAndConnect(
+                    onCompletion: self.handleConnectionResult)
+            },
+            cancelAction: { [weak self] in
+                guard let self = self else { return }
+                self.alertsPresenter.dismiss()
+                self.handleConnectionResult(.success(.canceled))
+            }))
+    }
+
+    private func localMobileReaderSupported() -> Bool {
+        #if !targetEnvironment(simulator)
+        if #available(iOS 15.4, *) {
+            return PaymentCardReader.isSupported
+        } else {
+            return false
         }
+        #endif
+        return true
     }
 
+    private func handleConnectionResult(_ result: Result<CardReaderConnectionController.ConnectionResult, Error>) {
+        let connectionResult = result.map { connection in
+            switch connection {
+            case .connected:
+                // TODO: pass the reader from the (New)CardReaderConnectionController
+                guard let connectedReader = self.connectedReader else { return CardReaderConnectionResult.canceled }
+                return CardReaderConnectionResult.connected(connectedReader)
+            case .canceled:
+                return CardReaderConnectionResult.canceled
+            }
+        }
 
+        switch connectionResult {
+        case .success(let unwrapped):
+            self.readerConnection.send(unwrapped)
+        default:
+            break
+        }
+    }
 
     /// Configure the CardPresentPaymentStore to use the appropriate backend
     ///