Merge branch 'trunk' into feat/15175-update-destination-remote

Author: selanthiraiyan

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.8
+This update resolves a critical issue preventing shipping labels from displaying in some orders. Enhancements include a better experience for uploading product images and creating Blaze campaigns. Additionally, merchants can now mark and filter favorite products for easier access.
+
 ## 21.7
 This update brings improvements to media library and login experience. You'll find enhanced accessibility in tax-related views and clearer product image organization with cover tags to help you manage your store. Update now for a smoother WooCommerce experience!
 

RELEASE-NOTES.txt

@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update).
 
+21.9
+-----
+
+
 21.8
 -----
 - [**] Shipping Labels: resolved issue preventing shipping labels from displaying in some orders when an error occurred during label creation. [https://github.com/woocommerce/woocommerce-ios/pull/15101]

WooCommerce/Classes/POS/Presentation/Card Present Payments/PointOfSaleCardPresentPaymentEventPresentationStyle.swift

@@ -246,14 +246,14 @@ enum PointOfSaleCardPresentPaymentEventPresentationStyle {
             /// Not-yet supported types
         case .selectSearchType:
             return nil
-            /// Immediately request location permission until POS view is created
+            /// Immediately request location permission until POS view is created, showing `Connecting to reader` underneath.
         case .locationRequestPreAlert(let requestPermission):
             requestPermission()
-            return nil
-            /// Skip location required step and rely on error during the payment process until POS view is created
+            self = .alert(.connectingToReader(viewModel: PointOfSaleCardPresentPaymentConnectingToReaderAlertViewModel()))
+            /// Skip location required step and rely on error during the payment process until POS view is created, showing `Connecting to reader` underneath.
         case .locationRequired(_, let skip):
             skip()
-            return nil
+            self = .alert(.connectingToReader(viewModel: PointOfSaleCardPresentPaymentConnectingToReaderAlertViewModel()))
         }
     }
 }

WooCommerce/Classes/POS/Presentation/ItemRowView.swift

@@ -46,10 +46,10 @@ struct ItemRowView: View {
                         .font(.posButtonSymbolMedium)
                 })
                 .accessibilityLabel(Localization.removeFromCartAccessibilityLabel)
-                .padding(.trailing, Constants.cardContentHorizontalPadding)
                 .foregroundColor(Color.posOnSurfaceVariantLowest)
             }
         }
+        .padding(.trailing, Constants.cardContentHorizontalPadding)
         .frame(maxWidth: .infinity, idealHeight: Constants.productCardSize * scale)
         .background(Color.posSurfaceContainerLowest)
         .posItemCardBorderStyles()

WooCommerce/Resources/AppStoreStrings.pot

@@ -61,9 +61,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v21.7-whats-new"
+msgctxt "v21.8-whats-new"
 msgid ""
-"This update brings improvements to media library and login experience. You'll find enhanced accessibility in tax-related views and clearer product image organization with cover tags to help you manage your store. Update now for a smoother WooCommerce experience!\n"
+"This update resolves a critical issue preventing shipping labels from displaying in some orders. Enhancements include a better experience for uploading product images and creating Blaze campaigns. Additionally, merchants can now mark and filter favorite products for easier access.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -1 +1 @@
-This update brings improvements to media library and login experience. You'll find enhanced accessibility in tax-related views and clearer product image organization with cover tags to help you manage your store. Update now for a smoother WooCommerce experience!
+This update resolves a critical issue preventing shipping labels from displaying in some orders. Enhancements include a better experience for uploading product images and creating Blaze campaigns. Additionally, merchants can now mark and filter favorite products for easier access.

WooCommerce/Resources/release_notes.txt

@@ -1,4 +1,4 @@
 CURRENT_PROJECT_VERSION = $VERSION_LONG
 MARKETING_VERSION = $VERSION_SHORT
-VERSION_LONG = 21.7.0.1
-VERSION_SHORT = 21.7
+VERSION_LONG = 21.8.0.0
+VERSION_SHORT = 21.8

config/Version.Public.xcconfig

@@ -1324,8 +1324,8 @@ lane :test_without_building do |options|
     fail_build: true
   )
 
-  # Trainer sometimes doesn't detect test failures, so we manually throw an error in the lane if there are failures to make sure there are no false positives
-  UI.user_error!("Tests failed with #{tests_result[:number_of_failures]} failures.") if tests_result[:number_of_failures].positive?
+  # `trainer` sometimes doesn't detect test failures, so we manually throw an error in the lane if there are failures to make sure there are no false positives
+  UI.user_error!("Tests failed with #{tests_result[:number_of_failures_excluding_retries]} failures.") if tests_result[:number_of_failures_excluding_retries].positive?
 end
 
 # -----------------------------------------------------------------------------------