fix issue where add-ons were not displayed if non of the rewards were…

… shippable (#2019) (#2020)
kickstarter · Apr 16, 2024 · 855d5ff · 855d5ff
1 parent 4bb904f
commit 855d5ff
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/kickstarter/viewmodels/projectpage/AddOnsViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/projectpage/AddOnsViewModel.kt
@@ -119,6 +119,8 @@ class AddOnsViewModel(val environment: Environment) : ViewModel() {
                         )
                         shippingRules = shippingRulesEnvelope.shippingRules()
                     }.addToDisposable(disposables)
+                } ?: run {
+                    shippingRulesObservable.onNext(listOf())
                 }
             }
         }
@@ -153,8 +155,12 @@ class AddOnsViewModel(val environment: Environment) : ViewModel() {
         return this.currentConfig.observable()
             .map { it.countryCode() }
             .map { countryCode ->
-                shippingRules.firstOrNull { it.location()?.country() == countryCode }
-                    ?: shippingRules.first()
+                if (shippingRules.isNotEmpty()) {
+                    shippingRules.firstOrNull { it.location()?.country() == countryCode }
+                        ?: shippingRules.first()
+                } else {
+                    ShippingRule.builder().build()
+                }
             }
     }