Merge branch 'trunk' into feat/5983-usecase-unit-tests

Author: jaclync

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -481,13 +481,7 @@ private extension StripeCardReaderService {
 // MARK: - Refunds
 extension StripeCardReaderService {
     public func refundPayment(parameters: RefundParameters) -> AnyPublisher<String, Error> {
-        if isChipCardInserted {
-            sendReaderEvent(CardReaderEvent.make(displayMessage: .removeCard))
-        }
-        return waitForInsertedCardToBeRemoved()
-            .flatMap {
-                self.createRefundParameters(parameters: parameters)
-            }
+        return createRefundParameters(parameters: parameters)
             .flatMap { refundParameters in
                 self.refund(refundParameters)
             }

Networking/Networking/Remote/OrderStatsRemoteV4.swift

@@ -21,14 +21,10 @@ public final class OrderStatsRemoteV4: Remote {
                                completion: @escaping (Result<OrderStatsV4, Error>) -> Void) {
         let dateFormatter = DateFormatter.Defaults.iso8601WithoutTimeZone
 
-        // Workaround for #1183: random number between 31-100 for `num_page` param.
-        // Replace `randomQuantity` with `quantity` in `num_page` param when API issue is fixed.
-        let randomQuantity = arc4random_uniform(70) + 31
-
         let parameters = [ParameterKeys.interval: unit.rawValue,
                           ParameterKeys.after: dateFormatter.string(from: earliestDateToInclude),
                           ParameterKeys.before: dateFormatter.string(from: latestDateToInclude),
-                          ParameterKeys.quantity: String(randomQuantity)]
+                          ParameterKeys.quantity: String(quantity)]
 
         let request = JetpackRequest(wooApiVersion: .wcAnalytics, method: .get, siteID: siteID, path: Constants.orderStatsPath, parameters: parameters)
         let mapper = OrderStatsV4Mapper(siteID: siteID, granularity: unit)

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 - [*] Share payment links from the order details screen. [https://github.com/woocommerce/woocommerce-ios/pull/6609]
 - [internal] Reviews lists on Products and Menu tabs are refactored to avoid duplicated code. Please quickly smoke test them to make sure that everything still works as before. [https://github.com/woocommerce/woocommerce-ios/pull/6553]
 - [**] Now it's possible to change the order of the product images. [https://github.com/woocommerce/woocommerce-ios/pull/6620]
+- [*] Improved accessibility for the error banner and info banner displayed in Orders and Products. [https://github.com/woocommerce/woocommerce-ios/pull/6633]
 
 8.9
 -----

WooCommerce/Classes/Extensions/UIView+SafeAreaConstraints.swift

@@ -3,56 +3,32 @@ import UIKit
 extension UIView {
     var safeLeadingAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
         get {
-            if #available(iOS 11.0, *) {
-                return self.safeAreaLayoutGuide.leadingAnchor
-            } else {
-                return self.leadingAnchor
-            }
+            safeAreaLayoutGuide.leadingAnchor
         }
     }
     var safeTrailingAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
         get {
-            if #available(iOS 11.0, *) {
-                return self.safeAreaLayoutGuide.trailingAnchor
-            } else {
-                return self.trailingAnchor
-            }
+            safeAreaLayoutGuide.trailingAnchor
         }
     }
     var safeLeftAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
         get {
-            if #available(iOS 11.0, *) {
-                return self.safeAreaLayoutGuide.leftAnchor
-            } else {
-                return self.leftAnchor
-            }
+            safeAreaLayoutGuide.leftAnchor
         }
     }
     var safeRightAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
         get {
-            if #available(iOS 11.0, *) {
-                return self.safeAreaLayoutGuide.rightAnchor
-            } else {
-                return self.rightAnchor
-            }
+            safeAreaLayoutGuide.rightAnchor
         }
     }
     var safeTopAnchor: NSLayoutAnchor<NSLayoutYAxisAnchor> {
         get {
-            if #available(iOS 11.0, *) {
-                return self.safeAreaLayoutGuide.topAnchor
-            } else {
-                return self.topAnchor
-            }
+            safeAreaLayoutGuide.topAnchor
         }
     }
     var safeBottomAnchor: NSLayoutAnchor<NSLayoutYAxisAnchor> {
         get {
-            if #available(iOS 11.0, *) {
-                return self.safeAreaLayoutGuide.bottomAnchor
-            } else {
-                return self.bottomAnchor
-            }
+            safeAreaLayoutGuide.bottomAnchor
         }
     }
 }

WooCommerce/Classes/Extensions/UIViewController+Helpers.swift

@@ -30,6 +30,7 @@ extension UIViewController {
         }
         else {
             navigationItem.leftBarButtonItem = UIBarButtonItem(image: .closeButton, style: .plain, target: target, action: action)
+            navigationItem.leftBarButtonItem?.accessibilityLabel = Localization.close
         }
     }
 
@@ -45,3 +46,10 @@ private extension UIViewController {
         dismiss(animated: true, completion: nil)
     }
 }
+
+// MARK: Constants
+private extension UIViewController {
+    enum Localization {
+        static let close = NSLocalizedString("Close", comment: "Accessibility label for the close button")
+    }
+}

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenu.swift

@@ -178,6 +178,7 @@ struct HubMenu: View {
                             }
                         }
                     }
+                    .accessibilityLabel(Localization.settings)
                     .accessibilityIdentifier("dashboard-settings-button")
                     Spacer()
                 }
