Skip to content

Commit

Permalink
Merge pull request #21707 from Yoast/1909-minor-237-new-dash-ftc-noti…
Browse files Browse the repository at this point in the history
…ce-should-not-be-shown-on-ftc-page

Remove notices on FTC tab
  • Loading branch information
leonidasmi authored Oct 15, 2024
2 parents a5e305b + 6942ab9 commit dec7c85
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions packages/js/src/dashboard/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 } />
}
{ 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
Expand All @@ -126,6 +108,24 @@ const App = () => {
enterFrom="yst-opacity-0"
enterTo="yst-opacity-100"
>
{ pathname !== "/first-time-configuration" && <div>
{ shouldShowWebinarPromotionNotificationInDashboard( STORE_NAME ) &&
<WebinarPromoNotification store={ STORE_NAME } url={ webinarIntroSettingsUrl } image={ null } />
}
{ 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 /> } />
Expand Down

0 comments on commit dec7c85

Please sign in to comment.