ThemeTierBadge: Return null whene there is no badge (#86659)

Automattic · Jan 22, 2024 · e210eef · e210eef
1 parent 3d36563
commit e210eef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/client/components/theme-tier/theme-tier-badge/index.js b/client/components/theme-tier/theme-tier-badge/index.js
@@ -53,14 +53,20 @@ export default function ThemeTierBadge( {
 		return <ThemeTierUpgradeBadge />;
 	};
 
+	const badge = getBadge();
+
+	if ( ! badge ) {
+		return null;
+	}
+
 	return (
 		<div className={ classNames( 'theme-tier-badge', className ) }>
 			<ThemeTierBadgeContextProvider
 				canGoToCheckout={ canGoToCheckout }
 				showUpgradeBadge={ showUpgradeBadge }
 				themeId={ themeId }
 			>
-				{ getBadge() }
+				{ badge }
 			</ThemeTierBadgeContextProvider>
 		</div>
 	);

diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/style.scss b/client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/style.scss
@@ -583,10 +583,6 @@ $design-button-primary-color: rgb(17, 122, 201);
 
 		.design-picker-design-title__theme-tier-badge {
 			gap: 8px;
-
-			&:empty {
-				display: none;
-			}
 		}
 
 		.step-container__navigation {