Replace Jetpack banner with a WP dashboard card UI #15180

irfano · 2026-01-09T13:21:14Z

Closes WOOMOB-1921

Description

Adds a new "Never miss a new order" dashboard card that prompts users to connect their store to WordPress.com for push notifications. The card is implemented as a configurable widget that can be hidden and reordered via the Customize screen.

The card is currently gated behind FeatureFlag.WOO_PUSH_NOTIFICATIONS_SYSTEM and will be shown when the flag is enabled. The onClick action is currently a no-op and will be implemented in a follow-up PR.

Test Steps

TC1: Feature flag disabled, authenticated with app passwords to site without support of new PN.

Disable the feature flag WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 and build the app.
Log in to a site without support of new PN with site credentials.
Confirm that the new dashboard card is not available in the Dashboard, and Jetpack banner is displayed.
Confirm that the card is not visible in the Customize screen.

TC2: Feature flag enabled, authenticated with app passwords to site without support of new PN.

Enable the feature flag WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 and build the app.
Log in to a site without support of new PN with site credentials.
Confirm that the new dashboard card is displayed, and Jetpack banner is hidden.
Tap the overflow menu on the card and select "Hide 'Enable push notifications'".
Confirm that the card is hidden and will not display again after refreshing or relaunching.
Confirm the card can be re-enabled from the Customize screen.

TC3: Feature flag enabled, authenticated with app passwords to site with support of new PN.

Enable the feature flag WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 and build the app.
Log in to a site with support of new PN with site credentials.
Confirm that the new dashboard card is not available (site is already registered), and Jetpack banner is not displayed.

TC4: Feature flag enabled, authenticated with WPCom to site without support of new PN.

Enable the feature flag WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 and build the app.
Log in to a site without support of new PN with WPCom credentials.
Confirm that the new dashboard card is not available, and Jetpack banner is not displayed.

Images/gif

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

wpmobilebot · 2026-01-09T13:26:29Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`de07126`
	Direct Download	`woocommerce-wear-prototype-build-pr15180-de07126.apk`

wpmobilebot · 2026-01-09T13:39:49Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`de07126`
	Direct Download	`woocommerce-prototype-build-pr15180-de07126.apk`

...lin/com/woocommerce/android/ui/dashboard/pushnotifications/DashboardPushNotificationsCard.kt

codecov-commenter · 2026-01-09T14:03:12Z

Codecov Report

❌ Patch coverage is 38.18182% with 68 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.77%. Comparing base (c8afae3) to head (de07126).
⚠️ Report is 35 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...ushnotifications/DashboardPushNotificationsCard.kt	0.00%	45 Missing ⚠️
...ations/push/ShouldShowEnablePushNotificationsUi.kt	0.00%	7 Missing ⚠️
...ommerce/android/ui/dashboard/DashboardViewModel.kt	81.81%	0 Missing and 4 partials ⚠️
...board/data/ObservePushNotificationsWidgetStatus.kt	0.00%	4 Missing ⚠️
...d/notifications/push/PushNotificationRepository.kt	0.00%	2 Missing and 1 partial ⚠️
...ommerce/android/ui/dashboard/DashboardContainer.kt	0.00%	3 Missing ⚠️
...cations/push/PushNotificationRegistrationStatus.kt	92.85%	0 Missing and 1 partial ⚠️
...e/android/ui/dashboard/data/DashboardRepository.kt	66.66%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #15180      +/-   ##
============================================
- Coverage     38.77%   38.77%   -0.01%     
  Complexity    10690    10690              
============================================
  Files          2208     2211       +3     
  Lines        125713   125802      +89     
  Branches      17409    17424      +15     
============================================
+ Hits          48745    48776      +31     
- Misses        72025    72081      +56     
- Partials       4943     4945       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

wpmobilebot · 2026-01-23T11:25:26Z

Version 24.0 has now entered code-freeze, so the milestone of this PR has been updated to 24.1.

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

Copilot

Pull request overview

This PR introduces a new configurable “Never miss a new order” dashboard card to encourage enabling push notifications, and wires it into the dynamic dashboard system while gating it behind a new feature flag and existing push-registration state.

Changes:

