Merge branch 'trunk' into task/wcios17-updates-to-onchange-v1

# Conflicts:
#	WooCommerce/Classes/POS/Presentation/Reusable Views/POSModalViewModifier.swift
#	WooCommerce/Classes/POS/Presentation/Reusable Views/POSSheet.swift

Author: iamgabrielma

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 23.1
+Managing your store just got smoother with a more reliable shipping label workflow! Jetpack setup has also been improved for a faster, easier connection. Update now and enjoy the improvements!
+
 ## 23.0
 Faster performance and smoother experience! This update brings improved product loading, better tax calculations, and enhanced address lookup with map support. We've added guided barcode scanning for POS users and strengthened shipping requirements for EU destinations. Plus, we've fixed stability issues for a more reliable experience.
 

Modules/Package.resolved

@@ -6,7 +6,7 @@ let package = Package(
     name: "Modules",
     platforms: [
         // Keep in sync with Common.xcconfig
-        .iOS(.v16),
+        .iOS(.v17),
         .macOS(.v10_14),
         .watchOS(.v9),
     ],
@@ -83,6 +83,7 @@ let package = Package(
         .package(url: "https://github.com/envoy/Embassy", from: "4.1.2"),
         // FIXME: This should be available via Tracks, but Tracks does not compile for watchOS
         .package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.46.0"),
+        .package(url: "https://github.com/groue/GRDB.swift", from: "7.0.0"),
         .package(url: "https://github.com/jonreid/ViewControllerPresentationSpy", from: "7.0.0"),
         .package(url: "https://github.com/kishikawakatsumi/KeychainAccess", from: "4.2.2"),
         .package(url: "https://github.com/krzysztofzablocki/Difference.git", branch: "master"),
@@ -159,7 +160,8 @@ let package = Package(
             name: "Storage",
             dependencies: [
                 "Codegen",
-                "WooFoundation"
+                "WooFoundation",
+                .product(name: "GRDB", package: "GRDB.swift")
             ],
             exclude: ["Model/Migrations.md"],
             resources: [.process("Resources")]

Modules/Package.swift

@@ -88,23 +88,22 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .productImageOptimizedHandling:
             return true
-        case .pointOfSaleBarcodeScanningi1:
-            return true
-        case .showPointOfSaleBarcodeSimulator:
-            // Enables a simulated barcode scanner in dev builds for testing. Do not ship this one!
-            return false
-        case .pointOfSaleAsATabi1:
-            return true
         case .pointOfSaleAsATabi2:
             return true
         case .pointOfSaleOrdersi1:
             return true
         case .pointOfSaleOrdersi2:
             return true
-        case .pointOfSaleBarcodeScanningi2:
+        case .pointOfSaleSettingsi1:
             return true
         case .orderAddressMapSearch:
             return true
+        case .pointOfSaleHistoricalOrdersi1:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .applicationPasswordExperiment:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .pointOfSaleLocalCatalogi1:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -183,18 +183,6 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleReceipts
 
-    /// Enables barcode scanning with an external scanner in POS
-    ///
-    case pointOfSaleBarcodeScanningi1
-
-    /// Enables a simulated barcode scanner for testing in POS. Do not ship this one!
-    ///
-    case showPointOfSaleBarcodeSimulator
-
-    /// Enables displaying POS as a tab in the tab bar with the same eligibility as the previous entry point
-    ///
-    case pointOfSaleAsATabi1
-
     /// Enables displaying POS as a tab in the tab bar for stores in eligible countries
     ///
     case pointOfSaleAsATabi2
@@ -207,11 +195,24 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleOrdersi2
 
-    /// Enables the Point of Sale Barcode Scanner set up flows, as part of i2
+    /// Enables the entry point for Point of Sale Settings
     ///
-    case pointOfSaleBarcodeScanningi2
+    case pointOfSaleSettingsi1
 
     /// Enables the CTA to search for an address in the map in order details > shipping address.
     ///
     case orderAddressMapSearch
+
+    /// Enables the entry point for Point of Sale Orders
+    ///
+    case pointOfSaleHistoricalOrdersi1
+
+    /// Enables switching Jetpack requests to use application password
+    ///
+    case applicationPasswordExperiment
+
+    /// Enables Local Catalog i1 in Point of Sale.
+    /// It syncs products and variations to local storage and display them in POS for quick access.
+    ///
+    case pointOfSaleLocalCatalogi1
 }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -753,12 +753,11 @@ extension Networking.POSProduct {
             productID: .fake(),
             name: .fake(),
             productTypeKey: .fake(),
+            fullDescription: .fake(),
+            shortDescription: .fake(),
             sku: .fake(),
             globalUniqueID: .fake(),
             price: .fake(),
-            regularPrice: .fake(),
-            salePrice: .fake(),
-            onSale: .fake(),
             downloadable: .fake(),
             parentID: .fake(),
             images: .fake(),
@@ -779,12 +778,10 @@ extension Networking.POSProductVariation {
             productVariationID: .fake(),
             attributes: .fake(),
             image: .fake(),
+            fullDescription: .fake(),
             sku: .fake(),
             globalUniqueID: .fake(),
             price: .fake(),
-            regularPrice: .fake(),
-            salePrice: .fake(),
-            onSale: .fake(),
             downloadable: .fake(),
             manageStock: .fake(),
             stockQuantity: .fake(),
@@ -1776,7 +1773,8 @@ extension Networking.Site {
             canBlaze: .fake(),
             isAdmin: .fake(),
             wasEcommerceTrial: .fake(),
-            hasSSOEnabled: .fake()
+            hasSSOEnabled: .fake(),
+            applicationPasswordAvailable: .fake()
         )
     }
 }
@@ -1786,7 +1784,8 @@ extension Networking.SiteAPI {
     public static func fake() -> Networking.SiteAPI {
         .init(
             siteID: .fake(),
-            namespaces: .fake()
+            namespaces: .fake(),
+            applicationPasswordAvailable: .fake()
         )
     }
 }
@@ -2014,22 +2013,6 @@ extension Networking.UploadableMedia {
         )
     }
 }
