diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt index 2139585b2404..5abf9e73b600 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsScreen.kt @@ -83,15 +83,17 @@ fun JetpackBenefitsScreen( ) Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_200))) - // Push notifications - BenefitEntry( - icon = R.drawable.ic_alarm_bell_ring, - title = R.string.jetpack_benefits_modal_push_notifications_title, - subtitle = R.string.jetpack_benefits_modal_push_notifications_subtitle, - modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.major_100)) - ) + if (viewState.isPushNotificationsBenefitVisible) { + // Push notifications + BenefitEntry( + icon = R.drawable.ic_alarm_bell_ring, + title = R.string.jetpack_benefits_modal_push_notifications_title, + subtitle = R.string.jetpack_benefits_modal_push_notifications_subtitle, + modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.major_100)) + ) - Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_100))) + Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.major_100))) + } // Analytics BenefitEntry( @@ -182,6 +184,7 @@ private fun JetpackBenefitsScreenPreview() { viewState = JetpackBenefitsViewModel.ViewState( isUsingJetpackCP = false, isLoadingDialogShown = false, + isPushNotificationsBenefitVisible = true, ) ) } @@ -195,6 +198,7 @@ private fun JetpackBenefitsScreenWithoutNativeInstallPreview() { viewState = JetpackBenefitsViewModel.ViewState( isUsingJetpackCP = false, isLoadingDialogShown = false, + isPushNotificationsBenefitVisible = true, ) ) } diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsViewModel.kt index bc185d665ec2..ef84ad8c2f5b 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/jetpack/benefits/JetpackBenefitsViewModel.kt @@ -17,6 +17,7 @@ import com.woocommerce.android.tools.SiteConnectionType import com.woocommerce.android.ui.common.UserEligibilityFetcher import com.woocommerce.android.ui.jetpack.FetchJetpackStatus import com.woocommerce.android.ui.jetpack.FetchJetpackStatus.JetpackStatusFetchResponse +import com.woocommerce.android.util.FeatureFlag import com.woocommerce.android.viewmodel.MultiLiveEvent.Event import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar @@ -47,6 +48,7 @@ class JetpackBenefitsViewModel @Inject constructor( ViewState( isUsingJetpackCP = selectedSite.connectionType == SiteConnectionType.JetpackConnectionPackage, isLoadingDialogShown = false, + isPushNotificationsBenefitVisible = !FeatureFlag.WOO_PUSH_NOTIFICATIONS_SYSTEM_M2.isEnabled(), ) ) val viewState = _viewState.asLiveData() @@ -184,6 +186,7 @@ class JetpackBenefitsViewModel @Inject constructor( data class ViewState( val isUsingJetpackCP: Boolean, val isLoadingDialogShown: Boolean, + val isPushNotificationsBenefitVisible: Boolean, ) object StartJetpackActivationForJetpackCP : Event()