[MBL-1714] "Estimated Shipping" Showing When There's No Estimated Shi…

…pping (#2151)

* remove .skipNil() so that "estimated shipping stackview is hidden" output can complete

* also updates helper functions so that they return String? instead of String

* fix snapshots

Kickstarter-iOS/Features/PledgeView/Controllers/NoShippingPledgeViewController.swift

@@ -274,9 +274,10 @@ final class NoShippingPledgeViewController: UIViewController,
 
     self.viewModel.outputs.configureEstimatedShippingView
       .observeForUI()
-      .observeValues { [weak self] strings in
-        let (estimatedShippingText, estimatedConversionText) = strings
-        self?.configureEstimatedShippingView(estimatedShippingText, estimatedConversionText)
+      .observeValues { [weak self] estimatedShippingText, estimatedConversionText in
+        guard let shippingText = estimatedShippingText else { return }
+
+        self?.configureEstimatedShippingView(shippingText, estimatedConversionText)
       }
 
     self.viewModel.outputs.estimatedShippingViewHidden
@@ -434,10 +435,10 @@ final class NoShippingPledgeViewController: UIViewController,
     self.pledgeDisclaimerView.configure(with: ("icon-not-a-store", attributedText))
   }
 
-  private func configureEstimatedShippingView(_ estimatedCost: String, _ aboutConversion: String) {
+  private func configureEstimatedShippingView(_ estimatedCost: String, _ aboutConversion: String?) {
     let estimatedShippingView = EstimatedShippingCheckoutView(
       estimatedCost: estimatedCost,
-      aboutConversion: aboutConversion
+      aboutConversion: aboutConversion ?? ""
     )
 
     self.estimatedShippingViewContainer.rootView = estimatedShippingView

Kickstarter-iOS/Features/PledgeView/Controllers/NoShippingPostCampaignCheckoutViewController.swift

@@ -240,9 +240,10 @@ final class NoShippingPostCampaignCheckoutViewController: UIViewController,
 
     self.viewModel.outputs.configureEstimatedShippingView
       .observeForUI()
-      .observeValues { [weak self] strings in
-        let (estimatedShippingText, estimatedConversionText) = strings
-        self?.configureEstimatedShippingView(estimatedShippingText, estimatedConversionText)
+      .observeValues { [weak self] estimatedShippingText, estimatedConversionText in
+        guard let shippingText = estimatedShippingText else { return }
+
+        self?.configureEstimatedShippingView(shippingText, estimatedConversionText)
       }
 
     self.viewModel.outputs.showWebHelp
@@ -341,10 +342,10 @@ final class NoShippingPostCampaignCheckoutViewController: UIViewController,
       }
   }
 
-  private func configureEstimatedShippingView(_ estimatedCost: String, _ aboutConversion: String) {
+  private func configureEstimatedShippingView(_ estimatedCost: String, _ aboutConversion: String?) {
     let estimatedShippingView = EstimatedShippingCheckoutView(
       estimatedCost: estimatedCost,
-      aboutConversion: aboutConversion
+      aboutConversion: aboutConversion ?? ""
     )
 
     self.estimatedShippingViewContainer.rootView = estimatedShippingView

Kickstarter-iOS/Features/RewardAddOnSelection/Views/RewardAddOnCardView.swift

@@ -212,7 +212,6 @@ public final class RewardAddOnCardView: UIView {
     self.includedItemsStackView.rac.hidden = self.viewModel.outputs.includedItemsStackViewHidden
     self.includedItemsLabel.rac.attributedText = self.viewModel.outputs.includedItemsLabelAttributedText
     self.estimatedShippingStackView.rac.hidden = self.viewModel.outputs.estimatedShippingStackViewHidden
-    self.estimatedShippingLabel.rac.text = self.viewModel.outputs.estimatedShippingLabelText
     self.amountLabel.rac.attributedText = self.viewModel.outputs.amountLabelAttributedText
     self.pillsView.rac.hidden = self.viewModel.outputs.pillsViewHidden
     self.quantityLabel.rac.text = self.viewModel.outputs.quantityLabelText
@@ -243,6 +242,14 @@ public final class RewardAddOnCardView: UIView {
     self.viewModel.outputs.generateNotificationWarningFeedback
       .observeForUI()
       .observeValues { generateNotificationWarningFeedback() }
+
+    self.viewModel.outputs.estimatedShippingLabelText
+      .observeForUI()
+      .observeValues { [weak self] text in
+        guard let labelText = text else { return }
+
+        self?.estimatedShippingLabel.text = labelText
+      }
   }
 
   // MARK: - Private Helpers

Kickstarter-iOS/Features/RewardsCollection/Views/RewardCardView.swift

@@ -140,9 +140,8 @@ public final class RewardCardView: UIView {
       |> baseRewardLabelStyle
       |> sectionTitleLabelStyle
 
-    // TODO: Translate string
     _ = self.estimatedShippingTitleLabel
-      |> \.text %~ { _ in "Estimated Shipping" }
+      |> \.text .~ Strings.Estimated_Shipping()
       |> \.textColor .~ UIColor.ksr_support_400
 
     _ = self.estimatedShippingLabel
@@ -199,7 +198,6 @@ public final class RewardCardView: UIView {
     self.minimumPriceConversionLabel.rac.text = self.viewModel.outputs.conversionLabelText
     self.descriptionLabel.rac.text = self.viewModel.outputs.descriptionLabelText
     self.estimatedShippingStackView.rac.hidden = self.viewModel.outputs.estimatedShippingStackViewHidden
-    self.estimatedShippingLabel.rac.text = self.viewModel.outputs.estimatedShippingLabelText
     self.estimatedDeliveryStackView.rac.hidden = self.viewModel.outputs.estimatedDeliveryStackViewHidden
     self.estimatedDeliveryDateLabel.rac.text = self.viewModel.outputs.estimatedDeliveryDateLabelText
     self.rewardLocationStackView.rac.hidden = self.viewModel.outputs.rewardLocationStackViewHidden
@@ -234,6 +232,14 @@ public final class RewardCardView: UIView {
       .observeValues { [weak self] values in
         self?.configurePillsView(values)
       }
+
+    self.viewModel.outputs.estimatedShippingLabelText
+      .observeForUI()
+      .observeValues { [weak self] text in
+        guard let labelText = text else { return }
+
+        self?.estimatedShippingLabel.text = labelText
+      }
   }
 
   // MARK: - Private Helpers

Library/SharedFunctions.swift

@@ -665,13 +665,13 @@ public func estimatedShippingText(
   for rewards: [Reward],
   project: Project,
   selectedShippingRule: ShippingRule
-) -> String {
+) -> String? {
   let (estimatedMin, estimatedMax) = estimatedMinMax(
     from: rewards,
     selectedShippingRule: selectedShippingRule
   )
 
-  guard estimatedMin > 0, estimatedMax > 0 else { return "" }
+  guard estimatedMin > 0, estimatedMax > 0 else { return nil }
 
   let currentCountry = project.stats.currentCountry ?? Project.Country.us
 
@@ -700,15 +700,15 @@ public func estimatedShippingConversionText(
   for rewards: [Reward],
   project: Project,
   selectedShippingRule: ShippingRule
-) -> String {
-  guard project.stats.needsConversion else { return "" }
+) -> String? {
+  guard project.stats.needsConversion else { return nil }
 
   let (estimatedMin, estimatedMax) = estimatedMinMax(
     from: rewards,
     selectedShippingRule: selectedShippingRule
   )
 
-  guard estimatedMin > 0, estimatedMax > 0 else { return "" }
+  guard estimatedMin > 0, estimatedMax > 0 else { return nil }
 
   let convertedMin = estimatedMin * Double(project.stats.currentCurrencyRate ?? project.stats.staticUsdRate)
   let convertedMax = estimatedMax * Double(project.stats.currentCurrencyRate ?? project.stats.staticUsdRate)

Library/ViewModels/NoShippingPledgeViewModel.swift

@@ -42,7 +42,7 @@ public protocol NoShippingPledgeViewModelInputs {
 
 public protocol NoShippingPledgeViewModelOutputs {
   var beginSCAFlowWithClientSecret: Signal<String, Never> { get }
-  var configureEstimatedShippingView: Signal<(String, String), Never> { get }
+  var configureEstimatedShippingView: Signal<(String?, String?), Never> { get }
   var configureLocalPickupViewWithData: Signal<PledgeLocalPickupViewData, Never> { get }
   var configurePaymentMethodsViewControllerWithValue: Signal<PledgePaymentMethodsValue, Never> { get }
   var configurePledgeAmountViewWithData: Signal<PledgeAmountViewConfigData, Never> { get }
@@ -315,7 +315,7 @@ public class NoShippingPledgeViewModel: NoShippingPledgeViewModelType, NoShippin
 
     self.configureEstimatedShippingView = Signal.combineLatest(project, rewards, selectedShippingRule)
       .map { project, rewards, shippingRule in
-        guard let rule = shippingRule else { return ("", "") }
+        guard let rule = shippingRule else { return (nil, nil) }
 
         return (
           estimatedShippingText(for: rewards, project: project, selectedShippingRule: rule),
@@ -326,7 +326,7 @@ public class NoShippingPledgeViewModel: NoShippingPledgeViewModelType, NoShippin
     self.estimatedShippingViewHidden = Signal.combineLatest(self.configureEstimatedShippingView, baseReward)
       .map { estimatedShippingStrings, reward in
         let (estimatedShipping, _) = estimatedShippingStrings
-        return reward.shipping.enabled == false || estimatedShipping.isEmpty
+        return reward.shipping.enabled == false || estimatedShipping == nil
       }
 
     // MARK: - Apple Pay
@@ -1014,7 +1014,7 @@ public class NoShippingPledgeViewModel: NoShippingPledgeViewModelType, NoShippin
   // MARK: - Outputs
 
   public let beginSCAFlowWithClientSecret: Signal<String, Never>
-  public let configureEstimatedShippingView: Signal<(String, String), Never>
+  public let configureEstimatedShippingView: Signal<(String?, String?), Never>
   public let configureLocalPickupViewWithData: Signal<PledgeLocalPickupViewData, Never>
   public let configurePaymentMethodsViewControllerWithValue: Signal<PledgePaymentMethodsValue, Never>
   public let configurePledgeAmountViewWithData: Signal<PledgeAmountViewConfigData, Never>

Library/ViewModels/NoShippingPostCampaignCheckoutViewModel.swift

@@ -20,7 +20,7 @@ public protocol NoShippingPostCampaignCheckoutViewModelInputs {
 }
 
 public protocol NoShippingPostCampaignCheckoutViewModelOutputs {
-  var configureEstimatedShippingView: Signal<(String, String), Never> { get }
+  var configureEstimatedShippingView: Signal<(String?, String?), Never> { get }
   var configurePaymentMethodsViewControllerWithValue: Signal<PledgePaymentMethodsValue, Never> { get }
   var configurePledgeRewardsSummaryViewWithData: Signal<
     (PostCampaignRewardsSummaryViewData, Double?, PledgeSummaryViewData),
@@ -111,7 +111,7 @@ public class NoShippingPostCampaignCheckoutViewModel: NoShippingPostCampaignChec
 
     self.configureEstimatedShippingView = Signal.combineLatest(project, rewards, selectedShippingRule)
       .map { project, rewards, shippingRule in
-        guard let rule = shippingRule else { return ("", "") }
+        guard let rule = shippingRule else { return (nil, nil) }
 
         return (
           estimatedShippingText(for: rewards, project: project, selectedShippingRule: rule),
@@ -122,7 +122,7 @@ public class NoShippingPostCampaignCheckoutViewModel: NoShippingPostCampaignChec
     self.estimatedShippingViewHidden = Signal.combineLatest(self.configureEstimatedShippingView, baseReward)
       .map { estimatedShippingStrings, reward in
         let (estimatedShipping, _) = estimatedShippingStrings
-        return reward?.shipping.enabled == false || estimatedShipping.isEmpty
+        return reward?.shipping.enabled == false || estimatedShipping == nil
       }
 
     // MARK: Validate Checkout Details On Submit
@@ -512,7 +512,7 @@ public class NoShippingPostCampaignCheckoutViewModel: NoShippingPostCampaignChec
 
   // MARK: - Outputs
 
-  public let configureEstimatedShippingView: Signal<(String, String), Never>
+  public let configureEstimatedShippingView: Signal<(String?, String?), Never>
   public let configurePaymentMethodsViewControllerWithValue: Signal<PledgePaymentMethodsValue, Never>
   public let configurePledgeRewardsSummaryViewWithData: Signal<(
     PostCampaignRewardsSummaryViewData,

Library/ViewModels/RewardAddOnCardViewModel.swift

@@ -28,7 +28,7 @@ public protocol RewardAddOnCardViewModelOutputs {
   var generateNotificationWarningFeedback: Signal<Void, Never> { get }
   var includedItemsLabelAttributedText: Signal<NSAttributedString, Never> { get }
   var includedItemsStackViewHidden: Signal<Bool, Never> { get }
-  var estimatedShippingLabelText: Signal<String, Never> { get }
+  var estimatedShippingLabelText: Signal<String?, Never> { get }
   var estimatedShippingStackViewHidden: Signal<Bool, Never> { get }
   var notifiyDelegateDidSelectQuantity: Signal<(SelectedRewardQuantity, SelectedRewardId), Never> { get }
   var pillsViewHidden: Signal<Bool, Never> { get }
@@ -57,7 +57,7 @@ public final class RewardAddOnCardViewModel: RewardAddOnCardViewModelType, Rewar
     let project: Signal<Project, Never> = configData.map(\.project)
     let reward: Signal<Reward, Never> = configData.map(\.reward)
     let selectedQuantities: Signal<SelectedRewardQuantities, Never> = configData.map(\.selectedQuantities)
-    let shippingRule: Signal<ShippingRule, Never> = configData.map(\.shippingRule).skipNil()
+    let shippingRule: Signal<ShippingRule?, Never> = configData.map(\.shippingRule)
 
     let projectAndReward = Signal.zip(project, reward)
     let projectRewardShippingRule = configData.map {
@@ -105,12 +105,14 @@ public final class RewardAddOnCardViewModel: RewardAddOnCardViewModelType, Rewar
 
     self.estimatedShippingLabelText = Signal.combineLatest(reward, project, shippingRule)
       .map { reward, project, shippingRule in
-        estimatedShippingText(for: [reward], project: project, selectedShippingRule: shippingRule)
+        guard let shipping = shippingRule else { return nil }
+
+        return estimatedShippingText(for: [reward], project: project, selectedShippingRule: shipping)
       }
 
     self.estimatedShippingStackViewHidden = Signal.combineLatest(reward, self.estimatedShippingLabelText)
       .map { reward, text in
-        reward.shipping.enabled == false || text.isEmpty
+        reward.shipping.enabled == false || text == nil
       }
 
     self.reloadPills = projectAndReward.map(pillValues(project:reward:))
@@ -200,7 +202,7 @@ public final class RewardAddOnCardViewModel: RewardAddOnCardViewModelType, Rewar
   public let generateNotificationWarningFeedback: Signal<Void, Never>
   public let includedItemsLabelAttributedText: Signal<NSAttributedString, Never>
   public let includedItemsStackViewHidden: Signal<Bool, Never>
-  public let estimatedShippingLabelText: Signal<String, Never>
+  public let estimatedShippingLabelText: Signal<String?, Never>
   public let estimatedShippingStackViewHidden: Signal<Bool, Never>
   public let notifiyDelegateDidSelectQuantity: Signal<(SelectedRewardQuantity, SelectedRewardId), Never>
   public let pillsViewHidden: Signal<Bool, Never>

Library/ViewModels/RewardCardViewModel.swift

@@ -34,7 +34,7 @@ public protocol RewardCardViewModelOutputs {
   var estimatedShippingStackViewHidden: Signal<Bool, Never> { get }
   var estimatedDeliveryStackViewHidden: Signal<Bool, Never> { get }
   var estimatedDeliveryDateLabelText: Signal<String, Never> { get }
-  var estimatedShippingLabelText: Signal<String, Never> { get }
+  var estimatedShippingLabelText: Signal<String?, Never> { get }
   var includedItemsStackViewHidden: Signal<Bool, Never> { get }
   var items: Signal<[String], Never> { get }
   var pillCollectionViewHidden: Signal<Bool, Never> { get }
@@ -62,7 +62,7 @@ public final class RewardCardViewModel: RewardCardViewModelType, RewardCardViewM
 
     let project: Signal<Project, Never> = configData.map(\.project)
     let reward: Signal<Reward, Never> = configData.map(\.reward)
-    let currentShippingRule: Signal<ShippingRule, Never> = configData.map(\.currentShippingRule).skipNil()
+    let currentShippingRule: Signal<ShippingRule?, Never> = configData.map(\.currentShippingRule)
 
     let projectAndReward = Signal.zip(project, reward)
 
@@ -130,16 +130,21 @@ public final class RewardCardViewModel: RewardCardViewModelType, RewardCardViewM
 
     self.estimatedShippingLabelText = Signal.combineLatest(reward, project, currentShippingRule)
       .map { reward, project, shippingRule in
-        estimatedShippingText(for: [reward], project: project, selectedShippingRule: shippingRule)
+        guard let shipping = shippingRule else { return nil }
+
+        return estimatedShippingText(for: [reward], project: project, selectedShippingRule: shipping)
       }
 
     self.estimatedDeliveryDateLabelText = reward.map(estimatedDeliveryDateText(with:)).skipNil()
     self.rewardLocationPickupLabelText = reward.map { $0.localPickup?.displayableName }.skipNil()
 
-    self.estimatedShippingStackViewHidden = Signal.combineLatest(reward, self.estimatedShippingLabelText)
-      .map { reward, text in
-        reward.shipping.enabled == false || text.isEmpty
-      }
+    self.estimatedShippingStackViewHidden = Signal.combineLatest(
+      reward,
+      self.estimatedShippingLabelText.signal
+    )
+    .map { reward, text in
+      reward.shipping.enabled == false || text == nil
+    }
   }
 
   private let configDataProperty = MutableProperty<RewardCardViewData?>(nil)
@@ -159,7 +164,7 @@ public final class RewardCardViewModel: RewardCardViewModelType, RewardCardViewM
   public let estimatedShippingStackViewHidden: Signal<Bool, Never>
   public let estimatedDeliveryStackViewHidden: Signal<Bool, Never>
   public let estimatedDeliveryDateLabelText: Signal<String, Never>
-  public let estimatedShippingLabelText: Signal<String, Never>
+  public let estimatedShippingLabelText: Signal<String?, Never>
   public let items: Signal<[String], Never>
   public let includedItemsStackViewHidden: Signal<Bool, Never>
   public let pillCollectionViewHidden: Signal<Bool, Never>