Merge 18.6-rc-2 into trunk

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)

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
             }

version.properties

@@ -1,2 +1,2 @@
-versionName=18.6-rc-1
-versionCode=548
+versionName=18.6-rc-2
+versionCode=549