Merge branch 'trunk' into woomob-872-shipping-labels-load-shipments-from-local-storage-to

Author: itsmeichigo

RELEASE-NOTES.txt

@@ -5,8 +5,10 @@
 -----
 - [**] Order Details: Update Shipping Labels section for stores with Woo Shipping extension [https://github.com/woocommerce/woocommerce-ios/pull/15889]
 - [*] Order List: New orders made through Point of Sale are now filterable via the Order List filters menu [https://github.com/woocommerce/woocommerce-ios/pull/15910]
+- [*] Shipping Labels: Display base rate on selected shipping service cards [https://github.com/woocommerce/woocommerce-ios/pull/15916]
 - [*] Shipping Labels: Update mark order completed toggle on purchase form [https://github.com/woocommerce/woocommerce-ios/pull/15917]
 - [*] Shipping Labels: Optimize data loading on purchase form [https://github.com/woocommerce/woocommerce-ios/pull/15919]
+- [internal] Optimized assets for app size reduction [https://github.com/woocommerce/woocommerce-ios/pull/15881]
 
 22.8
 -----

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Package and Rate Selection/WooShippingServiceCardViewModel.swift

@@ -129,17 +129,7 @@ final class WooShippingServiceCardViewModel: Identifiable, ObservableObject {
             }
         }()
 
-        let rateLabel = {
-            let selectedRate = WooShippingSelectedRate(
-                rate: rate,
-                signatureRate: signatureRequirement == .signatureRequired ? signatureRate : nil,
-                adultSignatureRate: signatureRequirement == .adultSignatureRequired ? adultSignatureRate : nil,
-                carbonNeutralRate: carbonNeutralSelected ? carbonNeutralRate : nil,
-                saturdayDeliveryRate: saturdayDeliverySelected ? saturdayDeliveryRate : nil,
-                additionalHandlingRate: additionalHandlingSelected ? additionalHandlingRate : nil
-            )
-            return currencyFormatter.formatAmount(Decimal(selectedRate.totalRate)) ?? ""
-        }()
+        let rateLabel = currencyFormatter.formatAmount(Decimal(rate.rate)) ?? ""
 
         let daysToDeliveryLabel: String? = {
             guard let deliveryDays = rate.deliveryDays else {

WooCommerce/Resources/Images.xcassets/app-password-tutorial-1.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "tutorial.pdf",
+      "filename" : "app-password-tutorial-1.pdf",
       "idiom" : "universal"
     }
   ],

WooCommerce/Resources/Images.xcassets/app-password-tutorial-1.imageset/app-password-tutorial-1.pdf

@@ -1,17 +1,12 @@
 {
   "images" : [
     {
-      "filename" : "prologue-illustration.pdf",
-      "idiom" : "universal",
-      "language-direction" : "left-to-right"
+      "filename" : "login-prologue-woo-mobile.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "localizable" : true,
-    "preserves-vector-representation" : true
   }
 }