fix(Announcements): Avoid overlapping dialog only show at root

cozy · Sep 25, 2024 · 2b5b6eb · 2b5b6eb
1 parent e028bdc
commit 2b5b6eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/Home.jsx b/src/components/Home.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Outlet } from 'react-router-dom'
+import { Outlet, useLocation } from 'react-router-dom'
 
 import flag from 'cozy-flags'
 import CozyDevTools from 'cozy-client/dist/devtools'
@@ -11,12 +11,16 @@ import ScrollToTopOnMount from 'components/ScrollToTopOnMount'
 import Services from 'components/Services'
 import Shortcuts from 'components/Shortcuts'
 import GroupedServices from 'components/GroupedServices'
+import { Announcements } from 'components/Announcements/Announcements'
 
 const Home = ({ setAppsReady, wrapper }) => {
+  const { pathname } = useLocation()
+
   return (
     <CozyConfirmDialogProvider>
       <Main className="u-flex-grow-1">
         <ScrollToTopOnMount target={wrapper} />
+        {pathname === '/connected' && <Announcements />}
         <Content className="u-flex u-flex-column u-ph-1">
           {flag('debug') && <CozyDevTools />}
           <Applications onAppsFetched={setAppsReady} />

diff --git a/src/containers/App.jsx b/src/containers/App.jsx
@@ -42,7 +42,6 @@ import {
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import SectionDialog from 'components/Sections/SectionDialog'
 import { SentryRoutes } from 'lib/sentry'
-import { Announcements } from 'components/Announcements/Announcements'
 
 window.flag = window.flag || flag
 window.minilog = minilog
@@ -135,7 +134,6 @@ const App = ({ accounts, konnectors, triggers }) => {
       <ReloadFocus />
       <MainView>
         <BackupNotification />
-        <Announcements />
         <Corner />
         <div
           className="u-flex u-flex-column u-flex-content-start u-flex-content-stretch u-w-100 u-m-auto u-pos-relative"