Remove Administration Email in General Settings

projects/packages/jetpack-mu-wpcom/changelog/remove-general-options-email

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Hide email field in general options on simple classic

projects/packages/jetpack-mu-wpcom/composer.json

@@ -62,7 +62,7 @@
 		},
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "5.53.x-dev"
+			"dev-trunk": "5.54.x-dev"
 		},
 		"textdomain": "jetpack-mu-wpcom",
 		"version-constants": {

projects/packages/jetpack-mu-wpcom/package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom",
-	"version": "5.53.1",
+	"version": "5.54.0-alpha",
 	"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": {

projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php

@@ -13,7 +13,7 @@
  * Jetpack_Mu_Wpcom main class.
  */
 class Jetpack_Mu_Wpcom {
-	const PACKAGE_VERSION = '5.53.1';
+	const PACKAGE_VERSION = '5.54.0-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 	const BASE_DIR        = __DIR__ . '/';
 	const BASE_FILE       = __FILE__;
@@ -103,6 +103,7 @@ public static function load_features() {
 		require_once __DIR__ . '/features/wpcom-admin-dashboard/wpcom-admin-dashboard.php';
 		require_once __DIR__ . '/features/wpcom-block-editor/class-jetpack-wpcom-block-editor.php';
 		require_once __DIR__ . '/features/wpcom-block-editor/functions.editor-type.php';
+		require_once __DIR__ . '/features/wpcom-general-settings/general-settings-mods.php';
 		require_once __DIR__ . '/features/wpcom-profile-settings/profile-settings-notices.php';
 		require_once __DIR__ . '/features/wpcom-themes/wpcom-theme-fixes.php';
 

projects/packages/jetpack-mu-wpcom/src/features/wpcom-general-settings/general-settings-mods.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Customizations for the /wp-admin/options-general.php page.
+ *
+ * @package automattic/jetpack-mu-wpcom
+ */
+
+/**
+ * Hide the Administration Email section in General Settings on Simple Classic sites.
+ */
+function wpcom_maybe_hide_admin_email_address() {
+	$is_classic_site = get_option( 'wpcom_admin_interface' ) === 'wp-admin';
+	$is_simple_site  = defined( 'IS_WPCOM' ) && IS_WPCOM;
+
+	if ( $is_simple_site && $is_classic_site ) {
+		add_action( 'admin_enqueue_scripts', 'wpcom_hide_admin_email_address' );
+	}
+}
+
+/**
+ * Hide the Administration Email section in General Settings.
+ */
+function wpcom_hide_admin_email_address() {
+	/**
+	 * Use the CSS :has selector to hide the admin email tr elegantly. However, some older browsers do not support :has.
+	 * Fallback to hiding the elements in the tr. This leaves some white space because it doesn't remove the row.
+	 */
+	?>
+	<style type="text/css">
+		tr:has(#new_admin_email) {
+			display: none;
+		}
+
+		#new_admin_email,
+		#new-admin-email-description,
+		label[for=new_admin_email] {
+			display: none;
+		}
+	</style>
+	<?php
+	/**
+	 * JavaScript is used to remove the whitespace of the row if we had to "fallback."
+	 */
+	?>
+	<script type="text/javascript">
+		document.addEventListener('DOMContentLoaded', function() {
+			var emailField = document.getElementById('new_admin_email');
+			if (emailField) {
+				var parentRow = emailField.closest('tr');
+				if (parentRow) {
+					parentRow.style.display = 'none';
+				}
+			}
+		});
+	</script>
+	<?php
+}
+add_action( 'load-options-general.php', 'wpcom_maybe_hide_admin_email_address' );

projects/plugins/mu-wpcom-plugin/changelog/remove-general-options-email

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/wpcomsh/changelog/remove-general-options-email

@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+

projects/plugins/wpcomsh/composer.json

@@ -128,7 +128,7 @@
 			"composer/installers": true,
 			"roots/wordpress-core-installer": true
 		},
-		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_2_1"
+		"autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_2_2_alpha"
 	},
 	"extra": {
 		"mirror-repo": "Automattic/wpcom-site-helper",

projects/plugins/wpcomsh/package.json

@@ -3,7 +3,7 @@
 	"name": "@automattic/jetpack-wpcomsh",
 	"description": "A helper for connecting WordPress.com sites to external host infrastructure.",
 	"homepage": "https://jetpack.com",
-	"version": "5.2.1",
+	"version": "5.2.1-alpha",
 	"bugs": {
 		"url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh"
 	},

projects/plugins/wpcomsh/wpcomsh.php

@@ -2,14 +2,14 @@
 /**
  * Plugin Name: WordPress.com Site Helper
  * Description: A helper for connecting WordPress.com sites to external host infrastructure.
- * Version: 5.2.1
+ * Version: 5.2.1-alpha
  * Author: Automattic
  * Author URI: http://automattic.com/
  *
  * @package wpcomsh
  */
 
-define( 'WPCOMSH_VERSION', '5.2.1' );
+define( 'WPCOMSH_VERSION', '5.2.1-alpha' );
 
 // If true, Typekit fonts will be available in addition to Google fonts
 add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );