Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/add_news_icons

src/components/ContainerComponents/ViewContainer/HomeViewContainer.tsx

@@ -10,7 +10,6 @@ import { AppContext } from 'components/Contexts/AppContextProvider'
 import MultliFluidIndicatorsContainer from 'components/ContainerComponents/IndicatorsContainer/MultiFluidIndicatorsContainer'
 import ChallengeCardContainer from 'components/ContainerComponents/ChallengeCardContainer/ChallengeCardContainer'
 import KonnectorViewerContainer from 'components/ContainerComponents/KonnectorViewerContainer/KonnectorViewerContainer'
-import WelcomeModalContainer from '../WelcomeModalContainer/WelcomeModalContainer'
 
 const HomeViewContainer: React.FC = () => {
   const [timeStep, setTimeStep] = useState<TimeStep>(20)
@@ -44,7 +43,6 @@ const HomeViewContainer: React.FC = () => {
 
   return (
     <React.Fragment>
-      <WelcomeModalContainer />
       <CozyBar />
       {fluidTypes && fluidTypes.length > 0 ? (
         <>

src/components/ContainerComponents/ViewContainer/ViewContainer.tsx

@@ -18,6 +18,7 @@ import OngoingChallengeDetailsViewContainer from './OngoingChallengeDetailsViewC
 import LockedChallengeDetailsViewContainer from './LockedChallengeDetailsViewContainer'
 import AvailableChallengeDetailsViewContainer from './AvailableChallengeDetailsViewContainer'
 import SplashContainer from 'components/ContainerComponents/SplashContainer/SplashContainer'
+import WelcomeModalContainer from '../WelcomeModalContainer/WelcomeModalContainer'
 
 export const history = createBrowserHistory()
 
@@ -27,6 +28,7 @@ export const ViewContainer = () => {
       <Layout>
         <AppContextProvider>
           <Navbar />
+          <WelcomeModalContainer />
           <Main>
             <Content className="app-content">
               <ScrollToTop>

src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx

@@ -41,7 +41,9 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
         .query(client.find(USERPROFILE_DOCTYPE).limitBy(1))
         .then(async ({ data }) => {
           const welcomeModalState = data[0].haveSeenWelcomeModal
-          setModalOpen(!welcomeModalState)
+          if (!welcomeModalState) {
+            setModalOpen(true)
+          }
         })
     }
     getWelcomeModalState()