Adds a new DashboardWidget.Type.PUSH_NOTIFICATIONS widget, its strings, icon (wp_woo.xml), Compose UI card, and integration into the configurable dashboard and widget editor.
Introduces ShouldShowEnablePushNotificationsUi and ObservePushNotificationsWidgetStatus to determine when the push notifications card and Jetpack benefits banner should be shown, based on feature flag, connection type, and PushNotificationRegistrationStatus.
Extends dashboard data/repository/test wiring and feature flags to support the new widget and gating behavior.

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
WooCommerce/src/test/kotlin/com/woocommerce/android/ui/dashboard/data/DashboardRepositoryTest.kt	Updates repository test constructor wiring to include the new `ObservePushNotificationsWidgetStatus` dependency.
WooCommerce/src/test/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModelTest.kt	Injects and mocks `ShouldShowEnablePushNotificationsUi` so the updated `DashboardViewModel` constructor and Jetpack banner logic can be instantiated in tests.
WooCommerce/src/main/res/values/strings.xml	Adds title, menu title, and body copy strings for the new push notifications dashboard card.
WooCommerce/src/main/res/drawable/wp_woo.xml	Adds the vector asset used in the push notifications card to visually represent the WordPress.com/Woo integration.
WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt	Introduces `WOO_PUSH_NOTIFICATIONS_SYSTEM_M2` and ensures both push-related flags default to `false`.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/pushnotifications/DashboardPushNotificationsCard.kt	Implements the Compose UI for the “Never miss a new order” card, including title, description, artwork, and the standard “Hide widget” overflow menu wiring.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/ObservePushNotificationsWidgetStatus.kt	Adds a widget-status observer that exposes the push notifications widget as `Available` or `Hidden` based on `ShouldShowEnablePushNotificationsUi`.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/DashboardRepository.kt	Wires the push notifications widget status into the combined dashboard widget stream and status mapping so the new widget participates in the dynamic dashboard.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/data/DashboardDataStore.kt	Ensures the new widget type is part of the default dashboard configuration and can be enabled/disabled via the widget editor, while being filtered when not supported.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt	Injects `ShouldShowEnablePushNotificationsUi` and updates `jetpackBenefitsBannerState` to suppress the Jetpack banner when the new push notifications UI is available.
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardContainer.kt	Renders `DashboardPushNotificationsCard` whenever a configurable widget of type `PUSH_NOTIFICATIONS` is present and visible.
WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/push/ShouldShowEnablePushNotificationsUi.kt	Adds core business logic for when the “Enable Push Notifications” UI should be shown (feature-flag + app-password connection + registration status), but currently contains a boolean condition that is always true for any single status, so registered sites still see the card.
WooCommerce/src/main/kotlin/com/woocommerce/android/model/DashboardWidget.kt	Adds the `PUSH_NOTIFICATIONS` enum entry, with appropriate title resource and tracking identifier, so it can participate in dashboard configuration and analytics.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

...ain/kotlin/com/woocommerce/android/notifications/push/ShouldShowEnablePushNotificationsUi.kt

