Protect: Update Threat Icons (#40621)

Automattic · Dec 18, 2024 · 4fa70a3 · 4fa70a3
1 parent 113aebc
commit 4fa70a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/projects/plugins/protect/src/js/components/admin-section-hero/index.tsx b/projects/plugins/protect/src/js/components/admin-section-hero/index.tsx
@@ -66,13 +66,7 @@ AdminSectionHero.Heading = ( {
 		<H3 mb={ 1 } { ...props }>
 			{ children }
 			{ !! icon && (
-				<ShieldIcon
-					height={ 38 }
-					variant={ icon }
-					outline
-					fill="default"
-					className={ styles[ 'heading-icon' ] }
-				/>
+				<ShieldIcon height={ 38 } variant={ icon } className={ styles[ 'heading-icon' ] } />
 			) }
 		</H3>
 	);

diff --git a/projects/plugins/protect/src/js/routes/home/home-statcards.jsx b/projects/plugins/protect/src/js/routes/home/home-statcards.jsx
@@ -136,15 +136,9 @@ const HomeStatCards = () => {
 		if ( scanning ) {
 			scanIcon = <Spinner />;
 		} else if ( scanError ) {
-			scanIcon = <ShieldIcon variant="error" height={ ICON_HEIGHT } />;
+			scanIcon = <ShieldIcon variant="error" outline height={ ICON_HEIGHT } />;
 		} else {
-			scanIcon = (
-				<ShieldIcon
-					variant={ numThreats ? 'warning' : 'success' }
-					height={ ICON_HEIGHT }
-					color={ numThreats ? '#F0B849' : '#069E08' }
-				/>
-			);
+			scanIcon = <ShieldIcon variant={ numThreats ? 'error' : 'success' } height={ ICON_HEIGHT } />;
 		}
 
 		let scanLabel;

diff --git a/projects/plugins/protect/src/js/routes/scan/index.jsx b/projects/plugins/protect/src/js/routes/scan/index.jsx
@@ -38,8 +38,9 @@ const ScanPage = () => {
 		currentScanStatus = 'active';
 	}
 
+	const hasActiveThreats = status && status.threats.length;
 	const hasHistory = history && history.threats.length;
-	const showResults = !! status.threats.length || hasHistory;
+	const showResults = hasActiveThreats || hasHistory;
 
 	const filters = useMemo( () => {
 		if ( location.pathname.includes( '/scan/history' ) ) {