From 0387404d7ff9f98dc264e22228cb3654b9c66f1c Mon Sep 17 00:00:00 2001
From: Chi-Hsuan Huang <chihsuan.tw@gmail.com>
Date: Wed, 10 Apr 2024 18:56:03 +0800
Subject: [PATCH] [LYS] Tweak site visibility settings page (#46365)

---
 .../launch-your-store/settings/slotfill.js    |  4 +--
 .../launch-your-store/settings/style.scss     | 35 +++++++++++++++++--
 .../changelog/tweak-lys-settings-page         |  4 +++
 .../includes/class-woocommerce.php            |  2 +-
 .../php/includes/class-woocommerce-test.php   |  4 +--
 5 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/tweak-lys-settings-page

diff --git a/plugins/woocommerce-admin/client/launch-your-store/settings/slotfill.js b/plugins/woocommerce-admin/client/launch-your-store/settings/slotfill.js
index 88dced5e519..a3b63fa645b 100644
--- a/plugins/woocommerce-admin/client/launch-your-store/settings/slotfill.js
+++ b/plugins/woocommerce-admin/client/launch-your-store/settings/slotfill.js
@@ -188,9 +188,9 @@ const SiteVisibility = () => {
 						} }
 					/>
 				</div>
-				{ privateLink === 'yes' && (
+				{ comingSoon === 'yes' && privateLink === 'yes' && (
 					<div className="site-visibility-settings-slotfill-private-link">
-						{ getPrivateLink() }
+						<input value={ getPrivateLink() } readOnly />
 						<Button
 							ref={ copyClipboardRef }
 							variant="link"
diff --git a/plugins/woocommerce-admin/client/launch-your-store/settings/style.scss b/plugins/woocommerce-admin/client/launch-your-store/settings/style.scss
index a661fd236e5..3236345662f 100644
--- a/plugins/woocommerce-admin/client/launch-your-store/settings/style.scss
+++ b/plugins/woocommerce-admin/client/launch-your-store/settings/style.scss
@@ -13,6 +13,7 @@
 	}
 
 	.site-visibility-settings-slotfill-private-link {
+		margin-top: 12px;
 		margin-left: 73px;
 		padding: 8px 16px;
 		border-radius: 4px;
@@ -20,8 +21,29 @@
 		background: #fff;
 		display: flex;
 		justify-content: space-between;
+		height: 40px;
+		box-sizing: border-box;
+
+		input {
+			width: 100%;
+			outline: none;
+			border: 0;
+			background: #fff;
+			font-size: 13px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 20px;
+			color: $gray-900;
+		}
+
 		button {
 			text-decoration: none;
+			white-space: nowrap;
+			font-size: 13px;
+			font-style: normal;
+			font-weight: 400;
+			line-height: 20px;
+
 			&:focus {
 				outline: none !important;
 				box-shadow: none;
@@ -74,17 +96,25 @@
 	}
 
 	.site-visibility-settings-slotfill-section {
-		max-width: 620px;
+		max-width: 650px;
+
 		&:last-child {
 			margin-top: 16px;
 		}
 
 		.site-visibility-settings-slotfill-section-content {
+			gap: 16px;
+			display: flex;
+			flex-direction: column;
+			margin: 16px 0 0 30px;
+
 			&.is-hidden {
 				display: none;
 			}
-			margin: 16px 0 0 30px;
+
 			.components-toggle-control {
+				margin: 0;
+
 				.components-h-stack {
 					align-items: baseline;
 				}
@@ -93,6 +123,7 @@
 			.components-base-control__field {
 				p {
 					margin-top: 6px;
+					margin-bottom: 0;
 				}
 			}
 		}
diff --git a/plugins/woocommerce/changelog/tweak-lys-settings-page b/plugins/woocommerce/changelog/tweak-lys-settings-page
new file mode 100644
index 00000000000..c5dae53801d
--- /dev/null
+++ b/plugins/woocommerce/changelog/tweak-lys-settings-page
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Tweaks Site visibility settings page'
diff --git a/plugins/woocommerce/includes/class-woocommerce.php b/plugins/woocommerce/includes/class-woocommerce.php
index 6541d073f42..afc881f6260 100644
--- a/plugins/woocommerce/includes/class-woocommerce.php
+++ b/plugins/woocommerce/includes/class-woocommerce.php
@@ -323,7 +323,7 @@ final class WooCommerce {
 
 		$coming_soon      = $is_new_install ? 'yes' : 'no';
 		$store_pages_only = WCAdminHelper::is_site_fresh() ? 'no' : 'yes';
-		$private_link     = 'yes';
+		$private_link     = 'no';
 		$share_key        = wp_generate_password( 32, false );
 
 		if ( false === get_option( 'woocommerce_coming_soon', false ) ) {
diff --git a/plugins/woocommerce/tests/php/includes/class-woocommerce-test.php b/plugins/woocommerce/tests/php/includes/class-woocommerce-test.php
index 0b23753f03b..67b00b25dd1 100644
--- a/plugins/woocommerce/tests/php/includes/class-woocommerce-test.php
+++ b/plugins/woocommerce/tests/php/includes/class-woocommerce-test.php
@@ -51,7 +51,7 @@ class WooCommerce_Test extends \WC_Unit_Test_Case {
 
 		$this->assertEquals( 'yes', get_option( 'woocommerce_coming_soon' ) );
 		$this->assertEquals( 'no', get_option( 'woocommerce_store_pages_only' ) );
-		$this->assertEquals( 'yes', get_option( 'woocommerce_private_link' ) );
+		$this->assertEquals( 'no', get_option( 'woocommerce_private_link' ) );
 		$this->assertNotEmpty( get_option( 'woocommerce_share_key' ) );
 		$this->assertMatchesRegularExpression( '/^[a-zA-Z0-9]{32}$/', get_option( 'woocommerce_share_key' ) );
 	}
@@ -67,7 +67,7 @@ class WooCommerce_Test extends \WC_Unit_Test_Case {
 
 		$this->assertEquals( 'no', get_option( 'woocommerce_coming_soon' ) );
 		$this->assertEquals( 'yes', get_option( 'woocommerce_store_pages_only' ) );
-		$this->assertEquals( 'yes', get_option( 'woocommerce_private_link' ) );
+		$this->assertEquals( 'no', get_option( 'woocommerce_private_link' ) );
 		$this->assertNotEmpty( get_option( 'woocommerce_share_key' ) );
 		$this->assertMatchesRegularExpression( '/^[a-zA-Z0-9]{32}$/', get_option( 'woocommerce_share_key' ) );
 	}