From ba77489522525ae2380038c23003e2b9deeb8b0a Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Mon, 13 May 2024 09:20:21 +0100 Subject: [PATCH 1/3] Add a check to avoid app crash when the products list is empty --- .../android/ui/dashboard/blaze/DashboardBlazeViewModel.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/blaze/DashboardBlazeViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/blaze/DashboardBlazeViewModel.kt index fb75a235a0f..30d20dd8bdf 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/blaze/DashboardBlazeViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/blaze/DashboardBlazeViewModel.kt @@ -82,6 +82,12 @@ class DashboardBlazeViewModel @AssistedInject constructor( val products = productsResult.getOrThrow() val blazeCampaignModel = blazeCampaignResult.getOrThrow() + if (products.isEmpty()) { + // When the products is empty, the card will be hidden by the parent view model + // so we don't need to show any UI + return@combine null + } + when { blazeCampaignModel == null -> showUiForNoCampaign(products) else -> showUiForCampaign(blazeCampaignModel) From fca0184c279f8d7741da0a9c669cd9831c8d71e9 Mon Sep 17 00:00:00 2001 From: Hicham Boushaba Date: Mon, 13 May 2024 09:48:28 +0100 Subject: [PATCH 2/3] Make sure to exclude non-published and sample products during the fetch --- .../android/ui/dashboard/data/ObserveBlazeWidgetStatus.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/ObserveBlazeWidgetStatus.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/ObserveBlazeWidgetStatus.kt index 97856af05de..1efa3cec4ce 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/ObserveBlazeWidgetStatus.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/ObserveBlazeWidgetStatus.kt @@ -37,7 +37,12 @@ class ObserveBlazeWidgetStatus @Inject constructor( .withIndex() .map { (index, productsCount) -> if (productsCount == 0L && index == 0) { - productListRepository.fetchProductList().getOrNull()?.size != 0 + productListRepository + .fetchProductList( + productFilterOptions = mapOf(ProductFilterOption.STATUS to ProductStatus.PUBLISH.value) + ).getOrNull() + ?.filterNot { it.isSampleProduct } + ?.size != 0 } else { productsCount > 0 } From 42bbdb0b0787d74513cb64f2025639e4dac4701d Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 13 May 2024 11:06:55 +0000 Subject: [PATCH 3/3] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index b1cc48035d8..517fec3fe09 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=18.6-rc-1 -versionCode=548 \ No newline at end of file +versionName=18.6-rc-2 +versionCode=549 \ No newline at end of file