Masterbar: Updates based on latest Masterbar module changes

projects/packages/masterbar/src/admin-menu/class-base-admin-menu.php

@@ -538,6 +538,10 @@ public function sort_hidden_submenus() {
 		global $submenu;
 
 		foreach ( $submenu as $menu_slug => $submenu_items ) {
+			if ( ! $submenu_items ) {
+				continue;
+			}
+
 			foreach ( $submenu_items as $submenu_index => $submenu_item ) {
 				if ( $this->is_item_visible( $submenu_item ) ) {
 					continue;

projects/packages/masterbar/src/masterbar/class-masterbar.php

@@ -987,18 +987,15 @@ public function add_my_sites_submenu( $wp_admin_bar ) {
 			$blog_name = mb_substr( html_entity_decode( $blog_name, ENT_QUOTES ), 0, 20 ) . '…';
 		}
 
-		$my_site_url   = 'https://wordpress.com/sites/' . $this->primary_site_url;
-		$my_site_title = _n( 'My Site', 'My Sites', $this->user_site_count, 'jetpack-masterbar' );
+		$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';
-			$my_site_title = esc_html__( 'My Sites', 'jetpack-masterbar' );
+			$my_site_url = 'https://wordpress.com/sites';
 		}
 
 		$wp_admin_bar->add_menu(
 			array(
 				'parent' => 'root-default',
 				'id'     => 'blog',
-				'title'  => $my_site_title,
 				'href'   => $my_site_url,
 				'meta'   => array(
 					'class' => 'my-sites mb-trackable',

projects/packages/masterbar/src/masterbar/overrides.css

@@ -3,6 +3,11 @@
     min-height: unset !important;
 }
 
+/* Remove margin between icon and text since the my-sites menu does not have text */
+#wpadminbar .my-sites .ab-item:before {
+	margin-right: 0;
+}
+
 /* Overwrite a core style which breaks the overflow for .my-sites in Safari */
 #wpadminbar li.menupop.my-sites {
 	overflow: visible;