[MBL-1210] Update checkout pledge summary table

Kickstarter-iOS/Features/PledgePaymentMethods/Controller/PostCampaignPledgeRewardsSummaryViewController.swift

@@ -109,6 +109,8 @@ final class PostCampaignPledgeRewardsSummaryViewController: UIViewController {
 
     _ = self.separatorView
       |> self.separatorViewStyle
+
+    self.tableViewContainerHeightConstraint?.constant = self.tableView.intrinsicContentSize.height
   }
 
   // MARK: - View model
@@ -125,7 +127,7 @@ final class PostCampaignPledgeRewardsSummaryViewController: UIViewController {
         self.tableView.reloadData()
         self.tableView.setNeedsLayout()
 
-        setEntireViewToIsHidden(false)
+        self.setEntireViewToIsHidden(false)
         self.tableViewContainerHeightConstraint?.constant = self.tableView.intrinsicContentSize.height
       }
 

Kickstarter-iOS/Features/PledgePaymentMethods/Views/Cells/PostCampaignPledgeRewardsSummaryHeaderCell.swift

@@ -55,6 +55,7 @@ final class PostCampaignPledgeRewardsSummaryHeaderCell: UITableViewCell, ValueCe
       .observeForUI()
       .observeValues { [weak self] titleText in
         self?.subtitleLabel.text = titleText
+        self?.subtitleLabel.isHidden = titleText.isEmpty
       }
   }
 

Library/ViewModels/ConfirmDetailsViewModel.swift

@@ -273,14 +273,19 @@ public class ConfirmDetailsViewModel: ConfirmDetailsViewModelType, ConfirmDetail
     )
     .map(PledgeShippingSummaryViewData.init)
 
+    let optionalShippingSummaryData = Signal.merge(
+      project.mapConst(nil),
+      shippingSummaryData.wrapInOptional()
+    )
+
     let bonusOrPledgeUpdatedAmount = self.pledgeAmountDataSignal.map { $0.amount }
 
     self.configurePledgeRewardsSummaryViewWithData = Signal.combineLatest(
       baseReward.map(\.isNoReward).filter(isFalse),
       project,
       rewards,
       selectedQuantities,
-      shippingSummaryData,
+      optionalShippingSummaryData,
       bonusOrPledgeUpdatedAmount,
       pledgeTotalSummaryData
     )
