diff --git a/package.json b/package.json index 185c02638ea36c04302c32e9e579fc16d2f4f5ce..4484c8f6ccec779e13fb4e00d22afeaa15d38af1 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx index dae75ee79225167822c7389288722a7974ad71a1..5f7941aa3545ac8a1921245540ca41b144b8b62f 100644 --- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx +++ b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx @@ -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>