From 316f26bed5faa4b8bf35b74c312b25f25c3e9dbd Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Wed, 12 May 2021 14:14:34 -0400
Subject: [PATCH 1/4] rename .close-button style to not conflict

---
 src/components/forms/button.jsx  | 2 +-
 src/components/forms/button.scss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/forms/button.jsx b/src/components/forms/button.jsx
index 39bab920a..7ac93878e 100644
--- a/src/components/forms/button.jsx
+++ b/src/components/forms/button.jsx
@@ -6,7 +6,7 @@ const React = require('react');
 require('./button.scss');
 
 const Button = props => {
-    const classes = classNames('button', props.className, {'close-button': props.isCloseType});
+    const classes = classNames('button', props.className, {'forms-close-button': props.isCloseType});
 
     return (
         <button
diff --git a/src/components/forms/button.scss b/src/components/forms/button.scss
index a09931f5b..bc5ae82c6 100644
--- a/src/components/forms/button.scss
+++ b/src/components/forms/button.scss
@@ -54,7 +54,7 @@ $pass-bg: $ui-aqua;
     }
 }
 
-.close-button {
+.forms-close-button {
     padding: 0;
 
     position: absolute;
@@ -69,6 +69,6 @@ $pass-bg: $ui-aqua;
     line-height: 2rem;
 }
 
-.close-button img {
+.forms-close-button img {
     padding-top: 0.5rem;
 }

From d3685610f6a74beb96e6df90822b3d884f630c4f Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Wed, 12 May 2021 16:27:25 -0400
Subject: [PATCH 2/4] fix logic for when to show intro to users

---
 src/views/splash/splash.jsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/splash/splash.jsx b/src/views/splash/splash.jsx
index 2366dcec3..4371be487 100644
--- a/src/views/splash/splash.jsx
+++ b/src/views/splash/splash.jsx
@@ -165,6 +165,13 @@ class Splash extends React.Component {
     shouldShowHOCMiddleBanner () {
         return false; // we did not use this middle banner in last HoC
     }
+    shouldShowIntro () {
+        return (
+            this.props.sessionStatus === sessionActions.Status.FETCHED && // done fetching session
+            Object.keys(this.props.user).length === 0 && // no user session found
+            this.shouldShowHOCTopBanner() !== true
+        );
+    }
     shouldShowDonateBanner () {
         return (
             this.state.dismissedDonateBanner === false &&
@@ -180,7 +187,7 @@ class Splash extends React.Component {
         const showDonateBanner = this.shouldShowDonateBanner() || false;
         const showHOCTopBanner = this.shouldShowHOCTopBanner() || false;
         const showHOCMiddleBanner = this.shouldShowHOCMiddleBanner() || false;
-        const showIntro = showHOCTopBanner !== true;
+        const showIntro = this.shouldShowIntro() || false;
         const showWelcome = this.shouldShowWelcome();
         const homepageRefreshStatus = this.getHomepageRefreshStatus();
 

From d5af535ea2b356c8b305bef32920bda6b7a60a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zoe=CC=88=20Bentley?= <zoe.bentley.1@gmail.com>
Date: Wed, 12 May 2021 16:52:16 -0400
Subject: [PATCH 3/4] Fixes to Developers' Page

---
 src/views/developers/developers.jsx | 2 +-
 src/views/developers/l10n.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/developers/developers.jsx b/src/views/developers/developers.jsx
index 6976466db..ede307376 100644
--- a/src/views/developers/developers.jsx
+++ b/src/views/developers/developers.jsx
@@ -364,7 +364,7 @@ const Developers = () => (
                                             <a href="https://github.com/LLK/">GitHub</a>
                                         ),
                                         contactUsLink: (
-                                            <a href="https://scratch.mit.edu/contact-us/">
+                                            <a href="/contact-us">
                                                 Contact Us
                                             </a>
                                         )
diff --git a/src/views/developers/l10n.json b/src/views/developers/l10n.json
index e2f5b18bc..8b7d0c707 100644
--- a/src/views/developers/l10n.json
+++ b/src/views/developers/l10n.json
@@ -1,7 +1,7 @@
 {
   "developers.hereLinkText": "here",
   "developers.title": "Scratch for Developers",
-  "developers.introLinkText": "Scratch Team at MIT",
+  "developers.introLinkText": "Scratch Team",
   "developers.intro": "On this page, you’ll find information about open source projects created and maintained by the {introLink}, as well as our thoughts on best practices for designing learning experiences for children.",
   "developers.projectsTitle": "Projects",
   "developers.principlesTitle": "Principles",

From 3fbfb6dfd1dd2f8c2579bb5ba04d64357fb6a0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zoe=CC=88=20Bentley?= <zoe.bentley.1@gmail.com>
Date: Thu, 13 May 2021 09:39:08 -0400
Subject: [PATCH 4/4] Fixed problem introduced by previous fix

---
 src/views/developers/developers.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/developers/developers.jsx b/src/views/developers/developers.jsx
index ede307376..862deefeb 100644
--- a/src/views/developers/developers.jsx
+++ b/src/views/developers/developers.jsx
@@ -365,7 +365,7 @@ const Developers = () => (
                                         ),
                                         contactUsLink: (
                                             <a href="/contact-us">
-                                                Contact Us
+                                                <FormattedMessage id="general.contactUs" />
                                             </a>
                                         )
                                     }}