Merge branch 'trunk' into task/stripe-sdk-update-4.2.0

Author: staskus

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 22.0
+This update adds the option to set different notification preferences for each store. In Orders and Products, your filters stay around as you move through the app, and we've fixed a crash that could happen when you choose pictures for your products. Payments is improved too, with support for Puerto Rico in WooPayments, and better accessibility.
+
 ## 21.9
 We're dedicated to enhancing your WooCommerce app experience! We've ironed out the issues related to discarding images during uploads in the Product Form. Plus, we've ramped up our login flow accessibility to make your journey smoother and more intuitive. Enjoy the fresh update and newly polished features!
 

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -72,7 +72,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .pointOfSale:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .enableCouponsInPointOfSale:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return false
         case .googleAdsCampaignCreationOnWebView:
             return true
         case .backgroundTasks:
@@ -92,9 +92,13 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .hideSitesInStorePicker:
             return true
         case .filterHistoryOnOrderAndProductLists:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .backgroundProductImageUpload:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .notificationSettings:
+            return true
+        case .allowMerchantAIAPIKey:
+            return false
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -204,4 +204,12 @@ public enum FeatureFlag: Int {
     /// Supports uploading product images in background
     ///
     case backgroundProductImageUpload
+
+    /// Supports managing notification settings from the app settings
+    ///
+    case notificationSettings
+
+    /// Allows merchants to use their own API keys for AI-powered features
+    ///
+    case allowMerchantAIAPIKey
 }

Fakes/Fakes/Networking.generated.swift

@@ -2118,7 +2118,8 @@ extension Networking.ShippingLabelPurchase {
             refundableAmount: .fake(),
             status: .fake(),
             productIDs: .fake(),
-            productNames: .fake()
+            productNames: .fake(),
+            shipmentID: .fake()
         )
     }
 }
@@ -2804,6 +2805,26 @@ extension Networking.WooShippingCarrierPredefinedOptions {
         )
     }
 }
+extension Networking.WooShippingConfig {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.WooShippingConfig {
+        .init(
+            siteID: .fake(),
+            shipments: .fake(),
+            shippingLabelData: .fake()
+        )
+    }
+}
+extension Networking.WooShippingConfigResponse {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.WooShippingConfigResponse {
+        .init(
+            config: .fake()
+        )
+    }
+}
 extension Networking.WooShippingCreatePackageResponse {
     /// Returns a "ready to use" type filled with fake values.
     ///
@@ -2957,6 +2978,16 @@ extension Networking.WooShippingSavedPredefinedPackage {
         )
     }
 }
+extension Networking.WooShippingShipment {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.WooShippingShipment {
+        .init(
+            id: .fake(),
+            subItems: .fake()
+        )
+    }
+}
 extension Networking.WordPressMedia {
     /// Returns a "ready to use" type filled with fake values.
     ///

Networking/Networking.xcodeproj/project.pbxproj

@@ -1257,7 +1257,13 @@
 		EE6FDCFC2966A70400E1CECF /* product-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE6FDCFB2966A70400E1CECF /* product-without-data.json */; };
 		EE71CC3D2951A8EA0074D908 /* ApplicationPasswordStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE71CC3C2951A8EA0074D908 /* ApplicationPasswordStorage.swift */; };
 		EE71CC412951CE700074D908 /* generate-application-password-using-wporg-creds-success.json in Resources */ = {isa = PBXBuildFile; fileRef = EE71CC402951CE700074D908 /* generate-application-password-using-wporg-creds-success.json */; };
+		EE74B1EA2D895F05000E4C56 /* WooShippingConfigMapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE74B1E92D895F00000E4C56 /* WooShippingConfigMapperTests.swift */; };
+		EE74B1ED2D895FA4000E4C56 /* shipping-label-config-success.json in Resources */ = {isa = PBXBuildFile; fileRef = EE74B1EB2D895FA4000E4C56 /* shipping-label-config-success.json */; };
+		EE74B1EE2D895FA4000E4C56 /* shipping-label-config-success-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE74B1EC2D895FA4000E4C56 /* shipping-label-config-success-without-data.json */; };
 		EE76762F2962B85E000066FA /* RequestProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE76762E2962B85E000066FA /* RequestProcessorTests.swift */; };
