Change logic when setting auxiliary content

Rather than checking the viewModel’s actionsMode to populate the modal, we directly set the values from the viewModel, regardless if these are populated or not.

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 = .secondaryActionAndAttributedAuxiliaryButton
+    let actionsMode: PaymentsModalActionsMode = .secondaryActionAndAuxiliaryButton
 
     let topTitle: String = Localization.title
 
@@ -21,6 +21,8 @@ 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

@@ -30,6 +30,9 @@ 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 }
 
@@ -86,8 +89,8 @@ enum PaymentsModalActionsMode {
     /// One secondary action button
     case secondaryOnlyAction
 
-    /// One secondary action button and an auxiliary button that uses NSAttributedString
-    case secondaryActionAndAttributedAuxiliaryButton
+    /// One secondary action button and an auxiliary button
+    case secondaryActionAndAuxiliaryButton
 
     /// Two action buttons
     case twoAction
@@ -103,4 +106,8 @@ extension CardPresentPaymentsModalViewModel {
     var auxiliaryAttributedButtonTitle: NSAttributedString? {
         get { return nil }
     }
+
+    var auxiliaryButtonimage: UIImage? {
+        get { return nil }
+    }
 }

WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift

@@ -158,7 +158,7 @@ private extension CardPresentPaymentsModalViewController {
     }
 
     func styleAuxiliaryButton() {
-        if viewModel.actionsMode != .secondaryActionAndAttributedAuxiliaryButton {
+        if viewModel.actionsMode != .secondaryActionAndAuxiliaryButton {
             auxiliaryButton.applyLinkButtonStyle()
         }
         auxiliaryButton.titleLabel?.minimumScaleFactor = 0.5
@@ -279,31 +279,26 @@ private extension CardPresentPaymentsModalViewController {
     }
 
     func configureAuxiliaryButton() {
-        clearAuxiliaryButton()
 
         guard shouldShowAuxiliaryButton() else {
             auxiliaryButton.isHidden = true
             return
         }
 
         auxiliaryButton.isHidden = false
-        auxiliaryButton.setTitleWithoutAnimation(viewModel.auxiliaryButtonTitle, for: .normal)
         auxiliaryButton.accessibilityIdentifier = Accessibility.auxiliaryButton
-
-        if viewModel.actionsMode == .secondaryActionAndAttributedAuxiliaryButton {
-            auxiliaryButton.setImage(.infoOutlineImage, for: .normal)
+        // Prevents UI flicker when loading different content
+        UIView.performWithoutAnimation {
+            auxiliaryButton.setTitle(viewModel.auxiliaryButtonTitle, for: .normal)
             auxiliaryButton.setAttributedTitle(viewModel.auxiliaryAttributedButtonTitle, for: .normal)
-            auxiliaryButton.distributeTitleAndImage(spacing: 12.0)
+            auxiliaryButton.setImage(viewModel.auxiliaryButtonimage, for: .normal)
+            if viewModel.auxiliaryButtonimage != nil {
+                auxiliaryButton.distributeTitleAndImage(spacing: 8.0)
+            }
+            view.layoutIfNeeded()
         }
     }
 
-    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()
 
@@ -355,12 +350,12 @@ private extension CardPresentPaymentsModalViewController {
     }
 
     func shouldShowBottomActionButton() -> Bool {
-        [.secondaryOnlyAction, .twoAction, .twoActionAndAuxiliary, .secondaryActionAndAttributedAuxiliaryButton]
+        [.secondaryOnlyAction, .twoAction, .twoActionAndAuxiliary, .secondaryActionAndAuxiliaryButton]
             .contains(viewModel.actionsMode)
     }
 
     func shouldShowAuxiliaryButton() -> Bool {
-        [.twoActionAndAuxiliary, .secondaryActionAndAttributedAuxiliaryButton].contains(viewModel.actionsMode)
+        [.twoActionAndAuxiliary, .secondaryActionAndAuxiliaryButton].contains(viewModel.actionsMode)
     }
 }