From 6cfa05ee5874065b469f4578d3a1698df93a89b2 Mon Sep 17 00:00:00 2001
From: Rishabh <zrishabhgarg@gmail.com>
Date: Fri, 5 Aug 2022 17:44:13 +0530
Subject: [PATCH] Fixed unable to manage comment notifications with single
 newsletter

closes https://github.com/TryGhost/Team/issues/1677

- for single newsletter sites we did not show email preference screen which allows managing comment notifications
- replaces newsletter toggle to use email preference screen when comments is enabled
---
 ghost/portal/src/components/pages/AccountHomePage.js | 6 +++---
 ghost/portal/src/utils/fixtures-generator.js         | 4 +++-
 ghost/portal/src/utils/fixtures.js                   | 1 +
 ghost/portal/src/utils/helpers.js                    | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js
index d7a822cb3c..8fa0510303 100644
--- a/ghost/portal/src/components/pages/AccountHomePage.js
+++ b/ghost/portal/src/components/pages/AccountHomePage.js
@@ -3,7 +3,7 @@ import MemberAvatar from '../common/MemberGravatar';
 import ActionButton from '../common/ActionButton';
 import CloseButton from '../common/CloseButton';
 import Switch from '../common/Switch';
-import {getMemberSubscription, getMemberTierName, getSiteNewsletters, getSupportAddress, getUpdatedOfferPrice, hasMultipleNewsletters, hasMultipleProductsFeature, hasOnlyFreePlan, isComplimentaryMember} from '../../utils/helpers';
+import {getMemberSubscription, getMemberTierName, getSiteNewsletters, getSupportAddress, getUpdatedOfferPrice, hasCommentsEnabled, hasMultipleNewsletters, hasMultipleProductsFeature, hasOnlyFreePlan, isComplimentaryMember} from '../../utils/helpers';
 import {getDateString} from '../../utils/date-time';
 import {ReactComponent as LoaderIcon} from '../../images/icons/loader.svg';
 import {ReactComponent as OfferTagIcon} from '../../images/icons/offer-tag.svg';
@@ -348,7 +348,7 @@ function EmailNewsletterAction() {
     const {member, site, onAction} = useContext(AppContext);
     let {newsletters} = member;
 
-    if (hasMultipleNewsletters({site})) {
+    if (hasMultipleNewsletters({site}) || hasCommentsEnabled({site})) {
         return null;
     }
     const subscribed = !!newsletters?.length;
@@ -380,7 +380,7 @@ function EmailNewsletterAction() {
 
 function EmailPreferencesAction() {
     const {site, onAction} = useContext(AppContext);
-    if (!hasMultipleNewsletters({site})) {
+    if (!hasMultipleNewsletters({site}) && !hasCommentsEnabled({site})) {
         return null;
     }
     return (
diff --git a/ghost/portal/src/utils/fixtures-generator.js b/ghost/portal/src/utils/fixtures-generator.js
index 5f8985bc15..a92809b0ac 100644
--- a/ghost/portal/src/utils/fixtures-generator.js
+++ b/ghost/portal/src/utils/fixtures-generator.js
@@ -37,7 +37,8 @@ export function getSiteData({
     portalButtonSignupText: portal_button_signup_text = 'Subscribe now',
     portalButtonStyle: portal_button_style = 'icon-and-text',
     membersSupportAddress: members_support_address = 'support@example.com',
-    newsletters = []
+    newsletters = [],
+    commentsEnabled
 } = {}) {
     return {
         title,
@@ -61,6 +62,7 @@ export function getSiteData({
         portal_button_signup_text,
         portal_button_style,
         members_support_address,
+        comments_enabled: !!commentsEnabled,
         newsletters
     };
 }
diff --git a/ghost/portal/src/utils/fixtures.js b/ghost/portal/src/utils/fixtures.js
index d0ff70c45f..16ebb82739 100644
--- a/ghost/portal/src/utils/fixtures.js
+++ b/ghost/portal/src/utils/fixtures.js
@@ -105,6 +105,7 @@ export const site = getSiteData({
     portalButtonSignupText: 'Subscribe now',
     portalButtonStyle: 'icon-and-text',
     membersSupportAddress: 'support@example.com',
+    commentsEnabled: true,
     newsletters: [
         {
             id: 'weekly',
diff --git a/ghost/portal/src/utils/helpers.js b/ghost/portal/src/utils/helpers.js
index d57a6d523d..35cecccf13 100644
--- a/ghost/portal/src/utils/helpers.js
+++ b/ghost/portal/src/utils/helpers.js
@@ -210,6 +210,10 @@ export function hasMultipleProductsFeature({site}) {
     return !!portalProducts;
 }
 
+export function hasCommentsEnabled({site}) {
+    return !!site?.comments_enabled;
+}
+
 export function transformApiSiteData({site}) {
     if (!site) {
         return null;