+		EE7E80B82D84F19100E6FF5B /* WooShippingConfigMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7E80B72D84F18700E6FF5B /* WooShippingConfigMapper.swift */; };
+		EE7E80BA2D84F42E00E6FF5B /* WooShippingConfigResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7E80B92D84F41500E6FF5B /* WooShippingConfigResponse.swift */; };
+		EE7E80BD2D84F55100E6FF5B /* WooShippingShipment.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE7E80BC2D84F54800E6FF5B /* WooShippingShipment.swift */; };
 		EE80A24729547F8B003591E4 /* coupons-all-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE80A24529547F8B003591E4 /* coupons-all-without-data.json */; };
 		EE80A24829547F8B003591E4 /* coupon-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE80A24629547F8B003591E4 /* coupon-without-data.json */; };
 		EE80A25029556FBD003591E4 /* coupon-reports-without-data.json in Resources */ = {isa = PBXBuildFile; fileRef = EE80A24F29556FBD003591E4 /* coupon-reports-without-data.json */; };
@@ -2488,7 +2494,13 @@
 		EE6FDCFB2966A70400E1CECF /* product-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "product-without-data.json"; sourceTree = "<group>"; };
 		EE71CC3C2951A8EA0074D908 /* ApplicationPasswordStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationPasswordStorage.swift; sourceTree = "<group>"; };
 		EE71CC402951CE700074D908 /* generate-application-password-using-wporg-creds-success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "generate-application-password-using-wporg-creds-success.json"; sourceTree = "<group>"; };
+		EE74B1E92D895F00000E4C56 /* WooShippingConfigMapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingConfigMapperTests.swift; sourceTree = "<group>"; };
+		EE74B1EB2D895FA4000E4C56 /* shipping-label-config-success.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "shipping-label-config-success.json"; sourceTree = "<group>"; };
+		EE74B1EC2D895FA4000E4C56 /* shipping-label-config-success-without-data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "shipping-label-config-success-without-data.json"; sourceTree = "<group>"; };
 		EE76762E2962B85E000066FA /* RequestProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestProcessorTests.swift; sourceTree = "<group>"; };
+		EE7E80B72D84F18700E6FF5B /* WooShippingConfigMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingConfigMapper.swift; sourceTree = "<group>"; };
+		EE7E80B92D84F41500E6FF5B /* WooShippingConfigResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingConfigResponse.swift; sourceTree = "<group>"; };
+		EE7E80BC2D84F54800E6FF5B /* WooShippingShipment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooShippingShipment.swift; sourceTree = "<group>"; };
 		EE80A24529547F8B003591E4 /* coupons-all-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "coupons-all-without-data.json"; sourceTree = "<group>"; };
 		EE80A24629547F8B003591E4 /* coupon-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "coupon-without-data.json"; sourceTree = "<group>"; };
 		EE80A24F29556FBD003591E4 /* coupon-reports-without-data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "coupon-reports-without-data.json"; sourceTree = "<group>"; };
@@ -2601,6 +2613,7 @@
 		02C2548225635BB500A04423 /* ShippingLabel */ = {
 			isa = PBXGroup;
 			children = (
+				EE7E80BB2D84F4E900E6FF5B /* Shipments */,
 				EE1042AB2D64E409005AB07F /* VerifyDestinationAddress */,
 				02C254B525637A8300A04423 /* Enums */,
 				029BA4F3255D72EC006171FD /* ShippingLabelPrintData.swift */,
@@ -3273,6 +3286,8 @@
 				DE66C5602977CB5F00DAA978 /* shipping-label-eligibility-success-without-data.json */,
 				DE66C55E2977C67D00DAA978 /* shipping-label-account-settings-without-data.json */,
 				DE66C55C2977C35A00DAA978 /* shipping-label-packages-success-without-data.json */,
+				EE74B1EB2D895FA4000E4C56 /* shipping-label-config-success.json */,
+				EE74B1EC2D895FA4000E4C56 /* shipping-label-config-success-without-data.json */,
 				DE66C55A2977C1A000DAA978 /* order-shipping-labels-without-data.json */,
 				DE66C558297799CF00DAA978 /* add-on-groups-without-data.json */,
 				DE66C5542976662700DAA978 /* just-in-time-message-list-without-data.json */,
@@ -3790,6 +3805,7 @@
 				CED9BCC42D3EBD0D00C063B8 /* WooShippingAddressValidationSuccessMapper.swift */,
 				EE1042AC2D65CE5E005AB07F /* WooShippingVerifyDestinationAddressMapper.swift */,
 				CE90E99D2CEFCB100068D852 /* WooShippingStatusMapper.swift */,
+				EE7E80B72D84F18700E6FF5B /* WooShippingConfigMapper.swift */,
 				CE606D8E2BE39426001CB424 /* ShippingMethodMapper.swift */,
 				FE28F6E326842848004465C7 /* UserMapper.swift */,
 				077F39D326A58DE700ABEADC /* SystemStatusMapper.swift */,
@@ -3965,6 +3981,7 @@
 				CCF48B7F2628BBC10034EA83 /* ShippingLabelAccountSettingsMapperTests.swift */,
 				CC9A254926442D26005DE56E /* ShippingLabelCreationEligibilityMapperTests.swift */,
 				CC07866426790B1100BA9AC1 /* ShippingLabelPurchaseMapperTests.swift */,
+				EE74B1E92D895F00000E4C56 /* WooShippingConfigMapperTests.swift */,
 				CC0786C8267BB32800BA9AC1 /* ShippingLabelStatusMapperTests.swift */,
 				CE606D922BE39889001CB424 /* ShippingMethodListMapperTests.swift */,
 				02C254D22563992900A04423 /* OrderShippingLabelListMapperTests.swift */,
@@ -4208,6 +4225,15 @@
 			path = ApplicationPassword;
 			sourceTree = "<group>";
 		};
+		EE7E80BB2D84F4E900E6FF5B /* Shipments */ = {
+			isa = PBXGroup;
+			children = (
+				EE7E80BC2D84F54800E6FF5B /* WooShippingShipment.swift */,
+				EE7E80B92D84F41500E6FF5B /* WooShippingConfigResponse.swift */,
+			);
+			path = Shipments;
+			sourceTree = "<group>";
+		};
 		EE80A24B29556F1D003591E4 /* Coupon */ = {
 			isa = PBXGroup;
 			children = (
@@ -4505,6 +4531,8 @@
 				02B41A92296BEB3000FE3311 /* load-site-current-plan-success.json in Resources */,
 				020EF5ED2A8C8F4F009D2169 /* products-total.json in Resources */,
 				02EF1672292F0D1900D90AD6 /* load-plan-success.json in Resources */,
+				EE74B1ED2D895FA4000E4C56 /* shipping-label-config-success.json in Resources */,
+				EE74B1EE2D895FA4000E4C56 /* shipping-label-config-success-without-data.json in Resources */,
 				DEA6B1C6296C13FB005AA5E9 /* payment-gateway-list-without-data.json in Resources */,
 				2685C0DE263B5A4200D9EE97 /* add-on-groups.json in Resources */,
 				AEA056E4296DBA6E00948D52 /* products-batch-update.json in Resources */,
@@ -5284,6 +5312,7 @@
 				CEB9BF392BB193020007978A /* ProductBundleStatsTotals.swift in Sources */,
 				CE71E22B2A4C363E00DB5376 /* ProductsReportsRemote.swift in Sources */,
 				45B204B82489095100FE6526 /* ProductCategoryMapper.swift in Sources */,
+				EE7E80BA2D84F42E00E6FF5B /* WooShippingConfigResponse.swift in Sources */,
 				B557DA0D20975DB1005962F4 /* WordPressAPIVersion.swift in Sources */,
 				7412A8EC21B6E286005D182A /* ReportOrderTotalsMapper.swift in Sources */,
 				451A97CD260A01A40059D135 /* ShippingLabelStoreOptions.swift in Sources */,
@@ -5376,6 +5405,7 @@
 				74A1D26D21189DFF00931DFA /* SiteVisitStatsMapper.swift in Sources */,
 				45152809257A7C6E0076B03C /* ProductAttributesRemote.swift in Sources */,
 				EECDBEDE296845F400293C4E /* RESTRequestConvertible.swift in Sources */,
+				EE7E80B82D84F19100E6FF5B /* WooShippingConfigMapper.swift in Sources */,
 				EE839C262ABEF9C900049545 /* AIProductMapper.swift in Sources */,
 				EEFAA57D295D77F0003583BE /* AuthenticatedRESTRequest.swift in Sources */,
 				D8FBFF2222D5266E006E3336 /* OrderStatsV4Interval.swift in Sources */,
@@ -5524,6 +5554,7 @@
 				451A97C92609FF050059D135 /* ShippingLabelPackagesResponse.swift in Sources */,
 				029BA4F0255D7282006171FD /* ShippingLabelRemote.swift in Sources */,
 				B557DA0F20975E07005962F4 /* DotcomRequest.swift in Sources */,
+				EE7E80BD2D84F55100E6FF5B /* WooShippingShipment.swift in Sources */,
 				AEF94585272974F2001DCCFB /* TelemetryRemote.swift in Sources */,
 				DE20046E2BFB522900660A72 /* ProductReportListMapper.swift in Sources */,
 				740211E321939C84002248DA /* CommentResultMapper.swift in Sources */,
@@ -5612,6 +5643,7 @@
 				74D5BECE217E0F98007B0348 /* SiteSettingsRemoteTests.swift in Sources */,
 				D8FBFF1C22D51C34006E3336 /* OrderStatsRemoteV4Tests.swift in Sources */,
 				EE62EE61295ACF8D009C965B /* RequestConverterTests.swift in Sources */,
+				EE74B1EA2D895F05000E4C56 /* WooShippingConfigMapperTests.swift in Sources */,
 				EE62EE65295AD46D009C965B /* String+URLTests.swift in Sources */,
 				EE8C202D2B47886500FE967B /* CreateBlazeCampaignMapperTests.swift in Sources */,
 				CE6D666F2379E82A007835A1 /* ArrayWooTests.swift in Sources */,

Networking/Networking/Mapper/WooShippingConfigMapper.swift

@@ -0,0 +1,48 @@
+import Foundation
+
+struct WooShippingConfigMapper: Mapper {
+    /// Site Identifier associated to the order that will be parsed.
+    ///
+    /// We're injecting this field via `JSONDecoder.userInfo` because SiteID is not returned by the config endpoint.
+    ///
+    let siteID: Int64
+
+    /// Order ID associated to the shipping labels that will be parsed.
+    ///
+    /// We're injecting this field via `JSONDecoder.userInfo` because OrderID is not returned by the config endpoint.
+    ///
+    let orderID: Int64
+
+    /// (Attempts) to convert a dictionary into `WooShippingConfig`.
+    ///
+    func map(response: Data) throws -> WooShippingConfig {
+        let decoder = JSONDecoder()
+        decoder.userInfo = [
+            .siteID: siteID,
+            .orderID: orderID
+        ]
+        if hasDataEnvelope(in: response) {
+            return try decoder.decode(WooShippingConfigMapperEnvelope.self, from: response).data.config
+        } else {
+            return try decoder.decode(WooShippingConfigResponse.self, from: response).config
+        }
+    }
+}
+
+/// WooShippingConfigMapperEnvelope Disposable Entity:
+/// `Woo Shipping Config` endpoint returns the shipping label config in the `data` key.
+/// This entity allows us to do parse all the things with JSONDecoder.
+///
+private struct WooShippingConfigMapperEnvelope: Decodable {
+    let data: WooShippingConfigResponse
+
+    private enum CodingKeys: String, CodingKey {
+        case data = "data"
+    }
+}
+
+extension WooShippingConfigMapper {
+    /// Load only the relevant fields from remote
+    ///
+    static let fieldsToLoad = "config.shipments, config.shippingLabelData.currentOrderLabels"
+}