From 8c35a38d517a0d16ca6d33fd7488592cafbd3150 Mon Sep 17 00:00:00 2001
From: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>
Date: Wed, 31 Jan 2024 22:52:37 -0300
Subject: [PATCH 1/5] Update copy to clarify that user connection is required

---
 .../hooks/use-connection-watcher/index.js     | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

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
index a9b9bef15c3f4..f547d9f39a793 100644
--- a/projects/packages/my-jetpack/_inc/hooks/use-connection-watcher/index.js
+++ b/projects/packages/my-jetpack/_inc/hooks/use-connection-watcher/index.js
@@ -37,27 +37,9 @@ export default function useConnectionWatcher() {
 					'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',
 				actions: [
@@ -71,7 +53,6 @@ export default function useConnectionWatcher() {
 		}
 	}, [
 		isSiteConnected,
-		needsSiteConnectionMessage,
 		needsUserConnectionMessage,
 		requiresUserConnection,
 		navToConnection,

From 669cb09d3630d0b957cb262350453e2d608d2832 Mon Sep 17 00:00:00 2001
From: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>
Date: Wed, 31 Jan 2024 23:06:28 -0300
Subject: [PATCH 2/5] changelog

---
 .../packages/my-jetpack/changelog/fix-welcome-banner-cta-copy | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 projects/packages/my-jetpack/changelog/fix-welcome-banner-cta-copy

diff --git a/projects/packages/my-jetpack/changelog/fix-welcome-banner-cta-copy b/projects/packages/my-jetpack/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..dba6514231292
--- /dev/null
+++ 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

From dbc1ddddbe7f4dcb3f3ef9b4ee1b1221d4c983b4 Mon Sep 17 00:00:00 2001
From: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:26:35 -0300
Subject: [PATCH 3/5] Fix notice status

---
 .../my-jetpack/_inc/hooks/use-connection-watcher/index.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f547d9f39a793..cf9ccf451cbb9 100644
--- a/projects/packages/my-jetpack/_inc/hooks/use-connection-watcher/index.js
+++ b/projects/packages/my-jetpack/_inc/hooks/use-connection-watcher/index.js
@@ -41,7 +41,7 @@ export default function useConnectionWatcher() {
 	useEffect( () => {
 		if ( ! isSiteConnected || requiresUserConnection ) {
 			setGlobalNotice( needsUserConnectionMessage, {
-				status: 'error',
+				status: 'warning',
 				actions: [
 					{
 						label: __( 'Connect your user account to fix this', 'jetpack-my-jetpack' ),

From 2434a9ed9543895c479261b65bd4b4561b8cec38 Mon Sep 17 00:00:00 2001
From: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>
Date: Fri, 2 Feb 2024 11:10:50 -0300
Subject: [PATCH 4/5] Update changelog

---
 projects/packages/my-jetpack/composer.json                   | 2 +-
 projects/packages/my-jetpack/package.json                    | 2 +-
 projects/packages/my-jetpack/src/class-initializer.php       | 2 +-
 .../plugins/backup/changelog/fix-welcome-banner-cta-copy     | 5 +++++
 projects/plugins/backup/composer.lock                        | 4 ++--
 projects/plugins/boost/changelog/fix-welcome-banner-cta-copy | 5 +++++
 projects/plugins/boost/composer.lock                         | 4 ++--
 .../plugins/jetpack/changelog/fix-welcome-banner-cta-copy    | 5 +++++
 projects/plugins/jetpack/composer.lock                       | 4 ++--
 .../plugins/migration/changelog/fix-welcome-banner-cta-copy  | 5 +++++
 projects/plugins/migration/composer.lock                     | 4 ++--
 .../plugins/protect/changelog/fix-welcome-banner-cta-copy    | 5 +++++
 projects/plugins/protect/composer.lock                       | 4 ++--
 .../plugins/search/changelog/fix-welcome-banner-cta-copy     | 5 +++++
 projects/plugins/search/composer.lock                        | 4 ++--
 .../plugins/social/changelog/fix-welcome-banner-cta-copy     | 5 +++++
 projects/plugins/social/composer.lock                        | 4 ++--
 .../starter-plugin/changelog/fix-welcome-banner-cta-copy     | 5 +++++
 projects/plugins/starter-plugin/composer.lock                | 4 ++--
 .../plugins/videopress/changelog/fix-welcome-banner-cta-copy | 5 +++++
 projects/plugins/videopress/composer.lock                    | 4 ++--
 21 files changed, 66 insertions(+), 21 deletions(-)
 create mode 100644 projects/plugins/backup/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/boost/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/jetpack/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/migration/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/protect/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/search/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/social/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/starter-plugin/changelog/fix-welcome-banner-cta-copy
 create mode 100644 projects/plugins/videopress/changelog/fix-welcome-banner-cta-copy

diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json
index 2b119d7eb19df..ba24a476e6c49 100644
--- 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
index 01df741ebc987..d2e70433df3a2 100644
--- 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
index c3908846cf96c..00abf23e1f8b4 100644
--- 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
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index 3b832905d9d10..da56d6d98cedb 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/composer.lock
@@ -985,7 +985,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -1017,7 +1017,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/plugins/boost/changelog/fix-welcome-banner-cta-copy b/projects/plugins/boost/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index 3c91852284f59..4830343b53249 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -1047,7 +1047,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -1079,7 +1079,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/plugins/jetpack/changelog/fix-welcome-banner-cta-copy b/projects/plugins/jetpack/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ 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
index 4c33e6bc7b5d5..b5f552f794688 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -1681,7 +1681,7 @@
 			"dist": {
 				"type": "path",
 				"url": "../../packages/my-jetpack",
-				"reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+				"reference": "bf778754fb706da75a7c178fa20217ae9281e212"
 			},
 			"require": {
 				"automattic/jetpack-admin-ui": "@dev",
@@ -1713,7 +1713,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/plugins/migration/changelog/fix-welcome-banner-cta-copy b/projects/plugins/migration/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index 4d7b2e2c06a43..c800c9bf14532 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -985,7 +985,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -1017,7 +1017,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/plugins/protect/changelog/fix-welcome-banner-cta-copy b/projects/plugins/protect/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index b2d40d7e83f31..a3a6066406dbc 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -898,7 +898,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -930,7 +930,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/plugins/search/changelog/fix-welcome-banner-cta-copy b/projects/plugins/search/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index e3aa23e679308..81fec73de3a46 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -841,7 +841,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -873,7 +873,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/plugins/social/changelog/fix-welcome-banner-cta-copy b/projects/plugins/social/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index e47f777cec5f1..e4d1138fdb9e2 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -841,7 +841,7 @@
 			"dist": {
 				"type": "path",
 				"url": "../../packages/my-jetpack",
-				"reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+				"reference": "bf778754fb706da75a7c178fa20217ae9281e212"
 			},
 			"require": {
 				"automattic/jetpack-admin-ui": "@dev",
@@ -873,7 +873,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/plugins/starter-plugin/changelog/fix-welcome-banner-cta-copy b/projects/plugins/starter-plugin/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index 0b75d33740bbf..b05cffff6f606 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -841,7 +841,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -873,7 +873,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/plugins/videopress/changelog/fix-welcome-banner-cta-copy b/projects/plugins/videopress/changelog/fix-welcome-banner-cta-copy
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ 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
index 213e35c6f23fd..fab0c64e6de76 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -841,7 +841,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/my-jetpack",
-                "reference": "800ea60c7c03b2caf037d0cd0ccb7e08eeb2786e"
+                "reference": "bf778754fb706da75a7c178fa20217ae9281e212"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "@dev",
@@ -873,7 +873,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"

From f0f0a41ea3db8df0e2b4b03a662bc41411e7281c Mon Sep 17 00:00:00 2001
From: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>
Date: Fri, 2 Feb 2024 11:11:32 -0300
Subject: [PATCH 5/5] Fix logic to display message for one product

---
 .../my-jetpack/_inc/hooks/use-connection-watcher/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
index cf9ccf451cbb9..c4bff4a3bc9c0 100644
--- 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,12 +31,12 @@ 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;
+			  );
 
 	useEffect( () => {
 		if ( ! isSiteConnected || requiresUserConnection ) {