[MBL-1682] Late Pledge UI ScrollView Not Scrolling (#2149)

* make sure the rootstack view has proper constraints * update snapshots
kickstarter · Sep 6, 2024 · 8677f52 · 8677f52
1 parent 0b0c46b
commit 8677f52
Show file tree

Hide file tree

Showing 22 changed files with 9 additions and 4 deletions.
diff --git a/...er-iOS/Features/PledgeView/Controllers/NoShippingPostCampaignCheckoutViewController.swift b/...er-iOS/Features/PledgeView/Controllers/NoShippingPostCampaignCheckoutViewController.swift
@@ -120,18 +120,18 @@ final class NoShippingPostCampaignCheckoutViewController: UIViewController,
     self.view.addSubview(self.rootScrollView)
     self.view.addSubview(self.pledgeCTAContainerView)
 
-    self.rootScrollView.addSubview(self.rootStackView)
+    _ = (self.rootStackView, self.rootScrollView)
+      |> ksr_addSubviewToParent()
+      |> ksr_constrainViewToEdgesInParent()
 
-    // Configure root stack view.
     self.rootStackView.addArrangedSubview(self.rootInsetStackView)
 
-    // Configure inset views.
     let arrangedInsetSubviews = [
       self.titleLabel,
       self.paymentMethodsViewController.view,
       self.pledgeDisclaimerView
     ]
-    .flatMap { $0 }
+    .compactMap { $0 }
     .compact()
 
     arrangedInsetSubviews.forEach { view in
@@ -184,6 +184,11 @@ final class NoShippingPostCampaignCheckoutViewController: UIViewController,
 
     self.rootStackView.axis = NSLayoutConstraint.Axis.vertical
     self.rootStackView.spacing = Styles.grid(1)
+    self.rootStackView.isLayoutMarginsRelativeArrangement = true
+    self.rootStackView.layoutMargins = UIEdgeInsets(
+      topBottom: ConfirmDetailsLayout.Margin.topBottom,
+      leftRight: 0
+    )
 
     rootInsetStackViewStyle(self.rootInsetStackView)
     rootInsetStackViewStyle(self.estimatedShippingStackView)

diff --git a/...tCampaignViewControllerTests/testView_HasAddOns.lang_de_device_phone4_7inch.png b/...tCampaignViewControllerTests/testView_HasAddOns.lang_de_device_phone4_7inch.png
diff --git a/...ippingPostCampaignViewControllerTests/testView_HasAddOns.lang_en_device_pad.png b/...ippingPostCampaignViewControllerTests/testView_HasAddOns.lang_en_device_pad.png
diff --git a/...tCampaignViewControllerTests/testView_HasAddOns.lang_es_device_phone4_7inch.png b/...tCampaignViewControllerTests/testView_HasAddOns.lang_es_device_phone4_7inch.png
diff --git a/...ippingPostCampaignViewControllerTests/testView_HasAddOns.lang_fr_device_pad.png b/...ippingPostCampaignViewControllerTests/testView_HasAddOns.lang_fr_device_pad.png
diff --git a/...tCampaignViewControllerTests/testView_HasAddOns.lang_ja_device_phone4_7inch.png b/...tCampaignViewControllerTests/testView_HasAddOns.lang_ja_device_phone4_7inch.png
diff --git a/...View_PledgeContext_FixPaymentMethod_ErroredCard.lang_en_device_phone4_7inch.png b/...View_PledgeContext_FixPaymentMethod_ErroredCard.lang_en_device_phone4_7inch.png
diff --git a/...sts/testView_PledgeContext_UnavailableStoredCards.lang_de_device_phone4inch.png b/...sts/testView_PledgeContext_UnavailableStoredCards.lang_de_device_phone4inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone4_7inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone4_7inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone5_5inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone5_5inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone5_8inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone5_8inch.png
diff --git a/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_pad.png b/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_pad.png
diff --git a/...rollerTests/testView_ShowsEstimatedShippingView.lang_de_device_phone4_7inch.png b/...rollerTests/testView_ShowsEstimatedShippingView.lang_de_device_phone4_7inch.png
diff --git a/...nViewControllerTests/testView_ShowsEstimatedShippingView.lang_en_device_pad.png b/...nViewControllerTests/testView_ShowsEstimatedShippingView.lang_en_device_pad.png
diff --git a/...rollerTests/testView_ShowsEstimatedShippingView.lang_es_device_phone4_7inch.png b/...rollerTests/testView_ShowsEstimatedShippingView.lang_es_device_phone4_7inch.png
diff --git a/...nViewControllerTests/testView_ShowsEstimatedShippingView.lang_fr_device_pad.png b/...nViewControllerTests/testView_ShowsEstimatedShippingView.lang_fr_device_pad.png
diff --git a/...rollerTests/testView_ShowsEstimatedShippingView.lang_ja_device_phone4_7inch.png b/...rollerTests/testView_ShowsEstimatedShippingView.lang_ja_device_phone4_7inch.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_de_device_phone4_7inch.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_de_device_phone4_7inch.png
diff --git a/...ControllerTests/testView_ShowsShippingSummaryViewSection.lang_en_device_pad.png b/...ControllerTests/testView_ShowsShippingSummaryViewSection.lang_en_device_pad.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_es_device_phone4_7inch.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_es_device_phone4_7inch.png
diff --git a/...ControllerTests/testView_ShowsShippingSummaryViewSection.lang_fr_device_pad.png b/...ControllerTests/testView_ShowsShippingSummaryViewSection.lang_fr_device_pad.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_ja_device_phone4_7inch.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_ja_device_phone4_7inch.png