Copilot · 2026-02-03T08:20:27Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt

            .map {
                val durationSinceDismissal =
                    (System.currentTimeMillis() - appPrefsWrapper.getJetpackBenefitsDismissalDate()).milliseconds
-                val showBanner =
+                val enablePnUiAvailable = shouldShowEnablePushNotificationsUi()
+                val showBanner = !enablePnUiAvailable &&
                    pushNotificationRegistrationStatus(selectedSite.getIfExists()?.siteId) == Status.UNREGISTERED &&
-                        durationSinceDismissal >= DAYS_TO_REDISPLAY_JP_BENEFITS_BANNER.days
+                    durationSinceDismissal >= DAYS_TO_REDISPLAY_JP_BENEFITS_BANNER.days


The new logic that hides the Jetpack Benefits banner when the "Enable Push Notifications" UI is available (enablePnUiAvailable = shouldShowEnablePushNotificationsUi(), then showBanner = !enablePnUiAvailable && …) is not covered by tests: all existing DashboardViewModelTest cases stub ShouldShowEnablePushNotificationsUi to return false. Given the detailed scenarios in the PR description (TC1–TC4), please add unit tests that exercise cases where ShouldShowEnablePushNotificationsUi() returns true versus false so the banner visibility behavior is validated (e.g., ensuring the Jetpack banner is suppressed when the new push card should be shown).

JorgeMucientes

Hey @irfano I've noticed a few issues that are worth checking particularly around TC3 not working. Some are NPs but some others are blocking issues.

JorgeMucientes · 2026-02-03T08:57:39Z

...ain/kotlin/com/woocommerce/android/notifications/push/ShouldShowEnablePushNotificationsUi.kt

+ *
+ * This is part of the Woo Core push notifications system for app-password authenticated sites.
+ */
+class ShouldShowEnablePushNotificationsUi @Inject constructor(


Np, it be nice to have unit tests added for this class.

Since FeatureFlag.WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 is a local feature flag that defaults to false and cannot be mocked in tests, we cannot write meaningful unit tests for this class when the flag is disabled.

We could add a wrapper similar to IsRemoteFeatureFlagEnabled for local feature flags, but given that a feature flag refactor (WOOMOB-2129) is already planned in the near future, I'd prefer not to introduce this change at this point.

JorgeMucientes · 2026-02-03T09:00:42Z

...ain/kotlin/com/woocommerce/android/notifications/push/ShouldShowEnablePushNotificationsUi.kt

+        val site = selectedSite.getIfExists() ?: return false
+        if (site.connectionType != SiteConnectionType.ApplicationPasswords) return false
+
+        return pushNotificationRegistrationStatus(site.siteId) != Status.WOO_REGISTERED ||


Np, pushNotificationRegistrationStatus() function access disk several times via app prefs and datastore. It be nice to call this function only once and keep the returned value in a function variable.

This logic has changed in my latest commits.

...ain/kotlin/com/woocommerce/android/notifications/push/ShouldShowEnablePushNotificationsUi.kt

JorgeMucientes · 2026-02-03T09:13:28Z

...lin/com/woocommerce/android/ui/dashboard/pushnotifications/DashboardPushNotificationsCard.kt

+    modifier: Modifier = Modifier,
+    onHideClicked: () -> Unit,


Minor NP, but modifier should be placed last as it is the first optional parameter:

We will adopt official guidelines on how to pass the Modifier as parameter: "MUST be named "modifier" and MUST appear as the first optional parameter in the element function's parameter list".

👍🏻 Done: 194efdd

JorgeMucientes · 2026-02-03T09:18:15Z

...ain/kotlin/com/woocommerce/android/ui/dashboard/data/ObservePushNotificationsWidgetStatus.kt

+class ObservePushNotificationsWidgetStatus @Inject constructor(
+    private val shouldShowEnablePushNotificationsUi: ShouldShowEnablePushNotificationsUi
+) {
+    operator fun invoke(): Flow<DashboardWidget.Status> = flow {


This function is called from DashboardRepository,kt which has @ActivityRetainedScoped. This means that when we log in with site credentials into a site that supports Woo PN notifications we'll always display the new "connect to WP.com" banner even after registering in Woo core PN system. Basically TC3 doesn't work with the current implementation even after fixing the issue reported above. We probably need to refresh the PNWidgetStatus after successfully registering in Woo system.

Screen_recording_20260203_100654.mp4

Good catch @JorgeMucientes! This isn't actually reproducible in #15283 but I still think it's better to apply your suggestion. Done here: c61cd28

…ons/push/ShouldShowEnablePushNotificationsUi.kt Co-authored-by: Copilot <[email protected]>

…th-wp-dashboard-card-ui

irfano · 2026-02-03T22:58:25Z

Thanks for your review, @JorgeMucientes! Ready for another round.
While addressing your feedback, I noticed another issue: we weren't clearing the Woo push token when the user was logged in with site credentials. I fixed it here: 0b88f0f

irfano added 4 commits January 9, 2026 16:11

Add WordPress Woo icon drawable

881f6a6

Add push notifications widget type and strings

4190bf1

Add push notifications status observer

037b3df

Add push notifications card to dashboard

cfcdb66

irfano added this to the 24.0 milestone Jan 9, 2026

irfano added the feature: notifications Related to notifications or notifs. label Jan 9, 2026

github-advanced-security bot found potential problems Jan 9, 2026

View reviewed changes

...lin/com/woocommerce/android/ui/dashboard/pushnotifications/DashboardPushNotificationsCard.kt Fixed Show fixed Hide fixed

...lin/com/woocommerce/android/ui/dashboard/pushnotifications/DashboardPushNotificationsCard.kt Fixed Show fixed Hide fixed

irfano marked this pull request as ready for review January 14, 2026 11:44

irfano requested review from JorgeMucientes and removed request for JorgeMucientes January 14, 2026 11:44

irfano marked this pull request as draft January 15, 2026 12:31

Base automatically changed from issue/woomob-1909-add-new-local-feature-flag-for-woo-notifications-disabled-by to trunk January 16, 2026 16:54

irfano added 3 commits January 21, 2026 21:29

Add WOO_PUSH_NOTIFICATIONS_SYSTEM_M2 feature flag

c2a73c5

Update ObservePushNotificationsWidgetStatus to use M2 feature flag

29ff3a3

Merge branch 'trunk' into issue/woomob-1921-replace-jetpack-banner-wi…

ac84fc3

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

wpmobilebot modified the milestones: 24.0, 24.1 Jan 23, 2026

irfano added 6 commits January 27, 2026 19:36

Merge branch 'trunk' into issue/woomob-1921-replace-jetpack-banner-wi…

df85d83

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

Add visibility logic for push notifications dashboard widget

b5517e6

Update push notifications menu title from "Unlock" to "Enable".

7b4ab4e

Set push notification card visible as default

827e26a

Hide Jetpack Benefits Banner when Enable PN card is available

2e6bef0

Add ShouldShowEnablePushNotificationsUi shared visibility class

d72393d

irfano force-pushed the issue/woomob-1921-replace-jetpack-banner-with-wp-dashboard-card-ui branch from 67446c7 to d72393d Compare January 28, 2026 15:35

irfano added 2 commits January 28, 2026 18:56

Merge branch 'trunk' into issue/woomob-1921-replace-jetpack-banner-wi…

015fe49

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

Merge branch 'trunk' into issue/woomob-1921-replace-jetpack-banner-wi…

b10ec9b

…th-wp-dashboard-card-ui # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardViewModel.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

Migrate DashboardPushNotificationsCard to material 3 typography

a008ba8

irfano requested a review from JorgeMucientes January 29, 2026 18:34

irfano marked this pull request as ready for review January 29, 2026 18:34

JorgeMucientes self-assigned this Jan 30, 2026

JorgeMucientes requested a review from Copilot February 3, 2026 08:13

Copilot started reviewing on behalf of JorgeMucientes February 3, 2026 08:13 View session

Copilot AI reviewed Feb 3, 2026

View reviewed changes

JorgeMucientes requested changes Feb 3, 2026

View reviewed changes

JorgeMucientes mentioned this pull request Feb 3, 2026

Add settings entry for Woo PNs #15261

Open

1 task

irfano and others added 3 commits February 3, 2026 16:23

Update WooCommerce/src/main/kotlin/com/woocommerce/android/notificati…

397a776

…ons/push/ShouldShowEnablePushNotificationsUi.kt Co-authored-by: Copilot <[email protected]>

Reorder parameters in DashboardPushNotificationsCard.kt

194efdd

Merge branch 'trunk' into issue/woomob-1921-replace-jetpack-banner-wi…

2d71511

…th-wp-dashboard-card-ui

irfano force-pushed the issue/woomob-1921-replace-jetpack-banner-with-wp-dashboard-card-ui branch from 4f32249 to 2d71511 Compare February 3, 2026 14:44

Add unit tests for Jetpack benefits banner visibility

bd5dac5

irfano force-pushed the issue/woomob-1921-replace-jetpack-banner-with-wp-dashboard-card-ui branch from b7f995e to bd5dac5 Compare February 3, 2026 15:15

irfano added 3 commits February 4, 2026 01:50

Convert PN registration status to reactive Flow pattern

c61cd28

Unregister WooCore tokens during application password logout

0b88f0f

Fix detekt indentation issues

de07126

irfano force-pushed the issue/woomob-1921-replace-jetpack-banner-with-wp-dashboard-card-ui branch from 54f95ac to de07126 Compare February 3, 2026 22:57

irfano requested a review from JorgeMucientes February 4, 2026 11:15

Replace Jetpack banner with a WP dashboard card UI #15180

Are you sure you want to change the base?

Replace Jetpack banner with a WP dashboard card UI #15180

Uh oh!

Conversation

irfano commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Test Steps

TC1: Feature flag disabled, authenticated with app passwords to site without support of new PN.

TC2: Feature flag enabled, authenticated with app passwords to site without support of new PN.

TC3: Feature flag enabled, authenticated with app passwords to site with support of new PN.

TC4: Feature flag enabled, authenticated with WPCom to site without support of new PN.

Images/gif

Uh oh!

wpmobilebot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

wpmobilebot commented Jan 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

irfano Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

irfano Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JorgeMucientes Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

irfano Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

irfano Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

irfano commented Feb 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

irfano commented Jan 9, 2026 •

edited

Loading

wpmobilebot commented Jan 9, 2026 •

edited

Loading

wpmobilebot commented Jan 9, 2026 •

edited

Loading

codecov-commenter commented Jan 9, 2026 •

edited

Loading

JorgeMucientes left a comment •

edited

Loading

irfano Feb 3, 2026 •

edited

Loading

irfano Feb 3, 2026 •

edited

Loading