diff --git a/CHANGELOG.md b/CHANGELOG.md index 3695f40420888714ea84ea39021d248c7960a268..1c14798f9a4b2eea3d878b049016f08456600d71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,20 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.2.3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.2.2...v1.2.3) (2021-09-17) + + +### Bug Fixes + +* **cicd:** deploy job for master branch was failing ([9ee5550](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/9ee5550f645194c1b973ad467c823b0ef8bea15a)) +* **cgu:** bug fix on displayed text for first cozy connection. + ### [1.2.2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.2.0...v1.2.2) (2021-09-17) ### ⚠ BREAKING CHANGES -* Change user profile's for the new terms managment +* Change user profile's for the new terms managment ### Features diff --git a/manifest.webapp b/manifest.webapp index 6ec969344c878b47de98afd2fabdd9c777c3d6c5..cd2eef620317ed10889c191fa78f98b5fdcc1ebe 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -3,7 +3,7 @@ "slug": "ecolyo", "icon": "icon.svg", "categories": ["energy"], - "version": "1.2.0", + "version": "1.2.3", "licence": "AGPL-3.0", "editor": "Métropole de Lyon", "default_locale": "fr", diff --git a/package.json b/package.json index 873eae61d134b3404f0569630eb623a31fa67405..fc5c91a028460da4967e1928be14d39861ed98b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecolyo", - "version": "1.2.2", + "version": "1.2.3", "scripts": { "tx": "tx pull --all || true", "lint": "yarn lint:js && yarn lint:styles", diff --git a/src/components/App.tsx b/src/components/App.tsx index 35bc76ef164e09926bf3ee20ff3207ca2fdf7233..8fbbb027f4a340bebf151552d8820b460382d153 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -28,8 +28,12 @@ export const App = () => { splashComponent={SplashScreen} splashErrorComponent={SplashScreenError} > - <TutorialWelcome open={!tutorial.isWelcomeSeen} /> - {isLastTermAccepted && <Navbar />} + {isLastTermAccepted && ( + <> + <TutorialWelcome open={!tutorial.isWelcomeSeen} /> + <Navbar /> + </> + )} <Main> <Content className="app-content"> <Routes isLastTermAccepted={isLastTermAccepted} />