Merge branch 'trunk' into task/WOOMOB-556-mitigate-tax-rounding

Author: iamgabrielma

Modules/Package.resolved

@@ -72,6 +72,7 @@ let package = Package(
         .package(url: "https://github.com/Alamofire/Alamofire", from: "5.2.0"),
         .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.0.0"),
         .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.0"),
+        .package(url: "https://github.com/apple/swift-async-algorithms", exact: "1.0.4"),
         .package(url: "https://github.com/Automattic/AutomatticAbout-swift.git", from: "1.1.5"),
         .package(url: "https://github.com/Automattic/Automattic-Tracks-iOS.git", from: "3.5.2"),
         .package(url: "https://github.com/Automattic/Gridicons-iOS", revision: "c904cb73e26e86463a78e1335c6f4fd54a9e9223"),
@@ -381,6 +382,7 @@ enum XcodeSupport {
                     .product(name: "Inject", package: "Inject"),
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                     .product(name: "Kingfisher", package: "Kingfisher"),
+                    .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
                     .product(name: "ScrollViewSectionKit", package: "ScrollViewSectionKit"),
                     .product(name: "Shimmer", package: "SwiftUI-Shimmer"),
                     .product(name: "StripeTerminal", package: "stripe-terminal-ios"),

Modules/Package.swift

@@ -103,6 +103,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pointOfSaleBarcodeScanningi2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .orderAddressMapSearch:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -210,4 +210,8 @@ public enum FeatureFlag: Int {
     /// Enables the Point of Sale Barcode Scanner set up flows, as part of i2
     ///
     case pointOfSaleBarcodeScanningi2
+
+    /// Enables the CTA to search for an address in the map in order details > shipping address.
+    ///
+    case orderAddressMapSearch
 }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -4,6 +4,7 @@
 23.0
 -----
 - [*] Increased decimal sensitivity in order creation to mitigate tax rounding issues [https://github.com/woocommerce/woocommerce-ios/pull/15957]
+- [*] Fix initialization of authenticator to avoid crashes during login [https://github.com/woocommerce/woocommerce-ios/pull/15953]
 - [*] Shipping Labels: Made HS tariff number field required in customs form for EU destinations [https://github.com/woocommerce/woocommerce-ios/pull/15946]
 
 22.9

RELEASE-NOTES.txt

@@ -369,7 +369,6 @@ private extension StorePickerViewController {
     }
 
     func presentSiteDiscovery() {
-        ServiceLocator.authenticationManager.initialize()
         guard let viewController = WordPressAuthenticator.siteDiscoveryUI() else {
             return
         }

WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -89,7 +89,6 @@ final class AppCoordinator {
                     self.displayLoggedInStateWithoutDefaultStore()
                 case (true, false):
                     self.validateRoleEligibility {
-                        self.configureAuthenticator()
                         self.displayLoggedInUI()
                         self.synchronizeAndShowWhatsNew()
                     }
@@ -200,19 +199,13 @@ private extension AppCoordinator {
             presentLoginOnboarding { [weak self] in
                 guard let self = self else { return }
                 // Only displays the authenticator when dismissing onboarding to allow time for A/B test setup.
-                self.configureAndDisplayAuthenticator()
+                self.displayAuthenticator()
             }
         } else {
-            configureAndDisplayAuthenticator()
+            displayAuthenticator()
         }
     }
 
-    /// Configures the WPAuthenticator and sets the authenticator UI as the window's root view.
-    func configureAndDisplayAuthenticator() {
-        configureAuthenticator()
-        displayAuthenticator()
-    }
-
     /// Configures the WPAuthenticator for usage in both logged-in and logged-out states.
     func configureAuthenticator() {
         authenticationManager.initialize()
@@ -296,7 +289,6 @@ private extension AppCoordinator {
         guard stores.isAuthenticatedWithoutWPCom == false else {
             return displayAuthenticatorWithOnboardingIfNeeded()
         }
-        configureAuthenticator()
 
         let matcher = ULAccountMatcher(storageManager: storageManager)
         matcher.refreshStoredSites()

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -19,7 +19,6 @@ final class JetpackSetupCoordinator {
     private let stores: StoresManager
     private let analytics: Analytics
     private let featureFlagService: FeatureFlagService
-    private let dotcomAuthScheme: String
 
     private var loginNavigationController: LoginNavigationController?
     private var setupStepsNavigationController: UINavigationController?
@@ -43,24 +42,18 @@ final class JetpackSetupCoordinator {
     }
 
     init(site: Site,
-         dotcomAuthScheme: String = ApiCredentials.dotcomAuthScheme,
          rootViewController: UIViewController,
          accountService: WordPressComAccountServiceProtocol = WordPressComAccountService(),
          stores: StoresManager = ServiceLocator.stores,
          analytics: Analytics = ServiceLocator.analytics,
          featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
         self.site = site
-        self.dotcomAuthScheme = dotcomAuthScheme
         self.requiresConnectionOnly = false // to be updated later after fetching Jetpack status
         self.rootViewController = rootViewController
         self.accountService = accountService
         self.stores = stores
         self.analytics = analytics
         self.featureFlagService = featureFlagService
-
-        /// the authenticator needs to be initialized with configs
-        /// to be used for requesting authentication link and handle login later.
-        WordPressAuthenticator.initializeWithCustomConfigs(dotcomAuthScheme: dotcomAuthScheme)
     }
 
     func showBenefitModal() {
@@ -72,7 +65,7 @@ final class JetpackSetupCoordinator {
         rootViewController.present(benefitsController, animated: true, completion: nil)
     }
 
-    func handleAuthenticationUrl(_ url: URL) -> Bool {
+    func handleAuthenticationUrl(_ url: URL, dotcomAuthScheme: String = ApiCredentials.dotcomAuthScheme) -> Bool {
         let expectedPrefix = dotcomAuthScheme + "://" + Constants.magicLinkUrlHostname
         guard url.absoluteString.hasPrefix(expectedPrefix) else {
             return false

WooCommerce/Classes/ViewRelated/AppCoordinator.swift

@@ -184,6 +184,10 @@ open class AddressFormViewModel: ObservableObject {
         return StateSelectorViewModel(states: states, selected: selectedStateBinding)
     }
 
+    func findCountry(by code: String) -> Country? {
+        allCountries.first { $0.code == code }
+    }
+
     /// Creates a view model to be used when selecting a country for secondary fields
     ///
     func createSecondaryCountryViewModel() -> CountrySelectorViewModel {