Merge branch 'trunk' into task/14080-disallow-negative-product-discount

woocommerce · Oct 3, 2024 · 1b8c10a · 1b8c10a
2 parents b94b567 + a131756
commit 1b8c10a
Show file tree

Hide file tree

Showing 49 changed files with 642 additions and 5,730 deletions.
diff --git a/Experiments/Experiments/DefaultFeatureFlagService.swift b/Experiments/Experiments/DefaultFeatureFlagService.swift
@@ -72,10 +72,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return (buildConfig == .localDeveloper || buildConfig == .alpha) && !isUITesting
         case .pointOfSale:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .productCreationAIv2M1:
-            return true
-        case .productCreationAIv2M3:
-            return true
         case .googleAdsCampaignCreationOnWebView:
             return true
         case .backgroundTasks:

diff --git a/Experiments/Experiments/FeatureFlag.swift b/Experiments/Experiments/FeatureFlag.swift
@@ -161,14 +161,6 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSale
 
-    /// Enables M1 updates of product creation AI version 2
-    ///
-    case productCreationAIv2M1
-
-    /// Enables M3 updates of product creation AI version 2
-    ///
-    case productCreationAIv2M3
-
     /// Enables Google ads campaign creation on web view
     ///
     case googleAdsCampaignCreationOnWebView

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -5,9 +5,12 @@
 -----
 - [*] Payments: Mitigated Custom Amounts issue where CTA was not tappable unless keyboard was manually dismissed first [https://github.com/woocommerce/woocommerce-ios/pull/13994]
 - [internal] Enhanced error logging in the `OrderDetailsDataSource` class to improve crash diagnostics. [https://github.com/woocommerce/woocommerce-ios/pull/14018]
+- [internal] Removed product creation AI feature flag and unused code. [https://github.com/woocommerce/woocommerce-ios/pull/14010]
 - [*] Payments: Fixed a bug preventing payments onboarding from being automatically hidden when complete [https://github.com/woocommerce/woocommerce-ios/pull/14017]
 - [*] Payments: Give a specific label to Tap to Pay trial payments [https://github.com/woocommerce/woocommerce-ios/pull/14022]
 - [*] Orders: Applying a discount higher than the product price is no longer allowed [https://github.com/woocommerce/woocommerce-ios/pull/14083]
+- [*] Some error views were misaligned on iPad when the store was not a WordPress site or didn't have Jetpack installed. Now, everything is perfectly centered. [https://github.com/woocommerce/woocommerce-ios/pull/13991]
+- [*] Orders: Fixed a crash when searching for products to add to an order. [https://github.com/woocommerce/woocommerce-ios/pull/14095]
 
 20.6
 -----

diff --git a/WooCommerce/Classes/Analytics/WooAnalyticsEvent+AddProductFromImage.swift b/WooCommerce/Classes/Analytics/WooAnalyticsEvent+AddProductFromImage.swift
diff --git a/WooCommerce/Classes/Analytics/WooAnalyticsStat.swift b/WooCommerce/Classes/Analytics/WooAnalyticsStat.swift
@@ -718,14 +718,6 @@ enum WooAnalyticsStat: String {
     case addProductSuccess = "add_product_success"
     case addProductFailed = "add_product_failed"
 
-    // MARK: Add product from image events
-    case addProductFromImageDisplayed = "add_product_from_image_displayed"
-    case addProductFromImageScanCompleted = "add_product_from_image_scan_completed"
-    case addProductFromImageScanFailed = "add_product_from_image_scan_failed"
-    case addProductFromImageDetailsGenerated = "add_product_from_image_details_generated"
-    case addProductFromImageDetailGenerationFailed = "add_product_from_image_detail_generation_failed"
-    case addProductFromImageContinueButtonTapped = "add_product_from_image_continue_button_tapped"
-
     // MARK: Duplicate Product events
     case duplicateProductSuccess = "duplicate_product_success"
     case duplicateProductFailed = "duplicate_product_failed"

diff --git a/WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift b/WooCommerce/Classes/Authentication/Navigation Exceptions/ULErrorViewController.swift
@@ -34,8 +34,6 @@ final class ULErrorViewController: UIViewController {
     /// Used to adjust the button width in unified views provided by WPAuthenticator
     @IBOutlet private weak var buttonViewLeadingConstraint: NSLayoutConstraint!
     @IBOutlet private weak var buttonViewTrailingConstraint: NSLayoutConstraint!
-    @IBOutlet private weak var stackViewLeadingConstraint: NSLayoutConstraint!
-    @IBOutlet private weak var stackViewTrailingConstraint: NSLayoutConstraint!
 
     private var primaryButtonSubscription: AnyCancellable?
     private var siteFaviconSubscription: AnyCancellable?
@@ -245,9 +243,6 @@ private extension ULErrorViewController {
 
         buttonViewLeadingConstraint?.constant = margin
         buttonViewTrailingConstraint?.constant = margin
-
-        stackViewLeadingConstraint?.constant = margin
-        stackViewTrailingConstraint?.constant = margin
     }
 
     private enum ButtonViewMarginMultipliers {