Merge branch 'trunk' into feat/8166-native-jetpack-installation-ab-testing

Author: selanthiraiyan

.buildkite/pipeline.yml

@@ -11,6 +11,7 @@ common_params:
         repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
+    # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
     IMAGE_ID: xcode-14
 
 # This is the default pipeline – it will build and test the app

.buildkite/release-builds.yml

@@ -13,6 +13,7 @@ common_params:
         repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
+    # Be sure to also update the `.xcode-version` file when updating the Xcode image/version here
     IMAGE_ID: xcode-14
 
 steps:

.xcode-version

@@ -0,0 +1 @@
+~> 14.0

.xcversion

@@ -37,6 +37,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .storeCreationM2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .storeCreationM2WithInAppPurchasesEnabled:
+            return false
         case .justInTimeMessagesOnDashboard:
             return true
         case .systemStatusReportInSupportRequest:

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -78,6 +78,11 @@ public enum FeatureFlag: Int {
     ///
     case storeCreationM2
 
+    /// Whether in-app purchases are enabled for store creation milestone 2 behind `storeCreationM2` feature flag.
+    /// If disabled, mock in-app purchases are provided by `MockInAppPurchases`.
+    ///
+    case storeCreationM2WithInAppPurchasesEnabled
+
     /// Just In Time Messages on Dashboard
     ///
     case justInTimeMessagesOnDashboard

Experiments/Experiments/FeatureFlag.swift

@@ -604,7 +604,8 @@ extension Networking.OrderStatsV4Totals {
             taxes: .fake(),
             shipping: .fake(),
             netRevenue: .fake(),
-            totalProducts: .fake()
+            totalProducts: .fake(),
+            averageOrderValue: .fake()
         )
     }
 }

Fakes/Fakes/Networking.generated.swift

@@ -729,7 +729,8 @@ extension Networking.OrderStatsV4Totals {
         taxes: CopiableProp<Decimal> = .copy,
         shipping: CopiableProp<Decimal> = .copy,
         netRevenue: CopiableProp<Decimal> = .copy,
-        totalProducts: NullableCopiableProp<Int> = .copy
+        totalProducts: NullableCopiableProp<Int> = .copy,
+        averageOrderValue: CopiableProp<Decimal> = .copy
     ) -> Networking.OrderStatsV4Totals {
         let totalOrders = totalOrders ?? self.totalOrders
         let totalItemsSold = totalItemsSold ?? self.totalItemsSold
@@ -741,6 +742,7 @@ extension Networking.OrderStatsV4Totals {
         let shipping = shipping ?? self.shipping
         let netRevenue = netRevenue ?? self.netRevenue
         let totalProducts = totalProducts ?? self.totalProducts
+        let averageOrderValue = averageOrderValue ?? self.averageOrderValue
 
         return Networking.OrderStatsV4Totals(
             totalOrders: totalOrders,
@@ -752,7 +754,8 @@ extension Networking.OrderStatsV4Totals {
             taxes: taxes,
             shipping: shipping,
             netRevenue: netRevenue,
-            totalProducts: totalProducts
+            totalProducts: totalProducts,
+            averageOrderValue: averageOrderValue
         )
     }
 }

Networking/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -13,6 +13,7 @@ public struct OrderStatsV4Totals: Decodable, Equatable, GeneratedCopiable, Gener
     public let shipping: Decimal
     public let netRevenue: Decimal
     public let totalProducts: Int?
+    public let averageOrderValue: Decimal
 
     public init(totalOrders: Int,
                 totalItemsSold: Int,
@@ -23,7 +24,8 @@ public struct OrderStatsV4Totals: Decodable, Equatable, GeneratedCopiable, Gener
                 taxes: Decimal,
                 shipping: Decimal,
                 netRevenue: Decimal,
-                totalProducts: Int?) {
+                totalProducts: Int?,
+                averageOrderValue: Decimal) {
         self.totalOrders = totalOrders
         self.totalItemsSold = totalItemsSold
         self.grossRevenue = grossRevenue
@@ -34,6 +36,7 @@ public struct OrderStatsV4Totals: Decodable, Equatable, GeneratedCopiable, Gener
         self.shipping = shipping
         self.netRevenue = netRevenue
         self.totalProducts = totalProducts
+        self.averageOrderValue = averageOrderValue
     }
 
     public init(from decoder: Decoder) throws {
@@ -48,6 +51,7 @@ public struct OrderStatsV4Totals: Decodable, Equatable, GeneratedCopiable, Gener
         let shipping = try container.decode(Decimal.self, forKey: .shipping)
         let netRevenue = try container.decode(Decimal.self, forKey: .netRevenue)
         let totalProducts = try container.decodeIfPresent(Int.self, forKey: .products)
+        let averageOrderValue = try container.decode(Decimal.self, forKey: .averageOrderValue)
 
         self.init(totalOrders: totalOrders,
                   totalItemsSold: totalItemsSold,
@@ -58,7 +62,8 @@ public struct OrderStatsV4Totals: Decodable, Equatable, GeneratedCopiable, Gener
                   taxes: taxes,
                   shipping: shipping,
                   netRevenue: netRevenue,
-                  totalProducts: totalProducts)
+                  totalProducts: totalProducts,
+                  averageOrderValue: averageOrderValue)
     }
 }
 
@@ -77,5 +82,6 @@ private extension OrderStatsV4Totals {
         case shipping
         case netRevenue = "net_revenue"
         case products
+        case averageOrderValue = "avg_order_value"
     }
 }

Networking/Networking/Model/Stats/OrderStatsV4Totals.swift

@@ -13,7 +13,7 @@ public protocol AccountRemoteProtocol {
     func checkIfWooCommerceIsActive(for siteID: Int64) -> AnyPublisher<Result<Bool, Error>, Never>
     func fetchWordPressSiteSettings(for siteID: Int64) -> AnyPublisher<Result<WordPressSiteSettings, Error>, Never>
     func loadSitePlan(for siteID: Int64, completion: @escaping (Result<SitePlan, Error>) -> Void)
-    func loadUsernameSuggestions(from text: String) async -> Result<[String], Error>
+    func loadUsernameSuggestions(from text: String) async throws -> [String]
 
     /// Creates a WPCOM account with the given email and password.
     /// - Parameters:
@@ -131,17 +131,15 @@ public class AccountRemote: Remote, AccountRemoteProtocol {
         enqueue(request, mapper: mapper, completion: completion)
     }
 
-    public func loadUsernameSuggestions(from text: String) async -> Result<[String], Error> {
+    public func loadUsernameSuggestions(from text: String) async throws -> [String] {
         let path = Path.usernameSuggestions
         let parameters = [ParameterKey.name: text]
         let request = DotcomRequest(wordpressApiVersion: .wpcomMark2, method: .get, path: path, parameters: parameters)
-        do {
-            let result: [String: [String]] = try await enqueue(request)
-            let suggestions = result["suggestions"] ?? []
-            return .success(suggestions)
-        } catch {
-            return .failure(error)
-        }
+
+        let result: [String: [String]] = try await enqueue(request)
+        let suggestions = result["suggestions"] ?? []
+
+        return suggestions
     }
 
     public func createAccount(email: String,