From 3b5605df8cf8a4e7b8fc72c3dc9b66bfadcd4762 Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Wed, 27 May 2020 17:48:49 +0200
Subject: [PATCH] fix: modal visibility
---
.../ContainerComponents/ViewContainer/ViewContainer.tsx | 2 +-
.../WelcomeModalContainer/WelcomeModalContainer.tsx | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx
index f6a52899d..0ed47c2b0 100644
--- a/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/ViewContainer.tsx
@@ -28,8 +28,8 @@ export const ViewContainer = () => {
<Layout>
<AppContextProvider>
<Navbar />
+ <WelcomeModalContainer />
<Main>
- <WelcomeModalContainer />
<Content className="app-content">
<ScrollToTop>
<Switch>
diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
index 5f7941aa3..401843f8c 100644
--- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
+++ b/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()
--
GitLab