Skip to content
Snippets Groups Projects
Commit 3430424d authored by Romain CREY's avatar Romain CREY
Browse files

Merge branch 'features/US406-welcome-modal' into dev

parents 4efea475 8a81d772
No related branches found
No related tags found
1 merge request!15Merge Dev to Master
......@@ -23,7 +23,7 @@
"build": "yarn run build:css && yarn run build:browser",
"release": "standard-version --no-verify",
"winstack": "start powershell -command docker run --rm -it -p 8080:8080 -p 5984:5984 -p 8025:8025 -v $PWD/build:/data/cozy-app/ecolyo -v $PWD/data/konnectors_sources/:/data/cozy_konnectors/ -v $PWD/data:/usr/local/couchdb/data -v $PWD/docker/disableCSP.yaml:/etc/cozy/cozy.yaml registry.forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/cozy-env",
"linuxstack": "docker run --rm -it -p 8080:8080 -p 5984:5984 -p 8025:8025 -v $(pwd)/build:/data/cozy-app/ecolyo -v ~/cozy/data/db/konnectors_sources/:/data/cozy_konnectors/ -v ~/cozy/data/db:/usr/local/couchdb/data -v ~/cozy/data/storage:/data/cozy-storage -v $(pwd)/docker/disableCSP.yaml:/etc/cozy/cozy.yaml 5fdc0725024f",
"linuxstack": "docker run --rm -it -p 8080:8080 -p 5984:5984 -p 8025:8025 -v $(pwd)/build:/data/cozy-app/ecolyo -v ~/cozy/data/db/konnectors_sources/:/data/cozy_konnectors/ -v ~/cozy/data/db:/usr/local/couchdb/data -v ~/cozy/data/storage:/data/cozy-storage -v $(pwd)/docker/disableCSP.yaml:/etc/cozy/cozy.yaml registry.forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/cozy-env",
"load-data": "cd test && importData.bat"
},
"repository": {
......
......@@ -15,10 +15,9 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
t,
client,
}: WelcomeModalContainerProps) => {
const [modalOpen, setModalOpen] = useState<boolean>(true)
const [modalOpen, setModalOpen] = useState<boolean>(false)
const { data: instanceSettings } = useInstanceSettings(client)
async function updateWelcomeModalState() {
await client
.query(client.find(USERPROFILE_DOCTYPE).limitBy(1))
......@@ -59,8 +58,11 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
{t('COMMON.WELCOME_MODAL_TITLE')}
</div>
<div className="wm-name text-24-bold">
{instanceSettings.public_name} !
{instanceSettings.public_name
? `${instanceSettings.public_name} !`
: null}
</div>
<div className="wm-perso text-18-bold">
{t('COMMON.WELCOME_MODAL_PERSO')}
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment