From 4491d985fc8ffed276872ea2689705326543e747 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Mon, 31 Jul 2023 11:31:34 -0700
Subject: [PATCH] fix: move the 'if Scratch Link is not running' advice into
 the Troubleshooting section

---
 .../extension-troubleshooting.jsx             | 30 ++++++++++++++-----
 .../install-scratch-link.jsx                  |  5 ----
 src/l10n.json                                 |  5 ++--
 src/views/boost/boost.jsx                     |  5 +++-
 src/views/download/scratch-link/download.jsx  |  1 +
 src/views/ev3/ev3.jsx                         |  1 +
 src/views/gdxfor/gdxfor.jsx                   |  1 +
 src/views/microbit/microbit.jsx               |  5 +++-
 src/views/wedo2/wedo2.jsx                     |  5 +++-
 9 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/components/extension-landing/extension-troubleshooting.jsx b/src/components/extension-landing/extension-troubleshooting.jsx
index 7e168f1fa..737ce4505 100644
--- a/src/components/extension-landing/extension-troubleshooting.jsx
+++ b/src/components/extension-landing/extension-troubleshooting.jsx
@@ -4,6 +4,9 @@ const React = require('react');
 
 const ExtensionSection = require('./extension-section.jsx');
 
+const OS_ENUM = require('../../lib/os-enum.js');
+const {isDownloaded} = require('../install-scratch/install-util.js');
+
 // TODO: after the Scratch Conference 2022, migrate from the individual extension landing pages all the
 // troubleshooting steps which are common to all extensions.
 const ExtensionTroubleshooting = props => {
@@ -17,14 +20,24 @@ const ExtensionTroubleshooting = props => {
                 id="extensions.troubleshootingTitle"
                 values={sharedValues}
             /></h2>
-            <h3 className="faq-title"><FormattedMessage
-                id="extensions.browserCompatibilityTitle"
-                values={sharedValues}
-            /></h3>
-            <p><FormattedMessage
-                id="extensions.browserCompatibilityText"
-                values={sharedValues}
-            /></p>
+            {(isDownloaded(props.currentOS)) && (<React.Fragment>
+                <h3 className="faq-title"><FormattedMessage
+                    id="extensions.scratchLinkRunning"
+                    values={sharedValues}
+                /></h3>
+                <p><FormattedMessage
+                    id={`extensions.startScratchLink.${
+                        props.currentOS === OS_ENUM.WINDOWS ? 'Windows' : 'macOS'
+                    }`}
+                /></p>
+                <h3 className="faq-title"><FormattedMessage
+                    id="extensions.browserCompatibilityTitle"
+                    values={sharedValues}
+                /></h3>
+                <p><FormattedMessage
+                    id="extensions.browserCompatibilityText"
+                    values={sharedValues}
+                /></p></React.Fragment>)}
             {props.children}
             {!props.scratchLinkOnly && (
                 <React.Fragment>
@@ -44,6 +57,7 @@ const ExtensionTroubleshooting = props => {
 
 ExtensionTroubleshooting.propTypes = {
     children: PropTypes.node,
+    currentOS: PropTypes.string.isRequired,
     deviceName: PropTypes.string.isRequired,
     deviceNameShort: PropTypes.string,
     scratchLinkOnly: PropTypes.bool
diff --git a/src/components/extension-landing/install-scratch-link.jsx b/src/components/extension-landing/install-scratch-link.jsx
index 9c6418b6a..a50354436 100644
--- a/src/components/extension-landing/install-scratch-link.jsx
+++ b/src/components/extension-landing/install-scratch-link.jsx
@@ -75,11 +75,6 @@ const InstallScratchLink = ({
                             }-toolbar.png`}
                         />
                     </span>
-                    <p className="step-description"><FormattedMessage
-                        id={`installScratchLink.startScratchLink2.${
-                            currentOS === OS_ENUM.WINDOWS ? 'Windows' : 'macOS'
-                        }`}
-                    /></p>
                 </Step>
                 <Step
                     compact
diff --git a/src/l10n.json b/src/l10n.json
index 5fe1f10d1..3a6403519 100644
--- a/src/l10n.json
+++ b/src/l10n.json
@@ -169,8 +169,6 @@
     "installScratchLink.downloadAndInstall": "Download and install Scratch Link.",
     "installScratchLink.startScratchLink.macOS": "Start Scratch Link and make sure it is running. It should appear in your menu bar.",
     "installScratchLink.startScratchLink.Windows": "Start Scratch Link and make sure it is running. It should appear in your notification area (system tray).",
-    "installScratchLink.startScratchLink2.macOS": "If it does not appear, run Scratch Link from your Applications folder.",
-    "installScratchLink.startScratchLink2.Windows": "If it does not appear, run Scratch Link from your Start menu.",
     "installScratchLink.learnMore.bodyText": "To learn more about Scratch Link, click {linkText}.",
     "installScratchLink.learnMore.linkText": "here",
     "installScratchLink.ifYouHaveTrouble.bodyText": "If you have trouble, see the {linkText} for tips.",
@@ -446,6 +444,9 @@
     "helpWidget.confirmation": "Thank you for your message.",
 
     "extensions.troubleshootingTitle": "Troubleshooting",
+    "extensions.scratchLinkRunning": "Make sure Scratch Link is running",
+    "extensions.startScratchLink.macOS": "If Scratch Link does not appear in your menu bar, run Scratch Link from your Applications folder.",
+    "extensions.startScratchLink.Windows": "If Scratch Link does not appear in your notification area (system tray), run Scratch Link from your Start menu.",
     "extensions.browserCompatibilityTitle": "Make sure your browser is compatible with Scratch Link",
     "extensions.browserCompatibilityText": "Scratch Link is compatible with most browsers on macOS and Windows. For Safari, please update to Scratch Link 2.x, Safari 14 or newer, and macOS 10.15 or newer.",
     "extensions.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
diff --git a/src/views/boost/boost.jsx b/src/views/boost/boost.jsx
index 9f86be639..0dff27d8d 100644
--- a/src/views/boost/boost.jsx
+++ b/src/views/boost/boost.jsx
@@ -193,7 +193,10 @@ class Boost extends ExtensionLanding {
                         />
                     </Steps>
                 </ExtensionSection>
-                <ExtensionTroubleshooting deviceName="BOOST">
+                <ExtensionTroubleshooting
+                    currentOS={this.state.OS}
+                    deviceName="BOOST"
+                >
                     {isDownloaded(this.state.OS) && (
                         <React.Fragment>
                             <h3 className="faq-title"><FormattedMessage id="boost.updateScratchLinkTitle" /></h3>
diff --git a/src/views/download/scratch-link/download.jsx b/src/views/download/scratch-link/download.jsx
index 94e7e4c0e..5cff4263c 100644
--- a/src/views/download/scratch-link/download.jsx
+++ b/src/views/download/scratch-link/download.jsx
@@ -103,6 +103,7 @@ const ScratchLink = ({intl}) => {
                 </div>
             </ExtensionSection>
             <ExtensionTroubleshooting
+                currentOS={os}
                 deviceName={intl.formatMessage({id: 'scratchLink.headerTitle'})}
                 scratchLinkOnly
             >
diff --git a/src/views/ev3/ev3.jsx b/src/views/ev3/ev3.jsx
index 539ab33ad..37aba205f 100644
--- a/src/views/ev3/ev3.jsx
+++ b/src/views/ev3/ev3.jsx
@@ -283,6 +283,7 @@ class EV3 extends ExtensionLanding {
                     </Steps>
                 </ExtensionSection>
                 <ExtensionTroubleshooting
+                    currentOS={this.state.OS}
                     deviceName="EV3"
                     scratchLinkOnly // EV3 is Bluetooth Classic so it's only available through Scratch Link
                 >
diff --git a/src/views/gdxfor/gdxfor.jsx b/src/views/gdxfor/gdxfor.jsx
index ecd0f1b48..f10c506bb 100644
--- a/src/views/gdxfor/gdxfor.jsx
+++ b/src/views/gdxfor/gdxfor.jsx
@@ -207,6 +207,7 @@ class GdxFor extends ExtensionLanding {
                     </Steps>
                 </ExtensionSection>
                 <ExtensionTroubleshooting
+                    currentOS={this.state.OS}
                     deviceName={this.props.intl.formatMessage({id: 'gdxfor.deviceName'})}
                     deviceNameShort={this.props.intl.formatMessage({id: 'gdxfor.deviceNameShort'})}
                 >
diff --git a/src/views/microbit/microbit.jsx b/src/views/microbit/microbit.jsx
index c53b3f6f7..c2ba778ab 100644
--- a/src/views/microbit/microbit.jsx
+++ b/src/views/microbit/microbit.jsx
@@ -319,7 +319,10 @@ class MicroBit extends ExtensionLanding {
                     </FlexRow>
                     <hr />
                 </ExtensionSection>
-                <ExtensionTroubleshooting deviceName="micro:bit">
+                <ExtensionTroubleshooting
+                    currentOS={this.state.OS}
+                    deviceName="micro:bit"
+                >
                     {isDownloaded(this.state.OS) && (
                         <React.Fragment>
                             <h3 className="faq-title"><FormattedMessage id="microbit.checkOSVersionTitle" /></h3>
diff --git a/src/views/wedo2/wedo2.jsx b/src/views/wedo2/wedo2.jsx
index c42e52ec9..18138b52d 100644
--- a/src/views/wedo2/wedo2.jsx
+++ b/src/views/wedo2/wedo2.jsx
@@ -192,7 +192,10 @@ class Wedo2 extends ExtensionLanding {
                         />
                     </Steps>
                 </ExtensionSection>
-                <ExtensionTroubleshooting deviceName="WeDo 2.0">
+                <ExtensionTroubleshooting
+                    currentOS={this.state.OS}
+                    deviceName="WeDo 2.0"
+                >
                     {isDownloaded(this.state.OS) && (
                         <React.Fragment>
                             <h3 className="faq-title"><FormattedMessage id="wedo2.checkOSVersionTitle" /></h3>