diff --git a/plugins/woocommerce-admin/client/header/index.js b/plugins/woocommerce-admin/client/header/index.js index 412d394fded..59611c2ced0 100644 --- a/plugins/woocommerce-admin/client/header/index.js +++ b/plugins/woocommerce-admin/client/header/index.js @@ -14,6 +14,7 @@ import { } from '@woocommerce/admin-layout'; import { getSetting } from '@woocommerce/settings'; import { Text, useSlot } from '@woocommerce/experimental'; +import { getScreenFromPath, isWCAdmin } from '@woocommerce/navigation'; /** * Internal dependencies @@ -100,9 +101,11 @@ export const Header = ( { sections, isEmbedded = false, query } ) => { } }, [ isEmbedded, sections, siteTitle ] ); + const isHomescreen = isWCAdmin() && getScreenFromPath() === 'homescreen'; const { isLoading, launchYourStoreEnabled, comingSoon, storePagesOnly } = useLaunchYourStore(); - const showLaunchYourStoreStatus = launchYourStoreEnabled && ! isLoading; + const showLaunchYourStoreStatus = + isHomescreen && launchYourStoreEnabled && ! isLoading; return (
diff --git a/plugins/woocommerce-admin/client/launch-store/index.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/index.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/index.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/index.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/main-content/pages/launch-store-success.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/main-content/pages/launch-store-success.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/main-content/pages/launch-store-success.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/main-content/pages/launch-store-success.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/main-content/pages/loading.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/main-content/pages/loading.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/main-content/pages/loading.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/main-content/pages/loading.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/main-content/pages/site-preview.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/main-content/pages/site-preview.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/main-content/pages/site-preview.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/main-content/pages/site-preview.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/main-content/xstate.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/main-content/xstate.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/main-content/xstate.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/main-content/xstate.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/sidebar/components/launch-store-hub.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/sidebar/components/launch-store-hub.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/sidebar/components/launch-store-hub.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/sidebar/components/launch-store-hub.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/sidebar/xstate.tsx b/plugins/woocommerce-admin/client/launch-your-store/hub/sidebar/xstate.tsx similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/sidebar/xstate.tsx rename to plugins/woocommerce-admin/client/launch-your-store/hub/sidebar/xstate.tsx diff --git a/plugins/woocommerce-admin/client/launch-store/styles.scss b/plugins/woocommerce-admin/client/launch-your-store/hub/styles.scss similarity index 100% rename from plugins/woocommerce-admin/client/launch-store/styles.scss rename to plugins/woocommerce-admin/client/launch-your-store/hub/styles.scss diff --git a/plugins/woocommerce-admin/client/launch-your-store/status/index.js b/plugins/woocommerce-admin/client/launch-your-store/status/index.js index 0ff9904ef63..4429be49c43 100644 --- a/plugins/woocommerce-admin/client/launch-your-store/status/index.js +++ b/plugins/woocommerce-admin/client/launch-your-store/status/index.js @@ -4,6 +4,7 @@ import { __ } from '@wordpress/i18n'; import { Icon, moreVertical } from '@wordpress/icons'; import { Dropdown, Button, MenuGroup, MenuItem } from '@wordpress/components'; +import { getNewPath } from '@woocommerce/navigation'; import { getAdminLink } from '@woocommerce/settings'; import classnames from 'classnames'; @@ -21,6 +22,9 @@ export const LaunchYourStoreStatus = ( { comingSoon, storePagesOnly } ) => { : __( 'Coming soon', 'woocommerce' ); const liveText = __( 'Live', 'woocommerce' ); const dropdownText = isComingSoon ? comingSoonText : liveText; + const launchYourStoreLink = new URL( + getAdminLink( getNewPath( {}, '/launch-your-store', {} ) ) + ); return (
@@ -55,12 +59,7 @@ export const LaunchYourStoreStatus = ( { comingSoon, storePagesOnly } ) => { ) } { isComingSoon && ( - + { __( 'Customize "Coming soon" page', 'woocommerce' diff --git a/plugins/woocommerce-admin/client/layout/controller.js b/plugins/woocommerce-admin/client/layout/controller.js index 0a2344adfc8..e4781775af8 100644 --- a/plugins/woocommerce-admin/client/layout/controller.js +++ b/plugins/woocommerce-admin/client/layout/controller.js @@ -87,7 +87,7 @@ const CustomizeStore = lazy( () => ); const LaunchStore = lazy( () => - import( /* webpackChunkName: "launch-store" */ '../launch-store' ) + import( /* webpackChunkName: "launch-store" */ '../launch-your-store/hub' ) ); export const PAGES_FILTER = 'woocommerce_admin_pages_list'; diff --git a/plugins/woocommerce/changelog/45688-fix-lys-status-issues b/plugins/woocommerce/changelog/45688-fix-lys-status-issues new file mode 100644 index 00000000000..d44024ba4c1 --- /dev/null +++ b/plugins/woocommerce/changelog/45688-fix-lys-status-issues @@ -0,0 +1,4 @@ +Significance: patch +Type: update +Comment: Update unreleased feature +