Merge branch 'trunk' into woomob-660-ios-26-exc_breakpoint-signalcompressionsignalencoderswift261

Author: staskus

Modules/Sources/Hardware/CardReader/CurrencyCode.swift

@@ -16,10 +16,9 @@ public struct CurrencyCode {
 
     public var wrappedValue: String {
         get {
-            guard Locale.isoCurrencyCodes.map({ $0.uppercased() }).contains(value.uppercased()) else {
+            guard Locale.Currency.isoCurrencies.map({ $0.identifier.uppercased() }).contains(value.uppercased()) else {
                 return ""
             }
-
             return value.lowercased()
         }
         set {

Modules/Sources/Hardware/CardReader/StripeCardReader/PaymentMethod+Stripe.swift

@@ -24,7 +24,7 @@ extension PaymentMethod {
                 return
             }
             self = .interacPresent(details: CardPresentTransactionDetails(details: details))
-        case .unknown:
+        case .affirm, .wechatPay, .unknown:
             self = .unknown
         @unknown default:
             self = .unknown

Modules/Sources/Networking/Mapper/JetpackConnectionProvisionMapper.swift

@@ -18,4 +18,11 @@ public struct JetpackConnectionProvisionResponse: Decodable {
     public let userId: Int64
     public let scope: String
     public let secret: String
+
+    /// periphery: ignore - used in test module
+    public init(userId: Int64, scope: String, secret: String) {
+        self.userId = userId
+        self.scope = scope
+        self.secret = secret
+    }
 }

Modules/Sources/Yosemite/Stores/JustInTimeMessageStore.swift

@@ -104,10 +104,10 @@ private extension JustInTimeMessageStore {
     }
 
     func localeLanguageRegionIdentifier() -> String? {
-        guard let languageCode = Locale.current.languageCode else {
+        guard let languageCode = Locale.current.language.languageCode?.identifier else {
             return nil
         }
-        guard let regionCode = Locale.current.regionCode else {
+        guard let regionCode = Locale.current.region?.identifier else {
             return languageCode
         }
         return "\(languageCode)_\(regionCode)"

RELEASE-NOTES.txt

@@ -3,7 +3,8 @@
 
 23.1
 -----
-
+- [*] Jetpack setup: Native experience for the connection step [https://github.com/woocommerce/woocommerce-ios/pull/15983]
+- [*] Payments: Updated the In-Person Payments `Learn More` redirection to display the correct page based on the selected payment provider [https://github.com/woocommerce/woocommerce-ios/pull/15998]
 
 23.0
 -----

WooCommerce/Classes/Authentication/Jetpack Setup/LoginJetpackSetupCoordinator.swift

@@ -44,7 +44,11 @@ final class LoginJetpackSetupCoordinator: Coordinator {
 //
 private extension LoginJetpackSetupCoordinator {
     func showSetupSteps() {
-        let setupUI = JetpackSetupHostingController(siteURL: siteURL, connectionOnly: connectionOnly, onStoreNavigation: { [weak self] connectedEmail in
+        let setupUI = JetpackSetupHostingController(
+            siteURL: siteURL,
+            connectionOnly: connectionOnly,
+            wpcomCredentials: stores.sessionManager.defaultCredentials,
+            onStoreNavigation: { [weak self] connectedEmail in
             guard let self, let email = connectedEmail else { return }
             if email != self.stores.sessionManager.defaultAccount?.email {
                 // if the user authorized Jetpack with a different account, support them to log in with that account.

WooCommerce/Classes/Authentication/Jetpack Setup/Native Jetpack Setup/JetpackSetupView.swift

@@ -7,22 +7,23 @@ import protocol WooFoundation.Analytics
 final class JetpackSetupHostingController: UIHostingController<JetpackSetupView> {
     private let viewModel: JetpackSetupViewModel
     private let authentication: Authentication
-    private let connectionWebViewCredentials: Credentials?
+    private let wpcomCredentials: Credentials?
 
     init(siteURL: String,
          connectionOnly: Bool,
-         connectionWebViewCredentials: Credentials? = nil,
+         wpcomCredentials: Credentials?,
          stores: StoresManager = ServiceLocator.stores,
          authentication: Authentication = ServiceLocator.authenticationManager,
          analytics: Analytics = ServiceLocator.analytics,
          onStoreNavigation: @escaping (String?) -> Void) {
         self.viewModel = JetpackSetupViewModel(siteURL: siteURL,
                                                connectionOnly: connectionOnly,
+                                               wpcomCredentials: wpcomCredentials,
                                                stores: stores,
                                                analytics: analytics,
                                                onStoreNavigation: onStoreNavigation)
         self.authentication = authentication
-        self.connectionWebViewCredentials = connectionWebViewCredentials
+        self.wpcomCredentials = wpcomCredentials
         super.init(rootView: JetpackSetupView(viewModel: viewModel))
 
         rootView.webViewPresentationHandler = { [weak self] in
@@ -92,7 +93,7 @@ final class JetpackSetupHostingController: UIHostingController<JetpackSetupView>
             guard let self else { return }
             self.viewModel.jetpackConnectionInterrupted = true
         })
-        let webView = AuthenticatedWebViewController(viewModel: webViewModel, extraCredentials: connectionWebViewCredentials)
+        let webView = AuthenticatedWebViewController(viewModel: webViewModel, extraCredentials: wpcomCredentials)
         webView.navigationItem.leftBarButtonItem = UIBarButtonItem(title: Localization.cancel,
                                                                    style: .plain,
                                                                    target: self,
@@ -327,10 +328,3 @@ private extension JetpackSetupView {
         static let interruptedConnectionActionHandlerDelayTime: Double = 0.3
     }
 }
-
-struct JetpackSetupView_Previews: PreviewProvider {
-    static var previews: some View {
-        JetpackSetupView(viewModel: JetpackSetupViewModel(siteURL: "https://test.com", connectionOnly: true))
-        JetpackSetupView(viewModel: JetpackSetupViewModel(siteURL: "https://test.com", connectionOnly: false))
-    }
-}