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

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

Author: ealeksandrov

Experiments/Experiments/ABTest.swift

@@ -7,9 +7,13 @@ public enum ABTest: String, CaseIterable {
     /// `An enum with no cases cannot declare a raw type`
     case null
 
+    /// A/A test to make sure there is no bias in the logged out state.
+    /// Experiment ref: pbxNRc-1QS-p2
+    case aaTestLoggedIn = "woocommerceios_explat_aa_test_logged_in_202212_v2"
+
     /// A/A test to make sure there is no bias in the logged out state.
     /// Experiment ref: pbxNRc-1S0-p2
-    case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202211"
+    case aaTestLoggedOut = "woocommerceios_explat_aa_test_logged_out_202212_v2"
 
     /// A/B test to measure the sign-in success rate when only WPCom login is enabled.
     /// Experiment ref: pbxNRc-27s-p2
@@ -39,7 +43,7 @@ public enum ABTest: String, CaseIterable {
     /// When adding a new experiment, add it to the appropriate case depending on its context (logged-in or logged-out experience).
     public var context: ExperimentContext {
         switch self {
-        case .productsOnboardingBanner, .productsOnboardingTemplateProducts, .nativeJetpackSetupFlow:
+        case .aaTestLoggedIn, .productsOnboardingBanner, .productsOnboardingTemplateProducts, .nativeJetpackSetupFlow:
             return .loggedIn
         case .aaTestLoggedOut, .abTestLoginWithWPComOnly:
             return .loggedOut

RELEASE-NOTES.txt

@@ -2,7 +2,7 @@
 
 11.5
 -----
-
+- [*] Account deletion is now supported for all users in settings or in the empty stores screen. [https://github.com/woocommerce/woocommerce-ios/pull/8179]
 
 11.4
 -----

WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.swift

@@ -28,19 +28,19 @@ final class EmptyStoresTableViewCell: UITableViewCell {
 
     @IBOutlet private weak var stackView: UIStackView!
     @IBOutlet private weak var emptyStoresImageView: UIImageView!
-    @IBOutlet private weak var removeAppleIDAccessButton: UIButton!
+    @IBOutlet private weak var closeAccountButton: UIButton!
 
     override func awakeFromNib() {
         super.awakeFromNib()
 
         configureStackView()
         configureImageView()
-        configureRemoveAppleIDAccessButton()
-        updateRemoveAppleIDAccessButtonVisibility(isVisible: false)
+        configureCloseAccountButton()
+        updateCloseAccountButtonVisibility(isVisible: false)
     }
 
-    func updateRemoveAppleIDAccessButtonVisibility(isVisible: Bool) {
-        removeAppleIDAccessButton.isHidden = !isVisible
+    func updateCloseAccountButtonVisibility(isVisible: Bool) {
+        closeAccountButton.isHidden = !isVisible
     }
 }
 
@@ -57,10 +57,10 @@ private extension EmptyStoresTableViewCell {
         emptyStoresImageView.image = .emptyStorePickerImage
     }
 
-    func configureRemoveAppleIDAccessButton() {
-        removeAppleIDAccessButton.applyLinkButtonStyle()
-        removeAppleIDAccessButton.setTitle(Localization.closeAccountTitle, for: .normal)
-        removeAppleIDAccessButton.on(.touchUpInside) { [weak self] _ in
+    func configureCloseAccountButton() {
+        closeAccountButton.applyLinkButtonStyle()
+        closeAccountButton.setTitle(Localization.closeAccountTitle, for: .normal)
+        closeAccountButton.on(.touchUpInside) { [weak self] _ in
             self?.onCloseAccountButtonTapped?()
         }
     }

WooCommerce/Classes/Authentication/Epilogue/EmptyStoresTableViewCell.xib

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -57,9 +55,9 @@
             </tableViewCellContentView>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
+                <outlet property="closeAccountButton" destination="XF9-r3-Vq9" id="sLP-Jl-0hK"/>
                 <outlet property="emptyStoresImageView" destination="uuh-xp-DA5" id="4yf-Rz-3c2"/>
                 <outlet property="legendLabel" destination="bPV-bJ-GBz" id="sQX-ir-ghQ"/>
-                <outlet property="removeAppleIDAccessButton" destination="XF9-r3-Vq9" id="sLP-Jl-0hK"/>
                 <outlet property="stackView" destination="pky-np-rBc" id="vRx-dY-Ma9"/>
                 <outlet property="subtitleLabel" destination="Oil-C8-RKM" id="9VO-5Z-BNb"/>
             </connections>

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -155,10 +155,10 @@ final class StorePickerViewController: UIViewController {
         }
     }
 
-    private lazy var removeAppleIDAccessCoordinator: RemoveAppleIDAccessCoordinator =
-    RemoveAppleIDAccessCoordinator(sourceViewController: self) { [weak self] in
-        guard let self = self else { throw RemoveAppleIDAccessError.presenterDeallocated }
-        return try await self.removeAppleIDAccess()
+    private lazy var closeAccountCoordinator: CloseAccountCoordinator =
+    CloseAccountCoordinator(sourceViewController: self) { [weak self] in
+        guard let self = self else { throw CloseAccountError.presenterDeallocated }
+        return try await self.closeAccount()
     } onRemoveSuccess: { [weak self] in
         self?.restartAuthentication()
     }
@@ -698,13 +698,15 @@ extension StorePickerViewController: UITableViewDataSource {
         guard let site = viewModel.site(at: indexPath) else {
             hideActionButton()
             let cell = tableView.dequeueReusableCell(EmptyStoresTableViewCell.self, for: indexPath)
-            let isRemoveAppleIDAccessButtonVisible = appleIDCredentialChecker.hasAppleUserID()
-            cell.updateRemoveAppleIDAccessButtonVisibility(isVisible: isRemoveAppleIDAccessButtonVisible)
-            if isRemoveAppleIDAccessButtonVisible {
+            let isCloseAccountButtonVisible = appleIDCredentialChecker.hasAppleUserID()
+            || featureFlagService.isFeatureFlagEnabled(.storeCreationMVP)
+            || featureFlagService.isFeatureFlagEnabled(.storeCreationM2)
+            cell.updateCloseAccountButtonVisibility(isVisible: isCloseAccountButtonVisible)
+            if isCloseAccountButtonVisible {
                 cell.onCloseAccountButtonTapped = { [weak self] in
                     guard let self = self else { return }
                     ServiceLocator.analytics.track(event: .closeAccountTapped(source: .emptyStores))
-                    self.removeAppleIDAccessCoordinator.start()
+                    self.closeAccountCoordinator.start()
                 }
             }
             return cell
@@ -777,7 +779,7 @@ extension StorePickerViewController: UITableViewDelegate {
 }
 
 private extension StorePickerViewController {
-    func removeAppleIDAccess() async throws {
+    func closeAccount() async throws {
         try await withCheckedThrowingContinuation { [weak self] continuation in
             guard let self = self else { return }
             let action = AccountAction.closeAccount { result in

WooCommerce/Classes/Extensions/UIButton+TitleAndImage.swift

@@ -81,33 +81,39 @@ private extension CardPresentModalScanningForReader {
 
     enum Localization {
         static let title = NSLocalizedString(
-            "Scanning for reader",
+            "cardPresent.modalScanningForReader.title",
+            value: "Scanning for reader",
             comment: "Title label for modal dialog that appears when searching for a card reader"
         )
 
         static let instruction = NSLocalizedString(
-            "To turn on your card reader, briefly press its power button.",
+            "cardPresent.modalScanningForReader.instruction",
+            value: "To turn on your card reader, briefly press its power button.",
             comment: "Label within the modal dialog that appears when searching for a card reader"
         )
 
         static let cancel = NSLocalizedString(
-            "Cancel",
+            "cardPresent.modalScanningForReader.cancelButton",
+            value: "Cancel",
             comment: "Label for a cancel button"
         )
 
         static let learnMoreLink = NSLocalizedString(
-            "Learn more",
+            "cardPresent.modalScanningForReader.learnMore.link",
+            value: "Learn more",
             comment: """
                      A label prompting users to learn more about In-Person Payments.
                      This is the link to the website, and forms part of a longer sentence which it should be considered a part of.
                      """
         )
 
         static let learnMoreText = NSLocalizedString(
-            "%1$@ about In\u{2011}Person Payments",
+            "cardPresent.modalScanningForReader.learnMore.text",
+            value: "%1$@ about In‑Person Payments",
             comment: """
                      A label prompting users to learn more about In-Person Payments.
-                     \u{2011} is a special character that acts as nonbreaking hyphen for "-" in the "In-Person" string.
+                     The hyphen in "In‑Person" is a non-breaking hyphen (U+2011).
+                     If your translation of that term also happens to contains a hyphen, please be sure to use the non-breaking hyphen character for it.
                      %1$@ is a placeholder that always replaced with \"Learn more\" string,
                      which should be translated separately and considered part of this sentence.
                      """

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalScanningForReader.swift

@@ -0,0 +1,120 @@
+import Foundation
+import Yosemite
+import Combine
+
+enum CardReaderConnectionResult {
+    case connected(CardReader)
+    case canceled
+}
+
+final class CardPresentPaymentPreflightController {
+    /// Store's ID.
+    ///
+    private let siteID: Int64
+
+    /// Payment Gateway Account to use.
+    ///
+    private let paymentGatewayAccount: PaymentGatewayAccount
+
+    /// IPP Configuration.
+    ///
+    private let configuration: CardPresentPaymentsConfiguration
+
+    /// View Controller used to present alerts.
+    ///
+    private var rootViewController: UIViewController
+
+    /// Stores manager.
+    ///
+    private let stores: StoresManager
+
+    /// Analytics manager.
+    ///
+    private let analytics: Analytics
+
+    /// Stores the connected card reader
+    private var connectedReader: CardReader?
+
+
+    /// Controller to connect a card reader.
+    ///
+    private var connectionController: CardReaderConnectionController
+
+
+    private(set) var readerConnection = CurrentValueSubject<CardReaderConnectionResult?, Never>(nil)
+
+    init(siteID: Int64,
+         paymentGatewayAccount: PaymentGatewayAccount,
+         configuration: CardPresentPaymentsConfiguration,
+         rootViewController: UIViewController,
+         stores: StoresManager = ServiceLocator.stores,
+         analytics: Analytics = ServiceLocator.analytics) {
+        self.siteID = siteID
+        self.paymentGatewayAccount = paymentGatewayAccount
+        self.configuration = configuration
+        self.rootViewController = rootViewController
+        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
+        self.connectionController = CardReaderConnectionController(
+            forSiteID: siteID,
+            knownReaderProvider: CardReaderSettingsKnownReaderStorage(),
+            alertsProvider: CardReaderSettingsAlerts(),
+            configuration: configuration,
+            analyticsTracker: analyticsTracker)
+    }
+
+    func start() {
+        configureBackend()
+        observeConnectedReaders()
+        // If we're already connected to a reader, return it
+        if let connectedReader = connectedReader {
+            readerConnection.send(CardReaderConnectionResult.connected(connectedReader))
+        }
+
+        // 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
+                }
+            }
+
+            switch connectionResult {
+            case .success(let unwrapped):
+                self.readerConnection.send(unwrapped)
+            default:
+                break
+            }
+        }
+    }
+
+
+
+    /// Configure the CardPresentPaymentStore to use the appropriate backend
+    ///
+    private func configureBackend() {
+        let setAccount = CardPresentPaymentAction.use(paymentGatewayAccount: paymentGatewayAccount)
+        stores.dispatch(setAccount)
+    }
+
+    private func observeConnectedReaders() {
+        let action = CardPresentPaymentAction.observeConnectedReaders() { [weak self] readers in
+            self?.connectedReader = readers.first
+        }
+        stores.dispatch(action)
+    }
+}

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentPreflightController.swift

@@ -320,7 +320,9 @@ private extension CardPresentPaymentsModalViewController {
             auxiliaryButton.setAttributedTitle(viewModel.auxiliaryAttributedButtonTitle, for: .normal)
             auxiliaryButton.setImage(viewModel.auxiliaryButtonimage, for: .normal)
             if viewModel.auxiliaryButtonimage != nil {
-                auxiliaryButton.distributeTitleAndImage(spacing: 8.0)
+                var config = UIButton.Configuration.plain()
+                config.imagePadding = Constants.buttonTitleAndImageSpacing
+                auxiliaryButton.configuration = config
             }
             view.layoutIfNeeded()
         }
@@ -416,6 +418,7 @@ private extension CardPresentPaymentsModalViewController {
         static let extraInfoCustomInsets = UIEdgeInsets(top: 12, left: 10, bottom: 12, right: 10)
         static let modalHeight: CGFloat = 382
         static let modalWidth: CGFloat = 280
+        static let buttonTitleAndImageSpacing: CGFloat = 8
     }
 }
 

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift

@@ -71,14 +71,14 @@ private extension BottomButtonContainerView {
         case .primary:
             button.applyPrimaryButtonStyle()
         case .link:
+            if let image = viewModel.image {
+                var configuration = UIButton.Configuration.plain()
+                button.setImage(image, for: .normal)
+                configuration.imagePadding = Constants.buttonTitleAndImageSpacing
+                button.configuration = configuration
+            }
             button.applyLinkButtonStyle()
             button.contentHorizontalAlignment = .leading
-            button.contentEdgeInsets = .zero
-        }
-
-        if let image = viewModel.image {
-            button.setImage(image, for: .normal)
-            button.distributeTitleAndImage(spacing: Constants.buttonTitleAndImageSpacing)
         }
     }