Add clearButton method. Add spacing to icon

Author: iamgabrielma

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalScanningForReader.swift

@@ -7,7 +7,7 @@ final class CardPresentModalScanningForReader: CardPresentPaymentsModalViewModel
     private let cancelAction: () -> Void
 
     let textMode: PaymentsModalTextMode = .reducedBottomInfo
-    let actionsMode: PaymentsModalActionsMode = .secondaryActionAndAuxiliary
+    let actionsMode: PaymentsModalActionsMode = .secondaryActionAndAttributedAuxiliaryButton
 
     let topTitle: String = Localization.title
 

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentPaymentsModalViewModel.swift

@@ -86,8 +86,8 @@ enum PaymentsModalActionsMode {
     /// One secondary action button
     case secondaryOnlyAction
 
-    /// One secondary action button and an auxiliary button
-    case secondaryActionAndAuxiliary
+    /// One secondary action button and an auxiliary button that uses NSAttributedString
+    case secondaryActionAndAttributedAuxiliaryButton
 
     /// Two action buttons
     case twoAction

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift

@@ -158,7 +158,7 @@ private extension CardPresentPaymentsModalViewController {
     }
 
     func styleAuxiliaryButton() {
-        if viewModel.actionsMode != .secondaryActionAndAuxiliary {
+        if viewModel.actionsMode != .secondaryActionAndAttributedAuxiliaryButton {
             auxiliaryButton.applyLinkButtonStyle()
         }
         auxiliaryButton.titleLabel?.minimumScaleFactor = 0.5
@@ -279,20 +279,31 @@ private extension CardPresentPaymentsModalViewController {
     }
 
     func configureAuxiliaryButton() {
+        clearAuxiliaryButton()
+
         guard shouldShowAuxiliaryButton() else {
             auxiliaryButton.isHidden = true
             return
         }
 
         auxiliaryButton.isHidden = false
+        auxiliaryButton.setTitle(viewModel.auxiliaryButtonTitle, for: .normal)
         auxiliaryButton.accessibilityIdentifier = Accessibility.auxiliaryButton
 
-        if viewModel.actionsMode == .secondaryActionAndAuxiliary {
+        if viewModel.actionsMode == .secondaryActionAndAttributedAuxiliaryButton {
             auxiliaryButton.setImage(.infoOutlineImage, for: .normal)
             auxiliaryButton.setAttributedTitle(viewModel.auxiliaryAttributedButtonTitle, for: .normal)
+            auxiliaryButton.distributeTitleAndImage(spacing: 12.0)
         }
     }
 
+    func clearAuxiliaryButton() {
+        auxiliaryButton.setImage(nil, for: .normal)
+        auxiliaryButton.setAttributedTitle(nil, for: .normal)
+        auxiliaryButton.setTitle(nil, for: .normal)
+        auxiliaryButton.accessibilityIdentifier = nil
+    }
+
     func configureSpacer() {
         let enabled = !shouldShowActionButtons()
 
@@ -344,12 +355,12 @@ private extension CardPresentPaymentsModalViewController {
     }
 
     func shouldShowBottomActionButton() -> Bool {
-        [.secondaryOnlyAction, .twoAction, .twoActionAndAuxiliary, .secondaryActionAndAuxiliary]
+        [.secondaryOnlyAction, .twoAction, .twoActionAndAuxiliary, .secondaryActionAndAttributedAuxiliaryButton]
             .contains(viewModel.actionsMode)
     }
 
     func shouldShowAuxiliaryButton() -> Bool {
-        [.twoActionAndAuxiliary, .secondaryActionAndAuxiliary].contains(viewModel.actionsMode)
+        [.twoActionAndAuxiliary, .secondaryActionAndAttributedAuxiliaryButton].contains(viewModel.actionsMode)
     }
 }