fix conflicts

Automattic · Jan 31, 2025 · b47657e · b47657e
1 parent 2f12118
commit b47657e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx b/projects/packages/my-jetpack/_inc/components/product-cards-section/index.tsx
@@ -109,8 +109,7 @@ const ProductCardsSection: FC< ProductCardsSectionProps > = ( { noticeMessage }
 		data: { ownedProducts, unownedProducts },
 	} = useProductsByOwnership();
 
-	const { canUserViewStats } = getMyJetpackWindowInitialState();
-
+	const { canUserViewStats, userIsAdmin } = getMyJetpackWindowInitialState();
 	const unownedSectionTitle = useMemo( () => {
 		return ownedProducts.length > 0
 			? __( 'Discover more', 'jetpack-my-jetpack' )
@@ -147,7 +146,7 @@ const ProductCardsSection: FC< ProductCardsSectionProps > = ( { noticeMessage }
 				</AdminSectionHero>
 			) }
 
-			{ filteredUnownedProducts.length > 0 && (
+			{ userIsAdmin && filteredUnownedProducts.length > 0 && (
 				<Container horizontalSpacing={ 6 } horizontalGap={ noticeMessage ? 3 : 6 }>
 					<Col>
 						<Col sm={ 4 } md={ 8 } lg={ 12 } className={ styles.cardListTitle }>

diff --git a/projects/packages/my-jetpack/global.d.ts b/projects/packages/my-jetpack/global.d.ts
@@ -456,7 +456,7 @@ interface Window {
 		isAtomic: boolean;
 		sandboxedDomain: string;
 		isDevVersion: boolean;
-		userIsAdmin: string;
+		userIsAdmin: boolean;
 		userIsNewToJetpack: string;
 	};
 	JP_CONNECTION_INITIAL_STATE: {