Reader - fix domain free plan upsell banner. (#102240)

* ensure upsell banner can fallback to most recently selected or primary site

* update reader upsell banner to point to correct domain flow

* undo commented logic check

* update other selectors to use the calculated siteId value

Author: Addison-Stavlo

client/blocks/upsell-nudge/index.tsx

@@ -22,14 +22,15 @@ import Banner from 'calypso/components/banner';
 import TrackComponentView from 'calypso/lib/analytics/track-component-view';
 import { addQueryArgs } from 'calypso/lib/url';
 import { canCurrentUser } from 'calypso/state/selectors/can-current-user';
+import getPrimarySiteId from 'calypso/state/selectors/get-primary-site-id';
 import getFeaturesBySiteId from 'calypso/state/selectors/get-site-features';
 import isSiteAutomatedTransfer from 'calypso/state/selectors/is-site-automated-transfer';
 import isSiteWPForTeams from 'calypso/state/selectors/is-site-wpforteams';
 import isVipSite from 'calypso/state/selectors/is-vip-site';
 import siteHasFeature from 'calypso/state/selectors/site-has-feature';
 import { isSiteOnECommerceTrial, isSiteOnWooExpress } from 'calypso/state/sites/plans/selectors';
-import { getSite, isJetpackSite } from 'calypso/state/sites/selectors';
-import { getSelectedSiteId, getSelectedSiteSlug } from 'calypso/state/ui/selectors';
+import { getSite, getSiteSlug, isJetpackSite } from 'calypso/state/sites/selectors';
+import { getMostRecentlySelectedSiteId, getSelectedSiteId } from 'calypso/state/ui/selectors';
 import type { SiteDetails } from '@automattic/data-stores';
 import type { IsEligibleForOneClickCheckoutReturnValue } from 'calypso/my-sites/checkout/purchase-modal/use-is-eligible-for-one-click-checkout';
 import type { IAppState } from 'calypso/state/types';
@@ -293,7 +294,10 @@ export const UpsellNudge = ( {
 };
 
 const ConnectedUpsellNudge = connect( ( state: IAppState, ownProps: OwnProps ) => {
-	const siteId = getSelectedSiteId( state );
+	const siteId =
+		getSelectedSiteId( state ) ||
+		getMostRecentlySelectedSiteId( state ) ||
+		getPrimarySiteId( state );
 	const siteFeatures = getFeaturesBySiteId( state, siteId || undefined );
 	const hasFeature =
 		siteFeatures === null ? null : siteHasFeature( state, siteId, ownProps.feature || '' );
@@ -308,8 +312,8 @@ const ConnectedUpsellNudge = connect( ( state: IAppState, ownProps: OwnProps ) =
 		isSiteWooExpressOrEcomFreeTrial: siteId
 			? isSiteOnECommerceTrial( state, siteId ) || isSiteOnWooExpress( state, siteId )
 			: false,
-		siteSlug: ownProps.disableHref ? null : getSelectedSiteSlug( state ),
-		siteIsWPForTeams: isSiteWPForTeams( state, getSelectedSiteId( state ) ) || false,
+		siteSlug: ownProps.disableHref ? null : getSiteSlug( state, siteId ),
+		siteIsWPForTeams: isSiteWPForTeams( state, siteId ) || false,
 	};
 } )( UpsellNudge );
 

client/reader/sidebar/reader-sidebar-nudges/index.jsx

@@ -19,7 +19,7 @@ function renderFreeToPaidPlanNudge( { siteId, siteSlug, translate }, dispatch )
 			forceHref
 			callToAction={ translate( 'Upgrade' ) }
 			compact
-			href={ '/plans/' + siteSlug }
+			href={ '/domains/add/' + siteSlug + '?domainAndPlanPackage=true' }
 			title={ translate( 'Free domain with an annual plan' ) }
 			onClick={ () => dispatch( clickUpgradeNudge( siteId ) ) }
 			tracksClickName="calypso_upgrade_nudge_cta_click"