From 5dd99aebd75cdaf0b380d7feb39a4ff1cf198685 Mon Sep 17 00:00:00 2001
From: Vraja Das <vraja.pro@gmail.com>
Date: Mon, 14 Oct 2024 15:12:23 +0300
Subject: [PATCH 1/3] remove notices on FTC tab

---
 packages/js/src/dashboard/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/js/src/dashboard/app.js b/packages/js/src/dashboard/app.js
index acd480fd0c3..c42a1a52db0 100644
--- a/packages/js/src/dashboard/app.js
+++ b/packages/js/src/dashboard/app.js
@@ -102,7 +102,7 @@ const App = () => {
 						{ shouldShowWebinarPromotionNotificationInDashboard( STORE_NAME ) &&
 							<WebinarPromoNotification store={ STORE_NAME } url={ webinarIntroSettingsUrl } image={ null } />
 						}
-						{ notices.length > 0 && <div className="yst-space-y-3 yoast-new-dashboard-notices"> {
+						{ pathname !== "/first-time-configuration" && notices.length > 0 && <div className="yst-space-y-3 yoast-new-dashboard-notices"> {
 							notices.map( ( notice, index ) => (
 								<Notice
 									key={ index }

From 6e7e26aaa2455339398e5296eeade7049b7bcac6 Mon Sep 17 00:00:00 2001
From: Vraja Das <vraja.pro@gmail.com>
Date: Mon, 14 Oct 2024 15:31:01 +0300
Subject: [PATCH 2/3] move notice under transition

---
 packages/js/src/dashboard/app.js | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/js/src/dashboard/app.js b/packages/js/src/dashboard/app.js
index c42a1a52db0..a1ba7f3aa97 100644
--- a/packages/js/src/dashboard/app.js
+++ b/packages/js/src/dashboard/app.js
@@ -98,24 +98,6 @@ const App = () => {
 					</SidebarNavigation.Sidebar>
 				</aside>
 				<div className="yst-grow">
-					<div>
-						{ shouldShowWebinarPromotionNotificationInDashboard( STORE_NAME ) &&
-							<WebinarPromoNotification store={ STORE_NAME } url={ webinarIntroSettingsUrl } image={ null } />
-						}
-						{ pathname !== "/first-time-configuration" && notices.length > 0 && <div className="yst-space-y-3 yoast-new-dashboard-notices"> {
-							notices.map( ( notice, index ) => (
-								<Notice
-									key={ index }
-									id={ notice.id || "yoast-dashboard-notice-" + index }
-									title={ notice.header }
-									isDismissable={ notice.isDismissable }
-								>
-									{ notice.content }
-								</Notice>
-							) )
-						}
-						</div> }
-					</div>
 					<div className="yst-space-y-6 yst-mb-8 xl:yst-mb-0">
 						<main>
 							<Transition
@@ -126,6 +108,24 @@ const App = () => {
 								enterFrom="yst-opacity-0"
 								enterTo="yst-opacity-100"
 							>
+								<div>
+									{ shouldShowWebinarPromotionNotificationInDashboard( STORE_NAME ) &&
+										<WebinarPromoNotification store={ STORE_NAME } url={ webinarIntroSettingsUrl } image={ null } />
+									}
+									{ pathname !== "/first-time-configuration" && notices.length > 0 && <div className="yst-space-y-3 yoast-new-dashboard-notices"> {
+										notices.map( ( notice, index ) => (
+											<Notice
+												key={ index }
+												id={ notice.id || "yoast-dashboard-notice-" + index }
+												title={ notice.header }
+												isDismissable={ notice.isDismissable }
+											>
+												{ notice.content }
+											</Notice>
+										) )
+									}
+									</div> }
+								</div>
 								<Routes>
 									<Route path="/" element={ <AlertCenter /> } />
 									<Route path="/first-time-configuration" element={ <FirstTimeConfiguration /> } />

From 6942ab9da64214fb286fa4ca74f2e37d3c18f4c9 Mon Sep 17 00:00:00 2001
From: Vraja Das <vraja.pro@gmail.com>
Date: Mon, 14 Oct 2024 15:35:30 +0300
Subject: [PATCH 3/3] hide webinar notice when on FTC tab

---
 packages/js/src/dashboard/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/js/src/dashboard/app.js b/packages/js/src/dashboard/app.js
index a1ba7f3aa97..386c00af151 100644
--- a/packages/js/src/dashboard/app.js
+++ b/packages/js/src/dashboard/app.js
@@ -108,11 +108,11 @@ const App = () => {
 								enterFrom="yst-opacity-0"
 								enterTo="yst-opacity-100"
 							>
-								<div>
+								{ pathname !== "/first-time-configuration" && <div>
 									{ shouldShowWebinarPromotionNotificationInDashboard( STORE_NAME ) &&
 										<WebinarPromoNotification store={ STORE_NAME } url={ webinarIntroSettingsUrl } image={ null } />
 									}
-									{ pathname !== "/first-time-configuration" && notices.length > 0 && <div className="yst-space-y-3 yoast-new-dashboard-notices"> {
+									{ notices.length > 0 && <div className="yst-space-y-3 yoast-new-dashboard-notices"> {
 										notices.map( ( notice, index ) => (
 											<Notice
 												key={ index }
@@ -125,7 +125,7 @@ const App = () => {
 										) )
 									}
 									</div> }
-								</div>
+								</div> }
 								<Routes>
 									<Route path="/" element={ <AlertCenter /> } />
 									<Route path="/first-time-configuration" element={ <FirstTimeConfiguration /> } />