Skip to content

CMM-891: support: hide bots and he entries in WP #22313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2025
Merged

CMM-891: support: hide bots and he entries in WP #22313

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b305c1
Hiding entries in WP build
adalpari Oct 24, 2025
f431deb
detekt
adalpari Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
}

Expand Down
7 changes: 5 additions & 2 deletions WordPress/src/test/java/org/wordpress/android/support/main/ui/SupportViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down