Merge pull request #8333 from woocommerce/task/remove-auxiliarybutton-image

Remove `auxiliaryButtonImage` from `CardPresentModalScanningForReader`

Author: iamgabrielma

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalScanningForReader.swift

@@ -21,8 +21,6 @@ final class CardPresentModalScanningForReader: CardPresentPaymentsModalViewModel
 
     let auxiliaryButtonTitle: String? = nil
 
-    let auxiliaryButtonimage: UIImage? = .infoOutlineImage
-
     var auxiliaryAttributedButtonTitle: NSAttributedString? {
         let result = NSMutableAttributedString(
             string: .localizedStringWithFormat(

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentPaymentsModalViewModel.swift

@@ -32,9 +32,6 @@ protocol CardPresentPaymentsModalViewModel {
     /// Provides a title as a NSAttributedString for an auxiliary button
     var auxiliaryAttributedButtonTitle: NSAttributedString? { get }
 
-    /// Provides an image for the auxiliary button
-    var auxiliaryButtonimage: UIImage? { get }
-
     /// The title in the bottom section of the modal. Right below the image
     var bottomTitle: String? { get }
 
@@ -109,10 +106,6 @@ extension CardPresentPaymentsModalViewModel {
         get { return nil }
     }
 
-    var auxiliaryButtonimage: UIImage? {
-        get { return nil }
-    }
-
     var showLoadingIndicator: Bool {
         get { return false }
     }

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift

@@ -318,12 +318,10 @@ private extension CardPresentPaymentsModalViewController {
         UIView.performWithoutAnimation {
             auxiliaryButton.setTitle(viewModel.auxiliaryButtonTitle, for: .normal)
             auxiliaryButton.setAttributedTitle(viewModel.auxiliaryAttributedButtonTitle, for: .normal)
-            auxiliaryButton.setImage(viewModel.auxiliaryButtonimage, for: .normal)
-            if viewModel.auxiliaryButtonimage != nil {
-                var config = UIButton.Configuration.plain()
-                config.imagePadding = Constants.buttonTitleAndImageSpacing
-                auxiliaryButton.configuration = config
-            }
+            var config = UIButton.Configuration.plain()
+            config.contentInsets = Constants.auxiliaryButtonInsets
+            config.titleAlignment = .leading
+            auxiliaryButton.configuration = config
             view.layoutIfNeeded()
         }
     }
@@ -418,7 +416,7 @@ private extension CardPresentPaymentsModalViewController {
         static let extraInfoCustomInsets = UIEdgeInsets(top: 12, left: 10, bottom: 12, right: 10)
         static let modalHeight: CGFloat = 382
         static let modalWidth: CGFloat = 280
-        static let buttonTitleAndImageSpacing: CGFloat = 8
+        static let auxiliaryButtonInsets = NSDirectionalEdgeInsets(top: 8, leading: 8, bottom: 8, trailing: 8)
     }
 }