Send the site URL, not domain, when starting a chat

Author: alshakero

client/landing/stepper/declarative-flow/internals/steps-repository/hundred-year-plan-site-picker/index.tsx

@@ -123,14 +123,14 @@ const Placeholders = () => (
 const ConfirmationModal = ( {
 	isFetching,
 	siteTitle,
-	siteDomain,
+	siteUrl,
 	siteId,
 	onConfirm,
 	closeModal,
 }: {
 	isFetching: boolean;
 	siteTitle?: string;
-	siteDomain?: string;
+	siteUrl?: string;
 	siteId?: number;
 	onConfirm: () => void;
 	closeModal: () => void;
@@ -147,7 +147,7 @@ const ConfirmationModal = ( {
 		setNewMessagingChat( {
 			initialMessage,
 			section: '100-year-plan',
-			siteUrl: siteDomain,
+			siteUrl,
 			siteId: siteId,
 		} );
 		setShowHelpCenter( true, true );
@@ -171,7 +171,7 @@ const ConfirmationModal = ( {
 							{
 								args: {
 									siteTitle: siteTitle || '',
-									siteDomain: siteDomain || '',
+									siteDomain: siteUrl || '',
 									planTitle: getPlan( PLAN_100_YEARS )?.getTitle() || '',
 								},
 								components: {
@@ -238,13 +238,6 @@ const HundredYearPlanSitePicker: Step< { submits: { siteSlug: string; siteId: nu
 		const [ selectedSiteId, setSelectedSiteId ] = useState< SiteId | null >( null );
 		const [ showConfirmModal, setShowConfirmModal ] = useState( false );
 
-		const siteDomain = useSelect(
-			( select ) =>
-				( selectedSiteId &&
-					( select( SITE_STORE ) as SiteSelect ).getPrimarySiteDomain( selectedSiteId ) ) ||
-				undefined,
-			[ selectedSiteId ]
-		);
 		const siteTitle = useSelect(
 			( select ) =>
 				( selectedSiteId &&
@@ -258,7 +251,7 @@ const HundredYearPlanSitePicker: Step< { submits: { siteSlug: string; siteId: nu
 				null,
 			[ selectedSiteId ]
 		);
-		const isFetching = ! site || ! siteDomain || ! siteTitle;
+		const isFetching = ! site || ! siteTitle;
 
 		const selectSite = () => {
 			const siteSlug = new URL( site?.URL || '' ).host;
@@ -315,7 +308,7 @@ const HundredYearPlanSitePicker: Step< { submits: { siteSlug: string; siteId: nu
 						onConfirm={ selectSite }
 						closeModal={ closeModal }
 						siteTitle={ siteTitle }
-						siteDomain={ siteDomain?.domain }
+						siteUrl={ site?.URL }
 						siteId={ site?.ID }
 					/>
 				) }

client/my-sites/plans-features-main/hooks/use-generate-action-callback.ts

@@ -18,7 +18,7 @@ import { cancelPurchase } from 'calypso/me/purchases/paths';
 import { useFreeTrialPlanSlugs } from 'calypso/my-sites/plans-features-main/hooks/use-free-trial-plan-slugs';
 import { useSelector } from 'calypso/state';
 import { isCurrentUserCurrentPlanOwner } from 'calypso/state/sites/plans/selectors';
-import { getSiteSlug, isCurrentPlanPaid } from 'calypso/state/sites/selectors';
+import { getSiteSlug, getSiteUrl, isCurrentPlanPaid } from 'calypso/state/sites/selectors';
 import { IAppState } from 'calypso/state/types';
 import useCurrentPlanManageHref from './use-current-plan-manage-href';
 import { useNonOwnerHandler } from './use-non-owner-handler';
@@ -104,10 +104,10 @@ function useUpgradeHandler( {
 }
 
 function useDowngradeHandler( {
-	siteSlug,
+	siteUrl,
 	currentPlan,
 }: {
-	siteSlug?: string | null;
+	siteUrl?: string | null;
 	currentPlan: Plans.SitePlan | undefined;
 } ) {
 	const { setNewMessagingChat } = useDispatch( HELP_CENTER_STORE );
@@ -116,16 +116,16 @@ function useDowngradeHandler( {
 		( planSlug: PlanSlug ) => {
 			// A downgrade to the free plan is essentially cancelling the current plan.
 			if ( isFreePlan( planSlug ) ) {
-				page( cancelPurchase( siteSlug, currentPlan?.purchaseId ) );
+				page( cancelPurchase( siteUrl, currentPlan?.purchaseId ) );
 				return;
 			}
 
 			setNewMessagingChat( {
 				initialMessage: 'User wants to downgrade plan.',
-				siteUrl: siteSlug,
+				siteUrl,
 			} );
 		},
-		[ currentPlan?.purchaseId, setNewMessagingChat, siteSlug ]
+		[ currentPlan?.purchaseId, setNewMessagingChat, siteUrl ]
 	);
 }
 
@@ -151,6 +151,7 @@ function useGenerateActionCallback( {
 	coupon?: string;
 } ): UseActionCallback {
 	const siteSlug = useSelector( ( state: IAppState ) => getSiteSlug( state, siteId ) );
+	const siteUrl = useSelector( ( state: IAppState ) => siteId && getSiteUrl( state, siteId ) );
 	const freeTrialPlanSlugs = useFreeTrialPlanSlugs( {
 		intent: intent ?? 'default',
 		eligibleForFreeHostingTrial,
@@ -163,7 +164,7 @@ function useGenerateActionCallback( {
 	);
 	const handleUpgradeClick = useUpgradeHandler( { siteSlug, coupon, cartHandler } );
 	const handleDowngradeClick = useDowngradeHandler( {
-		siteSlug,
+		siteUrl: siteUrl || '',
 		currentPlan,
 	} );
 	const handleNonOwnerClick = useNonOwnerHandler( { siteId, currentPlan } );