My Jetpack: fix the 'Missing site connection' notice (#39809)

My Jetpack will ask to establish user connection even if site connection is missing. This PR will give the "missing site connection" notice more priority so it would show up on non-connected sites.
Automattic · Oct 25, 2024 · 8fb5511 · 8fb5511
1 parent 33a4d42
commit 8fb5511
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/projects/packages/my-jetpack/changelog/fix-my-jetpack-missing-site-connection-notice b/projects/packages/my-jetpack/changelog/fix-my-jetpack-missing-site-connection-notice
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix the "Missing site connection" notice.
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -940,17 +940,18 @@ public static function alert_if_missing_connection( array $red_bubble_slugs ) {
 		$broken_modules = self::check_for_broken_modules();
 		$connection     = new Connection_Manager();
 
-		if ( ! empty( $broken_modules['needs_user_connection'] ) ) {
+		// Checking for site connection issues first.
+		if ( ! empty( $broken_modules['needs_site_connection'] ) ) {
 			$red_bubble_slugs[ self::MISSING_CONNECTION_NOTIFICATION_KEY ] = array(
-				'type'     => 'user',
+				'type'     => 'site',
 				'is_error' => true,
 			);
 			return $red_bubble_slugs;
 		}
 
-		if ( ! empty( $broken_modules['needs_site_connection'] ) ) {
+		if ( ! empty( $broken_modules['needs_user_connection'] ) ) {
 			$red_bubble_slugs[ self::MISSING_CONNECTION_NOTIFICATION_KEY ] = array(
-				'type'     => 'site',
+				'type'     => 'user',
 				'is_error' => true,
 			);
 			return $red_bubble_slugs;