Prevents upsell for Jetpack Backup for multisite installations

client/components/jetpack/upsell/index.tsx

@@ -16,7 +16,7 @@ import './style.scss';
 
 interface Props {
 	bodyText: TranslateResult;
-	buttonLink: TranslateResult;
+	buttonLink?: TranslateResult;
 	buttonText?: TranslateResult;
 	headerText: TranslateResult;
 	iconComponent?: ReactChild;

client/my-sites/backup/backup-upsell/index.tsx

@@ -30,6 +30,19 @@ const BackupsUpsellIcon: FunctionComponent = () => (
 	</div>
 );
 
+const BackupsMultisiteBody: FunctionComponent = () => {
+	const translate = useTranslate();
+	return (
+		<Upsell
+			headerText={ translate( 'WordPress multi-sites are not supported' ) }
+			bodyText={ translate(
+				"We're sorry, Jetpack Backup is not compatible with multisite WordPress installations at this time."
+			) }
+			iconComponent={ <BackupsUpsellIcon /> }
+		/>
+	);
+};
+
 const BackupsVPActiveBody: FunctionComponent = () => {
 	const translate = useTranslate();
 	const dispatch = useDispatch();
@@ -64,14 +77,26 @@ const BackupsUpsellBody: FunctionComponent = () => {
 	);
 };
 
-const BackupsUpsellPage: FunctionComponent< UpsellComponentProps > = ( { reason } ) => (
-	<Main className="backup-upsell">
-		<DocumentHead title="Backup" />
-		<SidebarNavigation />
-		<div className="backup-upsell__content">
-			{ 'vp_active_on_site' === reason ? <BackupsVPActiveBody /> : <BackupsUpsellBody /> }
-		</div>
-	</Main>
-);
+const BackupsUpsellPage: FunctionComponent< UpsellComponentProps > = ( { reason } ) => {
+	let body;
+	switch ( reason ) {
+		case 'vp_active_on_site':
+			body = <BackupsVPActiveBody />;
+			break;
+		case 'multisite_not_supported':
+			body = <BackupsMultisiteBody />;
+			break;
+		default:
+			body = <BackupsUpsellBody />;
+			break;
+	}
+	return (
+		<Main className="backup-upsell">
+			<DocumentHead title="Backup" />
+			<SidebarNavigation />
+			<div className="backup-upsell__content">{ body }</div>
+		</Main>
+	);
+};
 
 export default BackupsUpsellPage;

client/my-sites/scan/main.tsx

@@ -30,6 +30,7 @@ import getSiteUrl from 'state/sites/selectors/get-site-url';
 import getSiteScanProgress from 'state/selectors/get-site-scan-progress';
 import getSiteScanIsInitial from 'state/selectors/get-site-scan-is-initial';
 import getSiteScanState from 'state/selectors/get-site-scan-state';
+import isRequestingJetpackScan from 'state/selectors/is-requesting-jetpack-scan';
 import { withLocalizedMoment } from 'components/localized-moment';
 import contactSupportUrl from 'lib/jetpack/contact-support-url';
 import isJetpackCloud from 'lib/jetpack/is-jetpack-cloud';
@@ -51,6 +52,7 @@ interface Props {
 	scanState?: Scan;
 	scanProgress?: number;
 	isInitialScan?: boolean;
+	isRequestingScan: boolean;
 	timezone: string | null;
 	gmtOffset: number | null;
 	moment: {
@@ -59,6 +61,7 @@ interface Props {
 	applySiteOffset: applySiteOffsetType;
 	dispatchRecordTracksEvent: Function;
 	dispatchScanRun: Function;
+	isAdmin: boolean;
 }
 
 class ScanPage extends Component< Props > {
@@ -206,11 +209,15 @@ class ScanPage extends Component< Props > {
 	}
 
 	renderScanState() {
-		const { site, scanState } = this.props;
-		if ( ! scanState || ! site ) {
+		const { site, scanState, isRequestingScan } = this.props;
+		if ( isRequestingScan || ! site ) {
 			return <ScanPlaceholder />;
 		}
 
+		if ( ! scanState ) {
+			return this.renderScanError();
+		}
+
 		const { state, mostRecent, threats } = scanState;
 
 		if ( state === 'provisioning' ) {
@@ -288,6 +295,7 @@ export default connect(
 		const siteUrl = getSiteUrl( state, siteId ) ?? undefined;
 		const scanState = ( getSiteScanState( state, siteId ) as Scan ) ?? undefined;
 		const scanProgress = getSiteScanProgress( state, siteId ) ?? undefined;
+		const isRequestingScan = isRequestingJetpackScan( state, siteId );
 		const isInitialScan = getSiteScanIsInitial( state, siteId );
 		const isAdmin = canCurrentUser( state, siteId, 'manage_options' );
 
@@ -298,6 +306,7 @@ export default connect(
 			scanState,
 			scanProgress,
 			isInitialScan,
+			isRequestingScan,
 			isAdmin,
 		};
 	},

client/state/data-layer/wpcom/sites/scan/index.js

@@ -49,15 +49,16 @@ export const formatScanThreat = ( threat ) => ( {
 const formatScanStateRawResponse = ( {
 	state,
 	threats,
-	credentials,
 	most_recent: mostRecent,
 	current,
 	...rest
 } ) => {
+	if ( ! threats ) {
+		threats = [];
+	}
 	return {
 		state,
 		threats: threats.map( formatScanThreat ),
-		credentials,
 		mostRecent: mostRecent
 			? {
 					...omit( mostRecent, [ 'is_initial' ] ),