From cbf4e67d5eec2bfdcfba9bcbc1e68bc9dccd0e05 Mon Sep 17 00:00:00 2001
From: MILLER/F <millerf@automattic.com>
Date: Wed, 8 Nov 2023 17:23:10 +0000
Subject: [PATCH 01/16] Change tier hash (#34011)

---
 projects/plugins/jetpack/changelog/add-tier-hash              | 4 ++++
 .../plugins/jetpack/extensions/shared/memberships/utils.js    | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/add-tier-hash

diff --git a/projects/plugins/jetpack/changelog/add-tier-hash b/projects/plugins/jetpack/changelog/add-tier-hash
new file mode 100644
index 0000000000000..3186dc60cb896
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-tier-hash
@@ -0,0 +1,4 @@
+Significance: patch
+Type: compat
+
+Added tier hash
diff --git a/projects/plugins/jetpack/extensions/shared/memberships/utils.js b/projects/plugins/jetpack/extensions/shared/memberships/utils.js
index f09b6bee5307d..76f0a59b28720 100644
--- a/projects/plugins/jetpack/extensions/shared/memberships/utils.js
+++ b/projects/plugins/jetpack/extensions/shared/memberships/utils.js
@@ -22,10 +22,10 @@ export const encodeValueForShortcodeAttribute = value => {
 		.replace( /\u200b/g, '&#x200b;' );
 };
 
-export const getPaidPlanLink = alreadyHasNewsletterPlans => {
+export const getPaidPlanLink = alreadyHasTierPlans => {
 	const link = 'https://wordpress.com/earn/payments-plans/' + location.hostname;
 	// We force the "Newsletters plan" link only if there is no plans already created
-	return alreadyHasNewsletterPlans ? link : link + '#add-newsletter-payment-plan';
+	return alreadyHasTierPlans ? link : link + '#add-tier-plan';
 };
 
 export const getShowMisconfigurationWarning = ( postVisibility, accessLevel ) => {

From 435393d37bb9107f8270b99545ef326de030658c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Wed, 8 Nov 2023 12:12:31 -0600
Subject: [PATCH 02/16] AI Assistant: introduce action to increase requests
 counter (#34019)

* introduce constants file

* introduce ACTION_INCREASE_AI_ASSISTANT_REQUESTS_COUNT

* introduce a reducer file

* reduce the encrease counter action

* changelog
---
 .../update-ai-assistant-reduce-requests       |  4 +
 .../extensions/store/wordpress-com/actions.ts | 27 ++++--
 .../store/wordpress-com/constants.ts          | 12 +++
 .../extensions/store/wordpress-com/index.ts   | 73 +--------------
 .../extensions/store/wordpress-com/reducer.ts | 93 +++++++++++++++++++
 5 files changed, 133 insertions(+), 76 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-ai-assistant-reduce-requests
 create mode 100644 projects/plugins/jetpack/extensions/store/wordpress-com/constants.ts
 create mode 100644 projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts

diff --git a/projects/plugins/jetpack/changelog/update-ai-assistant-reduce-requests b/projects/plugins/jetpack/changelog/update-ai-assistant-reduce-requests
new file mode 100644
index 0000000000000..b1cead40d8683
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-ai-assistant-reduce-requests
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+AI Assistant: introduce action to increase requests counter
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts
index 64e84d027b416..5ebccaf31544a 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts
@@ -3,8 +3,16 @@
  */
 import apiFetch from '@wordpress/api-fetch';
 /**
- * Types
+ * Types & Constants
  */
+import {
+	ACTION_FETCH_FROM_API,
+	ACTION_INCREASE_AI_ASSISTANT_REQUESTS_COUNT,
+	ACTION_REQUEST_AI_ASSISTANT_FEATURE,
+	ACTION_SET_PLANS,
+	ACTION_STORE_AI_ASSISTANT_FEATURE,
+	ENDPOINT_AI_ASSISTANT_FEATURE,
+} from './constants';
 import type { Plan } from './types';
 import type { AiFeatureProps } from './types';
 import type { SiteAIAssistantFeatureEndpointResponseProps } from '../../types';
@@ -41,21 +49,21 @@ export function mapAIFeatureResponseToAiFeatureProps(
 const actions = {
 	setPlans( plans: Array< Plan > ) {
 		return {
-			type: 'SET_PLANS',
+			type: ACTION_SET_PLANS,
 			plans,
 		};
 	},
 
 	fetchFromAPI( url: string ) {
 		return {
-			type: 'FETCH_FROM_API',
+			type: ACTION_FETCH_FROM_API,
 			url,
 		};
 	},
 
 	storeAiAssistantFeature( feature: AiFeatureProps ) {
 		return {
-			type: 'STORE_AI_ASSISTANT_FEATURE',
+			type: ACTION_STORE_AI_ASSISTANT_FEATURE,
 			feature,
 		};
 	},
@@ -68,11 +76,11 @@ const actions = {
 	fetchAiAssistantFeature() {
 		return async ( { dispatch } ) => {
 			// Dispatch isFetching action.
-			dispatch( { type: 'REQUEST_AI_ASSISTANT_FEATURE' } );
+			dispatch( { type: ACTION_REQUEST_AI_ASSISTANT_FEATURE } );
 
 			try {
 				const response: SiteAIAssistantFeatureEndpointResponseProps = await apiFetch( {
-					path: '/wpcom/v2/jetpack-ai/ai-assistant-feature',
+					path: ENDPOINT_AI_ASSISTANT_FEATURE,
 				} );
 
 				// Store the feature in the store.
@@ -85,6 +93,13 @@ const actions = {
 			}
 		};
 	},
+
+	increaseAiAssistantRequestsCount( count = 1 ) {
+		return {
+			type: ACTION_INCREASE_AI_ASSISTANT_REQUESTS_COUNT,
+			count,
+		};
+	},
 };
 
 export default actions;
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/constants.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/constants.ts
new file mode 100644
index 0000000000000..91c46907438d6
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/constants.ts
@@ -0,0 +1,12 @@
+/**
+ * Actions
+ */
+export const ACTION_SET_PLANS = 'SET_PLANS';
+export const ACTION_FETCH_FROM_API = 'FETCH_FROM_API';
+export const ACTION_STORE_AI_ASSISTANT_FEATURE = 'STORE_AI_ASSISTANT_FEATURE';
+export const ACTION_REQUEST_AI_ASSISTANT_FEATURE = 'REQUEST_AI_ASSISTANT_FEATURE';
+export const ACTION_INCREASE_AI_ASSISTANT_REQUESTS_COUNT = 'INCREASE_AI_ASSISTANT_REQUESTS_COUNT';
+/**
+ * Endpoints
+ */
+export const ENDPOINT_AI_ASSISTANT_FEATURE = '/wpcom/v2/jetpack-ai/ai-assistant-feature';
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts
index ef337a7726118..f737bf19446e4 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts
@@ -6,6 +6,7 @@ import { createReduxStore, register } from '@wordpress/data';
  * Internal dependencies
  */
 import actions from './actions';
+import reducer from './reducer';
 /**
  * Types
  */
@@ -13,81 +14,13 @@ import type { PlanStateProps } from './types';
 
 const store = 'wordpress-com/plans';
 
-const INITIAL_STATE: PlanStateProps = {
-	plans: [],
-	features: {
-		aiAssistant: {
-			hasFeature: false,
-			isOverLimit: false,
-			requestsCount: 0,
-			requestsLimit: 0,
-			requireUpgrade: false,
-			errorMessage: '',
-			errorCode: '',
-			upgradeType: 'default',
-			currentTier: {
-				value: 1,
-			},
-			usagePeriod: {
-				currentStart: '',
-				nextStart: '',
-				requestsCount: 0,
-			},
-			_meta: {
-				isRequesting: false,
-			},
-		},
-	},
-};
-
 const wordpressPlansStore = createReduxStore( store, {
 	__experimentalUseThunks: true,
 
-	reducer( state = INITIAL_STATE, action ) {
-		switch ( action.type ) {
-			case 'SET_PLANS':
-				return {
-					...state,
-					plans: action.plans,
-				};
-
-			case 'REQUEST_AI_ASSISTANT_FEATURE':
-				return {
-					...state,
-					features: {
-						...state.features,
-						aiAssistant: {
-							...state.features.aiAssistant,
-							_meta: {
-								...state.features.aiAssistant._meta,
-								isRequesting: true,
-							},
-						},
-					},
-				};
-
-			case 'STORE_AI_ASSISTANT_FEATURE': {
-				return {
-					...state,
-					features: {
-						...state.features,
-						aiAssistant: {
-							...action.feature,
-							_meta: {
-								...state.features.aiAssistant._meta,
-								isRequesting: false,
-							},
-						},
-					},
-				};
-			}
-		}
-
-		return state;
-	},
-
 	actions,
 
+	reducer,
+
 	selectors: {
 		/*
 		 * Return the plan with the given slug.
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts
new file mode 100644
index 0000000000000..16d66949bbd77
--- /dev/null
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts
@@ -0,0 +1,93 @@
+/**
+ * Types
+ */
+import {
+	ACTION_INCREASE_AI_ASSISTANT_REQUESTS_COUNT,
+	ACTION_REQUEST_AI_ASSISTANT_FEATURE,
+	ACTION_SET_PLANS,
+	ACTION_STORE_AI_ASSISTANT_FEATURE,
+} from './constants';
+import type { PlanStateProps } from './types';
+
+const INITIAL_STATE: PlanStateProps = {
+	plans: [],
+	features: {
+		aiAssistant: {
+			hasFeature: false,
+			isOverLimit: false,
+			requestsCount: 0,
+			requestsLimit: 0,
+			requireUpgrade: false,
+			errorMessage: '',
+			errorCode: '',
+			upgradeType: 'default',
+			currentTier: {
+				value: 1,
+			},
+			usagePeriod: {
+				currentStart: '',
+				nextStart: '',
+				requestsCount: 0,
+			},
+			_meta: {
+				isRequesting: false,
+			},
+		},
+	},
+};
+
+export default function reducer( state = INITIAL_STATE, action ) {
+	switch ( action.type ) {
+		case ACTION_SET_PLANS:
+			return {
+				...state,
+				plans: action.plans,
+			};
+
+		case ACTION_REQUEST_AI_ASSISTANT_FEATURE:
+			return {
+				...state,
+				features: {
+					...state.features,
+					aiAssistant: {
+						...state.features.aiAssistant,
+						_meta: {
+							...state.features.aiAssistant._meta,
+							isRequesting: true,
+						},
+					},
+				},
+			};
+
+		case ACTION_STORE_AI_ASSISTANT_FEATURE: {
+			return {
+				...state,
+				features: {
+					...state.features,
+					aiAssistant: {
+						...action.feature,
+						_meta: {
+							...state.features.aiAssistant._meta,
+							isRequesting: false,
+						},
+					},
+				},
+			};
+		}
+
+		case ACTION_INCREASE_AI_ASSISTANT_REQUESTS_COUNT: {
+			return {
+				...state,
+				features: {
+					...state.features,
+					aiAssistant: {
+						...state.features.aiAssistant,
+						requestsCount: state.features.aiAssistant.requestsCount + action.count,
+					},
+				},
+			};
+		}
+	}
+
+	return state;
+}

From ee6116849df21db2342ba1e470aa14f41ee61afe Mon Sep 17 00:00:00 2001
From: Miguel Lezama <miguel@automattic.com>
Date: Wed, 8 Nov 2023 16:43:02 -0300
Subject: [PATCH 03/16] Subscribe Block: Fix regression in the editor (#34023)

---
 .../changelog/fix-subscribe-block-editor      |  4 ++
 .../extensions/blocks/subscriptions/edit.js   | 48 ++++++++++---------
 2 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/fix-subscribe-block-editor

diff --git a/projects/plugins/jetpack/changelog/fix-subscribe-block-editor b/projects/plugins/jetpack/changelog/fix-subscribe-block-editor
new file mode 100644
index 0000000000000..56bdd8c76fa6e
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-subscribe-block-editor
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Subscribe Block: Fix display in the editor.
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/edit.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/edit.js
index 74ac2f69a9e8c..f4bf97b6c23cc 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/edit.js
@@ -286,29 +286,31 @@ export function SubscriptionEdit( props ) {
 			) }
 
 			<div className={ getBlockClassName() } style={ cssVars }>
-				<div className="wp-block-jetpack-subscriptions__form" role="form">
-					<div className="wp-block-jetpack-subscriptions__form-elements">
-						<TextControl
-							placeholder={ subscribePlaceholder }
-							disabled={ true }
-							className={ classnames(
-								emailFieldClasses,
-								'wp-block-jetpack-subscriptions__textfield'
-							) }
-							style={ emailFieldStyles }
-						/>
-						<RichText
-							className={ classnames(
-								buttonClasses,
-								'wp-block-jetpack-subscriptions__button',
-								'wp-block-button__link'
-							) }
-							onChange={ value => setAttributes( { submitButtonText: value } ) }
-							style={ buttonStyles }
-							value={ submitButtonText }
-							withoutInteractiveFormatting
-							allowedFormats={ [ 'core/bold', 'core/italic', 'core/strikethrough' ] }
-						/>
+				<div className="jetpack_subscription_widget is-not-subscriber">
+					<div className="wp-block-jetpack-subscriptions__form" role="form">
+						<div className="wp-block-jetpack-subscriptions__form-elements">
+							<TextControl
+								placeholder={ subscribePlaceholder }
+								disabled={ true }
+								className={ classnames(
+									emailFieldClasses,
+									'wp-block-jetpack-subscriptions__textfield'
+								) }
+								style={ emailFieldStyles }
+							/>
+							<RichText
+								className={ classnames(
+									buttonClasses,
+									'wp-block-jetpack-subscriptions__button',
+									'wp-block-button__link'
+								) }
+								onChange={ value => setAttributes( { submitButtonText: value } ) }
+								style={ buttonStyles }
+								value={ submitButtonText }
+								withoutInteractiveFormatting
+								allowedFormats={ [ 'core/bold', 'core/italic', 'core/strikethrough' ] }
+							/>
+						</div>
 					</div>
 				</div>
 				{ showSubscribersTotal && (

From b36bfb68b672ed57117cdef6458221b81cbe664e Mon Sep 17 00:00:00 2001
From: Miguel Lezama <miguel@automattic.com>
Date: Wed, 8 Nov 2023 16:46:43 -0300
Subject: [PATCH 04/16] Subscription Block: Enhance button text and styles.
 (#33995)

---
 .../update-subscribe-block-submit-text        |  4 ++
 .../blocks/subscriptions/subscriptions.php    | 55 ++++++++++++++-----
 2 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-subscribe-block-submit-text

diff --git a/projects/plugins/jetpack/changelog/update-subscribe-block-submit-text b/projects/plugins/jetpack/changelog/update-subscribe-block-submit-text
new file mode 100644
index 0000000000000..a8a1155850875
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-subscribe-block-submit-text
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+fix to previous PR
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php b/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php
index cf001e0f73acc..157fc69f148ae 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php
@@ -550,20 +550,20 @@ function render_block( $attributes ) {
 	$styles  = get_element_styles_from_attributes( $attributes );
 
 	$include_social_followers = isset( $attributes['includeSocialFollowers'] ) ? (bool) get_attribute( $attributes, 'includeSocialFollowers' ) : true;
-	$is_paid_subscriber       = get_attribute( $attributes, 'isPaidSubscriber', false );
 
 	$data = array(
 		'widget_id'                     => Jetpack_Subscriptions_Widget::$instance_count,
 		'subscribe_email'               => $subscribe_email,
-
+		'is_paid_subscriber'            => get_attribute( $attributes, 'isPaidSubscriber', false ),
 		'wrapper_attributes'            => get_block_wrapper_attributes(
 			array(
 				'class' => $classes['block_wrapper'],
 			)
 		),
-		'subscribe_placeholder'         => get_attribute( $attributes, 'subscribePlaceholder', esc_html__( 'Type your email…', 'jetpack' ) ),
-		'submit_button_text'            => get_attribute( $attributes, 'submitButtonText', $is_paid_subscriber ? esc_html__( 'Upgrade', 'jetpack' ) : esc_html__( 'Subscribe', 'jetpack' ) ),
-		'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', esc_html__( 'Subscribed', 'jetpack' ) ),
+		'subscribe_placeholder'         => get_attribute( $attributes, 'subscribePlaceholder', __( 'Type your email…', 'jetpack' ) ),
+		'submit_button_text'            => get_attribute( $attributes, 'submitButtonText', __( 'Subscribe', 'jetpack' ) ),
+		'submit_button_text_subscribed' => get_attribute( $attributes, 'submitButtonTextSubscribed', __( 'Subscribed', 'jetpack' ) ),
+		'submit_button_text_upgrade'    => get_attribute( $attributes, 'submitButtonTextUpgrade', __( 'Upgrade subscription', 'jetpack' ) ),
 		'success_message'               => get_attribute(
 			$attributes,
 			'successMessage',
@@ -618,10 +618,7 @@ function render_for_website( $data, $classes, $styles ) {
 	$subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] );
 	$tier_id            = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true );
 	$is_subscribed      = Jetpack_Memberships::is_current_user_subscribed();
-	$button_text        = wp_kses(
-		html_entity_decode( $is_subscribed ? ( '✓ ' . $data['submit_button_text_subscribed'] ) : $data['submit_button_text'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ),
-		Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button
-	);
+	$button_text        = get_submit_button_text( $data );
 
 	ob_start();
 
@@ -710,7 +707,7 @@ class="<?php echo esc_attr( $classes['submit_button'] ); ?>"
 								<?php endif; ?>
 								name="jetpack_subscriptions_widget"
 							>
-								<?php echo esc_html( $button_text ); ?>
+								<?php echo sanitize_submit_text( $button_text ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 							</button>
 						</p>
 					</div>
@@ -739,17 +736,14 @@ class="<?php echo esc_attr( $classes['submit_button'] ); ?>"
  */
 function render_for_email( $data, $styles ) {
 	$submit_button_wrapper_style = ! empty( $styles['submit_button_wrapper'] ) ? 'style="' . esc_attr( $styles['submit_button_wrapper'] ) . '"' : '';
-	$button_text                 = wp_kses(
-		html_entity_decode( $data['submit_button_text'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ),
-		Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button
-	);
+	$button_text                 = get_submit_button_text( $data );
 
 	$html = '<div ' . wp_kses_data( $data['wrapper_attributes'] ) . '>
 		<div>
 			<div>
 				<div>
 					<p ' . $submit_button_wrapper_style . '>
-						<a href="' . esc_url( get_post_permalink() ) . '" style="text-decoration: none; ' . esc_attr( $styles['submit_button'] ) . '">' . $button_text . '</a>
+						<a href="' . esc_url( get_post_permalink() ) . '" style="text-decoration: none; ' . esc_attr( $styles['submit_button'] ) . '">' . sanitize_submit_text( $button_text ) . '</a>
 					</p>
 				</div>
 			</div>
@@ -912,6 +906,37 @@ function get_current_url() {
 	return $current_url;
 }
 
+/**
+ * Get the submit button text based on the subscription status.
+ *
+ * @param array $data Array containing block view data.
+ *
+ * @return string
+ */
+function get_submit_button_text( $data ) {
+	if ( ! Jetpack_Memberships::is_current_user_subscribed() ) {
+		return $data['submit_button_text'];
+	}
+	if ( ! Jetpack_Memberships::user_can_view_post() ) {
+		return $data['submit_button_text_upgrade'];
+	}
+	return '✓ ' . $data['submit_button_text_subscribed'];
+}
+
+/**
+ * Sanitize the submit button text.
+ *
+ * @param string $text String containing the submit button text.
+ *
+ * @return string
+ */
+function sanitize_submit_text( $text ) {
+	return wp_kses(
+		html_entity_decode( $text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ),
+		Jetpack_Subscriptions_Widget::$allowed_html_tags_for_submit_button
+	);
+}
+
 /**
  * Returns paywall content blocks if user is not authenticated
  *

From b8c2d2f0e564a725d8a365d3c02064015b067f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Wed, 8 Nov 2023 15:53:35 -0600
Subject: [PATCH 05/16] AI Client: ensure dispatching unclear error prompt once
 per request/response (#34025)

* ensure dispatching unclear prompt error once

* changelog

* Update projects/js-packages/ai-client/src/suggestions-event-source/index.ts

Co-authored-by: Douglas Henri <dhasilva@users.noreply.github.com>

* Update projects/js-packages/ai-client/src/suggestions-event-source/index.ts

Co-authored-by: Douglas Henri <dhasilva@users.noreply.github.com>

* update camelCase change

* bump new version

---------

Co-authored-by: Douglas Henri <dhasilva@users.noreply.github.com>
---
 ...pdate-ai-client-dispatch-unclear-prompt-once |  4 ++++
 projects/js-packages/ai-client/package.json     |  2 +-
 .../src/suggestions-event-source/index.ts       | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 projects/js-packages/ai-client/changelog/update-ai-client-dispatch-unclear-prompt-once

diff --git a/projects/js-packages/ai-client/changelog/update-ai-client-dispatch-unclear-prompt-once b/projects/js-packages/ai-client/changelog/update-ai-client-dispatch-unclear-prompt-once
new file mode 100644
index 0000000000000..b347b4d1605f9
--- /dev/null
+++ b/projects/js-packages/ai-client/changelog/update-ai-client-dispatch-unclear-prompt-once
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+AI Client: ensure dispatching unclear error prompt once per request/response
diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json
index 9e34ff929c9ff..bdd1d6f62bb61 100644
--- a/projects/js-packages/ai-client/package.json
+++ b/projects/js-packages/ai-client/package.json
@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.1.14",
+	"version": "0.1.15-alpha",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {
diff --git a/projects/js-packages/ai-client/src/suggestions-event-source/index.ts b/projects/js-packages/ai-client/src/suggestions-event-source/index.ts
index a21bed9d997fe..2025203546442 100644
--- a/projects/js-packages/ai-client/src/suggestions-event-source/index.ts
+++ b/projects/js-packages/ai-client/src/suggestions-event-source/index.ts
@@ -72,6 +72,9 @@ export default class SuggestionsEventSource extends EventTarget {
 	isPromptClear: boolean;
 	controller: AbortController;
 
+	// Flag to detect if the unclear prompt event was already dispatched
+	errorUnclearPromptTriggered: boolean;
+
 	constructor( data: SuggestionsEventSourceConstructorArgs ) {
 		super();
 		this.fullMessage = '';
@@ -157,6 +160,9 @@ export default class SuggestionsEventSource extends EventTarget {
 			bodyData.model = options.model;
 		}
 
+		// Clean the unclear prompt trigger flag
+		this.errorUnclearPromptTriggered = false;
+
 		await fetchEventSource( url, {
 			openWhenHidden: true,
 			method: 'POST',
@@ -257,8 +263,19 @@ export default class SuggestionsEventSource extends EventTarget {
 		 */
 		const replacedMessage = this.fullMessage.replace( /__|(\*\*)/g, '' );
 		if ( replacedMessage.startsWith( 'JETPACK_AI_ERROR' ) ) {
+			/*
+			 * Check if the unclear prompt event was already dispatched,
+			 * to ensure that it is dispatched only once per request.
+			 */
+			if ( this.errorUnclearPromptTriggered ) {
+				return;
+			}
+			this.errorUnclearPromptTriggered = true;
+
 			// The unclear prompt marker was found, so we dispatch an error event
 			this.dispatchEvent( new CustomEvent( ERROR_UNCLEAR_PROMPT ) );
+			debug( 'Unclear error prompt dispatched' );
+
 			this.dispatchEvent(
 				new CustomEvent( ERROR_RESPONSE, {
 					detail: getErrorData( ERROR_UNCLEAR_PROMPT ),

From 1fa57e6858143a06bd18c761c984785e6f0f322e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dami=C3=A1n=20Su=C3=A1rez?= <rdsuarez@gmail.com>
Date: Wed, 8 Nov 2023 16:21:37 -0600
Subject: [PATCH 06/16] AI Assistant: connect useAiFeature() hook with the
 plans store (#34001)

* introdude getIsRequestingAiAssistantFeature select

* only expose feature data from selector

* polish TS def and usage

* comnnect AI Assistant feature hook with the store

* clean obsolte code from custom hook

* changelog

* rename hook with useAiFeature()
---
 ...pdate-ai-assistant-connect-with-components |  4 ++
 .../components/upgrade-prompt/index.tsx       |  4 +-
 .../extensions/blocks/ai-assistant/edit.js    |  4 +-
 .../components/ai-assistant-bar/index.tsx     |  4 +-
 .../hooks/use-ai-feature/Readme.md            |  4 +-
 .../hooks/use-ai-feature/index.ts             | 61 ++++---------------
 .../ai-assistant-plugin-sidebar/index.tsx     |  4 +-
 .../components/usage-panel/index.tsx          |  4 +-
 .../extensions/store/wordpress-com/index.ts   | 24 ++++++--
 .../extensions/store/wordpress-com/types.ts   |  5 +-
 10 files changed, 52 insertions(+), 66 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/update-ai-assistant-connect-with-components

diff --git a/projects/plugins/jetpack/changelog/update-ai-assistant-connect-with-components b/projects/plugins/jetpack/changelog/update-ai-assistant-connect-with-components
new file mode 100644
index 0000000000000..b3beb9007d6f8
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-ai-assistant-connect-with-components
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+AI Assistant: connect useAiFeature() hook with the plans store
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/upgrade-prompt/index.tsx b/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/upgrade-prompt/index.tsx
index b01cbb9f9d598..b09baf1f4bc07 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/upgrade-prompt/index.tsx
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/upgrade-prompt/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
  */
 import { Nudge } from '../../../../shared/components/upgrade-nudge';
 import useAICheckout from '../../hooks/use-ai-checkout';
-import useAIFeature from '../../hooks/use-ai-feature';
+import useAiFeature from '../../hooks/use-ai-feature';
 import { canUserPurchasePlan } from '../../lib/connection';
 
 /**
@@ -102,7 +102,7 @@ const VIPUpgradePrompt = (): React.ReactNode => {
 };
 
 const UpgradePrompt = () => {
-	const { upgradeType } = useAIFeature();
+	const { upgradeType } = useAiFeature();
 
 	// If the user is on a VIP site, show the VIP upgrade prompt.
 	if ( upgradeType === 'vip' ) {
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js b/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
index 6fa8730716448..cf37de32a6429 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
@@ -33,7 +33,7 @@ import { promptTemplates } from './components/prompt-templates-control';
 import ToolbarControls from './components/toolbar-controls';
 import UpgradePrompt from './components/upgrade-prompt';
 import { getStoreBlockId } from './extensions/ai-assistant/with-ai-assistant';
-import useAIFeature from './hooks/use-ai-feature';
+import useAiFeature from './hooks/use-ai-feature';
 import useSuggestionsFromOpenAI from './hooks/use-suggestions-from-openai';
 import { isUserConnected } from './lib/connection';
 import { getImagesFromOpenAI } from './lib/image';
@@ -89,7 +89,7 @@ export default function AIAssistantEdit( { attributes, setAttributes, clientId }
 
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
 
-	const { requireUpgrade: requireUpgradeOnStart, refresh: refreshFeatureData } = useAIFeature();
+	const { requireUpgrade: requireUpgradeOnStart, refresh: refreshFeatureData } = useAiFeature();
 
 	const requireUpgrade = requireUpgradeOnStart || errorData?.code === 'error_quota_exceeded';
 
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/components/ai-assistant-bar/index.tsx b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/components/ai-assistant-bar/index.tsx
index 1d1be990813ef..93a4d4fe996c8 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/components/ai-assistant-bar/index.tsx
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/extensions/jetpack-contact-form/components/ai-assistant-bar/index.tsx
@@ -24,7 +24,7 @@ import React from 'react';
  */
 import ConnectPrompt from '../../../../components/connect-prompt';
 import UpgradePrompt from '../../../../components/upgrade-prompt';
-import useAIFeature from '../../../../hooks/use-ai-feature';
+import useAiFeature from '../../../../hooks/use-ai-feature';
 import { isUserConnected } from '../../../../lib/connection';
 import { PROMPT_TYPE_JETPACK_FORM_CUSTOM_PROMPT, getPrompt } from '../../../../lib/prompt';
 import { AiAssistantUiContext } from '../../ui-handler/context';
@@ -96,7 +96,7 @@ export default function AiAssistantBar( {
 		onDone: focusOnPrompt,
 	} );
 
-	const { requireUpgrade } = useAIFeature();
+	const { requireUpgrade } = useAiFeature();
 
 	const siteRequireUpgrade = requestingError?.code === ERROR_QUOTA_EXCEEDED || requireUpgrade;
 
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/Readme.md b/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/Readme.md
index ef5e87245b461..3465264c2ba5b 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/Readme.md
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/Readme.md
@@ -1,10 +1,10 @@
-# useAIFeature()
+# useAiFeature()
 
 React custom hook that provides valuable data about AI requests for the site.
 
 ```es6
 function UpgradePlan() {
-	const { hasFeature, count, refresh } = useAIFeature();
+	const { hasFeature, count, refresh } = useAiFeature();
 	if ( ! hasFeature ) {
 		return null;
 	}
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts b/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts
index 0ffc176487fcd..e01870d1fd29a 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts
@@ -1,13 +1,8 @@
 /**
  * External dependencies
  */
-import apiFetch from '@wordpress/api-fetch';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { useEffect, useState } from '@wordpress/element';
-/**
- * Types & constants
- */
-import { AiFeatureProps } from '../../../../store/wordpress-com/types';
-import type { SiteAIAssistantFeatureEndpointResponseProps } from '../../../../types';
 
 const NUM_FREE_REQUESTS_LIMIT = 20;
 
@@ -32,59 +27,29 @@ export const AI_Assistant_Initial_State = {
 	},
 };
 
-export async function getAIFeatures(): Promise< AiFeatureProps > {
-	const response: SiteAIAssistantFeatureEndpointResponseProps = await apiFetch( {
-		path: '/wpcom/v2/jetpack-ai/ai-assistant-feature',
-	} );
+export default function useAiFeature() {
+	const [ error ] = useState< Error >( null );
 
-	return {
-		hasFeature: !! response[ 'has-feature' ],
-		isOverLimit: !! response[ 'is-over-limit' ],
-		requestsCount: response[ 'requests-count' ],
-		requestsLimit: response[ 'requests-limit' ],
-		requireUpgrade: !! response[ 'site-require-upgrade' ],
-		errorMessage: response[ 'error-message' ],
-		errorCode: response[ 'error-code' ],
-		upgradeType: response[ 'upgrade-type' ],
-		usagePeriod: {
-			currentStart: response[ 'usage-period' ]?.[ 'current-start' ],
-			nextStart: response[ 'usage-period' ]?.[ 'next-start' ],
-			requestsCount: response[ 'usage-period' ]?.[ 'requests-count' ] || 0,
-		},
-		currentTier: {
-			value: response[ 'current-tier' ]?.value || 1,
-		},
-	};
-}
+	const { data, loading } = useSelect( select => {
+		const { getAiAssistantFeature, getIsRequestingAiAssistantFeature } =
+			select( 'wordpress-com/plans' );
 
-export default function useAIFeature() {
-	const [ data, setData ] = useState< AiFeatureProps >( AI_Assistant_Initial_State );
-	const [ loading, setLoading ] = useState< boolean >( false );
-	const [ error, setError ] = useState< Error >( null );
-
-	const loadFeatures = async () => {
-		setLoading( true );
-		setError( null );
+		return {
+			data: getAiAssistantFeature(),
+			loading: getIsRequestingAiAssistantFeature(),
+		};
+	}, [] );
 
-		try {
-			const aiFeatures = await getAIFeatures();
-			setData( aiFeatures );
-		} catch ( err ) {
-			setError( err );
-		} finally {
-			setLoading( false );
-		}
-	};
+	const { fetchAiAssistantFeature: loadFeatures } = useDispatch( 'wordpress-com/plans' );
 
 	useEffect( () => {
 		loadFeatures();
-	}, [] );
+	}, [ loadFeatures ] );
 
 	return {
 		...data,
 		loading,
 		error,
-		setLoading,
 		refresh: loadFeatures,
 	};
 }
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
index 061e9a2c1de1a..d126f56f02f13 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/ai-assistant-plugin-sidebar/index.tsx
@@ -12,7 +12,7 @@ import React from 'react';
  * Internal dependencies
  */
 import useAICheckout from '../../../../blocks/ai-assistant/hooks/use-ai-checkout';
-import useAIFeature, {
+import useAiFeature, {
 	UpgradeTypeProp,
 } from '../../../../blocks/ai-assistant/hooks/use-ai-feature';
 import JetpackPluginSidebar from '../../../../shared/jetpack-plugin-sidebar';
@@ -66,7 +66,7 @@ const Upgrade = ( {
 };
 
 export default function AiAssistantPluginSidebar() {
-	const { requireUpgrade, upgradeType } = useAIFeature();
+	const { requireUpgrade, upgradeType } = useAiFeature();
 	const { autosaveAndRedirect, isRedirecting } = useAICheckout();
 
 	const title = __( 'AI Assistant', 'jetpack' );
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-panel/index.tsx b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-panel/index.tsx
index e7c860ee6f779..2943825b001ac 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-panel/index.tsx
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/usage-panel/index.tsx
@@ -10,7 +10,7 @@ import React from 'react';
  */
 import './style.scss';
 import useAICheckout from '../../../../blocks/ai-assistant/hooks/use-ai-checkout';
-import useAIFeature from '../../../../blocks/ai-assistant/hooks/use-ai-feature';
+import useAiFeature from '../../../../blocks/ai-assistant/hooks/use-ai-feature';
 import { canUserPurchasePlan } from '../../../../blocks/ai-assistant/lib/connection';
 import UsageControl from '../usage-bar';
 import './style.scss';
@@ -20,7 +20,7 @@ export default function UsagePanel() {
 	const canUpgrade = canUserPurchasePlan();
 
 	// fetch usage data
-	const { hasFeature, requestsCount, requestsLimit, isOverLimit, loading } = useAIFeature();
+	const { hasFeature, requestsCount, requestsLimit, isOverLimit, loading } = useAiFeature();
 
 	return (
 		<div className="jetpack-ai-usage-panel">
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts
index f737bf19446e4..803ff783f2522 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/index.ts
@@ -10,7 +10,7 @@ import reducer from './reducer';
 /**
  * Types
  */
-import type { PlanStateProps } from './types';
+import type { AiFeatureProps, PlanStateProps } from './types';
 
 const store = 'wordpress-com/plans';
 
@@ -36,11 +36,25 @@ const wordpressPlansStore = createReduxStore( store, {
 		/**
 		 * Return the AI Assistant feature.
 		 *
-		 * @param {object} state - The Plans state tree.
-		 * @returns {object}       The AI Assistant feature data.
+		 * @param {PlanStateProps} state - The Plans state tree.
+		 * @returns {AiFeatureProps}       The AI Assistant feature data.
 		 */
-		getAiAssistantFeature( state: PlanStateProps ): object {
-			return state.features.aiAssistant;
+		getAiAssistantFeature( state: PlanStateProps ): AiFeatureProps {
+			// Clean up the _meta property.
+			const data = { ...state.features.aiAssistant };
+			delete data._meta;
+
+			return data;
+		},
+
+		/**
+		 * Get the isRequesting flag for the AI Assistant feature.
+		 *
+		 * @param {PlanStateProps} state - The Plans state tree.
+		 * @returns {boolean}              The isRequesting flag.
+		 */
+		getIsRequestingAiAssistantFeature( state: PlanStateProps ): boolean {
+			return state.features.aiAssistant?._meta?.isRequesting;
 		},
 	},
 
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts
index 39f6aa8ad8033..06a43531a3558 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts
@@ -7,7 +7,7 @@ export type Plan = {
 export type PlanStateProps = {
 	plans: Array< Plan >;
 	features: {
-		aiAssistant?: AiFeatureProps;
+		aiAssistant?: AiFeatureStateProps;
 	};
 };
 
@@ -31,6 +31,9 @@ export type AiFeatureProps = {
 		nextStart: string;
 		requestsCount: number;
 	};
+};
+
+export type AiFeatureStateProps = AiFeatureProps & {
 	_meta?: {
 		isRequesting: boolean;
 	};

From e1fc8e4ae96730b2e0f0022471332d303e5706f4 Mon Sep 17 00:00:00 2001
From: Eru Penkman <roo2@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:16:02 +1000
Subject: [PATCH 07/16] Add/blogging-prompts: Add bloganuary field (#33852)

---
 ...-rest-api-v3-endpoint-blogging-prompts.php | 33 +++++++++++++++++++
 .../add-blogging-prompts-bloganuary-field     |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/add-blogging-prompts-bloganuary-field

diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php
index ae3f154882bae..f30b77419a0b5 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php
@@ -306,9 +306,38 @@ public function prepare_item_for_response( $prompt, $request ) {
 			$data['answered_link_text'] = __( 'View all responses', 'jetpack' );
 		}
 
+		if ( $this->is_in_bloganuary( $prompt->post_date_gmt ) && rest_is_field_included( 'bloganuary_id', $fields ) ) {
+			$data['bloganuary_id'] = $this->get_bloganuary_id( $prompt->post_date_gmt );
+		}
+
 		return $data;
 	}
 
+	/**
+	 * Return true if the post is in "Bloganuary"
+	 *
+	 * @param string $post_date_gmt Post date in GMT.
+	 * @return bool True if the post is in "Bloganuary".
+	 */
+	protected function is_in_bloganuary( $post_date_gmt ) {
+		$post_month = gmdate( 'm', strtotime( $post_date_gmt ) );
+		return $post_month === '01';
+	}
+
+	/**
+	 * Return the bloganuary id of the form `bloganuary-yyyy-dd`
+	 *
+	 * @param string $post_date_gmt Post date in GMT.
+	 * @return string Bloganuary id.
+	 */
+	protected function get_bloganuary_id( $post_date_gmt ) {
+		$post_year_day = gmdate( 'Y-d', strtotime( $post_date_gmt ) );
+		if ( $this->force_year ) {
+			$post_year_day = $this->force_year . '-' . gmdate( 'd', strtotime( $post_date_gmt ) );
+		}
+		return 'bloganuary-' . $post_year_day;
+	}
+
 	/**
 	 * Format a date for a blogging prompt, omiting the time.
 	 *
@@ -444,6 +473,10 @@ public function get_item_schema() {
 					'description' => __( 'Text for the link to answers for the prompt.', 'jetpack' ),
 					'type'        => 'string',
 				),
+				'bloganuary_id'         => array(
+					'description' => __( 'Id used by the bloganuary promotion', 'jetpack' ),
+					'type'        => 'string',
+				),
 			),
 		);
 	}
diff --git a/projects/plugins/jetpack/changelog/add-blogging-prompts-bloganuary-field b/projects/plugins/jetpack/changelog/add-blogging-prompts-bloganuary-field
new file mode 100644
index 0000000000000..62902a357556b
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-blogging-prompts-bloganuary-field
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Add bloganuary date field to blogging prompts api. This field will be used for the bloganuary promotion.

From d9c1f3b34f1c84b09967dfedc59f059098516f4e Mon Sep 17 00:00:00 2001
From: Peter Petrov <peter.petrov89@gmail.com>
Date: Thu, 9 Nov 2023 12:16:30 +0200
Subject: [PATCH 08/16] JS Components: Fix react warnings in Boost Score Graph
 (#34014)

---
 .../changelog/fix-boost-score-graph-warnings  |  4 +
 .../boost-score-graph/background.tsx          | 80 +++++++++----------
 projects/js-packages/components/package.json  |  2 +-
 3 files changed, 45 insertions(+), 41 deletions(-)
 create mode 100644 projects/js-packages/components/changelog/fix-boost-score-graph-warnings

diff --git a/projects/js-packages/components/changelog/fix-boost-score-graph-warnings b/projects/js-packages/components/changelog/fix-boost-score-graph-warnings
new file mode 100644
index 0000000000000..f295af6e72646
--- /dev/null
+++ b/projects/js-packages/components/changelog/fix-boost-score-graph-warnings
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fixed
+
+Fix react warnings in Boost Score Graph.
diff --git a/projects/js-packages/components/components/boost-score-graph/background.tsx b/projects/js-packages/components/components/boost-score-graph/background.tsx
index 070b4a4e13ac0..ada7cfdc8a61b 100644
--- a/projects/js-packages/components/components/boost-score-graph/background.tsx
+++ b/projects/js-packages/components/components/boost-score-graph/background.tsx
@@ -96,23 +96,23 @@ export const Background: FunctionComponent = () => {
 				<path
 					d="M-42 98C-42 98 -23.5 83.5 13.5 82C50.5 80.5 67 95 96 94.5C125 94 162.495 76.7241 178 75.5C216 72.5 243.5 65.5 261 78.5C278.5 91.5 308.5 161 344 163.5C379.5 166 394 91.5 426 79.5C458 67.5 473.5 92 509.5 91.5C545.5 91 562 76 592 75.5C622 75 648.5 83.5 675 83.5C701.5 83.5 759 75.5 759 75.5L844 67.5C844 67.5 884.5 66 926 59.5C967.5 53 1008 30.5 1008 30.5"
 					stroke="#069E08"
-					stroke-width="2"
-					stroke-linecap="round"
-					stroke-linejoin="round"
-				/>
-				<circle cx="1008" cy="30.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="926" cy="59.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="843" cy="67.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="759" cy="75.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="675" cy="83.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="593" cy="75.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="509" cy="91.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="427" cy="79.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="343" cy="163.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="261" cy="78.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="178" cy="75.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="96" cy="94.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="14" cy="82.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
+					strokeWidth="2"
+					strokeLinecap="round"
+					strokeLinejoin="round"
+				/>
+				<circle cx="1008" cy="30.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="926" cy="59.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="843" cy="67.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="759" cy="75.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="675" cy="83.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="593" cy="75.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="509" cy="91.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="427" cy="79.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="343" cy="163.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="261" cy="78.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="178" cy="75.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="96" cy="94.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="14" cy="82.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
 				<path
 					opacity="0.16"
 					d="M261 99.9992C239 87.4992 207 98.0875 178 95.9992C149 93.911 124 98.3228 96 109.911C68 121.499 46 142.146 14 149.823C-18 157.499 -43 147.999 -43 147.999V198.999H1009V44.4992C1009 44.4992 962 66.9992 926 75.4992C890 83.9993 869.5 81.9992 843 78.4992C816.5 74.9993 789.5 39.4992 759 40.4992C728.5 41.4993 699.5 96.4992 676.5 99.9992C653.5 103.499 612.5 95.4992 593.5 95.4992C574.5 95.4992 524.5 111.499 509.5 111.999C494.5 112.499 455.5 111.499 427 115.499C398.5 119.499 372 138.999 344 138.999C316 138.999 283 112.499 261 99.9992Z"
@@ -121,23 +121,23 @@ export const Background: FunctionComponent = () => {
 				<path
 					d="M-41.5 148.5C-41.5 148.5 -8 156.639 21 148.32C50 140 66.5 122 95.5 109.351C124.5 96.7013 145.5 93.0007 178 95.5006C210.5 98.0005 236.5 86.5006 262 100.501C287.5 114.501 310.5 140.001 344 138.501C377.5 137.001 396 121.501 427 115.501C458 109.501 489 113.001 510.5 111.501C532 110.001 572.5 96.0006 593 95.5006C613.5 95.0006 646.5 103.001 676 99.5006C705.5 96.0006 719 43.5006 759 41.5006C799 39.5006 805 72.0006 844 78.5006C883 85.0006 901 78.5006 925 75.5006C949 72.5006 1008 45.5006 1008 45.5006"
 					stroke="#069E08"
-					stroke-width="2"
-					stroke-linecap="round"
-					stroke-linejoin="round"
-				/>
-				<circle cx="178" cy="95.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="96" cy="109.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="14" cy="149.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="261" cy="100.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="343" cy="138.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="427" cy="115.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="509" cy="111.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="593" cy="95.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="675" cy="99.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="759" cy="41.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="843" cy="78.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="926" cy="75.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
-				<circle cx="1008" cy="45.5" r="2.75" fill="white" stroke="#069E08" stroke-width="1.5" />
+					strokeWidth="2"
+					strokeLinecap="round"
+					strokeLinejoin="round"
+				/>
+				<circle cx="178" cy="95.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="96" cy="109.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="14" cy="149.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="261" cy="100.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="343" cy="138.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="427" cy="115.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="509" cy="111.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="593" cy="95.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="675" cy="99.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="759" cy="41.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="843" cy="78.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="926" cy="75.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
+				<circle cx="1008" cy="45.5" r="2.75" fill="white" stroke="#069E08" strokeWidth="1.5" />
 			</g>
 			<defs>
 				<filter
@@ -147,9 +147,9 @@ export const Background: FunctionComponent = () => {
 					width="1185.3"
 					height="239.127"
 					filterUnits="userSpaceOnUse"
-					color-interpolation-filters="sRGB"
+					colorInterpolationFilters="sRGB"
 				>
-					<feFlood flood-opacity="0" result="BackgroundImageFix" />
+					<feFlood floodOpacity="0" result="BackgroundImageFix" />
 					<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
 					<feGaussianBlur stdDeviation="4" result="effect1_foregroundBlur_3726_6340" />
 				</filter>
@@ -161,8 +161,8 @@ export const Background: FunctionComponent = () => {
 					y2="199"
 					gradientUnits="userSpaceOnUse"
 				>
-					<stop stop-color="#069E08" />
-					<stop offset="1" stop-color="#069E08" stop-opacity="0" />
+					<stop stopColor="#069E08" />
+					<stop offset="1" stopColor="#069E08" stopOpacity="0" />
 				</linearGradient>
 				<linearGradient
 					id="paint1_linear_3726_6340"
@@ -172,8 +172,8 @@ export const Background: FunctionComponent = () => {
 					y2="220.999"
 					gradientUnits="userSpaceOnUse"
 				>
-					<stop stop-color="#069E08" />
-					<stop offset="1" stop-color="#069E08" stop-opacity="0" />
+					<stop stopColor="#069E08" />
+					<stop offset="1" stopColor="#069E08" stopOpacity="0" />
 				</linearGradient>
 			</defs>
 		</svg>
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
index bed5d1ff222cf..7d77dcd172dc2 100644
--- a/projects/js-packages/components/package.json
+++ b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.44.4",
+	"version": "0.45.0-alpha",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

From b780fda17e848cc10f31dd6dd6f62c33a25b899b Mon Sep 17 00:00:00 2001
From: Tim Broddin <tim@wannabes.be>
Date: Thu, 9 Nov 2023 11:26:29 +0100
Subject: [PATCH 09/16] Fixed subscribe block redirect issue on non-post pages
 (#33932)

* Fixed subscribe block redirect issue on non-post pages
* Bind showing of subscribe modal to all `.wp-block-jetpack-subscriptions__container form`
---
 .../fix-subscribe-form-redirect-to-post-bug   |  4 ++
 .../blocks/subscriptions/subscriptions.php    | 19 ++++--
 .../extensions/blocks/subscriptions/view.js   | 67 +++++++++----------
 3 files changed, 50 insertions(+), 40 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/fix-subscribe-form-redirect-to-post-bug

diff --git a/projects/plugins/jetpack/changelog/fix-subscribe-form-redirect-to-post-bug b/projects/plugins/jetpack/changelog/fix-subscribe-form-redirect-to-post-bug
new file mode 100644
index 0000000000000..d394aa3a79bcd
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-subscribe-form-redirect-to-post-bug
@@ -0,0 +1,4 @@
+Significance: minor
+Type: bugfix
+
+Subscribe block: only redirect to post when inside a post context
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php b/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php
index 157fc69f148ae..de3db8fe910e4 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php
@@ -609,12 +609,19 @@ function get_post_access_level_for_current_post() {
  * @return string
  */
 function render_for_website( $data, $classes, $styles ) {
-	$blog_id            = \Jetpack_Options::get_option( 'id' );
-	$widget_id_suffix   = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '';
-	$form_id            = 'subscribe-blog' . $widget_id_suffix;
-	$form_url           = defined( 'SUBSCRIBE_BLOG_URL' ) ? SUBSCRIBE_BLOG_URL : '#';
-	$post_access_level  = get_post_access_level_for_current_post();
-	$post_id            = get_the_ID();
+	$blog_id           = \Jetpack_Options::get_option( 'id' );
+	$widget_id_suffix  = Jetpack_Subscriptions_Widget::$instance_count > 1 ? '-' . Jetpack_Subscriptions_Widget::$instance_count : '';
+	$form_id           = 'subscribe-blog' . $widget_id_suffix;
+	$form_url          = defined( 'SUBSCRIBE_BLOG_URL' ) ? SUBSCRIBE_BLOG_URL : '#';
+	$post_access_level = get_post_access_level_for_current_post();
+
+	$post_id = null;
+	if ( in_the_loop() ) {
+		$post_id = get_the_ID();
+	} elseif ( is_singular( 'post' ) ) {
+		$post_id = get_queried_object_id();
+	}
+
 	$subscribe_field_id = apply_filters( 'subscribe_field_id', 'subscribe-field' . $widget_id_suffix, $data['widget_id'] );
 	$tier_id            = get_post_meta( $post_id, META_NAME_FOR_POST_TIER_ID_SETTINGS, true );
 	$is_subscribed      = Jetpack_Memberships::is_current_user_subscribed();
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js
index b6e80738215c9..a37535a0d3081 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/view.js
@@ -55,39 +55,38 @@ domReady( function () {
 		} );
 	}
 
-	const form = document.querySelector( '.wp-block-jetpack-subscriptions__container form' );
-	if ( ! form ) {
-		return;
-	}
-	if ( ! form.payments_attached ) {
-		form.payments_attached = true;
-		form.addEventListener( 'submit', function ( event ) {
-			if ( form.resubmitted ) {
-				return;
-			}
-
-			const emailInput = form.querySelector( 'input[type=email]' );
-			const email = emailInput ? emailInput.value : form.dataset.subscriber_email;
-
-			if ( ! email ) {
-				return;
-			}
-
-			event.preventDefault();
-
-			const post_id = form.querySelector( 'input[name=post_id]' )?.value ?? '';
-			const tier_id = form.querySelector( 'input[name=tier_id]' )?.value ?? '';
-
-			show_iframe( {
-				email,
-				post_id,
-				tier_id,
-				blog: form.dataset.blog,
-				plan: 'newsletter',
-				source: 'jetpack_subscribe',
-				post_access_level: form.dataset.post_access_level,
-				display: 'alternate',
+	const forms = document.querySelectorAll( '.wp-block-jetpack-subscriptions__container form' );
+	forms.forEach( form => {
+		if ( ! form.payments_attached ) {
+			form.payments_attached = true;
+			form.addEventListener( 'submit', function ( event ) {
+				if ( form.resubmitted ) {
+					return;
+				}
+
+				const emailInput = form.querySelector( 'input[type=email]' );
+				const email = emailInput ? emailInput.value : form.dataset.subscriber_email;
+
+				if ( ! email ) {
+					return;
+				}
+
+				event.preventDefault();
+
+				const post_id = form.querySelector( 'input[name=post_id]' )?.value ?? '';
+				const tier_id = form.querySelector( 'input[name=tier_id]' )?.value ?? '';
+
+				show_iframe( {
+					email,
+					post_id,
+					tier_id,
+					blog: form.dataset.blog,
+					plan: 'newsletter',
+					source: 'jetpack_subscribe',
+					post_access_level: form.dataset.post_access_level,
+					display: 'alternate',
+				} );
 			} );
-		} );
-	}
+		}
+	} );
 } );

From bd5a24d3080983ea2c6a0e43d1ae427c58939999 Mon Sep 17 00:00:00 2001
From: Tim Broddin <tim@wannabes.be>
Date: Thu, 9 Nov 2023 11:48:18 +0100
Subject: [PATCH 10/16] Release jetpack-mu-wpcom 4.18.0

---
 projects/packages/jetpack-mu-wpcom/CHANGELOG.md              | 5 +++++
 .../changelog/add-launchpad_is_task_complete_id_map          | 4 ----
 .../packages/jetpack-mu-wpcom/changelog/fix-version-bumps    | 5 -----
 .../changelog/update-docker-php-memory-limit                 | 5 -----
 projects/packages/jetpack-mu-wpcom/package.json              | 2 +-
 .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +-
 projects/plugins/mu-wpcom-plugin/CHANGELOG.md                | 2 ++
 projects/plugins/mu-wpcom-plugin/changelog/fix-version-bumps | 5 -----
 .../mu-wpcom-plugin/changelog/update-docker-php-memory-limit | 5 -----
 projects/plugins/mu-wpcom-plugin/composer.json               | 2 +-
 projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php         | 2 +-
 projects/plugins/mu-wpcom-plugin/package.json                | 2 +-
 12 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 projects/packages/jetpack-mu-wpcom/changelog/add-launchpad_is_task_complete_id_map
 delete mode 100644 projects/packages/jetpack-mu-wpcom/changelog/fix-version-bumps
 delete mode 100644 projects/packages/jetpack-mu-wpcom/changelog/update-docker-php-memory-limit
 delete mode 100644 projects/plugins/mu-wpcom-plugin/changelog/fix-version-bumps
 delete mode 100644 projects/plugins/mu-wpcom-plugin/changelog/update-docker-php-memory-limit

diff --git a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
index e23ee6002ad02..dc3633fac7739 100644
--- a/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
+++ b/projects/packages/jetpack-mu-wpcom/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.18.0] - 2023-11-09
+### Added
+- Take id_map in consideration when checking if a task is completed inside wpcom_launchpad_is_task_option_completed. [#34009]
+
 ## [4.17.0] - 2023-11-08
 ### Added
 - Added Launchpad tasks and task list to the Subscriber page. [#33948]
@@ -425,6 +429,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Testing initial package release.
 
+[4.18.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.17.0...v4.18.0
 [4.17.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.16.2...v4.17.0
 [4.16.2]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.16.1...v4.16.2
 [4.16.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.16.0...v4.16.1
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-launchpad_is_task_complete_id_map b/projects/packages/jetpack-mu-wpcom/changelog/add-launchpad_is_task_complete_id_map
deleted file mode 100644
index 48e24905947de..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/add-launchpad_is_task_complete_id_map
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Take id_map in consideration when checking if a task is completed inside wpcom_launchpad_is_task_option_completed.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-version-bumps b/projects/packages/jetpack-mu-wpcom/changelog/fix-version-bumps
deleted file mode 100644
index 8864676d95ebb..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/fix-version-bumps
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Version bumps
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-docker-php-memory-limit b/projects/packages/jetpack-mu-wpcom/changelog/update-docker-php-memory-limit
deleted file mode 100644
index fe7e3acc72374..0000000000000
--- a/projects/packages/jetpack-mu-wpcom/changelog/update-docker-php-memory-limit
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Bump version
-
-
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
index 7a1df3b78e555..0d82e43e81529 100644
--- a/projects/packages/jetpack-mu-wpcom/package.json
+++ b/projects/packages/jetpack-mu-wpcom/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "4.18.0-alpha",
+	"version": "4.18.0",
 	"description": "Enhances your site with features powered by WordPress.com",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme",
 	"bugs": {
diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
index 04bab4366a745..2ad2e9ba7e424 100644
--- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
+++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Mu_Wpcom {
 
-	const PACKAGE_VERSION = '4.18.0-alpha';
+	const PACKAGE_VERSION = '4.18.0';
 	const PKG_DIR         = __DIR__ . '/../';
 
 	/**
diff --git a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
index 786341904fd57..9c185f542dd65 100644
--- a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
+++ b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.7.9 - 2023-11-09
+
 ## 1.7.8 - 2023-11-08
 
 ## 1.7.7 - 2023-11-03
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-version-bumps b/projects/plugins/mu-wpcom-plugin/changelog/fix-version-bumps
deleted file mode 100644
index 8864676d95ebb..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/fix-version-bumps
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Version bumps
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-docker-php-memory-limit b/projects/plugins/mu-wpcom-plugin/changelog/update-docker-php-memory-limit
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/update-docker-php-memory-limit
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json
index 4ab2faf25f054..c1aa37183314e 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.json
+++ b/projects/plugins/mu-wpcom-plugin/composer.json
@@ -46,6 +46,6 @@
 		]
 	},
 	"config": {
-		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_7_9_alpha"
+		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_7_9"
 	}
 }
diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
index 503964ab71163..a407639332d28 100644
--- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
+++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
@@ -3,7 +3,7 @@
  *
  * Plugin Name: WordPress.com Features
  * Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 1.7.9-alpha
+ * Version: 1.7.9
  * Author: Automattic
  * License: GPLv2 or later
  * Text Domain: jetpack-mu-wpcom-plugin
diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json
index 1410b1ec63422..f3ac3cfaae138 100644
--- a/projects/plugins/mu-wpcom-plugin/package.json
+++ b/projects/plugins/mu-wpcom-plugin/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom-plugin",
-	"version": "1.7.9-alpha",
+	"version": "1.7.9",
 	"description": "Test plugin for the jetpack-mu-wpcom package",
 	"homepage": "https://jetpack.com",
 	"bugs": {

From 0cdc4131c3c01ac1d0f56803d23652ed3fc43e7f Mon Sep 17 00:00:00 2001
From: Peter Petrov <peter.petrov89@gmail.com>
Date: Thu, 9 Nov 2023 13:13:56 +0200
Subject: [PATCH 11/16] Boost: Migrate svelte components to react (#33886)

---
 pnpm-lock.yaml                                |  3 +
 .../boost/app/assets/src/css/admin-style.scss |  2 -
 .../src/css/components/icon-tooltip.scss      | 24 -----
 .../app/assets/src/css/components/score.scss  |  4 +-
 .../assets/src/css/components/support.scss    | 13 ---
 .../src/js/elements/ActivateLicense.svelte    | 37 --------
 .../js/elements/ImageCDNRecommendation.svelte | 28 ------
 .../src/js/elements/OtherGroupContext.svelte  | 33 -------
 .../js/elements/RecommendationContext.svelte  | 32 -------
 .../image-size-analysis/MultiProgress.svelte  |  7 +-
 .../RecommendationsMeta.svelte                |  5 +-
 .../RecommendationsPage.svelte                |  6 +-
 .../recommendations/Hero.svelte               | 64 -------------
 .../benefits/BenefitsInterstitial.svelte      |  6 +-
 .../getting-started/GettingStarted.svelte     |  4 +-
 .../src/js/pages/settings/Settings.svelte     |  5 +-
 .../settings/elements/ScoreContext.svelte     | 44 ---------
 .../sections/AdvancedCriticalCss.svelte       |  2 +-
 .../js/pages/settings/sections/Modules.svelte |  2 +-
 .../js/pages/settings/sections/Score.svelte   |  8 +-
 .../js/pages/settings/sections/Support.svelte | 31 ------
 .../components/activate-license/index.tsx     | 24 +++++
 .../activate-license/styles.module.scss       | 12 +++
 .../back-button/index.tsx}                    |  0
 .../image-cdn-recommendation/index.tsx        | 28 ++++++
 .../styles.module.scss                        |  7 ++
 .../components/isa-hero/index.tsx             | 95 +++++++++++++++++++
 .../components/isa-hero/styles.module.scss    | 29 ++++++
 .../isa-other-group-context/index.tsx         | 29 ++++++
 .../styles.module.scss                        | 11 +++
 .../minify-meta/index.tsx}                    |  2 +-
 .../sections/score/context-tooltip/index.tsx  | 57 +++++++++++
 .../score/context-tooltip/styles.module.scss  | 22 +++++
 .../sections/support/index.tsx                | 34 +++++++
 .../sections/support/styles.module.scss       | 13 +++
 .../app/assets/src/js/sections/Header.svelte  |  2 +-
 .../changelog/boost-react-migrate-components  |  4 +
 .../boost-react-migrate-components#2          |  5 +
 projects/plugins/boost/composer.json          |  4 +-
 projects/plugins/boost/composer.lock          |  2 +-
 projects/plugins/boost/jetpack-boost.php      |  4 +-
 projects/plugins/boost/package.json           |  3 +-
 .../lib/pages/wp-admin/JetpackBoostPage.js    |  2 +-
 .../e2e/specs/modules/speed-score.test.js     |  4 +-
 44 files changed, 414 insertions(+), 339 deletions(-)
 delete mode 100644 projects/plugins/boost/app/assets/src/css/components/icon-tooltip.scss
 delete mode 100644 projects/plugins/boost/app/assets/src/css/components/support.scss
 delete mode 100644 projects/plugins/boost/app/assets/src/js/elements/ActivateLicense.svelte
 delete mode 100644 projects/plugins/boost/app/assets/src/js/elements/ImageCDNRecommendation.svelte
 delete mode 100644 projects/plugins/boost/app/assets/src/js/elements/OtherGroupContext.svelte
 delete mode 100644 projects/plugins/boost/app/assets/src/js/elements/RecommendationContext.svelte
 delete mode 100644 projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/recommendations/Hero.svelte
 delete mode 100644 projects/plugins/boost/app/assets/src/js/pages/settings/elements/ScoreContext.svelte
 delete mode 100644 projects/plugins/boost/app/assets/src/js/pages/settings/sections/Support.svelte
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/index.tsx
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/styles.module.scss
 rename projects/plugins/boost/app/assets/src/js/react-components/{common/back-button/BackButton.tsx => components/back-button/index.tsx} (100%)
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/index.tsx
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/styles.module.scss
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/index.tsx
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/styles.module.scss
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/index.tsx
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/styles.module.scss
 rename projects/plugins/boost/app/assets/src/js/react-components/{pages/settings/elements/MinifyMeta.tsx => components/minify-meta/index.tsx} (96%)
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/index.tsx
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/styles.module.scss
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/sections/support/index.tsx
 create mode 100644 projects/plugins/boost/app/assets/src/js/react-components/sections/support/styles.module.scss
 create mode 100644 projects/plugins/boost/changelog/boost-react-migrate-components
 create mode 100644 projects/plugins/boost/changelog/boost-react-migrate-components#2

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 38189fb4b6df2..1c8b55a212544 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2595,6 +2595,9 @@ importers:
       '@wordpress/element':
         specifier: 5.21.0
         version: 5.21.0
+      classnames:
+        specifier: 2.3.2
+        version: 2.3.2
       history:
         specifier: 5.3.0
         version: 5.3.0
diff --git a/projects/plugins/boost/app/assets/src/css/admin-style.scss b/projects/plugins/boost/app/assets/src/css/admin-style.scss
index a6f66b83e6e58..15306299468be 100644
--- a/projects/plugins/boost/app/assets/src/css/admin-style.scss
+++ b/projects/plugins/boost/app/assets/src/css/admin-style.scss
@@ -21,9 +21,7 @@
 @import 'components/checklist';
 @import 'components/icons';
 @import 'components/badge';
-@import 'components/support';
 @import 'components/snackbar';
-@import 'components/icon-tooltip';
 @import 'components/pricing-table.scss';
 
 // React Migration CSS
diff --git a/projects/plugins/boost/app/assets/src/css/components/icon-tooltip.scss b/projects/plugins/boost/app/assets/src/css/components/icon-tooltip.scss
deleted file mode 100644
index 11e03a8238130..0000000000000
--- a/projects/plugins/boost/app/assets/src/css/components/icon-tooltip.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.icon-tooltip-wrapper.wide-tooltip {
-	// Widen tooltips marked as "wide".
-	.icon-tooltip-helper .components-popover__content {
-		width: 440px;
-	}
-
-	// Allow bulleted lists in wide tooltips.
-	ul {
-		margin: 0 0 0 30px;
-		list-style-type: disc;
-	}
-
-	// Remove bottom margin from last list item.
-	ul li:last-child {
-		margin-bottom: 0;
-	}
-}
-
-// Narrow down tooltips that are not marked as "wide".
-.icon-tooltip-wrapper:not( .wide-tooltip ) {
-	.icon-tooltip-helper .components-popover__content {
-		width: 250px;
-	}
-}
diff --git a/projects/plugins/boost/app/assets/src/css/components/score.scss b/projects/plugins/boost/app/assets/src/css/components/score.scss
index 89a515289eb1a..34b72445a387e 100644
--- a/projects/plugins/boost/app/assets/src/css/components/score.scss
+++ b/projects/plugins/boost/app/assets/src/css/components/score.scss
@@ -39,7 +39,7 @@ $no_boost_score_size: 28px;
 		}
 	}
 
-	button {
+	.action-button {
 		color: $gray_90;
 
 		&.components-button.is-link {
@@ -156,7 +156,7 @@ $no_boost_score_size: 28px;
 				height:12px;
 				transform:translate(-50%,50%) rotate(45deg);
 				background-color:$primary-white;
-				
+
 				@include box-shadow();
 			}
 		}
diff --git a/projects/plugins/boost/app/assets/src/css/components/support.scss b/projects/plugins/boost/app/assets/src/css/components/support.scss
deleted file mode 100644
index b6fae96b9f322..0000000000000
--- a/projects/plugins/boost/app/assets/src/css/components/support.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.jb-support {
-	display: grid;
-	grid-template-columns: auto auto;
-	align-items: center;
-
-	& &__title {
-		margin-bottom: $halfling;
-	}
-
-	&__cta {
-		text-align: right;
-	}
-}
diff --git a/projects/plugins/boost/app/assets/src/js/elements/ActivateLicense.svelte b/projects/plugins/boost/app/assets/src/js/elements/ActivateLicense.svelte
deleted file mode 100644
index b601cc9b0de85..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/elements/ActivateLicense.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script lang="ts">
-	import { __ } from '@wordpress/i18n';
-	import TemplatedString from './TemplatedString.svelte';
-</script>
-
-<p class="jb-activate-license">
-	<TemplatedString
-		template={__(
-			'Already have an existing plan or license key? <link>Click here to get started</link>',
-			'jetpack-boost'
-		)}
-		vars={{
-			link: [
-				'a',
-				{
-					class: 'jb-activate-license__link',
-					href: 'admin.php?page=my-jetpack#/add-license',
-				},
-			],
-		}}
-	/>
-</p>
-
-<style lang="scss">
-	.jb-activate-license {
-		font-size: 13px;
-
-		:global( .jb-activate-license__link ) {
-			color: var( --blue-50 );
-
-			&:hover,
-			&:active {
-				color: var( --blue-60 );
-			}
-		}
-	}
-</style>
diff --git a/projects/plugins/boost/app/assets/src/js/elements/ImageCDNRecommendation.svelte b/projects/plugins/boost/app/assets/src/js/elements/ImageCDNRecommendation.svelte
deleted file mode 100644
index 2702c1d931ef4..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/elements/ImageCDNRecommendation.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<script lang="ts">
-	import { __ } from '@wordpress/i18n';
-	import TemplatedString from './TemplatedString.svelte';
-</script>
-
-<p>
-	<TemplatedString
-		template={__( 'We recommend enabling the <b>Image CDN</b>.', 'jetpack-boost' )}
-	/>
-</p>
-<p>
-	<small>
-		{__(
-			"Jetpack Boost's Image CDN can automatically resize many images to the correct size for you.",
-			'jetpack-boost'
-		)}
-	</small>
-</p>
-
-<style lang="scss">
-	p {
-		margin-top: 0 !important;
-	}
-
-	p:last-of-type {
-		margin-bottom: 0 !important;
-	}
-</style>
diff --git a/projects/plugins/boost/app/assets/src/js/elements/OtherGroupContext.svelte b/projects/plugins/boost/app/assets/src/js/elements/OtherGroupContext.svelte
deleted file mode 100644
index 476ec24087ff2..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/elements/OtherGroupContext.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script lang="ts">
-	import { __ } from '@wordpress/i18n';
-</script>
-
-<div class="jb-score-context">
-	<span class="jb-score-context__info-icon">i</span>
-	<div class="jb-score-context__info-container">
-		<p>
-			{__(
-				'In addition to the Homepage, Pages and Posts, Boost will also analyze the following custom post types found on your site:',
-				'jetpack-boost'
-			)}
-		</p>
-		<ul>
-			<!-- svelte-ignore missing-declaration -->
-			{#each Object.entries( Jetpack_Boost.site.postTypes ) as [slug, label]}
-				<li>{label}</li>
-			{/each}
-		</ul>
-		<i />
-	</div>
-</div>
-
-<style scope="scss">
-	ul {
-		list-style: outside;
-		margin-left: 20px;
-	}
-
-	ul:last-of-type {
-		margin-bottom: 0;
-	}
-</style>
diff --git a/projects/plugins/boost/app/assets/src/js/elements/RecommendationContext.svelte b/projects/plugins/boost/app/assets/src/js/elements/RecommendationContext.svelte
deleted file mode 100644
index d24e87793050e..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/elements/RecommendationContext.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script lang="ts">
-	import ImageCDNRecommendation from './ImageCDNRecommendation.svelte';
-</script>
-
-<div class="jb-score-context">
-	<span class="jb-score-context__info-icon">i</span>
-	<div class="jb-score-context__info-container">
-		<ImageCDNRecommendation />
-		<i />
-	</div>
-</div>
-
-<style lang="scss">
-	@use '../../css/main/mixins.scss' as *;
-
-	.jb-score-context {
-		top: -4px;
-	}
-
-	.jb-score-context__info-container {
-		left: -118px;
-		min-width: 400px;
-	}
-
-	.jb-score-context__info-container i {
-		left: 315px;
-	}
-
-	.jb-score-context__info-icon {
-		margin-left: 0;
-	}
-</style>
diff --git a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/MultiProgress.svelte b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/MultiProgress.svelte
index 14f809295c348..e5fef55de66eb 100644
--- a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/MultiProgress.svelte
+++ b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/MultiProgress.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
 	import { sprintf, __ } from '@wordpress/i18n';
 	import ConditionalLink from '../../elements/ConditionalLink.svelte';
-	import OtherGroupContext from '../../elements/OtherGroupContext.svelte';
 	import ProgressBar from '../../elements/ProgressBar.svelte';
+	import ReactComponent from '../../elements/ReactComponent.svelte';
 	import Spinner from '../../elements/Spinner.svelte';
+	import OtherGroupContext from '../../react-components/components/isa-other-group-context';
 	import WarningIcon from '../../svg/warning-outline.svg';
 	import { isaGroupLabel } from './store/isa-summary';
 
+	// @todo - move other-group-context markup/styles here, as it's not used anywhere else.
+
 	export let summaryProgress: {
 		group: string;
 		issue_count?: number;
@@ -56,7 +59,7 @@
 					{isaGroupLabel( summary.group )}
 				</ConditionalLink>
 				{#if 'other' === summary.group}
-					<OtherGroupContext />
+					<ReactComponent this={OtherGroupContext} />
 				{/if}
 			</div>
 
diff --git a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsMeta.svelte b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsMeta.svelte
index 42ba1d7588741..eb3d30a6416c0 100644
--- a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsMeta.svelte
+++ b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsMeta.svelte
@@ -2,7 +2,8 @@
 	import { __, sprintf } from '@wordpress/i18n';
 	import Button from '../../elements/Button.svelte';
 	import ErrorNotice from '../../elements/ErrorNotice.svelte';
-	import ImageCDNRecommendation from '../../elements/ImageCDNRecommendation.svelte';
+	import ReactComponent from '../../elements/ReactComponent.svelte';
+	import ImageCdnRecommendation from '../../react-components/components/image-cdn-recommendation';
 	import RefreshIcon from '../../svg/refresh.svg';
 	import WarningIcon from '../../svg/warning-outline.svg';
 	import { recordBoostEvent, recordBoostEventAndRedirect } from '../../utils/analytics';
@@ -170,7 +171,7 @@
 	{#if showCDNRecommendation}
 		<div class="jb-notice">
 			<div class="jb-notice__content">
-				<ImageCDNRecommendation />
+				<ReactComponent this={ImageCdnRecommendation} />
 			</div>
 		</div>
 	{/if}
diff --git a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsPage.svelte b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsPage.svelte
index 208480d6af746..1a9af8cbc76a9 100644
--- a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsPage.svelte
+++ b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/RecommendationsPage.svelte
@@ -2,10 +2,11 @@
 	import { onMount } from 'svelte';
 	import { get } from 'svelte/store';
 	import { __ } from '@wordpress/i18n';
+	import ReactComponent from '../../elements/ReactComponent.svelte';
+	import { Hero } from '../../react-components/components/isa-hero';
 	import Footer from '../../sections/Footer.svelte';
 	import Header from '../../sections/Header.svelte';
 	import { modulesState } from '../../stores/modules';
-	import Hero from './recommendations/Hero.svelte';
 	import Pagination from './recommendations/Pagination.svelte';
 	import Table from './recommendations/Table.svelte';
 	import Tabs from './recommendations/Tabs.svelte';
@@ -54,7 +55,8 @@
 	<Header subPage={__( 'Image analysis report', 'jetpack-boost' )} />
 	<div class="jb-recommendations-page jb-section--alt">
 		<div class="jb-container">
-			<Hero
+			<ReactComponent
+				this={Hero}
 				{needsRefresh}
 				{refresh}
 				{isImageCdnModuleActive}
diff --git a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/recommendations/Hero.svelte b/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/recommendations/Hero.svelte
deleted file mode 100644
index ca202c194acf4..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/modules/image-size-analysis/recommendations/Hero.svelte
+++ /dev/null
@@ -1,64 +0,0 @@
-<script lang="ts">
-	import { quadOut } from 'svelte/easing';
-	import { fade } from 'svelte/transition';
-	import { __, _n, sprintf } from '@wordpress/i18n';
-	import RecommendationContext from '../../../elements/RecommendationContext.svelte';
-	import TemplatedString from '../../../elements/TemplatedString.svelte';
-	import actionLinkTemplateVar from '../../../utils/action-link-template-var';
-
-	export let needsRefresh: boolean;
-	export let refresh: () => Promise< void >;
-	export let isImageCdnModuleActive: boolean;
-	export let isaLastUpdated: number;
-	export let hasActiveGroup: boolean;
-	export let totalIssueCount: number;
-
-	const formatter = new Intl.DateTimeFormat( 'en-US', {
-		month: 'long',
-		day: 'numeric',
-		hour: 'numeric',
-		minute: 'numeric',
-		hour12: true,
-	} );
-</script>
-
-{#if hasActiveGroup && isaLastUpdated}
-	{@const ( lastUpdated = formatter.format( isaLastUpdated ) )}
-
-	<div class="jb-hero" in:fade={{ duration: 300, easing: quadOut }}>
-		<span>Latest report as of {lastUpdated}</span>
-		{#if totalIssueCount}
-			<h1>
-				{sprintf(
-					/* translators: %d: number of image recommendations */
-					_n(
-						'%d Image Recommendation',
-						'%d Image Recommendations',
-						totalIssueCount,
-						'jetpack-boost'
-					),
-					totalIssueCount
-				)}
-
-				{#if ! isImageCdnModuleActive && totalIssueCount > 0}
-					<RecommendationContext />
-				{/if}
-			</h1>
-		{/if}
-
-		{#if needsRefresh}
-			<TemplatedString
-				template={__(
-					'More recommendations have been found. <refresh>Refresh</refresh> to see the latest recommendations.',
-					'jetpack-boost'
-				)}
-				vars={actionLinkTemplateVar( () => refresh(), 'refresh' )}
-			/>
-		{/if}
-	</div>
-{:else}
-	<div class="jb-hero">
-		<span>&nbsp;</span>
-		<h1>&nbsp;</h1>
-	</div>
-{/if}
diff --git a/projects/plugins/boost/app/assets/src/js/pages/benefits/BenefitsInterstitial.svelte b/projects/plugins/boost/app/assets/src/js/pages/benefits/BenefitsInterstitial.svelte
index 7a54f29b5d5a8..4886ce7fe569a 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/benefits/BenefitsInterstitial.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/benefits/BenefitsInterstitial.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { PricingCard } from '@automattic/jetpack-components';
 	import { __ } from '@wordpress/i18n';
-	import ActivateLicense from '../../elements/ActivateLicense.svelte';
 	import ReactComponent from '../../elements/ReactComponent.svelte';
-	import BackButton from '../../react-components/common/back-button/BackButton';
+	import ActivateLicense from '../../react-components/components/activate-license';
+	import BackButton from '../../react-components/components/back-button';
 	import Footer from '../../sections/Footer.svelte';
 	import { getUpgradeURL } from '../../stores/connection';
 	import Logo from '../../svg/jetpack-green.svg';
@@ -36,7 +36,7 @@
 				<JetpackBoostLogo />
 			</div>
 
-			<ActivateLicense />
+			<ReactComponent this={ActivateLicense} />
 		</div>
 	</div>
 
diff --git a/projects/plugins/boost/app/assets/src/js/pages/getting-started/GettingStarted.svelte b/projects/plugins/boost/app/assets/src/js/pages/getting-started/GettingStarted.svelte
index 47fad364f6357..174f09b83af3a 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/getting-started/GettingStarted.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/getting-started/GettingStarted.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { Snackbar } from '@wordpress/components';
-	import ActivateLicense from '../../elements/ActivateLicense.svelte';
 	import ReactComponent from '../../elements/ReactComponent.svelte';
 	import { BoostPricingTable } from '../../react-components/BoostPricingTable';
+	import ActivateLicense from '../../react-components/components/activate-license';
 	import Footer from '../../sections/Footer.svelte';
 	import Header from '../../sections/Header.svelte';
 	import { initializeConnection, getUpgradeURL } from '../../stores/connection';
@@ -49,7 +49,7 @@
 
 <div id="jb-dashboard" class="jb-dashboard jb-dashboard--main">
 	<Header>
-		<ActivateLicense />
+		<ReactComponent this={ActivateLicense} />
 	</Header>
 
 	<div class="jb-section jb-section--alt">
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/Settings.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/Settings.svelte
index 709bb0d6009ea..2afd1a7bdf707 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/Settings.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/Settings.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
 	import ReRouter from '../../elements/ReRouter.svelte';
+	import ReactComponent from '../../elements/ReactComponent.svelte';
+	import Support from '../../react-components/sections/support';
 	import Footer from '../../sections/Footer.svelte';
 	import Header from '../../sections/Header.svelte';
 	import config from '../../stores/config';
@@ -10,7 +12,6 @@
 	import AdvancedCriticalCss from './sections/AdvancedCriticalCss.svelte';
 	import Modules from './sections/Modules.svelte';
 	import Score from './sections/Score.svelte';
-	import Support from './sections/Support.svelte';
 	import Tips from './sections/Tips.svelte';
 
 	export let activeModules: boolean[];
@@ -42,7 +43,7 @@
 		<Tips />
 
 		{#if $hasPrioritySupport}
-			<Support />
+			<ReactComponent this={Support} />
 		{/if}
 
 		<Footer />
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/elements/ScoreContext.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/elements/ScoreContext.svelte
deleted file mode 100644
index 1b52de6ed0d1b..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/elements/ScoreContext.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-<script lang="ts">
-	import { __ } from '@wordpress/i18n';
-</script>
-
-<div class="jb-score-context">
-	<span class="jb-score-context__info-icon">i</span>
-	<div class="jb-score-context__info-container">
-		<p>
-			{__(
-				"Your Overall Score is a summary of your website performance across both mobile and desktop devices. It gives a general idea of your sites' overall performance.",
-				'jetpack-boost'
-			)}
-		</p>
-		<table>
-			<tr>
-				<th>A</th>
-				<td>90+</td>
-			</tr>
-			<tr>
-				<th>B</th>
-				<td>75 - 90</td>
-			</tr>
-			<tr>
-				<th>C</th>
-				<td>50 - 75</td>
-			</tr>
-		</table>
-		<table>
-			<tr>
-				<th>D</th>
-				<td>35 - 50</td>
-			</tr>
-			<tr>
-				<th>E</th>
-				<td>25 - 35</td>
-			</tr>
-			<tr>
-				<th>F</th>
-				<td>0 - 25</td>
-			</tr>
-		</table>
-		<i />
-	</div>
-</div>
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte
index a4e9d2fcd9494..697c3efc58a9b 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/AdvancedCriticalCss.svelte
@@ -3,7 +3,7 @@
 	import { __, _n, sprintf } from '@wordpress/i18n';
 	import CloseButton from '../../../elements/CloseButton.svelte';
 	import ReactComponent from '../../../elements/ReactComponent.svelte';
-	import BackButton from '../../../react-components/common/back-button/BackButton';
+	import BackButton from '../../../react-components/components/back-button';
 	import { replaceCssState, updateProvider } from '../../../stores/critical-css-state';
 	import { groupErrorsByFrequency } from '../../../stores/critical-css-state-errors';
 	import { type Provider } from '../../../stores/critical-css-state-types';
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte
index fb25fe858e137..ae941c5ed6d72 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Modules.svelte
@@ -15,7 +15,7 @@
 		isaSummary,
 	} from '../../../modules/image-size-analysis/store/isa-summary';
 	import { RegenerateCriticalCssSuggestion } from '../../../react-components/RegenerateCriticalCssSuggestion';
-	import MinifyMeta from '../../../react-components/pages/settings/elements/MinifyMeta';
+	import MinifyMeta from '../../../react-components/components/minify-meta';
 	import config from '../../../stores/config';
 	import {
 		criticalCssState,
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte
index 6179c83fba0af..dfd3179ac1dae 100644
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte
+++ b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Score.svelte
@@ -9,6 +9,7 @@
 	import { scoreChangeModal, ScoreChangeMessage } from '../../../api/speed-scores';
 	import ErrorNotice from '../../../elements/ErrorNotice.svelte';
 	import ReactComponent from '../../../elements/ReactComponent.svelte';
+	import ContextTooltip from '../../../react-components/sections/score/context-tooltip';
 	import { performanceHistoryPanelDS } from '../../../stores/data-sync-client';
 	import { dismissedAlerts } from '../../../stores/dismissed-alerts';
 	import { modulesState } from '../../../stores/modules';
@@ -18,9 +19,10 @@
 	import { castToString } from '../../../utils/cast-to-string';
 	import debounce from '../../../utils/debounce';
 	import PopOut from '../elements/PopOut.svelte';
-	import ScoreContext from '../elements/ScoreContext.svelte';
 	import History from './History.svelte';
 
+	// @todo - move score-context markup/styles here, as it's not used anywhere else.
+
 	// Flat list of which modules are active; useful for tracking changes in state.
 	export let activeModules: boolean[];
 	export let criticalCssCreated: number;
@@ -145,11 +147,11 @@
 					{/if}
 				</h2>
 				{#if ! isLoading && ! loadError}
-					<ScoreContext />
+					<ReactComponent this={ContextTooltip} />
 				{/if}
 				<button
 					type="button"
-					class="components-button is-link"
+					class="action-button components-button is-link"
 					disabled={isLoading}
 					on:click={() => loadScore( true )}
 				>
diff --git a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Support.svelte b/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Support.svelte
deleted file mode 100644
index fa4c4770752fd..0000000000000
--- a/projects/plugins/boost/app/assets/src/js/pages/settings/sections/Support.svelte
+++ /dev/null
@@ -1,31 +0,0 @@
-<script lang="ts">
-	import { __ } from '@wordpress/i18n';
-	import { openPaidSupport } from '../../../utils/paid-plan';
-</script>
-
-<div class="jb-section">
-	<div class="jb-container--narrow">
-		<div class="jb-support">
-			<div class="jb-support__content">
-				<h3 class="jb-support__title">
-					{__( "We're here to help", 'jetpack-boost' )}
-				</h3>
-				<p class="jb-support__description">
-					{__(
-						'Your paid plan gives you access to prioritized Jetpack Boost support',
-						'jetpack-boost'
-					)}
-				</p>
-			</div>
-			<div class="jb-support__cta">
-				<button
-					class="components-button jb-button jb-button--outline"
-					on:click={openPaidSupport}
-					type="button"
-				>
-					{__( 'Contact Us', 'jetpack-boost' )}
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/index.tsx b/projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/index.tsx
new file mode 100644
index 0000000000000..822652b17fa80
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/index.tsx
@@ -0,0 +1,24 @@
+import { createInterpolateElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import styles from './styles.module.scss';
+
+const ActivateLicense = () => {
+	const activateLicenseUrl = 'admin.php?page=my-jetpack#/add-license';
+
+	return (
+		<p className={ styles[ 'activate-license' ] }>
+			{ createInterpolateElement(
+				__(
+					'Already have an existing plan or license key? <link>Click here to get started</link>',
+					'jetpack-boost'
+				),
+				{
+					// eslint-disable-next-line jsx-a11y/anchor-has-content
+					link: <a className={ styles.link } href={ activateLicenseUrl } />,
+				}
+			) }
+		</p>
+	);
+};
+
+export default ActivateLicense;
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/styles.module.scss b/projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/styles.module.scss
new file mode 100644
index 0000000000000..4f3f5159d9cb6
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/activate-license/styles.module.scss
@@ -0,0 +1,12 @@
+.activate-license {
+	font-size: 13px;
+}
+
+.link {
+	color: var( --blue-50 ) !important;
+
+	&:hover,
+	&:active {
+		color: var( --blue-60 ) !important;
+	}
+}
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/common/back-button/BackButton.tsx b/projects/plugins/boost/app/assets/src/js/react-components/components/back-button/index.tsx
similarity index 100%
rename from projects/plugins/boost/app/assets/src/js/react-components/common/back-button/BackButton.tsx
rename to projects/plugins/boost/app/assets/src/js/react-components/components/back-button/index.tsx
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/index.tsx b/projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/index.tsx
new file mode 100644
index 0000000000000..01d14ec5bba07
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/index.tsx
@@ -0,0 +1,28 @@
+import { createInterpolateElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import styles from './styles.module.scss';
+
+const ImageCdnRecommendation = () => {
+	return (
+		<>
+			<p className={ styles.paragraph }>
+				{ createInterpolateElement(
+					__( 'We recommend enabling the <b>Image CDN</b>.', 'jetpack-boost' ),
+					{
+						b: <b />,
+					}
+				) }
+			</p>
+			<p className={ styles.paragraph }>
+				<small>
+					{ __(
+						"Jetpack Boost's Image CDN can automatically resize many images to the correct size for you.",
+						'jetpack-boost'
+					) }
+				</small>
+			</p>
+		</>
+	);
+};
+
+export default ImageCdnRecommendation;
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/styles.module.scss b/projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/styles.module.scss
new file mode 100644
index 0000000000000..cfc5025c9d125
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/image-cdn-recommendation/styles.module.scss
@@ -0,0 +1,7 @@
+.paragraph {
+	margin-top: 0 !important;
+}
+
+.paragraph:last-of-type {
+	margin-bottom: 0 !important;
+}
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/index.tsx b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/index.tsx
new file mode 100644
index 0000000000000..8d07461fb7e5b
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/index.tsx
@@ -0,0 +1,95 @@
+import { IconTooltip } from '@automattic/jetpack-components';
+import classNames from 'classnames';
+import { createInterpolateElement } from '@wordpress/element';
+import { __, _n, sprintf } from '@wordpress/i18n';
+import ImageCdnRecommendation from '../image-cdn-recommendation';
+import styles from './styles.module.scss';
+
+// removed in:fade={{ duration: 300, easing: quadOut }} from .jb-hero
+
+export const Hero = ( {
+	needsRefresh,
+	refresh,
+	isImageCdnModuleActive,
+	isaLastUpdated,
+	hasActiveGroup,
+	totalIssueCount,
+} ) => {
+	const formatter = new Intl.DateTimeFormat( 'en-US', {
+		month: 'long',
+		day: 'numeric',
+		hour: 'numeric',
+		minute: 'numeric',
+		hour12: true,
+	} );
+
+	const lastUpdated = formatter.format( isaLastUpdated );
+	const showLatestReport = hasActiveGroup && !! isaLastUpdated;
+
+	return (
+		<>
+			{ showLatestReport ? (
+				<div className={ classNames( styles.hero, styles[ 'fade-in' ] ) }>
+					<span>Latest report as of { lastUpdated }</span>
+					{ totalIssueCount > 0 && (
+						<h1>
+							{ sprintf(
+								/* translators: %d: number of image recommendations */
+								_n(
+									'%d Image Recommendation',
+									'%d Image Recommendations',
+									totalIssueCount,
+									'jetpack-boost'
+								),
+								totalIssueCount
+							) }
+
+							{ ! isImageCdnModuleActive && totalIssueCount > 0 && (
+								<IconTooltip
+									title=""
+									placement={ 'bottom' }
+									className={ styles.tooltip }
+									iconSize={ 22 }
+									offset={ 20 }
+									wide={ true }
+								>
+									<ImageCdnRecommendation />
+								</IconTooltip>
+							) }
+						</h1>
+					) }
+
+					{ needsRefresh && (
+						<span>
+							{ createInterpolateElement(
+								__(
+									'More recommendations have been found. <refresh>Refresh</refresh> to see the latest recommendations.',
+									'jetpack-boost'
+								),
+								{
+									refresh: (
+										// eslint-disable-next-line jsx-a11y/anchor-has-content, jsx-a11y/anchor-is-valid
+										<a
+											className="action"
+											onClick={ event => {
+												event.preventDefault();
+
+												refresh();
+											} }
+											href="#"
+										/>
+									),
+								}
+							) }
+						</span>
+					) }
+				</div>
+			) : (
+				<>
+					<span>&nbsp;</span>
+					<h1>&nbsp;</h1>
+				</>
+			) }
+		</>
+	);
+};
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/styles.module.scss b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/styles.module.scss
new file mode 100644
index 0000000000000..1e18f94b38565
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-hero/styles.module.scss
@@ -0,0 +1,29 @@
+.hero {
+	padding: 50px 0 30px;
+	display: flex;
+	flex-direction: column;
+	gap: calc( var( --gap ) / 2 );
+}
+
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+
+	to {
+		opacity: 1;
+	}
+}
+
+.fade-in {
+	animation-duration: 300ms;
+	animation-name: fadeIn;
+}
+
+.tooltip {
+	margin-left: 8px;
+}
+
+.tooltip button svg {
+	fill: var( --gray-30 );
+}
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/index.tsx b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/index.tsx
new file mode 100644
index 0000000000000..7aeacc50dc545
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/index.tsx
@@ -0,0 +1,29 @@
+import { IconTooltip } from '@automattic/jetpack-components';
+import { __ } from '@wordpress/i18n';
+import styles from './styles.module.scss';
+
+const OtherGroupContext = () => {
+	return (
+		<IconTooltip
+			title=""
+			placement={ 'bottom-end' }
+			className={ styles.tooltip }
+			iconSize={ 18 }
+			offset={ 8 }
+		>
+			<p>
+				{ __(
+					'In addition to the Homepage, Pages and Posts, Boost will also analyze the following custom post types found on your site:',
+					'jetpack-boost'
+				) }
+			</p>
+			<ul>
+				{ Object.entries( Jetpack_Boost.site.postTypes ).map( ( [ key, value ] ) => (
+					<li key={ key }>{ value }</li>
+				) ) }
+			</ul>
+		</IconTooltip>
+	);
+};
+
+export default OtherGroupContext;
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/styles.module.scss b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/styles.module.scss
new file mode 100644
index 0000000000000..bcc3f099bd99b
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/isa-other-group-context/styles.module.scss
@@ -0,0 +1,11 @@
+.tooltip {
+	margin-left: 8px;
+}
+
+.tooltip p:first-child {
+	margin-top: 0;
+}
+
+.tooltip button svg {
+	fill: var( --gray-30 );
+}
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/pages/settings/elements/MinifyMeta.tsx b/projects/plugins/boost/app/assets/src/js/react-components/components/minify-meta/index.tsx
similarity index 96%
rename from projects/plugins/boost/app/assets/src/js/react-components/pages/settings/elements/MinifyMeta.tsx
rename to projects/plugins/boost/app/assets/src/js/react-components/components/minify-meta/index.tsx
index 459fe7ee3d773..c57b65e9e45c3 100644
--- a/projects/plugins/boost/app/assets/src/js/react-components/pages/settings/elements/MinifyMeta.tsx
+++ b/projects/plugins/boost/app/assets/src/js/react-components/components/minify-meta/index.tsx
@@ -1,7 +1,7 @@
 import { DataSyncProvider } from '@automattic/jetpack-react-data-sync-client';
 import { useEffect, useState } from 'react';
 import { __, sprintf } from '@wordpress/i18n';
-import { type Props, useMetaQuery, useConfig } from '../../../../stores/minify';
+import { type Props, useMetaQuery, useConfig } from '../../../stores/minify';
 
 const MetaComponent = ( { inputLabel, buttonText, placeholder, datasyncKey }: Props ) => {
 	const config = useConfig();
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/index.tsx b/projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/index.tsx
new file mode 100644
index 0000000000000..57c1789a64a46
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/index.tsx
@@ -0,0 +1,57 @@
+import { IconTooltip } from '@automattic/jetpack-components';
+import { __ } from '@wordpress/i18n';
+import styles from './styles.module.scss';
+
+const ContextTooltip = () => {
+	return (
+		<IconTooltip
+			title=""
+			placement={ 'bottom' }
+			className={ styles.tooltip }
+			iconSize={ 22 }
+			offset={ 10 }
+			wide={ true }
+		>
+			<p>
+				{ __(
+					"Your Overall Score is a summary of your website performance across both mobile and desktop devices. It gives a general idea of your sites' overall performance.",
+					'jetpack-boost'
+				) }
+			</p>
+			<table className={ styles.table }>
+				<tbody>
+					<tr>
+						<th>A</th>
+						<td>90+</td>
+					</tr>
+					<tr>
+						<th>B</th>
+						<td>75 - 90</td>
+					</tr>
+					<tr>
+						<th>C</th>
+						<td>50 - 75</td>
+					</tr>
+				</tbody>
+			</table>
+			<table className={ styles.table }>
+				<tbody>
+					<tr>
+						<th>D</th>
+						<td>35 - 50</td>
+					</tr>
+					<tr>
+						<th>E</th>
+						<td>25 - 35</td>
+					</tr>
+					<tr>
+						<th>F</th>
+						<td>0 - 25</td>
+					</tr>
+				</tbody>
+			</table>
+		</IconTooltip>
+	);
+};
+
+export default ContextTooltip;
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/styles.module.scss b/projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/styles.module.scss
new file mode 100644
index 0000000000000..443b53c20046d
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/sections/score/context-tooltip/styles.module.scss
@@ -0,0 +1,22 @@
+.table {
+	width: 49%;
+	margin: 0;
+	display: inline-block;
+}
+
+.table td {
+	padding-left: 10px;
+}
+
+.tooltip {
+	margin: 8px 0 0 6px;
+}
+
+.tooltip p:first-child {
+	margin-top: 0;
+}
+
+.tooltip button svg {
+	margin: 0;
+	fill: var( --gray-30 );
+}
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/sections/support/index.tsx b/projects/plugins/boost/app/assets/src/js/react-components/sections/support/index.tsx
new file mode 100644
index 0000000000000..a21421761e37d
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/sections/support/index.tsx
@@ -0,0 +1,34 @@
+import { __ } from '@wordpress/i18n';
+import { openPaidSupport } from '../../../utils/paid-plan';
+import styles from './styles.module.scss';
+
+const Support = () => {
+	return (
+		<div className="jb-section">
+			<div className="jb-container--narrow">
+				<div className={ styles.support }>
+					<div className="content">
+						<h3 className={ styles.title }>{ __( "We're here to help", 'jetpack-boost' ) }</h3>
+						<p>
+							{ __(
+								'Your paid plan gives you access to prioritized Jetpack Boost support',
+								'jetpack-boost'
+							) }
+						</p>
+					</div>
+					<div className={ styles.cta }>
+						<button
+							className="components-button jb-button jb-button--outline"
+							onClick={ openPaidSupport }
+							type="button"
+						>
+							{ __( 'Contact Us', 'jetpack-boost' ) }
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export default Support;
diff --git a/projects/plugins/boost/app/assets/src/js/react-components/sections/support/styles.module.scss b/projects/plugins/boost/app/assets/src/js/react-components/sections/support/styles.module.scss
new file mode 100644
index 0000000000000..29f4a92f9a607
--- /dev/null
+++ b/projects/plugins/boost/app/assets/src/js/react-components/sections/support/styles.module.scss
@@ -0,0 +1,13 @@
+.support {
+	display: grid;
+	grid-template-columns: auto auto;
+	align-items: center;
+}
+
+.title {
+	margin-bottom: 24px !important; // @todo - use variable $halfling
+}
+
+.cta {
+	text-align: right;
+}
diff --git a/projects/plugins/boost/app/assets/src/js/sections/Header.svelte b/projects/plugins/boost/app/assets/src/js/sections/Header.svelte
index ac380041b72a8..1a4d5704e37e4 100644
--- a/projects/plugins/boost/app/assets/src/js/sections/Header.svelte
+++ b/projects/plugins/boost/app/assets/src/js/sections/Header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { useNavigate } from 'svelte-navigator';
 	import ReactComponent from '../elements/ReactComponent.svelte';
-	import BackButton from '../react-components/common/back-button/BackButton';
+	import BackButton from '../react-components/components/back-button';
 	import ChevronRight from '../svg/chevron-right.svg';
 	import Logo from '../svg/logo.svg';
 
diff --git a/projects/plugins/boost/changelog/boost-react-migrate-components b/projects/plugins/boost/changelog/boost-react-migrate-components
new file mode 100644
index 0000000000000..954fe03de54c3
--- /dev/null
+++ b/projects/plugins/boost/changelog/boost-react-migrate-components
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Refactor svelte components to react.
diff --git a/projects/plugins/boost/changelog/boost-react-migrate-components#2 b/projects/plugins/boost/changelog/boost-react-migrate-components#2
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/boost/changelog/boost-react-migrate-components#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
index f92676dca028e..066ff056c478c 100644
--- a/projects/plugins/boost/composer.json
+++ b/projects/plugins/boost/composer.json
@@ -3,7 +3,7 @@
 	"description": "Boost your WordPress site's performance, from the creators of Jetpack",
 	"type": "library",
 	"license": "GPL-2.0-or-later",
-	"version": "2.2.1-alpha",
+	"version": "2.3.0-alpha",
 	"authors": [
 		{
 			"name": "Automattic, Inc.",
@@ -73,7 +73,7 @@
 		"platform": {
 			"ext-intl": "0.0.0"
 		},
-		"autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ2_2_1_alpha",
+		"autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ2_3_0_alpha",
 		"allow-plugins": {
 			"roots/wordpress-core-installer": true,
 			"automattic/jetpack-autoloader": true,
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index 9229eb83fc78f..03644195fe317 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1fd61f725b40cb3b1cf4b7c3a4511fc2",
+    "content-hash": "9c78e3c648ff9c7884020bd259797002",
     "packages": [
         {
             "name": "automattic/jetpack-a8c-mc-stats",
diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php
index 865b2fa4e1a48..90159e8196578 100644
--- a/projects/plugins/boost/jetpack-boost.php
+++ b/projects/plugins/boost/jetpack-boost.php
@@ -9,7 +9,7 @@
  * Plugin Name:       Jetpack Boost
  * Plugin URI:        https://jetpack.com/boost
  * Description:       Boost your WordPress site's performance, from the creators of Jetpack
- * Version: 2.2.1-alpha
+ * Version: 2.3.0-alpha
  * Author:            Automattic - Jetpack Site Speed team
  * Author URI:        https://jetpack.com/boost/
  * License:           GPL-2.0+
@@ -29,7 +29,7 @@
 	die;
 }
 
-define( 'JETPACK_BOOST_VERSION', '2.2.1-alpha' );
+define( 'JETPACK_BOOST_VERSION', '2.3.0-alpha' );
 define( 'JETPACK_BOOST_SLUG', 'jetpack-boost' );
 
 if ( ! defined( 'JETPACK_BOOST_CLIENT_NAME' ) ) {
diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json
index ec309e350ddc2..6459b487b0371 100644
--- a/projects/plugins/boost/package.json
+++ b/projects/plugins/boost/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jetpack-boost",
-	"version": "2.2.1-alpha",
+	"version": "2.3.0-alpha",
 	"description": "Boost your WordPress site's performance, from the creators of Jetpack",
 	"directories": {
 		"test": "tests"
@@ -14,6 +14,7 @@
 		"@svgr/rollup": "8.1.0",
 		"@wordpress/components": "25.10.0",
 		"@wordpress/element": "5.21.0",
+		"classnames": "2.3.2",
 		"history": "5.3.0",
 		"jetpack-boost-critical-css-gen": "github:automattic/jetpack-boost-critical-css-gen#release-0.0.10",
 		"prettier": "npm:wp-prettier@3.0.3",
diff --git a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
index 696b2856ef589..ce839de311b22 100644
--- a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
+++ b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
@@ -152,7 +152,7 @@ export default class JetpackBoostPage extends WpPage {
 	}
 
 	async isScoreDescriptionPopinVisible() {
-		const selector = '.jb-score-context__info-container';
+		const selector = '.jb-site-score__top .icon-tooltip-wrapper .components-popover__content';
 		return this.page.isVisible( selector );
 	}
 
diff --git a/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js b/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js
index 9433895a61924..a74f8b4fb0ed9 100644
--- a/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js
+++ b/projects/plugins/boost/tests/e2e/specs/modules/speed-score.test.js
@@ -39,9 +39,9 @@ test.describe( 'Speed Score feature', () => {
 		expect( await jetpackBoostPage.isScoreVisible(), 'Score should be displayed' ).toBeTruthy();
 	} );
 
-	test( 'Should be able to hover info icon next to overall score and see the detailed overall score description popin', async () => {
+	test( 'Should be able to click info icon next to overall score and see the detailed overall score description popin', async () => {
 		await jetpackBoostPage.waitForScoreLoadingToFinish();
-		await jetpackBoostPage.page.hover( '.jb-score-context' );
+		await jetpackBoostPage.page.click( '.jb-site-score__top .icon-tooltip-wrapper > button' );
 		expect(
 			await jetpackBoostPage.isScoreDescriptionPopinVisible(),
 			'Score description should be visible'

From fc69184ef2b23d54ddf7a2c8edc444c898a0c24a Mon Sep 17 00:00:00 2001
From: Jasper Kang <jasper.kang@automattic.com>
Date: Fri, 10 Nov 2023 00:33:40 +1300
Subject: [PATCH 12/16] Add two bots signature to device detection (#34026)

* add facebookexternalhit and cookieinformationscanner to be detected as bot

* changelog

* fixup project versions
---
 .../changelog/update-add-bots-sig-to-ua-detection            | 4 ++++
 projects/packages/device-detection/composer.json             | 2 +-
 .../packages/device-detection/src/class-user-agent-info.php  | 2 ++
 .../backup/changelog/update-add-bots-sig-to-ua-detection     | 5 +++++
 projects/plugins/backup/composer.lock                        | 4 ++--
 .../boost/changelog/update-add-bots-sig-to-ua-detection      | 5 +++++
 projects/plugins/boost/composer.lock                         | 4 ++--
 .../jetpack/changelog/update-add-bots-sig-to-ua-detection    | 5 +++++
 projects/plugins/jetpack/composer.lock                       | 4 ++--
 .../migration/changelog/update-add-bots-sig-to-ua-detection  | 5 +++++
 projects/plugins/migration/composer.lock                     | 4 ++--
 .../protect/changelog/update-add-bots-sig-to-ua-detection    | 5 +++++
 projects/plugins/protect/composer.lock                       | 4 ++--
 .../search/changelog/update-add-bots-sig-to-ua-detection     | 5 +++++
 projects/plugins/search/composer.lock                        | 4 ++--
 .../social/changelog/update-add-bots-sig-to-ua-detection     | 5 +++++
 projects/plugins/social/composer.lock                        | 4 ++--
 .../changelog/update-add-bots-sig-to-ua-detection            | 5 +++++
 projects/plugins/starter-plugin/composer.lock                | 4 ++--
 .../changelog/update-add-bots-sig-to-ua-detection            | 5 +++++
 projects/plugins/super-cache/composer.json                   | 2 +-
 projects/plugins/super-cache/composer.lock                   | 4 ++--
 projects/plugins/super-cache/package.json                    | 2 +-
 projects/plugins/super-cache/wp-cache.php                    | 2 +-
 .../videopress/changelog/update-add-bots-sig-to-ua-detection | 5 +++++
 projects/plugins/videopress/composer.lock                    | 4 ++--
 26 files changed, 80 insertions(+), 24 deletions(-)
 create mode 100644 projects/packages/device-detection/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/backup/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/boost/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/jetpack/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/migration/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/protect/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/search/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/social/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/starter-plugin/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/super-cache/changelog/update-add-bots-sig-to-ua-detection
 create mode 100644 projects/plugins/videopress/changelog/update-add-bots-sig-to-ua-detection

diff --git a/projects/packages/device-detection/changelog/update-add-bots-sig-to-ua-detection b/projects/packages/device-detection/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..280b8d7357b14
--- /dev/null
+++ b/projects/packages/device-detection/changelog/update-add-bots-sig-to-ua-detection
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Allow cookieinformationscanner and facebookexternalhit to be detected as bots
diff --git a/projects/packages/device-detection/composer.json b/projects/packages/device-detection/composer.json
index 96fd3efac7e05..f8e8e8ddbe895 100644
--- a/projects/packages/device-detection/composer.json
+++ b/projects/packages/device-detection/composer.json
@@ -42,7 +42,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "1.4.x-dev"
+			"dev-trunk": "1.5.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/device-detection/src/class-user-agent-info.php b/projects/packages/device-detection/src/class-user-agent-info.php
index 3984dc2d22b7f..4a191e18b203a 100644
--- a/projects/packages/device-detection/src/class-user-agent-info.php
+++ b/projects/packages/device-detection/src/class-user-agent-info.php
@@ -1559,6 +1559,8 @@ public static function is_bot_user_agent( $ua = null ) {
 			'domaintunocrawler',
 			'grapeshotcrawler',
 			'cloudflare-alwaysonline',
+			'cookieinformationscanner', // p1699315886066389-slack-C0438NHCLSY
+			'facebookexternalhit', // https://www.facebook.com/externalhit_uatext.php
 		);
 
 		foreach ( $bot_agents as $bot_agent ) {
diff --git a/projects/plugins/backup/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/backup/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/backup/changelog/update-add-bots-sig-to-ua-detection
@@ -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 2ddb1d4035f50..98f16fb21ba7e 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/composer.lock
@@ -548,7 +548,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -565,7 +565,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/boost/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/boost/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-add-bots-sig-to-ua-detection
@@ -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 03644195fe317..a8cdb48f03c08 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -596,7 +596,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -613,7 +613,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/jetpack/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/jetpack/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..a1c1831fa1ef7
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-add-bots-sig-to-ua-detection
@@ -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 9cc1ac4c5a84d..2b80625a290ab 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -981,7 +981,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -998,7 +998,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/migration/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/migration/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/migration/changelog/update-add-bots-sig-to-ua-detection
@@ -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 4796d2c362769..361c66fd7af43 100644
--- a/projects/plugins/migration/composer.lock
+++ b/projects/plugins/migration/composer.lock
@@ -548,7 +548,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -565,7 +565,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/protect/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/protect/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-add-bots-sig-to-ua-detection
@@ -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 09929c100e191..cc0b3c2b216e5 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -463,7 +463,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -480,7 +480,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/search/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/search/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/search/changelog/update-add-bots-sig-to-ua-detection
@@ -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 2daa2d2f6991a..c51d9bb63e8b9 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -463,7 +463,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -480,7 +480,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/social/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/social/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/social/changelog/update-add-bots-sig-to-ua-detection
@@ -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 70db7214fc919..5f5c66e2381a7 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -463,7 +463,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -480,7 +480,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/starter-plugin/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/starter-plugin/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/update-add-bots-sig-to-ua-detection
@@ -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 0fe1a8857c1a1..8d471d6ec305c 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -463,7 +463,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -480,7 +480,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/super-cache/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/super-cache/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/super-cache/changelog/update-add-bots-sig-to-ua-detection
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/super-cache/composer.json b/projects/plugins/super-cache/composer.json
index 153c8317407b2..4f2d7cd7c176f 100644
--- a/projects/plugins/super-cache/composer.json
+++ b/projects/plugins/super-cache/composer.json
@@ -51,6 +51,6 @@
 		"wp-svn-autopublish": true
 	},
 	"config": {
-		"autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ1_11_0"
+		"autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ1_11_1_alpha"
 	}
 }
diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock
index 3dd23ba11f7e2..e22fadbe6b666 100644
--- a/projects/plugins/super-cache/composer.lock
+++ b/projects/plugins/super-cache/composer.lock
@@ -12,7 +12,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -29,7 +29,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {
diff --git a/projects/plugins/super-cache/package.json b/projects/plugins/super-cache/package.json
index 72341f7b70d37..e930d31428ad3 100644
--- a/projects/plugins/super-cache/package.json
+++ b/projects/plugins/super-cache/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-super-cache",
-	"version": "1.11.0",
+	"version": "1.11.1-alpha",
 	"description": "A very fast caching engine for WordPress that produces static html files.",
 	"homepage": "https://jetpack.com",
 	"bugs": {
diff --git a/projects/plugins/super-cache/wp-cache.php b/projects/plugins/super-cache/wp-cache.php
index 129e39ff1f838..29c8ad7763e97 100644
--- a/projects/plugins/super-cache/wp-cache.php
+++ b/projects/plugins/super-cache/wp-cache.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Super Cache
  * Plugin URI: https://wordpress.org/plugins/wp-super-cache/
  * Description: Very fast caching plugin for WordPress.
- * Version: 1.11.0
+ * Version: 1.11.1-alpha
  * Author: Automattic
  * Author URI: https://automattic.com/
  * License: GPL2+
diff --git a/projects/plugins/videopress/changelog/update-add-bots-sig-to-ua-detection b/projects/plugins/videopress/changelog/update-add-bots-sig-to-ua-detection
new file mode 100644
index 0000000000000..9aa70e3ec1f75
--- /dev/null
+++ b/projects/plugins/videopress/changelog/update-add-bots-sig-to-ua-detection
@@ -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 8adbe72142196..5301c0901cfa7 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -463,7 +463,7 @@
             "dist": {
                 "type": "path",
                 "url": "../../packages/device-detection",
-                "reference": "fef1f53b844143c5358061d969d7472bb321af18"
+                "reference": "fd0107efb4a3e0f3c2d37c6955a1c83b172e1499"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "@dev",
@@ -480,7 +480,7 @@
                     "link-template": "https://github.com/Automattic/jetpack-device-detection/compare/v${old}...v${new}"
                 },
                 "branch-alias": {
-                    "dev-trunk": "1.4.x-dev"
+                    "dev-trunk": "1.5.x-dev"
                 }
             },
             "autoload": {

From 3dd1dd8d0612a0966ea3b2b5dcf7f7bc3bebf2a5 Mon Sep 17 00:00:00 2001
From: Thomas Roberts <5656702+opr@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:37:24 +0000
Subject: [PATCH 13/16] Update WooCommerce Analytics module to check for
 changed template names (#34030)

---
 .../changelog/fix-template-name-change-warning   |  4 ++++
 ...class-jetpack-woocommerce-analytics-trait.php | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/fix-template-name-change-warning

diff --git a/projects/plugins/jetpack/changelog/fix-template-name-change-warning b/projects/plugins/jetpack/changelog/fix-template-name-change-warning
new file mode 100644
index 0000000000000..649deb5e605d2
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-template-name-change-warning
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Fix a PHP Warning when WooCommerce templates were not found due to a name change
diff --git a/projects/plugins/jetpack/modules/woocommerce-analytics/classes/class-jetpack-woocommerce-analytics-trait.php b/projects/plugins/jetpack/modules/woocommerce-analytics/classes/class-jetpack-woocommerce-analytics-trait.php
index a8829a702a6e9..9258eaef5357a 100644
--- a/projects/plugins/jetpack/modules/woocommerce-analytics/classes/class-jetpack-woocommerce-analytics-trait.php
+++ b/projects/plugins/jetpack/modules/woocommerce-analytics/classes/class-jetpack-woocommerce-analytics-trait.php
@@ -194,14 +194,14 @@ public function get_cart_checkout_info() {
 		$cart_template_id     = null;
 		$checkout_template_id = null;
 		$block_controller     = Automattic\WooCommerce\Blocks\Package::container()->get( Automattic\WooCommerce\Blocks\BlockTemplatesController::class );
-		$templates            = $block_controller->get_block_templates( array( 'cart', 'checkout' ) );
+		$templates            = $block_controller->get_block_templates( array( 'cart', 'checkout', 'page-checkout', 'page-cart' ) );
 
 		foreach ( $templates as $template ) {
-			if ( 'cart' === $template->slug ) {
+			if ( 'cart' === $template->slug || 'page-cart' === $template->slug ) {
 				$cart_template_id = ( $template->id );
 				continue;
 			}
-			if ( 'checkout' === $template->slug ) {
+			if ( 'checkout' === $template->slug || 'page-checkout' === $template->slug ) {
 				$checkout_template_id = ( $template->id );
 			}
 		}
@@ -217,6 +217,16 @@ public function get_cart_checkout_info() {
 			$checkout_template = get_block_template( $checkout_template_id );
 		}
 
+		// Something failed with the template retrieval, return early with 0 values rather than let a warning appear.
+		if ( ! $cart_template || ! $checkout_template ) {
+			return array(
+				'cart_page_contains_cart_block'         => 0,
+				'cart_page_contains_cart_shortcode'     => 0,
+				'checkout_page_contains_checkout_block' => 0,
+				'checkout_page_contains_checkout_shortcode' => 0,
+			);
+		}
+
 		// Update the info transient with data we got from the templates, if the site isn't using WC Blocks we
 		// won't be doing this so no concern about overwriting.
 		$info = array(

From a0b90f7b6af097aaf80df8bcc57a2a8bc79d14b4 Mon Sep 17 00:00:00 2001
From: Mikael Korpela <mikael@ihminen.org>
Date: Thu, 9 Nov 2023 13:45:31 +0200
Subject: [PATCH 14/16] Subscribe modal: fix lack of spacing in some themes 
 (#34032)

* Subscribe modal: fix lack of spacing in some themes

Uses fixed pixel values instead of theme presets, which seem to vary between themes.

TT4 for example doesn't have preset 7 at all, it goes only up to 6. And even then, the spacing is wildly incompatible with other themes and the spacing would be too large in one theme, while it's too small in another.

* Add "balance" text-wrap rule to keep text nice and balanced for mobile screens.
---
 .../plugins/jetpack/changelog/fix-subscribe-modal-spacing     | 4 ++++
 .../subscribe-modal/class-jetpack-subscribe-modal.php         | 4 ++--
 .../modules/subscriptions/subscribe-modal/subscribe-modal.css | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/fix-subscribe-modal-spacing

diff --git a/projects/plugins/jetpack/changelog/fix-subscribe-modal-spacing b/projects/plugins/jetpack/changelog/fix-subscribe-modal-spacing
new file mode 100644
index 0000000000000..85b76e9f439e3
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-subscribe-modal-spacing
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Subscribe modal: fix lack of spacing in some themes
diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php
index 0eedf8761b53a..60f4d6b0c9cdb 100644
--- a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php
+++ b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php
@@ -136,8 +136,8 @@ public function get_subscribe_template_content() {
 		$subscribe_text     = __( 'Subscribe now to keep reading and get access to the full archive.', 'jetpack' );
 
 		return <<<HTML
-	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70","left":"var:preset|spacing|70","right":"var:preset|spacing|70"},"margin":{"top":"0","bottom":"0"}},"border":{"color":"#dddddd","width":"1px"}},"layout":{"type":"constrained","contentSize":"450px"}} -->
-	<div class="wp-block-group has-border-color" style="border-color:#dddddd;border-width:1px;margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--70);padding-right:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)">
+	<!-- wp:group {"style":{"spacing":{"top":"32px","bottom":"32px","left":"32px","right":"32px"},"margin":{"top":"0","bottom":"0"}},"border":{"color":"#dddddd","width":"1px"}},"layout":{"type":"constrained","contentSize":"450px"}} -->
+	<div class="wp-block-group has-border-color" style="border-color:#dddddd;border-width:1px;margin-top:0;margin-bottom:0;padding-top:32px;padding-right:32px;padding-bottom:32px;padding-left:32px">
 
 	<!-- wp:heading {"textAlign":"center","style":{"typography":{"fontStyle":"normal","fontWeight":"600","fontSize":"26px"},"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"4px","bottom":"10px"}}}} -->
 		<h2 class="wp-block-heading has-text-align-center" style="margin-top:4px;margin-bottom:10px;font-size:26px;font-style:normal;font-weight:600">$discover_more_from</h2>
diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/subscribe-modal.css b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/subscribe-modal.css
index ea021637d662a..26fcba598a0a3 100644
--- a/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/subscribe-modal.css
+++ b/projects/plugins/jetpack/modules/subscriptions/subscribe-modal/subscribe-modal.css
@@ -28,6 +28,7 @@
 	border-radius: 10px;
 	box-sizing: border-box;
 	transition: all 0.4s;
+	text-wrap: balance;
 }
 
 .jetpack-subscribe-modal.open .jetpack-subscribe-modal__modal-content {

From f10623324ce21823f76fcdc5a007c532036863b5 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Thu, 9 Nov 2023 09:10:16 -0300
Subject: [PATCH 15/16] AI Assistant: add next-tier prop (#34028)

* add next-tier prop on JP AI Helper

* add next-tier prop from response into the hooks and state

* changelog

* add mapped value for next-tier

* resolve conflicts
---
 projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php | 1 +
 projects/plugins/jetpack/changelog/add-jp-helper-next-tier    | 4 ++++
 .../blocks/ai-assistant/hooks/use-ai-feature/index.ts         | 1 +
 .../plugins/jetpack/extensions/store/wordpress-com/actions.ts | 1 +
 .../plugins/jetpack/extensions/store/wordpress-com/reducer.ts | 1 +
 .../plugins/jetpack/extensions/store/wordpress-com/types.ts   | 1 +
 projects/plugins/jetpack/extensions/types.ts                  | 1 +
 7 files changed, 10 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/add-jp-helper-next-tier

diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php
index 37fc7a80f8494..54abe3d8721df 100644
--- a/projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php
+++ b/projects/plugins/jetpack/_inc/lib/class-jetpack-ai-helper.php
@@ -400,6 +400,7 @@ public static function get_ai_assistance_feature() {
 				'site-require-upgrade' => $require_upgrade,
 				'upgrade-type'         => $upgrade_type,
 				'current-tier'         => WPCOM\Jetpack_AI\Usage\Helper::get_current_tier( $blog_id ),
+				'next-tier'            => WPCOM\Jetpack_AI\Usage\Helper::get_next_tier( $blog_id ),
 				'tier-plans'           => WPCOM\Jetpack_AI\Usage\Helper::get_tier_plans_list(),
 			);
 		}
diff --git a/projects/plugins/jetpack/changelog/add-jp-helper-next-tier b/projects/plugins/jetpack/changelog/add-jp-helper-next-tier
new file mode 100644
index 0000000000000..130495511fb98
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-jp-helper-next-tier
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Add next-tier prop to the AI assistant feature endpoint response. Add the prop to hooks and statee
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts b/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts
index e01870d1fd29a..22ee4b93f12df 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/hooks/use-ai-feature/index.ts
@@ -25,6 +25,7 @@ export const AI_Assistant_Initial_State = {
 	currentTier: {
 		value: aiAssistantFeature?.[ 'current-tier' ]?.value || 1,
 	},
+	nextTier: aiAssistantFeature?.[ 'next-tier' ] || null,
 };
 
 export default function useAiFeature() {
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts
index 5ebccaf31544a..f8a5929b3efcf 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/actions.ts
@@ -43,6 +43,7 @@ export function mapAIFeatureResponseToAiFeatureProps(
 		currentTier: {
 			value: response[ 'current-tier' ]?.value || 1,
 		},
+		nextTier: response[ 'next-tier' ] || null,
 	};
 }
 
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts
index 16d66949bbd77..8155d927dadad 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/reducer.ts
@@ -32,6 +32,7 @@ const INITIAL_STATE: PlanStateProps = {
 			_meta: {
 				isRequesting: false,
 			},
+			nextTier: null,
 		},
 	},
 };
diff --git a/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts b/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts
index 06a43531a3558..901c3b381f5c1 100644
--- a/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts
+++ b/projects/plugins/jetpack/extensions/store/wordpress-com/types.ts
@@ -31,6 +31,7 @@ export type AiFeatureProps = {
 		nextStart: string;
 		requestsCount: number;
 	};
+	nextTier: null;
 };
 
 export type AiFeatureStateProps = AiFeatureProps & {
diff --git a/projects/plugins/jetpack/extensions/types.ts b/projects/plugins/jetpack/extensions/types.ts
index cbf87d3b7e243..4048fa3c556da 100644
--- a/projects/plugins/jetpack/extensions/types.ts
+++ b/projects/plugins/jetpack/extensions/types.ts
@@ -29,4 +29,5 @@ export type SiteAIAssistantFeatureEndpointResponseProps = {
 		limit: number;
 		value: TierValueProp;
 	} >;
+	'next-tier'?: null;
 };

From d17abbfd8b01c6baffcd56ca837ad4b4b8f29ad3 Mon Sep 17 00:00:00 2001
From: Miguel Lezama <miguel@automattic.com>
Date: Thu, 9 Nov 2023 09:58:46 -0300
Subject: [PATCH 16/16] Subscribe Block: Fix alignment (#34003)

---
 .../jetpack/changelog/update-subscribe-block-alignment        | 4 ++++
 .../plugins/jetpack/extensions/blocks/subscriptions/view.scss | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 projects/plugins/jetpack/changelog/update-subscribe-block-alignment

diff --git a/projects/plugins/jetpack/changelog/update-subscribe-block-alignment b/projects/plugins/jetpack/changelog/update-subscribe-block-alignment
new file mode 100644
index 0000000000000..0fd50f55eb2c6
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-subscribe-block-alignment
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+fix subscribe block alignment
diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/view.scss b/projects/plugins/jetpack/extensions/blocks/subscriptions/view.scss
index 6c4964e7449e6..68060cfac4728 100644
--- a/projects/plugins/jetpack/extensions/blocks/subscriptions/view.scss
+++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/view.scss
@@ -85,6 +85,8 @@
 		p#subscribe-submit,
 		p#subscribe-email {
 			margin: 0;
+			justify-content: center;
+  			display: flex;
 		}
 	}