-extension Networking.User {
-    /// Returns a "ready to use" type filled with fake values.
-    ///
-    public static func fake() -> Networking.User {
-        .init(
-            localID: .fake(),
-            siteID: .fake(),
-            email: .fake(),
-            username: .fake(),
-            firstName: .fake(),
-            lastName: .fake(),
-            nickname: .fake(),
-            roles: .fake()
-        )
-    }
-}
 extension Networking.WCAnalyticsCustomer {
     /// Returns a "ready to use" type filled with fake values.
     ///

Modules/Sources/Fakes/Networking.generated.swift

@@ -575,3 +575,19 @@ extension NetworkingCore.StatsGranularityV4 {
         .hourly
     }
 }
+extension NetworkingCore.User {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> NetworkingCore.User {
+        .init(
+            localID: .fake(),
+            siteID: .fake(),
+            email: .fake(),
+            username: .fake(),
+            firstName: .fake(),
+            lastName: .fake(),
+            nickname: .fake(),
+            roles: .fake()
+        )
+    }
+}

Modules/Sources/Fakes/NetworkingCore.generated.swift

@@ -1109,7 +1109,7 @@ private extension StripeCardReaderService {
             DDLogError("💳 Card Reader Config Error: \(error)")
         default:
             let errorCode = ErrorCode(_nsError: error as NSError)
-            DDLogError("💳 Stripe Error Code: \(errorCode.code)")
+            DDLogError("💳 Stripe Error Code: \(errorCode.errorCode)")
         }
         return UnderlyingError(with: error)
     }

Modules/Sources/Hardware/CardReader/StripeCardReader/StripeCardReaderService.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
+    }
 }