Merge branch 'trunk' into issue/14593-make-pos-aggregate-model-require-iOS-17

joshheald · web-flow · commit 72dade18223d · 2025-02-05T14:55:30.000Z
diff --git a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift
@@ -430,7 +430,13 @@ extension StripeCardReaderService: CardReaderService {
             }
 
             paymentCancellable.cancel({ [weak self] error in
-                if error == nil {
+                // If the action could not be canceled,
+                // e.g. it has already completed, the completion block will be called with an
+                // error. Otherwise, the completion block will be called with nil.
+                if let error {
+                    let underlyingError = Self.logAndDecodeError(error)
+                    promise(.failure(CardReaderServiceError.paymentCancellation(underlyingError: underlyingError)))
+                } else {
                     self?.paymentCancellable = nil
                     cancelPaymentIntent()
                 }
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,9 +2,10 @@
 *** 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.7
 -----
+- [*] Orders: Improved accessibility UI for Tax Rates related views [https://github.com/woocommerce/woocommerce-ios/pull/15043]
 - [*] Product Details: Display cover tag on the first product image [https://github.com/woocommerce/woocommerce-ios/pull/15041]
 - [*] Payments: Update learn more links to open Stripe-specific docs when using that gateway [https://github.com/woocommerce/woocommerce-ios/pull/15035]
-- [x] Now, usernames and emails in text fields across multiple login views are no longer capitalized. [https://github.com/woocommerce/woocommerce-ios/pull/15002]
+- [*] Now, usernames and emails in text fields across multiple login views are no longer capitalized. [https://github.com/woocommerce/woocommerce-ios/pull/15002]
 
 21.6
 -----
diff --git a/WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift b/WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift
@@ -108,6 +108,7 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {
             DDLogError("Attempting to cancel the payment has failed \(error)")
         }
 
+        paymentTask?.cancel()
         connectionControllerManager.knownReaderProvider.forgetCardReader()
 
         return await withCheckedContinuation { continuation in
diff --git a/WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift b/WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift
@@ -187,7 +187,7 @@ extension PointOfSaleAggregateModel {
                     }
                 }
                 .removeDuplicates()
-                .sink { _ in
+                .sink { [weak self] _ in
                     Task { @MainActor [weak self] in
                         await self?.collectCardPayment()
                     }
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/Taxes/NewTaxRateSelectorView.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/Taxes/NewTaxRateSelectorView.swift
@@ -2,9 +2,6 @@ import SwiftUI
 import WooFoundation
 
 struct NewTaxRateSelectorView: View {
-    /// Scale of the view based on accessibility changes
-    @ScaledMetric private var scale: CGFloat = 1.0
-
     @Environment(\.dismiss) var dismiss
 
     @StateObject var viewModel: NewTaxRateSelectorViewModel
@@ -22,58 +19,47 @@ struct NewTaxRateSelectorView: View {
 
     var body: some View {
         NavigationView {
-            VStack(alignment: .leading, spacing: 0) {
-                Group {
-                    HStack(alignment: .top, spacing: Layout.explanatoryBoxHorizontalSpacing) {
-                        Image(systemName: "info.circle")
-                            .foregroundColor(Color(.wooCommercePurple(.shade60)))
-                        Text(Localization.infoText)
-                    }
-                    .padding(Layout.generalPadding)
-                }
-                .overlay(
-                    RoundedRectangle(cornerRadius: Layout.explanatoryBoxCornerRadius)
-                        .stroke(Color(.separator), lineWidth: 1)
-                )
-                .padding(Layout.generalPadding)
+            ScrollView {
+                taxRateSelectorHeaderView
 
-                switch viewModel.syncState {
+                VStack(alignment: .leading, spacing: 0) {
+                    switch viewModel.syncState {
                     case .results:
-                    Text(Localization.taxRatesSectionTitle.uppercased())
-                        .footnoteStyle()
-                        .multilineTextAlignment(.leading)
-                        .padding([.leading, .trailing], Layout.generalPadding)
-                        .padding([.top, .bottom], Layout.taxRatesSectionTitleVerticalPadding)
-
-                    Divider()
-
-                    ScrollView {
-                        LazyVStack(spacing: 0) {
-                            ForEach(Array(viewModel.taxRateViewModels.enumerated()), id: \.offset) { index, taxRateViewModel in
-                                TaxRateRow(viewModel: taxRateViewModel) {
-                                    viewModel.onRowSelected(with: index, storeSelectedTaxRate: storeSelectedTaxRate)
-                                    dismiss()
-                                }
+                        Text(Localization.taxRatesSectionTitle.uppercased())
+                            .footnoteStyle()
+                            .multilineTextAlignment(.leading)
+                            .padding([.leading, .trailing], Layout.generalPadding)
+                            .padding([.top, .bottom], Layout.taxRatesSectionTitleVerticalPadding)
 
-                                Divider()
-                            }
-                            .background(Color(.listForeground(modal: false)))
+                        Divider()
 
-                            resultsListFooter
-                                .renderedIf(!viewModel.shouldShowBottomActivityIndicator)
+                        ScrollView {
+                            LazyVStack(spacing: 0) {
+                                ForEach(Array(viewModel.taxRateViewModels.enumerated()), id: \.offset) { index, taxRateViewModel in
+                                    TaxRateRow(viewModel: taxRateViewModel) {
+                                        viewModel.onRowSelected(with: index, storeSelectedTaxRate: storeSelectedTaxRate)
+                                        dismiss()
+                                    }
 
-                            InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
-                                .padding(.top, Layout.generalPadding)
-                                .onAppear {
-                                    viewModel.onLoadNextPageAction()
+                                    Divider()
                                 }
+                                .background(Color(.listForeground(modal: false)))
+
+                                resultsListFooter
+                                    .renderedIf(!viewModel.shouldShowBottomActivityIndicator)
+
+                                InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
+                                    .padding(.top, Layout.generalPadding)
+                                    .onAppear {
+                                        viewModel.onLoadNextPageAction()
+                                    }
+                            }
                         }
-                    }
 
-                    storeTaxRateBottomView
+                        storeTaxRateBottomView
 
                     case .empty:
-                    EmptyState(title: Localization.emptyStateTitle,
+                        EmptyState(title: Localization.emptyStateTitle,
                                    description: Localization.emptyStateDescription,
                                    image: .emptyTaxRatesImage)
                         .padding(Layout.generalPadding)
@@ -102,6 +88,7 @@ struct NewTaxRateSelectorView: View {
                             }
                         }
                         .background(Color(.listForeground(modal: false)))
+                    }
                 }
             }
             .onAppear {
@@ -132,8 +119,29 @@ struct NewTaxRateSelectorView: View {
             showingWPAdminWebView = false
         })
     }
+}
+
+private extension NewTaxRateSelectorView {
+    var taxRateSelectorHeaderView: some View {
+        Group {
+            HStack(alignment: .top, spacing: Layout.explanatoryBoxHorizontalSpacing) {
+                Image(systemName: "info.circle")
+                    .foregroundColor(Color(.wooCommercePurple(.shade60)))
+                Text(Localization.infoText)
+                    .minimumScaleFactor(0.75)
+                    .allowsTightening(true)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+            .padding(Layout.generalPadding)
+        }
+        .overlay(
+            RoundedRectangle(cornerRadius: Layout.explanatoryBoxCornerRadius)
+                .stroke(Color(.separator), lineWidth: 1)
+        )
+        .padding(Layout.generalPadding)
+    }
 
-    private var resultsListFooter: some View {
+    var resultsListFooter: some View {
         Group {
             Text(Localization.listFooterResultsSectionTitle)
                 .foregroundColor(Color(.textSubtle))
@@ -158,10 +166,9 @@ struct NewTaxRateSelectorView: View {
         }
     }
 
-    private var storeTaxRateBottomView: some View {
+    var storeTaxRateBottomView: some View {
         VStack {
             Divider()
-
             Toggle(isOn: $storeSelectedTaxRate) {
                 VStack(alignment: .leading, spacing: Layout.fixedBottomPanelVerticalSpace) {
                     Text(Localization.fixedBottomPanelBody)
@@ -193,20 +200,55 @@ extension NewTaxRateSelectorView {
         static let fixedBottomPanelVerticalSpace: CGFloat = 4
     }
     enum Localization {
-        static let navigationTitle = NSLocalizedString("Set Tax Rate", comment: "Navigation title for the tax rate selector")
-        static let cancelButton = NSLocalizedString("Cancel", comment: "Cancel button title for the tax rate selector")
-        static let infoText = NSLocalizedString("This will change the customer’s address to the location of the tax rate you select.",
-                                                comment: "Explanatory text for the tax rate selector")
-        static let taxRatesSectionTitle = NSLocalizedString("Select a tax rate", comment: "Title for the tax rate selector section")
-        static let editTaxRatesInWpAdminButtonTitle = NSLocalizedString("Edit tax rates in admin",
-                                                                         comment: "Title of the button that prompts the user to edit tax rates in the web")
-        static let emptyStateTitle = NSLocalizedString("We couldn’t find any tax rates", comment: "Title for the empty state on the Tax Rates selector screen")
-        static let emptyStateDescription = NSLocalizedString("Add tax rates in admin. Only tax rates with location information will be shown here.",
-                                                             comment: "Description for the empty state on the Tax Rates selector screen")
-        static let listFooterResultsSectionTitle = NSLocalizedString("Can’t find the rate you’re looking for?",
-                                                                         comment: "Text to prompt the user to edit tax rates in the web")
-        static let fixedBottomPanelBody = NSLocalizedString("Add this rate to all created orders", comment: "Body for the action to store selected tax rate")
-        static let fixedBottomPanelFootnote = NSLocalizedString("This will not affect online orders",
-                                                                comment: "Footnote for the action to store selected tax rate")
+        static let navigationTitle = NSLocalizedString(
+            "newTaxRateSelectorView.navigationTitle",
+            value: "Set Tax Rate",
+            comment: "Navigation title for the tax rate selector")
+        static let cancelButton = NSLocalizedString(
+            "newTaxRateSelectorView.cancelButton",
+            value: "Cancel",
+            comment: "Cancel button title for the tax rate selector")
+        static let infoText = NSLocalizedString(
+            "newTaxRateSelectorView.infoText",
+            value: "This will change the customer’s address to the location of the tax rate you select.",
+            comment: "Explanatory text for the tax rate selector")
+        static let taxRatesSectionTitle = NSLocalizedString(
+            "newTaxRateSelectorView.taxRatesSectionTitle",
+            value: "Select a tax rate",
+            comment: "Title for the tax rate selector section")
+        static let editTaxRatesInWpAdminButtonTitle = NSLocalizedString(
+            "newTaxRateSelectorView.editTaxRatesInWpAdminButtonTitle",
+            value: "Edit tax rates in admin",
+            comment: "Title of the button that prompts the user to edit tax rates in the web")
+        static let emptyStateTitle = NSLocalizedString(
+            "newTaxRateSelectorView.emptyStateTitle",
+            value: "We couldn’t find any tax rates",
+            comment: "Title for the empty state on the Tax Rates selector screen")
+        static let emptyStateDescription = NSLocalizedString(
+            "newTaxRateSelectorView.emptyStateDescription",
+            value: "Add tax rates in admin. Only tax rates with location information will be shown here.",
+            comment: "Description for the empty state on the Tax Rates selector screen")
+        static let listFooterResultsSectionTitle = NSLocalizedString(
+            "newTaxRateSelectorView.listFooterResultsSectionTitle",
+            value: "Can’t find the rate you’re looking for?",
+            comment: "Text to prompt the user to edit tax rates in the web")
+        static let fixedBottomPanelBody = NSLocalizedString(
+            "newTaxRateSelectorView.taxRfixedBottomPanelBodyatesSectionTitle",
+            value: "Add this rate to all created orders",
+            comment: "Body for the action to store selected tax rate")
+        static let fixedBottomPanelFootnote = NSLocalizedString(
+            "newTaxRateSelectorView.fixedBottomPanelFootnote",
+            value: "This will not affect online orders",
+            comment: "Footnote for the action to store selected tax rate")
     }
 }
+
+#Preview {
+    let viewModel = NewTaxRateSelectorViewModel(siteID: 123, onTaxRateSelected: { _ in })
+    let taxEduViewModel = TaxEducationalDialogViewModel(orderTaxLines: [], taxBasedOnSetting: nil)
+
+    NewTaxRateSelectorView(viewModel: viewModel,
+                                  taxEducationalDialogViewModel: taxEduViewModel,
+                                  onDismissWpAdminWebView: { },
+                                  storeSelectedTaxRate: false)
+}

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,13 @@ extension StripeCardReaderService: CardReaderService {`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`paymentCancellable.cancel({ [weak self] error in`
`433`		`- if error == nil {`
	`433`	`+ // If the action could not be canceled,`
	`434`	`+ // e.g. it has already completed, the completion block will be called with an`
	`435`	`+ // error. Otherwise, the completion block will be called with nil.`
	`436`	`+ if let error {`
	`437`	`+ let underlyingError = Self.logAndDecodeError(error)`
	`438`	`+ promise(.failure(CardReaderServiceError.paymentCancellation(underlyingError: underlyingError)))`
	`439`	`+ } else {`
`434`	`440`	`self?.paymentCancellable = nil`
`435`	`441`	`cancelPaymentIntent()`
`436`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {`
`108`	`108`	`DDLogError("Attempting to cancel the payment has failed \(error)")`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ paymentTask?.cancel()`
`111`	`112`	`connectionControllerManager.knownReaderProvider.forgetCardReader()`
`112`	`113`
`113`	`114`	`return await withCheckedContinuation { continuation in`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ extension PointOfSaleAggregateModel {`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`.removeDuplicates()`
`190`		`- .sink { _ in`
	`190`	`+ .sink { [weak self] _ in`
`191`	`191`	`Task { @MainActor [weak self] in`
`192`	`192`	`await self?.collectCardPayment()`
`193`	`193`	`}`