Skip to content

[Push Notifications] Check Jetpack connection status on Continue tap #15400

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
hichamboushaba merged 12 commits into from
Feb 24, 2026
+624 −40
Merged

[Push Notifications] Check Jetpack connection status on Continue tap #15400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9a17fe
Check Jetpack connection status on Continue tap
hichamboushaba Feb 20, 2026
5678a8e
Add loading and error UI to push notifications introduction
hichamboushaba Feb 20, 2026
4c50ed3
Add tests for push notifications introduction connection check
hichamboushaba Feb 20, 2026
7462949
Replace ViewState data class with sealed interface and fetch on init
hichamboushaba Feb 20, 2026
95b5187
Add loading skeleton, update-required screen, and sealed state UI
hichamboushaba Feb 20, 2026
b3bc758
Rework tests to assert ViewState from init fetch
hichamboushaba Feb 20, 2026
f125489
Update help button wording
hichamboushaba Feb 20, 2026
68f5212
Add close icon to the intro dialog
hichamboushaba Feb 20, 2026
a0230ae
Make isSiteConnected a property
hichamboushaba Feb 20, 2026
882ba0a
Simplify Compose code
hichamboushaba Feb 20, 2026
8feaaa6
Show generic error when Woo version check fails
hichamboushaba Feb 20, 2026
cb34af4
Fix unit tests
hichamboushaba Feb 20, 2026
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
7 changes: 7 additions & 0 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/model/JetpackStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ data class JetpackStatus(
) : Parcelable {
val isCurrentUserConnected: Boolean
get() = jetpackConnectionStatus is JetpackConnectionStatus.AccountConnected

val isSiteConnected: Boolean
get() = when (jetpackConnectionStatus) {
is JetpackConnectionStatus.AccountConnected -> true
is JetpackConnectionStatus.AccountNotConnected ->
jetpackConnectionStatus.siteRegistrationStatus == JetpackSiteRegistrationStatus.REGISTERED
}
}

sealed interface JetpackConnectionStatus : Parcelable {
Expand Down
17 changes: 12 additions & 5 deletions ...merce/android/ui/pushnotifications/introduction/WooPushNotificationsIntroductionDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import com.woocommerce.android.R
import com.woocommerce.android.extensions.navigateSafely
import com.woocommerce.android.extensions.navigateToHelpScreen
import com.woocommerce.android.ui.compose.composeView
import com.woocommerce.android.ui.login.wpcom.WPComLoginMode
import com.woocommerce.android.util.ChromeCustomTabUtils
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.NavigateToHelpScreen
import dagger.hilt.android.AndroidEntryPoint
import org.wordpress.android.util.DisplayUtils

Expand All @@ -34,11 +36,7 @@ class WooPushNotificationsIntroductionDialog : DialogFragment() {
dialog?.window?.attributes?.windowAnimations = R.style.Woo_Animations_Dialog

return composeView {
WooPushNotificationsIntroductionScreen(
onContinueClick = viewModel::onContinueClick,
onNotNowClick = viewModel::onNotNowClick,
onWhatIsWPComClick = viewModel::onWhatIsWPComClick
)
WooPushNotificationsIntroductionScreen(viewModel)
}
}

Expand All @@ -58,6 +56,15 @@ class WooPushNotificationsIntroductionDialog : DialogFragment() {
)
}

WooPushNotificationsIntroductionViewModel.NavigateToConnectionSteps -> {
findNavController().navigateSafely(
WooPushNotificationsIntroductionDialogDirections
.actionWooPushNotificationsIntroductionDialogToWooPushNotificationsConnectionStepsFragment()
)
}

is NavigateToHelpScreen -> navigateToHelpScreen(event.origin)

is WooPushNotificationsIntroductionViewModel.OpenUrlEvent -> {
ChromeCustomTabUtils.launchUrl(requireContext(), event.url)
}
Expand Down
Loading