[MBL-1599] Adds the Shipping Dropdown Selector to the Rewards Carouse…

…l. (#2095) * WIP: populate shipping countries using the project's rewards * No longer using individually passed in Rewards * update PledgeShippingLocationViewModelTests * add PledgeShippingLocationViewController to Rewards screen * update snapshots + clean up * snapshot test updates * new orthogonals * formatting clean up
kickstarter · Jul 16, 2024 · e495aca · e495aca
1 parent 864066d
commit e495aca
Show file tree

Hide file tree

Showing 281 changed files with 431 additions and 76 deletions.
diff --git a/Kickstarter-iOS/Features/PledgeView/Controllers/PledgeViewControllerTests.swift b/Kickstarter-iOS/Features/PledgeView/Controllers/PledgeViewControllerTests.swift
@@ -32,7 +32,7 @@ final class PledgeViewControllerTests: TestCase {
     let project = Project.template
       |> \.availableCardTypes .~ [CreditCardType.discover.rawValue]
 
-    combos(Language.allLanguages, Device.allCases).forEach { language, device in
+    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService, currentUser: User.template, language: language) {
         let controller = PledgeViewController.instantiate()
 
@@ -112,7 +112,7 @@ final class PledgeViewControllerTests: TestCase {
   func testView_PledgeContext_NeedsConversion_IsFalse() {
     let response = UserEnvelope<GraphUser>(me: self.userWithCards)
     let mockService = MockService(fetchGraphUserResult: .success(response))
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(apiService: mockService, currentUser: currentUser, language: language) {
           let controller = PledgeViewController.instantiate()
@@ -164,7 +164,7 @@ final class PledgeViewControllerTests: TestCase {
       |> Project.lens.stats.currentCurrency .~ Project.Country.gb.currencyCode
       |> Project.lens.stats.currentCurrencyRate .~ .some(2.0)
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(apiService: mockService, currentUser: currentUser, language: language) {
           let controller = PledgeViewController.instantiate()
@@ -395,7 +395,7 @@ final class PledgeViewControllerTests: TestCase {
           |> Backing.lens.amount .~ 700.0
       )
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach { language, device in
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach { language, device in
       withEnvironment(apiService: mockService, currentUser: .template, language: language) {
         let controller = PledgeViewController.instantiate()
         let data = PledgeViewData(
@@ -444,7 +444,7 @@ final class PledgeViewControllerTests: TestCase {
     let response = UserEnvelope<GraphUser>(me: self.userWithCards)
     let mockService = MockService(fetchGraphUserResult: .success(response))
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach { language, device in
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach { language, device in
       withEnvironment(apiService: mockService, currentUser: .template, language: language) {
         let controller = PledgeViewController.instantiate()
         let data = PledgeViewData(
@@ -487,7 +487,7 @@ final class PledgeViewControllerTests: TestCase {
 
     let reward = Reward.template
 
-    combos(Language.allLanguages, Device.allCases).forEach { language, device in
+    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService, currentUser: User.template, language: language) {
         let controller = PledgeViewController.instantiate()
         let data = PledgeViewData(
@@ -518,7 +518,7 @@ final class PledgeViewControllerTests: TestCase {
     let reward = Reward.template
       |> (Reward.lens.shipping .. Reward.Shipping.lens.enabled) .~ true
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()
@@ -554,7 +554,7 @@ final class PledgeViewControllerTests: TestCase {
     let reward = Reward.template
       |> (Reward.lens.shipping .. Reward.Shipping.lens.enabled) .~ true
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()
@@ -592,7 +592,7 @@ final class PledgeViewControllerTests: TestCase {
       |> (Reward.lens.shipping .. Reward.Shipping.lens.preference) .~ .local
       |> Reward.lens.localPickup .~ Location.losAngeles
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()
@@ -645,7 +645,7 @@ final class PledgeViewControllerTests: TestCase {
       context: .pledge
     )
 
-    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()

diff --git a/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_de_device_pad.png b/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_de_device_pad.png
diff --git a/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch.png b/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch.png
diff --git a/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_en_device_pad.png b/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_en_device_pad.png
diff --git a/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch.png b/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch.png
diff --git a/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_es_device_pad.png b/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_es_device_pad.png
diff --git a/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch.png b/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch.png
diff --git a/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_fr_device_pad.png b/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_fr_device_pad.png
diff --git a/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch.png b/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch.png
diff --git a/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_ja_device_pad.png b/...tView_ChangePaymentMethodContext_NeedsConversion_IsFalse.lang_ja_device_pad.png
diff --git a/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch.png b/...ngePaymentMethodContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch.png
diff --git a/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_de_device_pad.png b/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_de_device_pad.png
diff --git a/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch.png b/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch.png
diff --git a/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_en_device_pad.png b/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_en_device_pad.png
diff --git a/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch.png b/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch.png
diff --git a/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_es_device_pad.png b/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_es_device_pad.png
diff --git a/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch.png b/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch.png
diff --git a/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_fr_device_pad.png b/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_fr_device_pad.png
diff --git a/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch.png b/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch.png
diff --git a/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_ja_device_pad.png b/...stView_ChangePaymentMethodContext_NeedsConversion_IsTrue.lang_ja_device_pad.png
diff --git a/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch.png b/...angePaymentMethodContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch.png
diff --git a/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_de_device_pad.png b/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_de_device_pad.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone4_7inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone4_7inch.png
diff --git a/...ChangePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone4inch.png b/...ChangePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone4inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone5_5inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone5_5inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone5_8inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_de_device_phone5_8inch.png
diff --git a/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_en_device_pad.png b/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_en_device_pad.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone4_7inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone4_7inch.png
diff --git a/...ChangePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone4inch.png b/...ChangePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone4inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone5_5inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone5_5inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone5_8inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_en_device_phone5_8inch.png
diff --git a/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_es_device_pad.png b/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_es_device_pad.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone4_7inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone4_7inch.png
diff --git a/...ChangePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone4inch.png b/...ChangePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone4inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone5_5inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone5_5inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone5_8inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_es_device_phone5_8inch.png
diff --git a/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_fr_device_pad.png b/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_fr_device_pad.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone4_7inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone4_7inch.png
diff --git a/...ChangePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone4inch.png b/...ChangePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone4inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone5_5inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone5_5inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone5_8inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_fr_device_phone5_8inch.png
diff --git a/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_ja_device_pad.png b/...stView_ChangePaymentMethodContext_UnavailableStoredCards.lang_ja_device_pad.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone4_7inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone4_7inch.png
diff --git a/...ChangePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone4inch.png b/...ChangePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone4inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone5_5inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone5_5inch.png
diff --git a/...angePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone5_8inch.png b/...angePaymentMethodContext_UnavailableStoredCards.lang_ja_device_phone5_8inch.png
diff --git a/...rollerTests/testView_HasAddOns_ShippingSelected.lang_de_device_pad_LoggedIn.png b/...rollerTests/testView_HasAddOns_ShippingSelected.lang_de_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_HasAddOns_ShippingSelected.lang_de_device_pad_LoggedOut.png b/...ollerTests/testView_HasAddOns_ShippingSelected.lang_de_device_pad_LoggedOut.png
diff --git a/...ts/testView_HasAddOns_ShippingSelected.lang_de_device_phone4_7inch_LoggedIn.png b/...ts/testView_HasAddOns_ShippingSelected.lang_de_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_HasAddOns_ShippingSelected.lang_de_device_phone4_7inch_LoggedOut.png b/...s/testView_HasAddOns_ShippingSelected.lang_de_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_HasAddOns_ShippingSelected.lang_en_device_pad_LoggedIn.png b/...rollerTests/testView_HasAddOns_ShippingSelected.lang_en_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_HasAddOns_ShippingSelected.lang_en_device_pad_LoggedOut.png b/...ollerTests/testView_HasAddOns_ShippingSelected.lang_en_device_pad_LoggedOut.png
diff --git a/...ts/testView_HasAddOns_ShippingSelected.lang_en_device_phone4_7inch_LoggedIn.png b/...ts/testView_HasAddOns_ShippingSelected.lang_en_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_HasAddOns_ShippingSelected.lang_en_device_phone4_7inch_LoggedOut.png b/...s/testView_HasAddOns_ShippingSelected.lang_en_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_HasAddOns_ShippingSelected.lang_es_device_pad_LoggedIn.png b/...rollerTests/testView_HasAddOns_ShippingSelected.lang_es_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_HasAddOns_ShippingSelected.lang_es_device_pad_LoggedOut.png b/...ollerTests/testView_HasAddOns_ShippingSelected.lang_es_device_pad_LoggedOut.png
diff --git a/...ts/testView_HasAddOns_ShippingSelected.lang_es_device_phone4_7inch_LoggedIn.png b/...ts/testView_HasAddOns_ShippingSelected.lang_es_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_HasAddOns_ShippingSelected.lang_es_device_phone4_7inch_LoggedOut.png b/...s/testView_HasAddOns_ShippingSelected.lang_es_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_HasAddOns_ShippingSelected.lang_fr_device_pad_LoggedIn.png b/...rollerTests/testView_HasAddOns_ShippingSelected.lang_fr_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_HasAddOns_ShippingSelected.lang_fr_device_pad_LoggedOut.png b/...ollerTests/testView_HasAddOns_ShippingSelected.lang_fr_device_pad_LoggedOut.png
diff --git a/...ts/testView_HasAddOns_ShippingSelected.lang_fr_device_phone4_7inch_LoggedIn.png b/...ts/testView_HasAddOns_ShippingSelected.lang_fr_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_HasAddOns_ShippingSelected.lang_fr_device_phone4_7inch_LoggedOut.png b/...s/testView_HasAddOns_ShippingSelected.lang_fr_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_HasAddOns_ShippingSelected.lang_ja_device_pad_LoggedIn.png b/...rollerTests/testView_HasAddOns_ShippingSelected.lang_ja_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_HasAddOns_ShippingSelected.lang_ja_device_pad_LoggedOut.png b/...ollerTests/testView_HasAddOns_ShippingSelected.lang_ja_device_pad_LoggedOut.png
diff --git a/...ts/testView_HasAddOns_ShippingSelected.lang_ja_device_phone4_7inch_LoggedIn.png b/...ts/testView_HasAddOns_ShippingSelected.lang_ja_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_HasAddOns_ShippingSelected.lang_ja_device_phone4_7inch_LoggedOut.png b/...s/testView_HasAddOns_ShippingSelected.lang_ja_device_phone4_7inch_LoggedOut.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/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_de_device_pad_LoggedIn.png b/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_de_device_pad_LoggedIn.png
diff --git a/...testView_PledgeContext_NeedsConversion_IsFalse.lang_de_device_pad_LoggedOut.png b/...testView_PledgeContext_NeedsConversion_IsFalse.lang_de_device_pad_LoggedOut.png
diff --git a/..._PledgeContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch_LoggedIn.png b/..._PledgeContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch_LoggedIn.png
diff --git a/...PledgeContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch_LoggedOut.png b/...PledgeContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch_LoggedOut.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_en_device_pad_LoggedIn.png b/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_en_device_pad_LoggedIn.png
diff --git a/...testView_PledgeContext_NeedsConversion_IsFalse.lang_en_device_pad_LoggedOut.png b/...testView_PledgeContext_NeedsConversion_IsFalse.lang_en_device_pad_LoggedOut.png
diff --git a/..._PledgeContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch_LoggedIn.png b/..._PledgeContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch_LoggedIn.png
diff --git a/...PledgeContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch_LoggedOut.png b/...PledgeContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch_LoggedOut.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_es_device_pad_LoggedIn.png b/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_es_device_pad_LoggedIn.png
diff --git a/...testView_PledgeContext_NeedsConversion_IsFalse.lang_es_device_pad_LoggedOut.png b/...testView_PledgeContext_NeedsConversion_IsFalse.lang_es_device_pad_LoggedOut.png
diff --git a/..._PledgeContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch_LoggedIn.png b/..._PledgeContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch_LoggedIn.png
diff --git a/...PledgeContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch_LoggedOut.png b/...PledgeContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch_LoggedOut.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_fr_device_pad_LoggedIn.png b/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_fr_device_pad_LoggedIn.png
diff --git a/...testView_PledgeContext_NeedsConversion_IsFalse.lang_fr_device_pad_LoggedOut.png b/...testView_PledgeContext_NeedsConversion_IsFalse.lang_fr_device_pad_LoggedOut.png
diff --git a/..._PledgeContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch_LoggedIn.png b/..._PledgeContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch_LoggedIn.png
diff --git a/...PledgeContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch_LoggedOut.png b/...PledgeContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch_LoggedOut.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_ja_device_pad_LoggedIn.png b/.../testView_PledgeContext_NeedsConversion_IsFalse.lang_ja_device_pad_LoggedIn.png
diff --git a/...testView_PledgeContext_NeedsConversion_IsFalse.lang_ja_device_pad_LoggedOut.png b/...testView_PledgeContext_NeedsConversion_IsFalse.lang_ja_device_pad_LoggedOut.png
diff --git a/..._PledgeContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch_LoggedIn.png b/..._PledgeContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch_LoggedIn.png
diff --git a/...PledgeContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch_LoggedOut.png b/...PledgeContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch_LoggedOut.png
diff --git a/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_de_device_pad_LoggedIn.png b/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_de_device_pad_LoggedIn.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_de_device_pad_LoggedOut.png b/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_de_device_pad_LoggedOut.png
diff --git a/...w_PledgeContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch_LoggedIn.png b/...w_PledgeContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch_LoggedIn.png
diff --git a/..._PledgeContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch_LoggedOut.png b/..._PledgeContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch_LoggedOut.png
diff --git a/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_en_device_pad_LoggedIn.png b/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_en_device_pad_LoggedIn.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_en_device_pad_LoggedOut.png b/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_en_device_pad_LoggedOut.png
diff --git a/...w_PledgeContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch_LoggedIn.png b/...w_PledgeContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch_LoggedIn.png
diff --git a/..._PledgeContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch_LoggedOut.png b/..._PledgeContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch_LoggedOut.png
diff --git a/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_es_device_pad_LoggedIn.png b/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_es_device_pad_LoggedIn.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_es_device_pad_LoggedOut.png b/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_es_device_pad_LoggedOut.png
diff --git a/...w_PledgeContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch_LoggedIn.png b/...w_PledgeContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch_LoggedIn.png
diff --git a/..._PledgeContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch_LoggedOut.png b/..._PledgeContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch_LoggedOut.png
diff --git a/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_fr_device_pad_LoggedIn.png b/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_fr_device_pad_LoggedIn.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_fr_device_pad_LoggedOut.png b/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_fr_device_pad_LoggedOut.png
diff --git a/...w_PledgeContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch_LoggedIn.png b/...w_PledgeContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch_LoggedIn.png
diff --git a/..._PledgeContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch_LoggedOut.png b/..._PledgeContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch_LoggedOut.png
diff --git a/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_ja_device_pad_LoggedIn.png b/...s/testView_PledgeContext_NeedsConversion_IsTrue.lang_ja_device_pad_LoggedIn.png
diff --git a/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_ja_device_pad_LoggedOut.png b/.../testView_PledgeContext_NeedsConversion_IsTrue.lang_ja_device_pad_LoggedOut.png
diff --git a/...w_PledgeContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch_LoggedIn.png b/...w_PledgeContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch_LoggedIn.png
diff --git a/..._PledgeContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch_LoggedOut.png b/..._PledgeContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch_LoggedOut.png
diff --git a/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_de_device_pad.png b/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_de_device_pad.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_de_device_phone4_7inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_de_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_de_device_phone5_5inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_de_device_phone5_5inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_de_device_phone5_8inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_de_device_phone5_8inch.png
diff --git a/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_en_device_pad.png b/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_en_device_pad.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/...sts/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone4inch.png b/...sts/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone4inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone5_5inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone5_5inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone5_8inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_en_device_phone5_8inch.png
diff --git a/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_es_device_pad.png b/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_es_device_pad.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone4_7inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone4_7inch.png
diff --git a/...sts/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone4inch.png b/...sts/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone4inch.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_es_device_phone5_8inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_es_device_phone5_8inch.png
diff --git a/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_pad.png b/...ollerTests/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_pad.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone4_7inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone4_7inch.png
diff --git a/...sts/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone4inch.png b/...sts/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone4inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_fr_device_phone5_5inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_fr_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/...s/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone4_7inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone4_7inch.png
diff --git a/...sts/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone4inch.png b/...sts/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone4inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone5_5inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone5_5inch.png
diff --git a/...s/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone5_8inch.png b/...s/testView_PledgeContext_UnavailableStoredCards.lang_ja_device_phone5_8inch.png
diff --git a/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_pad.png b/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_pad.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone4_7inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone4_7inch.png
diff --git a/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone4inch.png b/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone4inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone5_5inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone5_5inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone5_8inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_de_device_phone5_8inch.png
diff --git a/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_pad.png b/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_pad.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone4_7inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone4_7inch.png
diff --git a/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone4inch.png b/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone4inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone5_5inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone5_5inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone5_8inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_en_device_phone5_8inch.png
diff --git a/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_pad.png b/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_pad.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone4_7inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone4_7inch.png
diff --git a/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone4inch.png b/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone4inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone5_5inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone5_5inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone5_8inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_es_device_phone5_8inch.png
diff --git a/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_pad.png b/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_pad.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone4_7inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone4_7inch.png
diff --git a/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone4inch.png b/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone4inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone5_5inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone5_5inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone5_8inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_fr_device_phone5_8inch.png
diff --git a/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_pad.png b/...vailableStoredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_pad.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone4_7inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone4_7inch.png
diff --git a/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone4inch.png b/...eStoredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone4inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone5_5inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone5_5inch.png
diff --git a/...toredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone5_8inch.png b/...toredCards_OptimizelyExperiementVariant1Enabled.lang_ja_device_phone5_8inch.png
diff --git a/...rollerTests/testView_ShowsRewardLocationSection.lang_de_device_pad_LoggedIn.png b/...rollerTests/testView_ShowsRewardLocationSection.lang_de_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_ShowsRewardLocationSection.lang_de_device_pad_LoggedOut.png b/...ollerTests/testView_ShowsRewardLocationSection.lang_de_device_pad_LoggedOut.png
diff --git a/...ts/testView_ShowsRewardLocationSection.lang_de_device_phone4_7inch_LoggedIn.png b/...ts/testView_ShowsRewardLocationSection.lang_de_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_ShowsRewardLocationSection.lang_de_device_phone4_7inch_LoggedOut.png b/...s/testView_ShowsRewardLocationSection.lang_de_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_ShowsRewardLocationSection.lang_en_device_pad_LoggedIn.png b/...rollerTests/testView_ShowsRewardLocationSection.lang_en_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_ShowsRewardLocationSection.lang_en_device_pad_LoggedOut.png b/...ollerTests/testView_ShowsRewardLocationSection.lang_en_device_pad_LoggedOut.png
diff --git a/...ts/testView_ShowsRewardLocationSection.lang_en_device_phone4_7inch_LoggedIn.png b/...ts/testView_ShowsRewardLocationSection.lang_en_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_ShowsRewardLocationSection.lang_en_device_phone4_7inch_LoggedOut.png b/...s/testView_ShowsRewardLocationSection.lang_en_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_ShowsRewardLocationSection.lang_es_device_pad_LoggedIn.png b/...rollerTests/testView_ShowsRewardLocationSection.lang_es_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_ShowsRewardLocationSection.lang_es_device_pad_LoggedOut.png b/...ollerTests/testView_ShowsRewardLocationSection.lang_es_device_pad_LoggedOut.png
diff --git a/...ts/testView_ShowsRewardLocationSection.lang_es_device_phone4_7inch_LoggedIn.png b/...ts/testView_ShowsRewardLocationSection.lang_es_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_ShowsRewardLocationSection.lang_es_device_phone4_7inch_LoggedOut.png b/...s/testView_ShowsRewardLocationSection.lang_es_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_ShowsRewardLocationSection.lang_fr_device_pad_LoggedIn.png b/...rollerTests/testView_ShowsRewardLocationSection.lang_fr_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_ShowsRewardLocationSection.lang_fr_device_pad_LoggedOut.png b/...ollerTests/testView_ShowsRewardLocationSection.lang_fr_device_pad_LoggedOut.png
diff --git a/...ts/testView_ShowsRewardLocationSection.lang_fr_device_phone4_7inch_LoggedIn.png b/...ts/testView_ShowsRewardLocationSection.lang_fr_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_ShowsRewardLocationSection.lang_fr_device_phone4_7inch_LoggedOut.png b/...s/testView_ShowsRewardLocationSection.lang_fr_device_phone4_7inch_LoggedOut.png
diff --git a/...rollerTests/testView_ShowsRewardLocationSection.lang_ja_device_pad_LoggedIn.png b/...rollerTests/testView_ShowsRewardLocationSection.lang_ja_device_pad_LoggedIn.png
diff --git a/...ollerTests/testView_ShowsRewardLocationSection.lang_ja_device_pad_LoggedOut.png b/...ollerTests/testView_ShowsRewardLocationSection.lang_ja_device_pad_LoggedOut.png
diff --git a/...ts/testView_ShowsRewardLocationSection.lang_ja_device_phone4_7inch_LoggedIn.png b/...ts/testView_ShowsRewardLocationSection.lang_ja_device_phone4_7inch_LoggedIn.png
diff --git a/...s/testView_ShowsRewardLocationSection.lang_ja_device_phone4_7inch_LoggedOut.png b/...s/testView_ShowsRewardLocationSection.lang_ja_device_phone4_7inch_LoggedOut.png
diff --git a/...llerTests/testView_ShowsShippingLocationSection.lang_de_device_pad_LoggedIn.png b/...llerTests/testView_ShowsShippingLocationSection.lang_de_device_pad_LoggedIn.png
diff --git a/...lerTests/testView_ShowsShippingLocationSection.lang_de_device_pad_LoggedOut.png b/...lerTests/testView_ShowsShippingLocationSection.lang_de_device_pad_LoggedOut.png
diff --git a/.../testView_ShowsShippingLocationSection.lang_de_device_phone4_7inch_LoggedIn.png b/.../testView_ShowsShippingLocationSection.lang_de_device_phone4_7inch_LoggedIn.png
diff --git a/...testView_ShowsShippingLocationSection.lang_de_device_phone4_7inch_LoggedOut.png b/...testView_ShowsShippingLocationSection.lang_de_device_phone4_7inch_LoggedOut.png
diff --git a/...llerTests/testView_ShowsShippingLocationSection.lang_en_device_pad_LoggedIn.png b/...llerTests/testView_ShowsShippingLocationSection.lang_en_device_pad_LoggedIn.png
diff --git a/...lerTests/testView_ShowsShippingLocationSection.lang_en_device_pad_LoggedOut.png b/...lerTests/testView_ShowsShippingLocationSection.lang_en_device_pad_LoggedOut.png
diff --git a/.../testView_ShowsShippingLocationSection.lang_en_device_phone4_7inch_LoggedIn.png b/.../testView_ShowsShippingLocationSection.lang_en_device_phone4_7inch_LoggedIn.png
diff --git a/...testView_ShowsShippingLocationSection.lang_en_device_phone4_7inch_LoggedOut.png b/...testView_ShowsShippingLocationSection.lang_en_device_phone4_7inch_LoggedOut.png
diff --git a/...llerTests/testView_ShowsShippingLocationSection.lang_es_device_pad_LoggedIn.png b/...llerTests/testView_ShowsShippingLocationSection.lang_es_device_pad_LoggedIn.png
diff --git a/...lerTests/testView_ShowsShippingLocationSection.lang_es_device_pad_LoggedOut.png b/...lerTests/testView_ShowsShippingLocationSection.lang_es_device_pad_LoggedOut.png
diff --git a/.../testView_ShowsShippingLocationSection.lang_es_device_phone4_7inch_LoggedIn.png b/.../testView_ShowsShippingLocationSection.lang_es_device_phone4_7inch_LoggedIn.png
diff --git a/...testView_ShowsShippingLocationSection.lang_es_device_phone4_7inch_LoggedOut.png b/...testView_ShowsShippingLocationSection.lang_es_device_phone4_7inch_LoggedOut.png
diff --git a/...llerTests/testView_ShowsShippingLocationSection.lang_fr_device_pad_LoggedIn.png b/...llerTests/testView_ShowsShippingLocationSection.lang_fr_device_pad_LoggedIn.png
diff --git a/...lerTests/testView_ShowsShippingLocationSection.lang_fr_device_pad_LoggedOut.png b/...lerTests/testView_ShowsShippingLocationSection.lang_fr_device_pad_LoggedOut.png
diff --git a/.../testView_ShowsShippingLocationSection.lang_fr_device_phone4_7inch_LoggedIn.png b/.../testView_ShowsShippingLocationSection.lang_fr_device_phone4_7inch_LoggedIn.png
diff --git a/...testView_ShowsShippingLocationSection.lang_fr_device_phone4_7inch_LoggedOut.png b/...testView_ShowsShippingLocationSection.lang_fr_device_phone4_7inch_LoggedOut.png
diff --git a/...llerTests/testView_ShowsShippingLocationSection.lang_ja_device_pad_LoggedIn.png b/...llerTests/testView_ShowsShippingLocationSection.lang_ja_device_pad_LoggedIn.png
diff --git a/...lerTests/testView_ShowsShippingLocationSection.lang_ja_device_pad_LoggedOut.png b/...lerTests/testView_ShowsShippingLocationSection.lang_ja_device_pad_LoggedOut.png
diff --git a/.../testView_ShowsShippingLocationSection.lang_ja_device_phone4_7inch_LoggedIn.png b/.../testView_ShowsShippingLocationSection.lang_ja_device_phone4_7inch_LoggedIn.png
diff --git a/...testView_ShowsShippingLocationSection.lang_ja_device_phone4_7inch_LoggedOut.png b/...testView_ShowsShippingLocationSection.lang_ja_device_phone4_7inch_LoggedOut.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_de_device_pad_LoggedIn.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_de_device_pad_LoggedIn.png
diff --git a/...Tests/testView_ShowsShippingSummaryViewSection.lang_de_device_pad_LoggedOut.png b/...Tests/testView_ShowsShippingSummaryViewSection.lang_de_device_pad_LoggedOut.png
diff --git a/...stView_ShowsShippingSummaryViewSection.lang_de_device_phone4_7inch_LoggedIn.png b/...stView_ShowsShippingSummaryViewSection.lang_de_device_phone4_7inch_LoggedIn.png
diff --git a/...tView_ShowsShippingSummaryViewSection.lang_de_device_phone4_7inch_LoggedOut.png b/...tView_ShowsShippingSummaryViewSection.lang_de_device_phone4_7inch_LoggedOut.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_en_device_pad_LoggedIn.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_en_device_pad_LoggedIn.png
diff --git a/...Tests/testView_ShowsShippingSummaryViewSection.lang_en_device_pad_LoggedOut.png b/...Tests/testView_ShowsShippingSummaryViewSection.lang_en_device_pad_LoggedOut.png
diff --git a/...stView_ShowsShippingSummaryViewSection.lang_en_device_phone4_7inch_LoggedIn.png b/...stView_ShowsShippingSummaryViewSection.lang_en_device_phone4_7inch_LoggedIn.png
diff --git a/...tView_ShowsShippingSummaryViewSection.lang_en_device_phone4_7inch_LoggedOut.png b/...tView_ShowsShippingSummaryViewSection.lang_en_device_phone4_7inch_LoggedOut.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_es_device_pad_LoggedIn.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_es_device_pad_LoggedIn.png
diff --git a/...Tests/testView_ShowsShippingSummaryViewSection.lang_es_device_pad_LoggedOut.png b/...Tests/testView_ShowsShippingSummaryViewSection.lang_es_device_pad_LoggedOut.png
diff --git a/...stView_ShowsShippingSummaryViewSection.lang_es_device_phone4_7inch_LoggedIn.png b/...stView_ShowsShippingSummaryViewSection.lang_es_device_phone4_7inch_LoggedIn.png
diff --git a/...tView_ShowsShippingSummaryViewSection.lang_es_device_phone4_7inch_LoggedOut.png b/...tView_ShowsShippingSummaryViewSection.lang_es_device_phone4_7inch_LoggedOut.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_fr_device_pad_LoggedIn.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_fr_device_pad_LoggedIn.png
diff --git a/...Tests/testView_ShowsShippingSummaryViewSection.lang_fr_device_pad_LoggedOut.png b/...Tests/testView_ShowsShippingSummaryViewSection.lang_fr_device_pad_LoggedOut.png
diff --git a/...stView_ShowsShippingSummaryViewSection.lang_fr_device_phone4_7inch_LoggedIn.png b/...stView_ShowsShippingSummaryViewSection.lang_fr_device_phone4_7inch_LoggedIn.png
diff --git a/...tView_ShowsShippingSummaryViewSection.lang_fr_device_phone4_7inch_LoggedOut.png b/...tView_ShowsShippingSummaryViewSection.lang_fr_device_phone4_7inch_LoggedOut.png
diff --git a/...rTests/testView_ShowsShippingSummaryViewSection.lang_ja_device_pad_LoggedIn.png b/...rTests/testView_ShowsShippingSummaryViewSection.lang_ja_device_pad_LoggedIn.png
diff --git a/...Tests/testView_ShowsShippingSummaryViewSection.lang_ja_device_pad_LoggedOut.png b/...Tests/testView_ShowsShippingSummaryViewSection.lang_ja_device_pad_LoggedOut.png
diff --git a/...stView_ShowsShippingSummaryViewSection.lang_ja_device_phone4_7inch_LoggedIn.png b/...stView_ShowsShippingSummaryViewSection.lang_ja_device_phone4_7inch_LoggedIn.png
diff --git a/...tView_ShowsShippingSummaryViewSection.lang_ja_device_phone4_7inch_LoggedOut.png b/...tView_ShowsShippingSummaryViewSection.lang_ja_device_phone4_7inch_LoggedOut.png
diff --git a/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_de_device_pad.png b/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_de_device_pad.png
diff --git a/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch.png b/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_de_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_en_device_pad.png b/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_en_device_pad.png
diff --git a/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch.png b/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_en_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_es_device_pad.png b/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_es_device_pad.png
diff --git a/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch.png b/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_es_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_fr_device_pad.png b/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_fr_device_pad.png
diff --git a/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch.png b/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_fr_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_ja_device_pad.png b/...llerTests/testView_UpdateContext_NeedsConversion_IsFalse.lang_ja_device_pad.png
diff --git a/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch.png b/.../testView_UpdateContext_NeedsConversion_IsFalse.lang_ja_device_phone4_7inch.png
diff --git a/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_de_device_pad.png b/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_de_device_pad.png
diff --git a/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_de_device_phone4_7inch.png b/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_de_device_phone4_7inch.png
diff --git a/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_en_device_pad.png b/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_en_device_pad.png
diff --git a/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_en_device_phone4_7inch.png b/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_en_device_phone4_7inch.png
diff --git a/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_es_device_pad.png b/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_es_device_pad.png
diff --git a/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_es_device_phone4_7inch.png b/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_es_device_phone4_7inch.png
diff --git a/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_fr_device_pad.png b/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_fr_device_pad.png
diff --git a/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_fr_device_phone4_7inch.png b/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_fr_device_phone4_7inch.png
diff --git a/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_ja_device_pad.png b/...dsConversion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_ja_device_pad.png
diff --git a/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_ja_device_phone4_7inch.png b/...ion_IsFalse_OptimizelyExperimentVariant1Enabled.lang_ja_device_phone4_7inch.png
diff --git a/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_de_device_pad.png b/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_de_device_pad.png
diff --git a/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch.png b/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_de_device_phone4_7inch.png
diff --git a/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_en_device_pad.png b/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_en_device_pad.png
diff --git a/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch.png b/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_en_device_phone4_7inch.png
diff --git a/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_es_device_pad.png b/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_es_device_pad.png
diff --git a/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch.png b/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_es_device_phone4_7inch.png
diff --git a/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_fr_device_pad.png b/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_fr_device_pad.png
diff --git a/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch.png b/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_fr_device_phone4_7inch.png
diff --git a/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_ja_device_pad.png b/...ollerTests/testView_UpdateContext_NeedsConversion_IsTrue.lang_ja_device_pad.png
diff --git a/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch.png b/...s/testView_UpdateContext_NeedsConversion_IsTrue.lang_ja_device_phone4_7inch.png
diff --git a/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_de_device_pad.png b/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_de_device_pad.png
diff --git a/...ests/testView_UpdateContext_withConversionLabel.lang_de_device_phone4_7inch.png b/...ests/testView_UpdateContext_withConversionLabel.lang_de_device_phone4_7inch.png
diff --git a/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_en_device_pad.png b/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_en_device_pad.png
diff --git a/...ests/testView_UpdateContext_withConversionLabel.lang_en_device_phone4_7inch.png b/...ests/testView_UpdateContext_withConversionLabel.lang_en_device_phone4_7inch.png
diff --git a/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_es_device_pad.png b/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_es_device_pad.png
diff --git a/...ests/testView_UpdateContext_withConversionLabel.lang_es_device_phone4_7inch.png b/...ests/testView_UpdateContext_withConversionLabel.lang_es_device_phone4_7inch.png
diff --git a/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_fr_device_pad.png b/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_fr_device_pad.png
diff --git a/...ests/testView_UpdateContext_withConversionLabel.lang_fr_device_phone4_7inch.png b/...ests/testView_UpdateContext_withConversionLabel.lang_fr_device_phone4_7inch.png
diff --git a/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_ja_device_pad.png b/...ntrollerTests/testView_UpdateContext_withConversionLabel.lang_ja_device_pad.png
diff --git a/...ests/testView_UpdateContext_withConversionLabel.lang_ja_device_phone4_7inch.png b/...ests/testView_UpdateContext_withConversionLabel.lang_ja_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_de_device_pad.png b/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_de_device_pad.png
diff --git a/.../testView_UpdateContext_withRewardIsLocalPickup.lang_de_device_phone4_7inch.png b/.../testView_UpdateContext_withRewardIsLocalPickup.lang_de_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_en_device_pad.png b/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_en_device_pad.png
diff --git a/.../testView_UpdateContext_withRewardIsLocalPickup.lang_en_device_phone4_7inch.png b/.../testView_UpdateContext_withRewardIsLocalPickup.lang_en_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_es_device_pad.png b/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_es_device_pad.png
diff --git a/.../testView_UpdateContext_withRewardIsLocalPickup.lang_es_device_phone4_7inch.png b/.../testView_UpdateContext_withRewardIsLocalPickup.lang_es_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_fr_device_pad.png b/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_fr_device_pad.png
diff --git a/.../testView_UpdateContext_withRewardIsLocalPickup.lang_fr_device_phone4_7inch.png b/.../testView_UpdateContext_withRewardIsLocalPickup.lang_fr_device_phone4_7inch.png
diff --git a/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_ja_device_pad.png b/...llerTests/testView_UpdateContext_withRewardIsLocalPickup.lang_ja_device_pad.png
diff --git a/.../testView_UpdateContext_withRewardIsLocalPickup.lang_ja_device_phone4_7inch.png b/.../testView_UpdateContext_withRewardIsLocalPickup.lang_ja_device_phone4_7inch.png
diff --git a/Kickstarter-iOS/Features/RewardsCollection/Controller/RewardsCollectionViewController.swift b/Kickstarter-iOS/Features/RewardsCollection/Controller/RewardsCollectionViewController.swift
@@ -20,6 +20,13 @@ final class RewardsCollectionViewController: UICollectionViewController {
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
   }()
 
+  /// The bottom-up modal for selecting a new shipping location
+  private lazy var pledgeShippingLocationViewController = {
+    PledgeShippingLocationViewController.instantiate()
+      |> \.delegate .~ self
+      |> \.view.layoutMargins .~ .init(all: Styles.grid(3))
+  }()
+
   private let layout: UICollectionViewFlowLayout = {
     UICollectionViewFlowLayout()
       |> \.minimumLineSpacing .~ Styles.grid(3)
@@ -66,14 +73,19 @@ final class RewardsCollectionViewController: UICollectionViewController {
     _ = self
       |> \.extendedLayoutIncludesOpaqueBars .~ true
 
-    if featurePostCampaignPledgeEnabled() {
-      _ = (self.headerView, self.view)
-        |> ksr_addSubviewToParent()
-    }
-
     _ = self.collectionView
       |> \.dataSource .~ self.dataSource
 
+    _ = (self.headerView, self.view)
+      |> ksr_addSubviewToParent()
+
+    /// Adding this to the CollectionView Header's rootStackView from here so that we can handle the shipping view's delegates from this view controller.
+    _ = ([self.pledgeShippingLocationViewController.view], self.headerView.rootStackView)
+      |> ksr_addArrangedSubviewsToStackView()
+
+    self.addChild(self.pledgeShippingLocationViewController)
+    self.pledgeShippingLocationViewController.didMove(toParent: self)
+
     _ = (self.rewardsCollectionFooterView, self.view)
       |> ksr_addSubviewToParent()
 
@@ -131,6 +143,7 @@ final class RewardsCollectionViewController: UICollectionViewController {
       |> checkoutBackgroundStyle
 
     _ = self.headerView
+      |> \.backgroundColor .~ .ksr_alert
       |> \.layoutMargins .~ .init(all: Styles.grid(3))
 
     _ = self.collectionView
@@ -213,6 +226,17 @@ final class RewardsCollectionViewController: UICollectionViewController {
       .observeValues { [weak self] title, message in
         self?.showEditRewardConfirmationPrompt(title: title, message: message)
       }
+
+    // MARK: - Shipping Location Outputs
+
+    self.pledgeShippingLocationViewController.view.rac.hidden = self.viewModel.outputs
+      .shippingLocationViewHidden
+
+    self.viewModel.outputs.configureShippingLocationViewWithData
+      .observeForUI()
+      .observeValues { [weak self] data in
+        self?.pledgeShippingLocationViewController.configureWith(value: data)
+      }
   }
 
   // MARK: - Functions
@@ -221,24 +245,16 @@ final class RewardsCollectionViewController: UICollectionViewController {
     _ = self.collectionView
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
 
-    if featurePostCampaignPledgeEnabled() {
-      self.headerView.leftAnchor.constraint(equalTo: self.view.leftAnchor).isActive = true
-      self.headerView.rightAnchor.constraint(equalTo: self.view.rightAnchor).isActive = true
-      self.headerView.topAnchor.constraint(equalTo: self.view.topAnchor).isActive = true
-    }
-
     NSLayoutConstraint.activate([
+      self.headerView.leftAnchor.constraint(equalTo: self.view.leftAnchor),
+      self.headerView.rightAnchor.constraint(equalTo: self.view.rightAnchor),
+      self.headerView.topAnchor.constraint(equalTo: self.view.topAnchor),
       self.rewardsCollectionFooterView.leftAnchor.constraint(equalTo: self.view.leftAnchor),
       self.rewardsCollectionFooterView.rightAnchor.constraint(equalTo: self.view.rightAnchor),
       self.rewardsCollectionFooterView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor),
       self.collectionView.leftAnchor.constraint(equalTo: self.view.leftAnchor),
       self.collectionView.rightAnchor.constraint(equalTo: self.view.rightAnchor),
-      self.collectionView.topAnchor
-        .constraint(
-          equalTo: featurePostCampaignPledgeEnabled()
-            ? self.headerView.bottomAnchor
-            : self.view.topAnchor
-        )
+      self.collectionView.topAnchor.constraint(equalTo: self.headerView.bottomAnchor)
     ])
 
     self.collectionViewBottomConstraintFooterView = self.collectionView.bottomAnchor
@@ -368,6 +384,18 @@ extension RewardsCollectionViewController: RewardCellDelegate {
   }
 }
 
+// MARK: - PledgeShippingLocationViewControllerDelegate
+
+extension RewardsCollectionViewController: PledgeShippingLocationViewControllerDelegate {
+  func pledgeShippingLocationViewController(
+    _: PledgeShippingLocationViewController,
+    didSelect _: ShippingRule
+  ) {}
+
+  func pledgeShippingLocationViewControllerLayoutDidUpdate(_: PledgeShippingLocationViewController) {}
+  func pledgeShippingLocationViewControllerFailedToLoad(_: PledgeShippingLocationViewController) {}
+}
+
 // MARK: Styles
 
 private var collectionViewStyle: CollectionViewStyle = { collectionView -> UICollectionView in