From cfcf074886fbc62e967d7871829e830d40580469 Mon Sep 17 00:00:00 2001
From: Paul Sealock <psealock@gmail.com>
Date: Tue, 3 Sep 2024 12:45:48 +1200
Subject: [PATCH] [Settings] Update feature flag usage (#50977)

---
 .../50977-update-settings-feature-setup       |  4 ++
 .../src/Admin/Features/Features.php           |  2 -
 .../Features/Settings.php}                    | 37 ++-----------------
 3 files changed, 7 insertions(+), 36 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/50977-update-settings-feature-setup
 rename plugins/woocommerce/src/{Internal/Admin/SettingsNavigationFeature.php => Admin/Features/Settings.php} (81%)

diff --git a/plugins/woocommerce/changelog/50977-update-settings-feature-setup b/plugins/woocommerce/changelog/50977-update-settings-feature-setup
new file mode 100644
index 00000000000..7d4c1547e4c
--- /dev/null
+++ b/plugins/woocommerce/changelog/50977-update-settings-feature-setup
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+Comment: Change to underlying Settings feature usage
+
diff --git a/plugins/woocommerce/src/Admin/Features/Features.php b/plugins/woocommerce/src/Admin/Features/Features.php
index 330a33cb906..90ed9b28dfc 100644
--- a/plugins/woocommerce/src/Admin/Features/Features.php
+++ b/plugins/woocommerce/src/Admin/Features/Features.php
@@ -27,7 +27,6 @@ class Features {
 	 */
 	protected static $optional_features = array(
 		'navigation'                 => array( 'default' => 'no' ),
-		'settings'                   => array( 'default' => 'no' ),
 		'analytics'                  => array( 'default' => 'yes' ),
 		'remote-inbox-notifications' => array( 'default' => 'yes' ),
 	);
@@ -353,7 +352,6 @@ class Features {
 			'Automattic\WooCommerce\Internal\Admin\Marketing' => 'Automattic\WooCommerce\Admin\Features\Marketing',
 			'Automattic\WooCommerce\Internal\Admin\MobileAppBanner' => 'Automattic\WooCommerce\Admin\Features\MobileAppBanner',
 			'Automattic\WooCommerce\Internal\Admin\RemoteInboxNotifications' => 'Automattic\WooCommerce\Admin\Features\RemoteInboxNotifications',
-			'Automattic\WooCommerce\Internal\Admin\SettingsNavigationFeature' => 'Automattic\WooCommerce\Admin\Features\Settings',
 			'Automattic\WooCommerce\Internal\Admin\ShippingLabelBanner' => 'Automattic\WooCommerce\Admin\Features\ShippingLabelBanner',
 			'Automattic\WooCommerce\Internal\Admin\ShippingLabelBannerDisplayRules' => 'Automattic\WooCommerce\Admin\Features\ShippingLabelBannerDisplayRules',
 			'Automattic\WooCommerce\Internal\Admin\WcPayWelcomePage' => 'Automattic\WooCommerce\Admin\Features\WcPayWelcomePage',
diff --git a/plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php b/plugins/woocommerce/src/Admin/Features/Settings.php
similarity index 81%
rename from plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php
rename to plugins/woocommerce/src/Admin/Features/Settings.php
index 49a14b96b28..34ab3577686 100644
--- a/plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php
+++ b/plugins/woocommerce/src/Admin/Features/Settings.php
@@ -1,21 +1,16 @@
-<?php
+<?php //phpcs:ignore Generic.PHP.RequireStrictTypes.MissingDeclaration
 /**
  * WooCommerce Settings.
  */
 
-namespace Automattic\WooCommerce\Internal\Admin;
+namespace Automattic\WooCommerce\Admin\Features;
 
 use Automattic\WooCommerce\Admin\PageController;
 
 /**
  * Contains backend logic for the Settings feature.
  */
-class SettingsNavigationFeature {
-	/**
-	 * Option name used to toggle this feature.
-	 */
-	const TOGGLE_OPTION_NAME = 'woocommerce_settings_enabled';
-
+class Settings {
 	/**
 	 * Class instance.
 	 *
@@ -41,12 +36,6 @@ class SettingsNavigationFeature {
 			return;
 		}
 
-		add_filter( 'woocommerce_settings_features', array( $this, 'add_feature_toggle' ) );
-
-		if ( 'yes' !== get_option( 'woocommerce_settings_enabled', 'no' ) ) {
-			return;
-		}
-
 		add_filter( 'woocommerce_admin_shared_settings', array( __CLASS__, 'add_component_settings' ) );
 		// Run this after the original WooCommerce settings have been added.
 		add_action( 'admin_menu', array( $this, 'register_pages' ), 60 );
@@ -75,26 +64,6 @@ class SettingsNavigationFeature {
 		return $settings;
 	}
 
-	/**
-	 * Add the feature toggle to the features settings.
-	 *
-	 * @param array $features Feature sections.
-	 * @return array
-	 */
-	public static function add_feature_toggle( $features ) {
-		$features[] = array(
-			'title' => __( 'Settings', 'woocommerce' ),
-			'desc'  => __(
-				'Adds the new WooCommerce settings UI.',
-				'woocommerce'
-			),
-			'id'    => 'woocommerce_settings_enabled',
-			'type'  => 'checkbox',
-		);
-
-		return $features;
-	}
-
 	/**
 	 * Registers settings pages.
 	 */