@@ -354,17 +359,26 @@ public class ConfirmDetailsViewModel: ConfirmDetailsViewModelType, ConfirmDetail
       Signal.combineLatest(
         initialData,
         bonusOrPledgeUpdatedAmount,
-        shippingSummaryData,
+        optionalShippingSummaryData,
         pledgeTotal
       )
     )
     .map { checkoutValue, otherData -> PostCampaignCheckoutData in
-      let (initialData, bonus, shipping, pledgeTotal) = otherData
+      let (initialData, bonusOrReward, shipping, pledgeTotal) = otherData
+      var rewards = initialData.rewards
+      var bonus = bonusOrReward
+      if let reward = rewards.first, reward.isNoReward {
+        rewards[0] = reward
+          |> Reward.lens.minimum .~ bonusOrReward
+          |> Reward.lens.title .~ Strings.Pledge_without_a_reward()
+        bonus = 0
+      }
+
       return PostCampaignCheckoutData(
         project: initialData.project,
-        rewards: initialData.rewards,
+        rewards: rewards,
         selectedQuantities: initialData.selectedQuantities,
-        bonusAmount: bonus,
+        bonusAmount: bonus == 0 ? nil : bonus,
         total: pledgeTotal,
         projectCountry: initialData.project.stats.currentCountry ?? initialData.project.country,
         omitCurrencyCode: initialData.project.stats.omitUSCurrencyCode,

Library/ViewModels/PostCampaignCheckoutViewModel.swift

@@ -8,11 +8,11 @@ public struct PostCampaignCheckoutData: Equatable {
   public let project: Project
   public let rewards: [Reward]
   public let selectedQuantities: SelectedRewardQuantities
-  public let bonusAmount: Double
+  public let bonusAmount: Double?
   public let total: Double
   public let projectCountry: Project.Country
   public let omitCurrencyCode: Bool
-  public let shipping: PledgeShippingSummaryViewData
+  public let shipping: PledgeShippingSummaryViewData?
   public let refTag: RefTag?
   public let context: PledgeViewContext
   public let checkoutId: String
@@ -27,7 +27,7 @@ public protocol PostCampaignCheckoutViewModelInputs {
 public protocol PostCampaignCheckoutViewModelOutputs {
   var configurePaymentMethodsViewControllerWithValue: Signal<PledgePaymentMethodsValue, Never> { get }
   var configurePledgeRewardsSummaryViewWithData: Signal<
-    (PostCampaignRewardsSummaryViewData, Double, PledgeSummaryViewData),
+    (PostCampaignRewardsSummaryViewData, Double?, PledgeSummaryViewData),
     Never
   > { get }
   var configurePledgeViewCTAContainerView: Signal<PledgeViewCTAContainerViewData, Never> { get }
@@ -117,7 +117,7 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
   public let configurePaymentMethodsViewControllerWithValue: Signal<PledgePaymentMethodsValue, Never>
   public let configurePledgeRewardsSummaryViewWithData: Signal<(
     PostCampaignRewardsSummaryViewData,
-    Double,
+    Double?,
     PledgeSummaryViewData
   ), Never>
   public let configurePledgeViewCTAContainerView: Signal<PledgeViewCTAContainerViewData, Never>

Library/ViewModels/PostCampaignPledgeRewardsSummaryViewModel.swift

@@ -34,7 +34,7 @@ public struct PostCampaignRewardsSummaryViewData {
   public let selectedQuantities: SelectedRewardQuantities
   public let projectCountry: Project.Country
   public let omitCurrencyCode: Bool
-  public let shipping: PledgeShippingSummaryViewData
+  public let shipping: PledgeShippingSummaryViewData?
 }
 
 public protocol PostCampaignPledgeRewardsSummaryViewModelInputs {
@@ -84,7 +84,6 @@ public final class PostCampaignPledgeRewardsSummaryViewModel: PostCampaignPledge
 
       return Strings.backing_info_estimated_delivery_date(delivery_date: dateString)
     }
-    .skipNil()
 
     let total: Signal<Double, Never> = Signal.combineLatest(
       rewards,
@@ -141,14 +140,14 @@ public final class PostCampaignPledgeRewardsSummaryViewModel: PostCampaignPledge
 private func items(
   with data: PostCampaignRewardsSummaryViewData,
   selectedQuantities: SelectedRewardQuantities,
-  estimatedDeliveryString: String,
+  estimatedDeliveryString: String?,
   bonusAmount: Double?,
   total _: Double
 ) -> [PostCampaignRewardsSummaryItem] {
   // MARK: Header
 
   let headerItem = PostCampaignRewardsSummaryItem.header((
-    text: estimatedDeliveryString,
+    text: estimatedDeliveryString ?? "",
     amount: NSAttributedString(string: "")
   ))
 
@@ -170,20 +169,22 @@ private func items(
       amount: amountAttributedText
     ))
   }
+  var items = [headerItem] + rewardItems
 
   // MARK: Shipping
 
-  let shippingAmountAttributedText = attributedRewardCurrency(
-    with: data.projectCountry, amount: data.shipping.total, omitUSCurrencyCode: data.omitCurrencyCode
-  )
-  // TODO: [MBL-1217])https://kickstarter.atlassian.net/browse/MBL-1217) Update hardcoded string with translations
-  let shippingItem = PostCampaignRewardsSummaryItem.reward((
-    text: "Shipping to \(data.shipping.locationName)",
-    amount: shippingAmountAttributedText
-  ))
+  if let shipping = data.shipping {
+    let shippingAmountAttributedText = attributedRewardCurrency(
+      with: data.projectCountry, amount: shipping.total, omitUSCurrencyCode: data.omitCurrencyCode
+    )
+    // TODO: [MBL-1217])https://kickstarter.atlassian.net/browse/MBL-1217) Update hardcoded string with translations
+    let shippingItem = PostCampaignRewardsSummaryItem.reward((
+      text: "Shipping to \(shipping.locationName)",
+      amount: shippingAmountAttributedText
+    ))
 
-  var items = [headerItem] + rewardItems
-  items.append(shippingItem)
+    items.append(shippingItem)
+  }
 
   // MARK: Bonus