Automattic · IanRamosC · Feb 2, 2024 · Feb 1, 2024 · Feb 1, 2024 · Feb 1, 2024
diff --git a/projects/packages/my-jetpack/_inc/hooks/use-connection-watcher/index.js b/projects/packages/my-jetpack/_inc/hooks/use-connection-watcher/index.js
@@ -31,35 +31,17 @@ export default function useConnectionWatcher() {
 	);
 
 	const needsUserConnectionMessage =
-		productsThatRequiresUserConnection.length > 1
-			? __(
+		productsThatRequiresUserConnection.length === 1
+			? oneProductMessage
+			: __(
 					'Some products need a user connection to WordPress.com to be able to work.',
 					'jetpack-my-jetpack'
-			  )
-			: oneProductMessage;
-	const needsSiteConnectionMessage = __(
-		'Some products need a connection to WordPress.com to be able to work.',
-		'jetpack-my-jetpack'
-	);
+			  );
 
 	useEffect( () => {
-		if ( ! isSiteConnected ) {
-			setGlobalNotice( needsSiteConnectionMessage, {
-				status: 'warning',
-				actions: [
-					{
-						label: __( 'Connect your site to fix this', 'jetpack-my-jetpack' ),
-						onClick: navToConnection,
-						variant: 'link',
-						noDefaultClasses: true,
-					},
-				],
-			} );
-			return;
-		}
-		if ( requiresUserConnection ) {
+		if ( ! isSiteConnected || requiresUserConnection ) {
 			setGlobalNotice( needsUserConnectionMessage, {
-				status: 'error',
+				status: 'warning',
 				actions: [
 					{
 						label: __( 'Connect your user account to fix this', 'jetpack-my-jetpack' ),
@@ -71,7 +53,6 @@ export default function useConnectionWatcher() {
 		}
 	}, [
 		isSiteConnected,
-		needsSiteConnectionMessage,
 		needsUserConnectionMessage,
 		requiresUserConnection,
 		navToConnection,

diff --git a/projects/packages/my-jetpack/changelog/fix-welcome-banner-cta-copy b/projects/packages/my-jetpack/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Update CTA copy on the connection banner to make it clear which type of connection we are going to request
diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json
@@ -76,7 +76,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "4.7.x-dev"
+			"dev-trunk": "4.8.x-dev"
 		},
 		"version-constants": {
 			"::PACKAGE_VERSION": "src/class-initializer.php"

diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-my-jetpack",
-	"version": "4.7.1-alpha",
+	"version": "4.8.0-alpha",
 	"description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme",
 	"bugs": {

diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
@@ -34,7 +34,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '4.7.1-alpha';
+	const PACKAGE_VERSION = '4.8.0-alpha';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

diff --git a/projects/plugins/backup/changelog/fix-welcome-banner-cta-copy b/projects/plugins/backup/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/boost/changelog/fix-welcome-banner-cta-copy b/projects/plugins/boost/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/jetpack/changelog/fix-welcome-banner-cta-copy b/projects/plugins/jetpack/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/migration/changelog/fix-welcome-banner-cta-copy b/projects/plugins/migration/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
diff --git a/projects/plugins/protect/changelog/fix-welcome-banner-cta-copy b/projects/plugins/protect/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
diff --git a/projects/plugins/search/changelog/fix-welcome-banner-cta-copy b/projects/plugins/search/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
diff --git a/projects/plugins/social/changelog/fix-welcome-banner-cta-copy b/projects/plugins/social/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
diff --git a/projects/plugins/starter-plugin/changelog/fix-welcome-banner-cta-copy b/projects/plugins/starter-plugin/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
diff --git a/projects/plugins/videopress/changelog/fix-welcome-banner-cta-copy b/projects/plugins/videopress/changelog/fix-welcome-banner-cta-copy
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock