diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 164b4a32c36..39c696e9061 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -4,6 +4,7 @@ 22.9 ----- - [*] 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] 22.8 ----- diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Package and Rate Selection/WooShippingServiceCardViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Package and Rate Selection/WooShippingServiceCardViewModel.swift index 0644dfb2b70..154092b8341 100644 --- a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Package and Rate Selection/WooShippingServiceCardViewModel.swift +++ b/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 { diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingServiceCardViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingServiceCardViewModelTests.swift index d446821451b..6bea21a8c64 100644 --- a/WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingServiceCardViewModelTests.swift +++ b/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)")