@@ -206,6 +207,7 @@ struct HubMenu: View {
     private enum Localization {
         static let switchStore = NSLocalizedString("Switch store",
                                                    comment: "Switch store option in the hub menu")
+        static let settings = NSLocalizedString("Settings", comment: "Settings button in the hub menu")
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/Order Creation/PaymentSection/OrderPaymentSection.swift

@@ -78,7 +78,7 @@ struct OrderPaymentSection: View {
                 shouldShowFeeLineDetails = true
             }
         } else {
-            Button(Localization.addFees) {
+            Button(Localization.addFee) {
                 shouldShowFeeLineDetails = true
             }
             .buttonStyle(PlusButtonStyle())
@@ -95,7 +95,7 @@ private extension OrderPaymentSection {
         static let orderTotal = NSLocalizedString("Order Total", comment: "Label for the the row showing the total cost of the order")
         static let addShipping = NSLocalizedString("Add Shipping", comment: "Title text of the button that adds shipping line when creating a new order")
         static let shippingTotal = NSLocalizedString("Shipping", comment: "Label for the row showing the cost of shipping in the order")
-        static let addFees = NSLocalizedString("Add Fees", comment: "Title text of the button that adds fees when creating a new order")
+        static let addFee = NSLocalizedString("Add Fee", comment: "Title text of the button that adds a fee when creating a new order")
         static let feesTotal = NSLocalizedString("Fees", comment: "Label for the row showing the cost of fees in the order")
         static let taxesTotal = NSLocalizedString("Taxes", comment: "Label for the row showing the taxes in the order")
     }

WooCommerce/Classes/ViewRelated/Orders/Order Creation/PaymentSection/ShippingLineDetailsViewModel.swift

@@ -21,7 +21,7 @@ class ShippingLineDetailsViewModel: ObservableObject {
 
     /// Placeholder for amount text field
     ///
-    let amountPlaceholder: String
+    let amountPlaceholder: String = "0"
 
     /// Stores the amount entered by the merchant.
     ///
@@ -36,7 +36,7 @@ class ShippingLineDetailsViewModel: ObservableObject {
     ///
     @Published var methodTitle: String
 
-    private let initialAmount: Decimal
+    private let initialAmount: Decimal?
     private let initialMethodTitle: String
 
     /// Returns true when existing shipping line is edited.
@@ -52,7 +52,7 @@ class ShippingLineDetailsViewModel: ObservableObject {
     /// Returns true when there are no valid pending changes.
     ///
     var shouldDisableDoneButton: Bool {
-        guard let amountDecimal = priceFieldFormatter.amountDecimal, amountDecimal != .zero else {
+        guard let amountDecimal = priceFieldFormatter.amountDecimal else {
             return true
         }
 
@@ -71,7 +71,6 @@ class ShippingLineDetailsViewModel: ObservableObject {
         self.priceFieldFormatter = .init(locale: locale, storeCurrencySettings: storeCurrencySettings, allowNegativeNumber: true)
         self.currencySymbol = storeCurrencySettings.symbol(from: storeCurrencySettings.currencyCode)
         self.currencyPosition = storeCurrencySettings.currencyPosition
-        self.amountPlaceholder = priceFieldFormatter.formatAmount("0")
 
         self.isExistingShippingLine = isExistingShippingLine
         self.initialMethodTitle = initialMethodTitle
@@ -81,10 +80,10 @@ class ShippingLineDetailsViewModel: ObservableObject {
         if let initialAmount = currencyFormatter.convertToDecimal(from: shippingTotal) {
             self.initialAmount = initialAmount as Decimal
         } else {
-            self.initialAmount = .zero
+            self.initialAmount = nil
         }
 
-        if initialAmount != .zero, let formattedInputAmount = currencyFormatter.formatAmount(initialAmount) {
+        if let initialAmount = initialAmount, let formattedInputAmount = currencyFormatter.formatAmount(initialAmount) {
             self.amount = priceFieldFormatter.formatAmount(formattedInputAmount)
         }
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/Edit Tags/ProductTagsViewController.swift

@@ -131,6 +131,7 @@ private extension ProductTagsViewController {
         textView.autocorrectionType = .yes
         textView.autocapitalizationType = .none
         textView.font = .body
+        textView.adjustsFontForContentSizeCategory = true
         textView.textColor = .text
         textView.isScrollEnabled = false
         // Padding already provided by readable margins

WooCommerce/Classes/ViewRelated/Products/Edit Product/Reviews/ProductReviewsViewController.swift

@@ -9,7 +9,7 @@ final class ProductReviewsViewController: UIViewController, GhostableViewControl
     private let viewModel: ProductReviewsViewModel
 
     lazy var ghostTableViewController = GhostTableViewController(options: GhostTableViewOptions(cellClass: ProductReviewTableViewCell.self,
-                                                                                                estimatedRowHeight: DefaultReviewsDataSource
+                                                                                                estimatedRowHeight: ReviewsDataSource
                                                                                                                     .Settings
                                                                                                                     .estimatedRowHeight))
 
@@ -61,7 +61,7 @@ final class ProductReviewsViewController: UIViewController, GhostableViewControl
     init(product: Product) {
         self.product = product
         viewModel = ProductReviewsViewModel(siteID: product.siteID,
-                                            data: DefaultReviewsDataSource(siteID: product.siteID,
+                                            data: ReviewsDataSource(siteID: product.siteID,
                                                                            customizer: ProductReviewsDataSourceCustomizer(product: product)))
         super.init(nibName: type(of: self).nibName, bundle: nil)
     }