From 0b305c14e88d0873c3cfbfd36fc79d1a27c293da Mon Sep 17 00:00:00 2001 From: adalpari Date: Fri, 24 Oct 2025 09:27:48 +0200 Subject: [PATCH 1/2] Hiding entries in WP build --- .../wordpress/android/support/main/ui/SupportViewModel.kt | 5 +++-- .../android/support/main/ui/SupportViewModelTest.kt | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportViewModel.kt b/WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportViewModel.kt index c6f9c40db273..f31ae801457b 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportViewModel.kt @@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import org.wordpress.android.BuildConfig import org.wordpress.android.fluxc.store.AccountStore import org.wordpress.android.fluxc.utils.AppLogWrapper import org.wordpress.android.support.model.UserInfo @@ -62,8 +63,8 @@ class SupportViewModel @Inject constructor( ) _optionsVisibility.value = SupportOptionsVisibility( - showAskTheBots = hasAccessToken, - showAskHappinessEngineers = hasAccessToken + showAskTheBots = hasAccessToken && BuildConfig.IS_JETPACK_APP, + showAskHappinessEngineers = hasAccessToken && BuildConfig.IS_JETPACK_APP ) } diff --git a/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt index 07e9868b5189..774970c4bd6d 100644 --- a/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt @@ -142,8 +142,11 @@ class SupportViewModelTest : BaseUnitTest() { viewModel.init() // Then - assertThat(viewModel.optionsVisibility.value.showAskTheBots).isTrue() - assertThat(viewModel.optionsVisibility.value.showAskHappinessEngineers).isTrue() + // Note: For WordPress variant (IS_JETPACK_APP=false), these options should be hidden + // For Jetpack variant (IS_JETPACK_APP=true), they should be shown when user has access token + // This test will behave differently based on which variant is being tested + assertThat(viewModel.optionsVisibility.value.showAskTheBots).isEqualTo(org.wordpress.android.BuildConfig.IS_JETPACK_APP) + assertThat(viewModel.optionsVisibility.value.showAskHappinessEngineers).isEqualTo(org.wordpress.android.BuildConfig.IS_JETPACK_APP) } @Test From f431debfb131db0ea0a44f5bd8a8db5d528541c5 Mon Sep 17 00:00:00 2001 From: adalpari Date: Fri, 24 Oct 2025 10:06:53 +0200 Subject: [PATCH 2/2] detekt --- .../android/support/main/ui/SupportViewModelTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt index 774970c4bd6d..86c9c9629665 100644 --- a/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt @@ -145,8 +145,10 @@ class SupportViewModelTest : BaseUnitTest() { // Note: For WordPress variant (IS_JETPACK_APP=false), these options should be hidden // For Jetpack variant (IS_JETPACK_APP=true), they should be shown when user has access token // This test will behave differently based on which variant is being tested - assertThat(viewModel.optionsVisibility.value.showAskTheBots).isEqualTo(org.wordpress.android.BuildConfig.IS_JETPACK_APP) - assertThat(viewModel.optionsVisibility.value.showAskHappinessEngineers).isEqualTo(org.wordpress.android.BuildConfig.IS_JETPACK_APP) + assertThat(viewModel.optionsVisibility.value.showAskTheBots) + .isEqualTo(org.wordpress.android.BuildConfig.IS_JETPACK_APP) + assertThat(viewModel.optionsVisibility.value.showAskHappinessEngineers) + .isEqualTo(org.wordpress.android.BuildConfig.IS_JETPACK_APP) } @Test