From 863eb2c948312a8db46f43ae7fa217e0a7c60b51 Mon Sep 17 00:00:00 2001
From: wxa <wxa@users.noreply.github.com>
Date: Thu, 27 Aug 2020 00:13:56 +0300
Subject: [PATCH] Conditionally hide old header in newsletter creation steps
 [MAILPOET-3014]

---
 .../newsletters/listings/heading_display.jsx  | 20 +++++++++++++++++++
 assets/js/src/newsletters/newsletters.jsx     |  8 ++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 assets/js/src/newsletters/listings/heading_display.jsx

diff --git a/assets/js/src/newsletters/listings/heading_display.jsx b/assets/js/src/newsletters/listings/heading_display.jsx
new file mode 100644
index 0000000000..01608348f0
--- /dev/null
+++ b/assets/js/src/newsletters/listings/heading_display.jsx
@@ -0,0 +1,20 @@
+import { withRouter } from 'react-router-dom';
+import { mapPathToSteps } from './heading_steps.jsx';
+
+const showWPScreenOptions = () => {
+  const screenOptions = document.getElementById('screen-meta-links');
+  if (screenOptions && screenOptions.style.display === 'none') {
+    screenOptions.style.display = 'block';
+  }
+};
+
+const ListingHeadingDisplay = ({ children, location }) => {
+  const stepNumber = mapPathToSteps(location);
+  if (stepNumber === null) {
+    showWPScreenOptions();
+    return children;
+  }
+  return null;
+};
+
+export default withRouter(ListingHeadingDisplay);
diff --git a/assets/js/src/newsletters/newsletters.jsx b/assets/js/src/newsletters/newsletters.jsx
index 100150e386..154852d0ed 100644
--- a/assets/js/src/newsletters/newsletters.jsx
+++ b/assets/js/src/newsletters/newsletters.jsx
@@ -28,6 +28,7 @@ import RoutedTabs from 'common/tabs/routed_tabs';
 import Tab from 'common/tabs/tab';
 import withNpsPoll from 'nps_poll.jsx';
 import ListingHeading from 'newsletters/listings/heading.jsx';
+import ListingHeadingDisplay from 'newsletters/listings/heading_display.jsx';
 import FeatureAnnouncement from 'announcements/feature_announcement.jsx';
 import SubscribersLimitNotice from 'notices/subscribers_limit_notice.jsx';
 import InvalidMssKeyNotice from 'notices/invalid_mss_key_notice';
@@ -192,9 +193,12 @@ const App = () => (
   <GlobalContext.Provider value={useGlobalContextValue(window)}>
     <HashRouter>
       <Notices />
-      <ListingHeading />
 
-      <FeatureAnnouncement hasNews={window.mailpoet_feature_announcement_has_news} />
+      <ListingHeadingDisplay>
+        <ListingHeading />
+        <FeatureAnnouncement hasNews={window.mailpoet_feature_announcement_has_news} />
+      </ListingHeadingDisplay>
+
       <SubscribersLimitNotice />
       <TransactionalEmailsProposeOptInNotice
         mailpoetInstalledDaysAgo={window.mailpoet_installed_days_ago}