[MBL-1783] Don't filter local pickup based on shipping rule (#2179)

* Don't filter local pickup based on shipping rule * Fix test
kickstarter · Oct 17, 2024 · 7184ab9 · 7184ab9
1 parent ce18b80
commit 7184ab9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
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/Library/ViewModels/NoShippingPledgeViewModel.swift b/Library/ViewModels/NoShippingPledgeViewModel.swift
@@ -242,7 +242,7 @@ public class NoShippingPledgeViewModel: NoShippingPledgeViewModelType, NoShippin
       context.map { $0.confirmationLabelHidden }
     )
 
-    let shippingSummaryViewData = Signal.combineLatest(
+    let shippingSummaryViewDataNonnil = Signal.combineLatest(
       selectedShippingRule.skipNil().map(\.location.localizedName),
       project.map(\.stats.omitUSCurrencyCode),
       project.map { project in
@@ -252,6 +252,11 @@ public class NoShippingPledgeViewModel: NoShippingPledgeViewModelType, NoShippin
     )
     .map(PledgeShippingSummaryViewData.init)
 
+    let shippingSummaryViewData = Signal.merge(
+      shippingSummaryViewDataNonnil.wrapInOptional(),
+      selectedShippingRule.filter(isNil).mapConst(nil)
+    )
+
     self.configurePledgeRewardsSummaryViewWithData = Signal.combineLatest(
       initialData,
       pledgeTotal,

diff --git a/Library/ViewModels/WithShippingRewardsCollectionViewModel.swift b/Library/ViewModels/WithShippingRewardsCollectionViewModel.swift
@@ -482,19 +482,10 @@ private func filteredRewardsByLocation(
     let isUnrestrictedShippingReward = reward.isUnRestrictedShippingPreference
     let isRestrictedShippingReward = reward.isRestrictedShippingPreference
 
-    // return all rewards that are no reward, digital, or ship anywhere in the world.
+    // Return all rewards that are no reward, digital, local pickup, or ship anywhere in the world.
     if rewards.first?.id == reward.id || isRewardLocalOrDigital || isUnrestrictedShippingReward {
       shouldDisplayReward = true
 
-      // if add on is local pickup, ensure locations are equal.
-      if isRewardLocalPickup(reward) {
-        if let rewardLocation = reward.localPickup?.country,
-           let shippingRuleLocation = shippingRule?.location.country, rewardLocation == shippingRuleLocation {
-          shouldDisplayReward = true
-        } else {
-          shouldDisplayReward = false
-        }
-      }
       // If restricted shipping, compare against selected shipping location.
     } else if isRestrictedShippingReward {
       shouldDisplayReward = rewardShipsTo(selectedLocation: shippingRule?.location.id, reward)