From 73bcac168cba92b5a7d26425ae1c88bd9a216f63 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 May 2026 15:46:12 -0400 Subject: [PATCH 1/5] Include 'contact_us' in the list of allowed pages & remove banner --- src/components/page/www/page.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/components/page/www/page.jsx b/src/components/page/www/page.jsx index 8fe39a87116..7a99e8023a5 100644 --- a/src/components/page/www/page.jsx +++ b/src/components/page/www/page.jsx @@ -9,8 +9,7 @@ const ErrorBoundary = require('../../errorboundary/errorboundary.jsx'); const PrivacyBanner = require('../../privacy-banner/privacy-banner.jsx'); const TosModal = require('../../modal/tos/modal.jsx'); const ParentalConsentView = require('../../../views/parental-consent/parental-consent-view.jsx'); -const ALLOWED_PAGES = ['community_guidelines']; -const StudentDeactivationBanner = require('../../student-deactivation-banner/student-deactivation-banner.jsx'); +const ALLOWED_PAGES = ['community_guidelines','contact_us']; const today = new Date(); const semi = today.getDate() === 1 && today.getMonth() === 3; @@ -44,8 +43,6 @@ const Page = ({ !user.acceptedTermsOfService && !isAllowedPage && !shouldDisplayTosModal; - - const shouldDisplayStudentDeactivationBanner = !!user; return ( From f67328005600e8de0c7ee1413afc5bd487f9a1cf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 May 2026 15:50:38 -0400 Subject: [PATCH 2/5] Comment out React import in student-deactivation-banner.jsx Comment out the React import statement in student-deactivation-banner.jsx. --- .../student-deactivation-banner.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/student-deactivation-banner/student-deactivation-banner.jsx b/src/components/student-deactivation-banner/student-deactivation-banner.jsx index 003af00880a..70496eeb427 100644 --- a/src/components/student-deactivation-banner/student-deactivation-banner.jsx +++ b/src/components/student-deactivation-banner/student-deactivation-banner.jsx @@ -1,4 +1,4 @@ -const React = require('react'); +/* const React = require('react'); const {useState, useCallback} = React; const PropTypes = require('prop-types'); const {FormattedMessage, useIntl} = require('react-intl'); @@ -68,4 +68,4 @@ StudentDeactivationBanner.propTypes = { username: PropTypes.string }; -module.exports = StudentDeactivationBanner; +module.exports = StudentDeactivationBanner; */ From 303540b044510663ac2a56d0f9d5771a7e1ad999 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 May 2026 16:01:48 -0400 Subject: [PATCH 3/5] Import StudentDeactivationBanner and update display logic Add StudentDeactivationBanner import and condition for display --- src/components/page/www/page.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/page/www/page.jsx b/src/components/page/www/page.jsx index 7a99e8023a5..6148a1a4da8 100644 --- a/src/components/page/www/page.jsx +++ b/src/components/page/www/page.jsx @@ -9,6 +9,7 @@ const ErrorBoundary = require('../../errorboundary/errorboundary.jsx'); const PrivacyBanner = require('../../privacy-banner/privacy-banner.jsx'); const TosModal = require('../../modal/tos/modal.jsx'); const ParentalConsentView = require('../../../views/parental-consent/parental-consent-view.jsx'); +const StudentDeactivationBanner = require('../../student-deactivation-banner/student-deactivation-banner.jsx'); const ALLOWED_PAGES = ['community_guidelines','contact_us']; const today = new Date(); const semi = today.getDate() === 1 && today.getMonth() === 3; @@ -43,6 +44,8 @@ const Page = ({ !user.acceptedTermsOfService && !isAllowedPage && !shouldDisplayTosModal; + + const shouldDisplayStudentDeactivationBanner = !!(user.isStudent && user); return ( From e644900afc41d926bcb8e1aa4a9cbb7b2862473a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 May 2026 16:02:56 -0400 Subject: [PATCH 4/5] Clean up commented code in student-deactivation-banner Removed commented-out code related to React import. --- .../student-deactivation-banner.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/student-deactivation-banner/student-deactivation-banner.jsx b/src/components/student-deactivation-banner/student-deactivation-banner.jsx index 70496eeb427..003af00880a 100644 --- a/src/components/student-deactivation-banner/student-deactivation-banner.jsx +++ b/src/components/student-deactivation-banner/student-deactivation-banner.jsx @@ -1,4 +1,4 @@ -/* const React = require('react'); +const React = require('react'); const {useState, useCallback} = React; const PropTypes = require('prop-types'); const {FormattedMessage, useIntl} = require('react-intl'); @@ -68,4 +68,4 @@ StudentDeactivationBanner.propTypes = { username: PropTypes.string }; -module.exports = StudentDeactivationBanner; */ +module.exports = StudentDeactivationBanner; From b0a46eeddeb218b4961020ad91994b49d7d61d68 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 May 2026 16:09:48 -0400 Subject: [PATCH 5/5] Fix formatting of ALLOWED_PAGES array --- src/components/page/www/page.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/page/www/page.jsx b/src/components/page/www/page.jsx index 6148a1a4da8..aaa7750f2f2 100644 --- a/src/components/page/www/page.jsx +++ b/src/components/page/www/page.jsx @@ -10,7 +10,7 @@ const PrivacyBanner = require('../../privacy-banner/privacy-banner.jsx'); const TosModal = require('../../modal/tos/modal.jsx'); const ParentalConsentView = require('../../../views/parental-consent/parental-consent-view.jsx'); const StudentDeactivationBanner = require('../../student-deactivation-banner/student-deactivation-banner.jsx'); -const ALLOWED_PAGES = ['community_guidelines','contact_us']; +const ALLOWED_PAGES = ['community_guidelines', 'contact_us']; const today = new Date(); const semi = today.getDate() === 1 && today.getMonth() === 3;