Merge branch 'trunk' into woomob-795-shipping-label-fix-the-visibility-logic-of-mark-order-as

Author: itsmeichigo

RELEASE-NOTES.txt

@@ -5,6 +5,7 @@
 -----
 - [**] 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]
 
 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/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingServiceCardViewModelTests.swift

@@ -19,7 +19,7 @@ final class WooShippingServiceCardViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.signatureRequirement, .signatureRequired)
         XCTAssertEqual(viewModel.title, "USPS - Parcel Select Mail")
         XCTAssertEqual(viewModel.daysToDeliveryLabel, "2 business days")
-        XCTAssertEqual(viewModel.rateLabel, "$45.99")
+        XCTAssertEqual(viewModel.rateLabel, "$40.33")
         XCTAssertEqual(viewModel.carrierLogo, UIImage(named: "shipping-label-usps-logo"))
         XCTAssertEqual(viewModel.trackingLabel, "Tracking")
         XCTAssertEqual(viewModel.insuranceLabel, "Insurance (up to $100.00)")
@@ -69,7 +69,7 @@ final class WooShippingServiceCardViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.signatureRequirement, .signatureRequired)
         XCTAssertEqual(viewModel.title, "USPS - Parcel Select Mail")
         XCTAssertEqual(viewModel.daysToDeliveryLabel, "2 business days")
-        XCTAssertEqual(viewModel.rateLabel, "$65.58")
+        XCTAssertEqual(viewModel.rateLabel, "$40.33")
         XCTAssertEqual(viewModel.carrierLogo, UIImage(named: "shipping-label-usps-logo"))
         XCTAssertEqual(viewModel.trackingLabel, "Tracking")
         XCTAssertEqual(viewModel.insuranceLabel, "Insurance (up to $100.00)")
@@ -102,7 +102,7 @@ final class WooShippingServiceCardViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.signatureRequirement, .signatureRequired)
         XCTAssertEqual(viewModel.title, "USPS - Parcel Select Mail")
         XCTAssertEqual(viewModel.daysToDeliveryLabel, "2 business days")
-        XCTAssertEqual(viewModel.rateLabel, "$38.84")
+        XCTAssertEqual(viewModel.rateLabel, "$25.95")
         XCTAssertEqual(viewModel.carrierLogo, UIImage(named: "shipping-label-usps-logo"))
         XCTAssertEqual(viewModel.trackingLabel, "Tracking")
         XCTAssertEqual(viewModel.insuranceLabel, "Insurance (up to $100.00)")