From e9febae2f3a33698c37692088b3e5fb07dd4250e Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Wed, 26 Sep 2018 17:51:35 -0400
Subject: [PATCH] Don't show feedback button if there is a session
---
src/components/menu-bar/menu-bar.jsx | 38 ++++++++++++++--------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
index 5b710fd35..0e14f6915 100644
--- a/src/components/menu-bar/menu-bar.jsx
+++ b/src/components/menu-bar/menu-bar.jsx
@@ -432,25 +432,6 @@ class MenuBar extends React.Component {
}
</div>
</div>
- <div className={classNames(styles.menuBarItem, styles.feedbackButtonWrapper)}>
- <a
- className={styles.feedbackLink}
- href="https://scratch.mit.edu/discuss/topic/312261/"
- rel="noopener noreferrer"
- target="_blank"
- >
- <Button
- className={styles.feedbackButton}
- iconSrc={feedbackIcon}
- >
- <FormattedMessage
- defaultMessage="Give Feedback"
- description="Label for feedback form modal button"
- id="gui.menuBar.giveFeedback"
- />
- </Button>
- </a>
- </div>
{/* show the proper UI in the account menu, given whether the user is
logged in, and whether a session is available to log in with */}
@@ -531,6 +512,25 @@ class MenuBar extends React.Component {
) : (
// ******** no login session is available, so don't show login stuff
<React.Fragment>
+ <div className={classNames(styles.menuBarItem, styles.feedbackButtonWrapper)}>
+ <a
+ className={styles.feedbackLink}
+ href="https://scratch.mit.edu/discuss/topic/312261/"
+ rel="noopener noreferrer"
+ target="_blank"
+ >
+ <Button
+ className={styles.feedbackButton}
+ iconSrc={feedbackIcon}
+ >
+ <FormattedMessage
+ defaultMessage="Give Feedback"
+ description="Label for feedback form modal button"
+ id="gui.menuBar.giveFeedback"
+ />
+ </Button>
+ </a>
+ </div>
<MenuBarItemTooltip id="mystuff">
<div
className={classNames(
--
GitLab