Merge b0605c8 into e2a0363

Author: katinthehatsite

src/components/publish-site-button.tsx

@@ -3,20 +3,15 @@ import { useI18n } from '@wordpress/react-i18n';
 import { useCallback } from 'react';
 import { useSyncSites } from 'src/hooks/sync-sites';
 import { useAuth } from 'src/hooks/use-auth';
-import { useContentTabs } from 'src/hooks/use-content-tabs';
 import { useSiteDetails } from 'src/hooks/use-site-details';
+import { generateCheckoutUrl } from 'src/lib/generate-checkout-url';
+import { getIpcApi } from 'src/lib/get-ipc-api';
 import { ConnectButton } from 'src/modules/sync/components/connect-button';
-import { useAppDispatch } from 'src/stores';
-import {
-	connectedSitesActions,
-	useGetConnectedSitesForLocalSiteQuery,
-} from 'src/stores/sync/connected-sites';
+import { useGetConnectedSitesForLocalSiteQuery } from 'src/stores/sync/connected-sites';
 
 export const PublishSiteButton = () => {
 	const { __ } = useI18n();
-	const dispatch = useAppDispatch();
-	const { setSelectedTab } = useContentTabs();
-	const { user, authenticate } = useAuth();
+	const { user } = useAuth();
 	const { selectedSite } = useSiteDetails();
 	const { data: connectedSites = [] } = useGetConnectedSitesForLocalSiteQuery( {
 		localSiteId: selectedSite?.id,
@@ -26,12 +21,8 @@ export const PublishSiteButton = () => {
 	const isAnySiteSyncing = isAnySitePulling || isAnySitePushing;
 
 	const handlePublishClick = useCallback( () => {
-		if ( ! user ) {
-			authenticate();
-		}
-		dispatch( connectedSitesActions.openModal( 'push' ) );
-		setSelectedTab( 'sync' );
-	}, [ user, setSelectedTab, dispatch, authenticate ] );
+		getIpcApi().openURL( generateCheckoutUrl( selectedSite ?? undefined ) );
+	}, [ selectedSite ] );
 
 	if ( connectedSites.length !== 0 ) return null;
 

src/lib/generate-checkout-url.ts

@@ -0,0 +1,20 @@
+import { DEFAULT_CUSTOM_DOMAIN_SUFFIX } from 'common/constants';
+
+export function generateCheckoutUrl( selectedSite?: SiteDetails ): string {
+	const url = new URL(
+		'https://wordpress.com/setup/new-hosted-site?ref=studio&section=studio-sync&showDomainStep'
+	);
+
+	if ( ! selectedSite ) {
+		return url.toString();
+	}
+
+	const suggestedName = selectedSite.customDomain
+		? selectedSite.customDomain.replace( DEFAULT_CUSTOM_DOMAIN_SUFFIX, '' )
+		: selectedSite.name;
+
+	url.searchParams.set( 'studioSiteId', String( selectedSite.id ) );
+	url.searchParams.set( 'new', suggestedName );
+
+	return url.toString();
+}

src/modules/sync/components/create-button.tsx

@@ -1,11 +1,11 @@
 import { __ } from '@wordpress/i18n';
-import { DEFAULT_CUSTOM_DOMAIN_SUFFIX } from 'common/constants';
 import { ArrowIcon } from 'src/components/arrow-icon';
 import Button, { ButtonVariant } from 'src/components/button';
 import offlineIcon from 'src/components/offline-icon';
 import { Tooltip } from 'src/components/tooltip';
 import { useOffline } from 'src/hooks/use-offline';
 import { cx } from 'src/lib/cx';
+import { generateCheckoutUrl } from 'src/lib/generate-checkout-url';
 import { getIpcApi } from 'src/lib/get-ipc-api';
 
 interface CreateButtonProps {
@@ -24,24 +24,6 @@ export const CreateButton = ( {
 	onClick,
 }: CreateButtonProps ) => {
 	const isOffline = useOffline();
-	function generateCheckoutUrl( selectedSite?: SiteDetails ): string {
-		const url = new URL(
-			'https://wordpress.com/setup/new-hosted-site?ref=studio&section=studio-sync&showDomainStep'
-		);
-
-		if ( ! selectedSite ) {
-			return url.toString();
-		}
-
-		const suggestedName = selectedSite.customDomain
-			? selectedSite.customDomain.replace( DEFAULT_CUSTOM_DOMAIN_SUFFIX, '' )
-			: selectedSite.name;
-
-		url.searchParams.set( 'studioSiteId', String( selectedSite.id ) );
-		url.searchParams.set( 'new', suggestedName );
-
-		return url.toString();
-	}
 
 	return (
 		<Tooltip