From e0e444c3dd6b0260ab30f88800431224555b56dd Mon Sep 17 00:00:00 2001
From: Ashar Fuadi <ashar.fuadi@automattic.com>
Date: Mon, 23 Sep 2024 22:14:19 +0700
Subject: [PATCH 1/2] Admin bar: ensure the Atomic debug bar is the leftmost
 menu

---
 .../features/wpcom-admin-bar/wpcom-admin-bar.php    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php
index df845aeaca305..168784c627afe 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.php
@@ -57,26 +57,19 @@ function wpcom_enqueue_admin_bar_assets() {
 	);
 
 	/**
-	 * Hotfix the order of the admin menu items due to WP 6.6
-	 * See https://core.trac.wordpress.org/ticket/61615.
+	 * Force the Atomic debug bar menu to be the first menu at the top-right.
 	 */
-	$wp_version = get_bloginfo( 'version' );
-	if ( version_compare( $wp_version, '6.6', '<=' ) && version_compare( $wp_version, '6.6.RC', '>=' ) ) {
+	if ( defined( 'AT_PROXIED_REQUEST' ) && AT_PROXIED_REQUEST ) {
 		wp_add_inline_style(
 			'wpcom-admin-bar',
 			<<<CSS
 				#wpadminbar .quicklinks #wp-admin-bar-top-secondary {
 					display: flex;
-					flex-direction: row-reverse;
 				}
 
-				#wpadminbar .quicklinks #wp-admin-bar-top-secondary #wp-admin-bar-search {
+				#wpadminbar .quicklinks #wp-admin-bar-top-secondary #wp-admin-bar-debug-bar {
 					order: -1;
 				}
-
-				#wpadminbar .quicklinks #wp-admin-bar-top-secondary #wp-admin-bar-help-center {
-					order: 1;
-				}
 CSS
 		);
 	}

From 339b333b73d653d40678b378d086076fafed609b Mon Sep 17 00:00:00 2001
From: Ashar Fuadi <ashar.fuadi@automattic.com>
Date: Mon, 23 Sep 2024 22:14:45 +0700
Subject: [PATCH 2/2] changelog

---
 projects/packages/jetpack-mu-wpcom/changelog/debug-bar-left | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/debug-bar-left

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/debug-bar-left b/projects/packages/jetpack-mu-wpcom/changelog/debug-bar-left
new file mode 100644
index 0000000000000..59e7467f9f383
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/debug-bar-left
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Admin bar: ensure the Atomic debug bar is the leftmost menu