From 0c6a95ab26e645745a1b7551500bc178c934831a Mon Sep 17 00:00:00 2001
From: Foteini Giannaropoulou <giannaropoulou.foteini@gmail.com>
Date: Mon, 30 Sep 2024 12:09:46 +0300
Subject: [PATCH] Masterbar: Remove User Info side-panel (#39546)

* Masterbar: Remove User Info side-panel
---
 ...pdate-masterbar-remove-user-info-sidepanel |  4 +
 .../src/masterbar/class-masterbar.php         | 82 -------------------
 2 files changed, 4 insertions(+), 82 deletions(-)
 create mode 100644 projects/packages/masterbar/changelog/update-masterbar-remove-user-info-sidepanel

diff --git a/projects/packages/masterbar/changelog/update-masterbar-remove-user-info-sidepanel b/projects/packages/masterbar/changelog/update-masterbar-remove-user-info-sidepanel
new file mode 100644
index 0000000000000..21b6b6ded5e3d
--- /dev/null
+++ b/projects/packages/masterbar/changelog/update-masterbar-remove-user-info-sidepanel
@@ -0,0 +1,4 @@
+Significance: patch
+Type: removed
+
+Masterbar: Remove User Info side-panel
diff --git a/projects/packages/masterbar/src/masterbar/class-masterbar.php b/projects/packages/masterbar/src/masterbar/class-masterbar.php
index a9c84085df0c5..20204f8a370f0 100644
--- a/projects/packages/masterbar/src/masterbar/class-masterbar.php
+++ b/projects/packages/masterbar/src/masterbar/class-masterbar.php
@@ -721,16 +721,6 @@ public function wpcom_adminbar_add_secondary_groups( $wp_admin_bar ) {
 			)
 		);
 
-		$wp_admin_bar->add_group(
-			array(
-				'parent' => 'blog',
-				'id'     => 'blog-secondary',
-				'meta'   => array(
-					'class' => 'ab-sub-secondary',
-				),
-			)
-		);
-
 		$wp_admin_bar->add_group(
 			array(
 				'id'   => 'top-secondary',
@@ -767,69 +757,6 @@ public function add_me_submenu( $wp_admin_bar ) {
 				),
 			)
 		);
-
-		/** This filter is documented in modules/masterbar.php */
-		if ( apply_filters( 'jetpack_load_admin_menu_class', false ) ) {
-			return;
-		}
-
-		$id = 'user-actions';
-		$wp_admin_bar->add_group(
-			array(
-				'parent' => 'my-account',
-				'id'     => $id,
-			)
-		);
-
-		$logout_url = wp_logout_url();
-		$logout_url = add_query_arg( 'context', 'masterbar', $logout_url );
-
-		$user_info  = get_avatar( $this->user_email, 128, 'mm', '', array( 'force_display' => true ) );
-		$user_info .= '<span class="display-name">' . $this->display_name . '</span>';
-		$user_info .= '<span class="username">' . $this->user_login . '</span>';
-
-		$blog_id = Connection_Manager::get_site_id( true );
-
-		$args = array();
-		if ( $blog_id ) {
-			$args['site'] = $blog_id;
-		}
-
-		$wp_admin_bar->add_menu(
-			array(
-				'parent' => $id,
-				'id'     => 'user-info',
-				'title'  => $user_info,
-				'meta'   => array(
-					'class'    => 'user-info user-info-item',
-					'tabindex' => -1,
-				),
-			)
-		);
-
-		$wp_admin_bar->add_menu(
-			array(
-				'parent' => $id,
-				'id'     => 'profile',
-				'title'  => esc_html__( 'Profile', 'jetpack-masterbar' ),
-				'href'   => Redirect::get_url( 'calypso-me', $args ),
-				'meta'   => array(
-					'class' => 'mb-icon',
-				),
-			)
-		);
-
-		$wp_admin_bar->add_menu(
-			array(
-				'parent' => $id,
-				'id'     => 'logout',
-				'title'  => esc_html__( 'Log Out', 'jetpack-masterbar' ),
-				'href'   => $logout_url,
-				'meta'   => array(
-					'class' => 'mb-icon',
-				),
-			)
-		);
 	}
 
 	/**
@@ -870,15 +797,6 @@ public function add_write_button( $wp_admin_bar ) {
 	 * @param WP_Admin_Bar $wp_admin_bar Admin Bar instance.
 	 */
 	public function add_my_sites_submenu( $wp_admin_bar ) {
-		$blog_name = get_bloginfo( 'name' );
-		if ( empty( $blog_name ) ) {
-			$blog_name = $this->primary_site_slug;
-		}
-
-		if ( mb_strlen( $blog_name ) > 20 ) {
-			$blog_name = mb_substr( html_entity_decode( $blog_name, ENT_QUOTES ), 0, 20 ) . '&hellip;';
-		}
-
 		$my_site_url = 'https://wordpress.com/sites/' . $this->primary_site_url;
 		if ( 'wp-admin' === get_option( 'wpcom_admin_interface' ) ) {
 			$my_site_url = 'https://wordpress.com/sites';