Merge branch 'trunk' into task/15065-failed-uploads-screen

Author: itsmeichigo

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -91,8 +91,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .acceptCashForPointOfSale:
             return true
-        case .variableProductsInPointOfSale:
-            return true
         case .hideSitesInStorePicker:
             return true
         case .filterHistoryOnOrderAndProductLists:

Experiments/Experiments/FeatureFlag.swift

@@ -197,10 +197,6 @@ public enum FeatureFlag: Int {
     ///
     case acceptCashForPointOfSale
 
-    /// Supports variable products in POS.
-    ///
-    case variableProductsInPointOfSale
-
     /// Supports hiding sites from the store picker
     ///
     case hideSitesInStorePicker

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 - [*] Now "Suggested by AI" label is visible in dark mode in Blaze campaign creation flow. [https://github.com/woocommerce/woocommerce-ios/pull/15088]
 - [*] Improved image loading in Blaze Campaign Creation: displays a redacted and shimmering effects when loading product image and falls back to a placeholder if no image is available. [https://github.com/woocommerce/woocommerce-ios/pull/15098]
 - [*] Product List: Display syncing animation on items with image upload in progress [https://github.com/woocommerce/woocommerce-ios/pull/15052]
+- [*] Background image upload: Fix missing error notice in iPhones [https://github.com/woocommerce/woocommerce-ios/pull/15117]
 
 21.7
 -----

WooCommerce/Classes/POS/Colors/Color+POSColorPalette.swift

@@ -8,6 +8,8 @@ extension Color {
     static var posOnPrimaryContainer: Color { Color(.posOnPrimaryContainer) }
 
     // MARK: - Secondary Container Colors
+    static var posSecondary: Color { Color(.posSecondary) }
+    static var posOnSecondary: Color { Color(.posOnSecondary) }
     static var posSecondaryContainer: Color { Color(.posSecondaryContainer) }
     static var posOnSecondaryContainer: Color { Color(.posOnSecondaryContainer) }
 
@@ -44,11 +46,6 @@ extension Color {
     static var posAlert: Color { Color(.posAlert) }
     static var posOnAlert: Color { Color(.posOnAlert) }
 
-    // MARK: - Text Colors
-    static var posPrimaryText: Color { Color(.posPrimaryText) }
-    static var posSecondaryText: Color { Color(.posSecondaryText) }
-    static var posTertiaryText: Color { Color(.posTertiaryText) }
-
     // MARK: - Other
     static var posShadow: Color { Color(.posShadow) }
 }

…/posSecondaryText.colorset/Contents.json …ts/posOnSecondary.colorset/Contents.jsonWooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posSecondaryText.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnSecondary.colorset/Contents.json WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posSecondaryText.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnSecondary.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x5E",
-          "green" : "0x57",
-          "red" : "0x50"
+          "blue" : "0x17",
+          "green" : "0x15",
+          "red" : "0x10"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xAD",
-          "green" : "0xAA",
-          "red" : "0xA7"
+          "blue" : "0x17",
+          "green" : "0x15",
+          "red" : "0x10"
         }
       },
       "idiom" : "universal"

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posOnSuccess.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
+          "blue" : "0x17",
+          "green" : "0x15",
+          "red" : "0x10"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
+          "blue" : "0x17",
+          "green" : "0x15",
+          "red" : "0x10"
         }
       },
       "idiom" : "universal"

…ts/posPrimaryText.colorset/Contents.json …sets/posSecondary.colorset/Contents.jsonWooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posPrimaryText.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posSecondary.colorset/Contents.json WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posPrimaryText.colorset/Contents.json renamed to WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posSecondary.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
+          "blue" : "0xFF",
+          "green" : "0xC1",
+          "red" : "0xD1"
         }
       },
       "idiom" : "universal"
@@ -24,8 +24,8 @@
         "components" : {
           "alpha" : "1.000",
           "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
+          "green" : "0xC1",
+          "red" : "0xD1"
         }
       },
       "idiom" : "universal"

WooCommerce/Classes/POS/Colors/POSColorPalette.xcassets/posTertiaryText.colorset/Contents.json

@@ -13,8 +13,8 @@ private extension PointOfSaleCardPresentPaymentPreparingForPaymentMessageViewMod
             comment: "Title shown on the Point of Sale checkout while the reader is being prepared."
         )
         static let message = NSLocalizedString(
-            "pointOfSale.cardPresent.preparingForPayment.message",
-            value: "Preparing card for payment",
+            "pointOfSale.cardPresent.preparingReaderForPayment.message",
+            value: "Preparing reader for payment",
             comment: "Message shown on the Point of Sale checkout while the reader is being prepared."
         )
     }

WooCommerce/Classes/POS/Presentation/Card Present Payments/Reader Messages/PointOfSaleCardPresentPaymentPreparingForPaymentMessageViewModel.swift

@@ -88,7 +88,7 @@ private extension CardReaderConnectionStatusView {
     var connectedFontColor: Color {
         switch backgroundAppearance {
         case .primary:
-            .posPrimaryText
+            .posOnSurface
         case .secondary:
             POSFloatingControlView.secondaryFontColor
         }
@@ -97,7 +97,7 @@ private extension CardReaderConnectionStatusView {
     var disconnectedFontColor: Color {
         switch backgroundAppearance {
         case .primary:
-            .posPrimaryText
+            .posOnSurface
         case .secondary:
             POSFloatingControlView.secondaryFontColor
         }
@@ -111,7 +111,7 @@ private extension CardReaderConnectionStatusView {
         static let imageDimension: CGFloat = 12
         static let progressIndicatorDimension: CGFloat = 10
         static let progressIndicatorLineWidth: CGFloat = 2
-        static let font = POSFontStyle.posDetailEmphasized
+        static let font = POSFontStyle.posBodyMediumRegular()
         static let horizontalPadding: CGFloat = 24
         static let overlayRadius: CGFloat = 4
         static let overlayLineWidth: CGFloat = 2