From 04ef848b159afd12a5db69846a46328a08eab73e Mon Sep 17 00:00:00 2001 From: Sag Date: Thu, 21 Sep 2023 21:09:47 +0200 Subject: [PATCH] Fixed copy when there is only 1 click / new member (#18280) no issue --- .../site/recommendations/RecommendationIcon.tsx | 10 +++++----- .../site/recommendations/RecommendationList.tsx | 12 +++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationIcon.tsx b/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationIcon.tsx index 8345cf4e68..7839c2b275 100644 --- a/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationIcon.tsx +++ b/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationIcon.tsx @@ -5,11 +5,11 @@ import React, {useState} from 'react'; interface Props { title: string, favicon?: string | null, - showSubscribes?: number | boolean, - featured_image?: string | null + featured_image?: string | null, + isGhostSite?: boolean, } -const RecommendationIcon: React.FC = ({title, favicon, showSubscribes, featured_image}) => { +const RecommendationIcon: React.FC = ({title, favicon, featured_image, isGhostSite}) => { const [icon, setIcon] = useState(favicon || featured_image || null); const clearIcon = () => { @@ -20,12 +20,12 @@ const RecommendationIcon: React.FC = ({title, favicon, showSubscribes, fe return null; } - const hint = showSubscribes ? 'This is a Ghost site that supports one-click subscribe' : ''; + const hint = isGhostSite ? 'This is a Ghost site that supports one-click subscribe' : ''; return (
{title} - {showSubscribes && Ghost Logo} + {isGhostSite && Ghost Logo}
); }; diff --git a/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationList.tsx b/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationList.tsx index e2bd7eb5f7..248bf595b7 100644 --- a/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationList.tsx +++ b/apps/admin-x-settings/src/components/settings/site/recommendations/RecommendationList.tsx @@ -31,8 +31,10 @@ const RecommendationItem: React.FC<{recommendation: Recommendation}> = ({recomme }); }; - const showSubscribes = recommendation.one_click_subscribe; - const count = (showSubscribes ? recommendation.count?.subscribers : recommendation.count?.clicks) || 0; + const isGhostSite = recommendation.one_click_subscribe; + const count = (isGhostSite ? recommendation.count?.subscribers : recommendation.count?.clicks) || 0; + const newMembers = count === 1 ? 'new member' : 'new members'; + const clicks = count === 1 ? 'click' : 'clicks'; return ( @@ -40,7 +42,7 @@ const RecommendationItem: React.FC<{recommendation: Recommendation}> = ({recomme
- + {recommendation.title}
{/* {recommendation.url || 'No reason added'} */} @@ -50,11 +52,11 @@ const RecommendationItem: React.FC<{recommendation: Recommendation}> = ({recomme {/* {(count === 0) ? (-) : (
{count} - {showSubscribes ? ('New members') : ('Clicks')} + {isGhostSite ? newMembers : clicks}
)} */} {(count === 0) ? (-) : (
{count} - {showSubscribes ? ('New members') : ('Clicks')} + {isGhostSite ? newMembers : clicks}
)}