Revert Pledge Redemption M1 Work (#2100)

* Revert "[MBL-1631] Remove Shipping Dropdown From Add-Ons (#2097)" This reverts commit b9398aa. * Revert "[MBL-1599] Adds the Shipping Dropdown Selector to the Rewards Carousel. (#2095)" This reverts commit e495aca.
kickstarter · Jul 24, 2024 · 773c817 · 773c817
1 parent f130ccd
commit 773c817
Show file tree

Hide file tree

Showing 401 changed files with 413 additions and 763 deletions.
diff --git a/Kickstarter-iOS/Features/PledgeView/Controllers/PledgeViewControllerTests.swift b/Kickstarter-iOS/Features/PledgeView/Controllers/PledgeViewControllerTests.swift
@@ -32,15 +32,14 @@ final class PledgeViewControllerTests: TestCase {
     let project = Project.template
       |> \.availableCardTypes .~ [CreditCardType.discover.rawValue]
 
-    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
+    combos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService, currentUser: User.template, language: language) {
         let controller = PledgeViewController.instantiate()
 
         let reward = Reward.template
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -88,7 +87,6 @@ final class PledgeViewControllerTests: TestCase {
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -114,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))
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    combos(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()
@@ -123,7 +121,6 @@ final class PledgeViewControllerTests: TestCase {
           let data = PledgeViewData(
             project: project,
             rewards: [reward],
-            selectedShippingRule: ShippingRule.template,
             selectedQuantities: [reward.id: 1],
             selectedLocationId: nil,
             refTag: nil,
@@ -167,14 +164,13 @@ final class PledgeViewControllerTests: TestCase {
       |> Project.lens.stats.currentCurrency .~ Project.Country.gb.currencyCode
       |> Project.lens.stats.currentCurrencyRate .~ .some(2.0)
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    combos(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()
           let data = PledgeViewData(
             project: project,
             rewards: [reward],
-            selectedShippingRule: ShippingRule.template,
             selectedQuantities: [reward.id: 1],
             selectedLocationId: nil,
             refTag: nil,
@@ -224,7 +220,6 @@ final class PledgeViewControllerTests: TestCase {
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -269,7 +264,6 @@ final class PledgeViewControllerTests: TestCase {
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -314,7 +308,6 @@ final class PledgeViewControllerTests: TestCase {
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -360,7 +353,6 @@ final class PledgeViewControllerTests: TestCase {
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -403,13 +395,12 @@ final class PledgeViewControllerTests: TestCase {
           |> Backing.lens.amount .~ 700.0
       )
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach { language, device in
+    combos(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(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -453,13 +444,12 @@ final class PledgeViewControllerTests: TestCase {
     let response = UserEnvelope<GraphUser>(me: self.userWithCards)
     let mockService = MockService(fetchGraphUserResult: .success(response))
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad]).forEach { language, device in
+    combos(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(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -497,13 +487,12 @@ final class PledgeViewControllerTests: TestCase {
 
     let reward = Reward.template
 
-    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
+    combos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService, currentUser: User.template, language: language) {
         let controller = PledgeViewController.instantiate()
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [reward.id: 1],
           selectedLocationId: nil,
           refTag: nil,
@@ -529,14 +518,13 @@ final class PledgeViewControllerTests: TestCase {
     let reward = Reward.template
       |> (Reward.lens.shipping .. Reward.Shipping.lens.enabled) .~ true
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()
           let data = PledgeViewData(
             project: .template,
             rewards: [reward],
-            selectedShippingRule: ShippingRule.template,
             selectedQuantities: [reward.id: 1],
             selectedLocationId: nil,
             refTag: nil,
@@ -566,14 +554,13 @@ final class PledgeViewControllerTests: TestCase {
     let reward = Reward.template
       |> (Reward.lens.shipping .. Reward.Shipping.lens.enabled) .~ true
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()
           let data = PledgeViewData(
             project: .template,
             rewards: [reward, .noReward],
-            selectedShippingRule: ShippingRule.template,
             selectedQuantities: [reward.id: 1, Reward.noReward.id: 1],
             selectedLocationId: nil,
             refTag: nil,
@@ -605,14 +592,13 @@ final class PledgeViewControllerTests: TestCase {
       |> (Reward.lens.shipping .. Reward.Shipping.lens.preference) .~ .local
       |> Reward.lens.localPickup .~ Location.losAngeles
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    combos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
       .forEach { language, device, currentUser in
         withEnvironment(language: language) {
           let controller = PledgeViewController.instantiate()
           let data = PledgeViewData(
             project: .template,
             rewards: [reward, .noReward],
-            selectedShippingRule: ShippingRule.template,
             selectedQuantities: [reward.id: 1, Reward.noReward.id: 1],
             selectedLocationId: nil,
             refTag: nil,
@@ -653,14 +639,13 @@ final class PledgeViewControllerTests: TestCase {
     let data = PledgeViewData(
       project: project,
       rewards: [reward, addOnReward1, addOnReward2],
-      selectedShippingRule: ShippingRule.template,
       selectedQuantities: [reward.id: 1, addOnReward1.id: 2, addOnReward2.id: 1],
       selectedLocationId: ShippingRule.template.id,
       refTag: .projectPage,
       context: .pledge
     )
 
-    orthogonalCombos(Language.allLanguages, [Device.phone4_7inch, Device.pad], [nil, User.template])
+    combos(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/...ter-iOS/Features/RewardAddOnSelection/Controller/RewardAddOnSelectionViewController.swift b/...ter-iOS/Features/RewardAddOnSelection/Controller/RewardAddOnSelectionViewController.swift
@@ -11,6 +11,10 @@ final class RewardAddOnSelectionViewController: UIViewController {
   private lazy var headerLabel: UILabel = UILabel(frame: .zero)
   private lazy var headerView: UIView = UIView(frame: .zero)
   private lazy var headerRootStackView: UIStackView = UIStackView(frame: .zero)
+  private lazy var pledgeShippingLocationViewController: PledgeShippingLocationViewController = {
+    PledgeShippingLocationViewController.instantiate()
+      |> \.delegate .~ self
+  }()
 
   private lazy var continueCTAView: RewardAddOnSelectionContinueCTAView = {
     RewardAddOnSelectionContinueCTAView(frame: .zero)
@@ -92,8 +96,11 @@ final class RewardAddOnSelectionViewController: UIViewController {
       |> ksr_addSubviewToParent()
       |> ksr_constrainViewToEdgesInParent(priority: UILayoutPriority(rawValue: 999))
 
-    _ = ([self.headerLabel], self.headerRootStackView)
+    _ = ([self.headerLabel, self.pledgeShippingLocationViewController.view], self.headerRootStackView)
       |> ksr_addArrangedSubviewsToStackView()
+
+    self.addChild(self.pledgeShippingLocationViewController)
+    self.pledgeShippingLocationViewController.didMove(toParent: self)
   }
 
   private func setupConstraints() {
@@ -139,12 +146,21 @@ final class RewardAddOnSelectionViewController: UIViewController {
   override func bindViewModel() {
     super.bindViewModel()
 
+    self.pledgeShippingLocationViewController.view.rac.hidden
+      = self.viewModel.outputs.shippingLocationViewIsHidden
+
     self.viewModel.outputs.configureContinueCTAViewWithData
       .observeForUI()
       .observeValues { [weak self] data in
         self?.continueCTAView.configure(with: data)
       }
 
+    self.viewModel.outputs.configurePledgeShippingLocationViewControllerWithData
+      .observeForUI()
+      .observeValues { [weak self] data in
+        self?.pledgeShippingLocationViewController.configureWith(value: data)
+      }
+
     self.viewModel.outputs.loadAddOnRewardsIntoDataSourceAndReloadTableView
       .observeForUI()
       .observeValues { [weak self] items in
@@ -211,6 +227,25 @@ final class RewardAddOnSelectionViewController: UIViewController {
   }
 }
 
+// MARK: - PledgeShippingLocationViewControllerDelegate
+
+extension RewardAddOnSelectionViewController: PledgeShippingLocationViewControllerDelegate {
+  func pledgeShippingLocationViewController(
+    _: PledgeShippingLocationViewController,
+    didSelect shippingRule: ShippingRule
+  ) {
+    self.viewModel.inputs.shippingRuleSelected(shippingRule)
+  }
+
+  func pledgeShippingLocationViewControllerLayoutDidUpdate(_: PledgeShippingLocationViewController) {
+    self.tableView.ksr_sizeHeaderFooterViewsToFit()
+  }
+
+  func pledgeShippingLocationViewControllerFailedToLoad(_: PledgeShippingLocationViewController) {
+    self.viewModel.inputs.shippingLocationViewDidFailToLoad()
+  }
+}
+
 // MARK: - RewardAddOnCardViewDelegate
 
 extension RewardAddOnSelectionViewController: RewardAddOnCardViewDelegate {

diff --git a/...OS/Features/RewardAddOnSelection/Controller/RewardAddOnSelectionViewControllerTests.swift b/...OS/Features/RewardAddOnSelection/Controller/RewardAddOnSelectionViewControllerTests.swift
@@ -38,14 +38,13 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
 
     let mockService = MockService(fetchRewardAddOnsSelectionViewRewardsResult: .success(project))
 
-    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
+    combos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService) {
         let controller = RewardAddOnSelectionViewController.instantiate()
 
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [:],
           selectedLocationId: nil,
           refTag: nil,
@@ -98,13 +97,12 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
       fetchRewardAddOnsSelectionViewRewardsResult: .success(project)
     )
 
-    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
+    combos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService) {
         let controller = RewardAddOnSelectionViewController.instantiate()
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [:],
           selectedLocationId: nil,
           refTag: nil,
@@ -116,6 +114,13 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
 
         self.scheduler.advance()
 
+        controller.pledgeShippingLocationViewController(
+          PledgeShippingLocationViewController.instantiate(),
+          didSelect: .template
+        )
+
+        self.scheduler.advance(by: .seconds(1))
+
         assertSnapshot(
           matching: parent.view,
           as: .image(perceptualPrecision: 0.98),
@@ -196,13 +201,12 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
       fetchRewardAddOnsSelectionViewRewardsResult: .success(project)
     )
 
-    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
+    combos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService) {
         let controller = RewardAddOnSelectionViewController.instantiate()
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [:],
           selectedLocationId: nil,
           refTag: nil,
@@ -214,6 +218,13 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
 
         self.scheduler.advance()
 
+        controller.pledgeShippingLocationViewController(
+          PledgeShippingLocationViewController.instantiate(),
+          didSelect: shippingRule
+        )
+
+        self.scheduler.advance(by: .seconds(1))
+
         assertSnapshot(
           matching: parent.view,
           as: .image(perceptualPrecision: 0.98),
@@ -231,14 +242,13 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
 
     let mockService = MockService(fetchRewardAddOnsSelectionViewRewardsResult: .failure(.couldNotParseJSON))
 
-    orthogonalCombos(Language.allLanguages, Device.allCases).forEach { language, device in
+    combos(Language.allLanguages, Device.allCases).forEach { language, device in
       withEnvironment(apiService: mockService) {
         let controller = RewardAddOnSelectionViewController.instantiate()
 
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [:],
           selectedLocationId: nil,
           refTag: nil,
@@ -278,14 +288,13 @@ final class RewardAddOnSelectionViewControllerTests: TestCase {
 
     let mockService = MockService(fetchRewardAddOnsSelectionViewRewardsResult: .success(project))
 
-    orthogonalCombos(Language.allLanguages, [Device.phone5_8inch, Device.pad]).forEach { language, device in
+    combos(Language.allLanguages, [Device.phone5_8inch, Device.pad]).forEach { language, device in
       withEnvironment(apiService: mockService, language: language) {
         let controller = RewardAddOnSelectionViewController.instantiate()
 
         let data = PledgeViewData(
           project: project,
           rewards: [reward],
-          selectedShippingRule: ShippingRule.template,
           selectedQuantities: [:],
           selectedLocationId: nil,
           refTag: nil,

diff --git a/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_de_device_pad.png b/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_de_device_pad.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_de_device_phone4_7inch.png b/...electionViewControllerTests/testView_EmptyState.lang_de_device_phone4_7inch.png
diff --git a/...nSelectionViewControllerTests/testView_EmptyState.lang_de_device_phone4inch.png b/...nSelectionViewControllerTests/testView_EmptyState.lang_de_device_phone4inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_de_device_phone5_5inch.png b/...electionViewControllerTests/testView_EmptyState.lang_de_device_phone5_5inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_de_device_phone5_8inch.png b/...electionViewControllerTests/testView_EmptyState.lang_de_device_phone5_8inch.png
diff --git a/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_en_device_pad.png b/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_en_device_pad.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_en_device_phone4_7inch.png b/...electionViewControllerTests/testView_EmptyState.lang_en_device_phone4_7inch.png
diff --git a/...nSelectionViewControllerTests/testView_EmptyState.lang_en_device_phone4inch.png b/...nSelectionViewControllerTests/testView_EmptyState.lang_en_device_phone4inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_en_device_phone5_5inch.png b/...electionViewControllerTests/testView_EmptyState.lang_en_device_phone5_5inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_en_device_phone5_8inch.png b/...electionViewControllerTests/testView_EmptyState.lang_en_device_phone5_8inch.png
diff --git a/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_es_device_pad.png b/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_es_device_pad.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_es_device_phone4_7inch.png b/...electionViewControllerTests/testView_EmptyState.lang_es_device_phone4_7inch.png
diff --git a/...nSelectionViewControllerTests/testView_EmptyState.lang_es_device_phone4inch.png b/...nSelectionViewControllerTests/testView_EmptyState.lang_es_device_phone4inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_es_device_phone5_5inch.png b/...electionViewControllerTests/testView_EmptyState.lang_es_device_phone5_5inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_es_device_phone5_8inch.png b/...electionViewControllerTests/testView_EmptyState.lang_es_device_phone5_8inch.png
diff --git a/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_fr_device_pad.png b/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_fr_device_pad.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_fr_device_phone4_7inch.png b/...electionViewControllerTests/testView_EmptyState.lang_fr_device_phone4_7inch.png
diff --git a/...nSelectionViewControllerTests/testView_EmptyState.lang_fr_device_phone4inch.png b/...nSelectionViewControllerTests/testView_EmptyState.lang_fr_device_phone4inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_fr_device_phone5_5inch.png b/...electionViewControllerTests/testView_EmptyState.lang_fr_device_phone5_5inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_fr_device_phone5_8inch.png b/...electionViewControllerTests/testView_EmptyState.lang_fr_device_phone5_8inch.png
diff --git a/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_ja_device_pad.png b/...ardAddOnSelectionViewControllerTests/testView_EmptyState.lang_ja_device_pad.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_ja_device_phone4_7inch.png b/...electionViewControllerTests/testView_EmptyState.lang_ja_device_phone4_7inch.png
diff --git a/...nSelectionViewControllerTests/testView_EmptyState.lang_ja_device_phone4inch.png b/...nSelectionViewControllerTests/testView_EmptyState.lang_ja_device_phone4inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_ja_device_phone5_5inch.png b/...electionViewControllerTests/testView_EmptyState.lang_ja_device_phone5_5inch.png
diff --git a/...electionViewControllerTests/testView_EmptyState.lang_ja_device_phone5_8inch.png b/...electionViewControllerTests/testView_EmptyState.lang_ja_device_phone5_8inch.png
diff --git a/..._/RewardAddOnSelectionViewControllerTests/testView_Error.lang_de_device_pad.png b/..._/RewardAddOnSelectionViewControllerTests/testView_Error.lang_de_device_pad.png
diff --git a/...ddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone4_7inch.png b/...ddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone4_7inch.png
diff --git a/...dAddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone4inch.png b/...dAddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone4inch.png
diff --git a/...ddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone5_5inch.png b/...ddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone5_5inch.png
diff --git a/...ddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone5_8inch.png b/...ddOnSelectionViewControllerTests/testView_Error.lang_de_device_phone5_8inch.png
diff --git a/..._/RewardAddOnSelectionViewControllerTests/testView_Error.lang_en_device_pad.png b/..._/RewardAddOnSelectionViewControllerTests/testView_Error.lang_en_device_pad.png