From bd79d49b8a07173a6e39d3d51d1b84c93720382d Mon Sep 17 00:00:00 2001 From: Rishabh Date: Tue, 24 May 2022 14:21:50 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20label=20for=20email=20ne?= =?UTF-8?q?wsletter=20pref=20UI=20for=20single=20newsletter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/pages/AccountHomePage.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js index a5f618135d..68eb2931b2 100644 --- a/ghost/portal/src/components/pages/AccountHomePage.js +++ b/ghost/portal/src/components/pages/AccountHomePage.js @@ -346,27 +346,20 @@ const AccountActions = () => { function EmailNewsletterAction() { const {member, site, onAction} = useContext(AppContext); - let {subscribed} = member; + let {newsletters} = member; if (hasMultipleNewsletters({site})) { return null; } - + const subscribed = !!newsletters?.length; let label = subscribed ? 'Subscribed' : 'Unsubscribed'; const onToggleSubscription = (e, sub) => { e.preventDefault(); - const newsletters = getSiteNewsletters({site}); - if (newsletters?.length === 1) { - const subscribedNewsletters = !member?.newsletters?.length ? newsletters : []; - onAction('updateNewsletterPreference', {newsletters: subscribedNewsletters}); - } else { - onAction('updateNewsletter', {subscribed: !sub}); - } + const siteNewsletters = getSiteNewsletters({site}); + const subscribedNewsletters = !member?.newsletters?.length ? siteNewsletters : []; + onAction('updateNewsletterPreference', {newsletters: subscribedNewsletters}); }; - const newsletters = getSiteNewsletters({site}); - if (newsletters?.length > 0) { - subscribed = !!member?.newsletters?.length; - } + return (