Guilhem CARRON · Guilhem CARRON · Hugo SUBTIL · Guilhem CARRON · Guilhem CARRON · Hugo SUBTIL
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,160 +6,160 @@
 # See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
 image: docker:git
 services:
- docker:dind
+  - docker:dind
 variables:
  DOCKER_DRIVER: overlay2
  DOCKER_TLS_CERTDIR: ''

 stages:
- test
- build
- quality
- deploy
- publish
+  - test
+  - build
+  - quality
+  - deploy
+  - publish

 test:
  stage: test
-  image: node:14.15.4-alpine
+  image: node:14.18-alpine
  before_script:
-  - apk add git
+    - apk add git
  script:
-  - yarn
-  - yarn test --ci --reporters=default --reporters=jest-junit
+    - yarn
+    - yarn test --ci --reporters=default --reporters=jest-junit
  coverage: "/All files[^|]*\\|[^|]*\\s+([\\d\\.]+)/"
  artifacts:
    when: always
    reports:
      junit:
-      - junit.xml
+        - junit.xml
  only:
-  - dev
-  - master
-  - merge_requests
+    - dev
+    - master
+    - merge_requests

 build-test:
  stage: build
-  image: node:14.15.4-alpine
+  image: node:14.18-alpine
  before_script:
-  - apk add git
-  - apk add bash
+    - apk add git
+    - apk add bash
  script:
-  - yarn
-  - yarn build
+    - yarn
+    - yarn build
  only:
-  - merge_requests
+    - merge_requests
  artifacts:
    paths:
-    - build/assets
+      - build/assets

 build-dev:
  stage: build
-  image: node:14.15.4-alpine
+  image: node:14.18-alpine
  before_script:
-  - apk add git
-  - apk add bash
+    - apk add git
+    - apk add bash
  script:
-  - yarn
-  - yarn build-dev
-  - git config --global user.name build-pipeline
-  - git config --global user.email "$GIT_USER"
-  - git config --global user.password "$GIT_PWD"
-  - git config user.email "$GIT_USER"
-  - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git
-  - git config --global credential.helper store
-  - yarn deploy-dev
+    - yarn
+    - yarn build-dev
+    - git config --global user.name build-pipeline
+    - git config --global user.email "$GIT_USER"
+    - git config --global user.password "$GIT_PWD"
+    - git config user.email "$GIT_USER"
+    - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git
+    - git config --global credential.helper store
+    - yarn deploy-dev
  only:
-  - dev
+    - dev

 build:
  stage: build
-  image: node:14.15.4-alpine
+  image: node:14.18-alpine
  before_script:
-  - apk add git
-  - apk add bash
+    - apk add git
+    - apk add bash
  script:
-  - yarn
-  - yarn build
-  - git config --global user.name build-pipeline
-  - git config --global user.email "$GIT_USER"
-  - git config --global user.password "$GIT_PWD"
-  - git config user.email "$GIT_USER"
-  - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git
-  - git config --global credential.helper store
-  - yarn deploy
+    - yarn
+    - yarn build
+    - git config --global user.name build-pipeline
+    - git config --global user.email "$GIT_USER"
+    - git config --global user.password "$GIT_PWD"
+    - git config user.email "$GIT_USER"
+    - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git
+    - git config --global credential.helper store
+    - yarn deploy
  only:
-  - master
+    - master

 build_stack:
  stage: build
  script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  - docker build -t "$CI_REGISTRY_IMAGE/cozy-env:latest"  ./docker/
-  - docker push $CI_REGISTRY_IMAGE/cozy-env:latest
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker build -t "$CI_REGISTRY_IMAGE/cozy-env:latest"  ./docker/
+    - docker push $CI_REGISTRY_IMAGE/cozy-env:latest
  only:
-  - master
+    - master
  when: manual

 publish:
  stage: publish
-  image: node:14.15.4-alpine
+  image: node:14.18-alpine
  before_script:
-  - apk add git
+    - apk add git
  script:
-  - yarn cozyPublish
+    - yarn cozyPublish
  only:
-  - tags
+    - tags
  when: manual

 sonarqube:
  stage: quality
  only:
-  - dev
+    - dev
  image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
  before_script:
-  - export NODE_PATH=$NODE_PATH:`npm root -g`
-  - npm install -g typescript
+    - export NODE_PATH=$NODE_PATH:`npm root -g`
+    - npm install -g typescript
  script:
-  - 'sonar-scanner -Dsonar.projectName="ecolyo" -Dsonar.projectVersion=1.0 -Dsonar.sourceEncoding=UTF-8
-    -Dsonar.projectBaseDir=. -Dsonar.host.url=${SONAR_URL} -Dsonar.projectKey=${CI_PROJECT_PATH_SLUG}
-    -Dsonar.login=${SONAR_TOKEN} -Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts*
-    -Dsonar.qualitygate.wait=true'
+    - 'sonar-scanner -Dsonar.projectName="ecolyo" -Dsonar.projectVersion=1.0 -Dsonar.sourceEncoding=UTF-8
+      -Dsonar.projectBaseDir=. -Dsonar.host.url=${SONAR_URL} -Dsonar.projectKey=${CI_PROJECT_PATH_SLUG}
+      -Dsonar.login=${SONAR_TOKEN} -Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts*
+      -Dsonar.qualitygate.wait=true'

 sonarqube-mr:
  stage: quality
  only:
-  - merge_requests
+    - merge_requests
  image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
  before_script:
-  - export NODE_PATH=$NODE_PATH:`npm root -g`
-  - npm install -g typescript
+    - export NODE_PATH=$NODE_PATH:`npm root -g`
+    - npm install -g typescript
  script:
-  - 'sonar-scanner -Dsonar.projectName="ecolyo-mr" -Dsonar.projectVersion=1.0 -Dsonar.sourceEncoding=UTF-8
-    -Dsonar.projectBaseDir=. -Dsonar.host.url=${SONAR_URL} -Dsonar.projectKey=ecolyo-mr
-    -Dsonar.login=${SONAR_MR_TOKEN} -Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts*
-    -Dsonar.qualitygate.wait=true'
+    - 'sonar-scanner -Dsonar.projectName="ecolyo-mr" -Dsonar.projectVersion=1.0 -Dsonar.sourceEncoding=UTF-8
+      -Dsonar.projectBaseDir=. -Dsonar.host.url=${SONAR_URL} -Dsonar.projectKey=ecolyo-mr
+      -Dsonar.login=${SONAR_MR_TOKEN} -Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts*
+      -Dsonar.qualitygate.wait=true'

 deploy_demo:
  stage: deploy
  tags:
-  - deploy
+    - deploy
  script:
-  - cd /root/ecolyo-infra-scripts/cicid_scripts
-  - "./update_ecolyo_dev.sh"
+    - cd /root/ecolyo-infra-scripts/cicid_scripts
+    - './update_ecolyo_dev.sh'
  only:
-  - dev
+    - dev

 deploy_alpha:
  stage: deploy
  tags:
-  - deploy
+    - deploy
  script:
-  - cd /root/ecolyo-infra-scripts/cicid_scripts
-  - "./update_all_ecolyo_dev.sh"
+    - cd /root/ecolyo-infra-scripts/cicid_scripts
+    - './update_all_ecolyo_dev.sh'
  only:
-  - tags
+    - tags

 sast:
  stage: test
 include:
- template: Security/SAST.gitlab-ci.yml
+  - template: Security/SAST.gitlab-ci.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,58 +2,86 @@

 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.4.4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.3...v1.4.4) (2021-11-10)
-
+## [1.5.0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.4...v1.5.0) (2021-11-29)

 ### Features

-* **analysis:** Add new pie chart section ([20ecfec](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/20ecfec1877039bd0723c30b49cdc1f2ff410c39))
-* **Analysis:** update analysis card ([234109e](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/234109ef12255768521ea3b848cc0692602b6620))
-* **faq:** Add 2 more answers about data questions ([3af8f80](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/3af8f808348610148811821e91d396f71f3c4bb6))
-* **HalfHour:** Edited text related to half hour harvest activation ([46dd6f2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/46dd6f28175c262d1f6f83c81a203f181c60b707))
-* **profileType:** Now user can choose fuel or wood as warming type ([82457f9](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/82457f9864c70632d2daca180c2d5e9dd8848803))
-* scaffolding for new analysis page ([8842ba7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8842ba74d51aeac8e57679f92c92f35bd0f8c808))
+- **Analysis:** Add max day consumption card by fluid ([e0f15b0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/e0f15b000b25cf974ffdbef8f523659259dfb36d))
+- **Analysis:** add scroll position save for analysis view ([e1b9a9f](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/e1b9a9f7364a9bac57df09c6eadf0ce34f114643))
+- **Challenge:** Add isBuilding banner to main challenge view ([5371740](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/537174086871abdcc302d7a3028441ab2c58b03e))
+- **Conso:** add cursor pointer on areas ([0202811](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0202811189011af0e394f130f100e364d20eaeb7))
+- **ProfileType:** Handling profileTypes modifications over time ([f6e9bec](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/f6e9bec60486632d798b2fbd8d2e145a0b066cfc))
+- **Water-alert:** new design for water threshold notification ([107455c](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/107455cead293b19031ea07a3a406b1fdac3475e))
+
+### Bug Fixes

+- **Analysis:** alignment fluid name maxcons card when no fluid ([a538eaf](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/a538eaf5e7fe8d78952a7c9a717bf5c211fd74ef))
+- **Analysis:** fix css overflow issue and prevent display of total analysis when only one fluid ([5900e3b](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/5900e3b566cef4e27cc4405a7f517a16e48718ca))
+- **Analysis:** fix no data display on maxcons card + price alignment ([6916544](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6916544cdfaf4d33865d5f2edc5ba94aa70e0aa5))
+- **Analysis:** fix total consumption card display ([3f9923b](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/3f9923bd1f8b4759c75c1d51673cdc7b71eca9bb))
+- **Analysis:** z-index to allow click on link ([a2e449d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/a2e449d30ef5559317653278cf985a5ba090616f))
+- **Challenge:** fix challenge title and banner display, it was overflowing on header. ([2ad925a](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2ad925af32694214b64a8dde10512c32bf547744))
+- **Conso:** Disable half hour check if fluid different from elec ([743e29f](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/743e29f235d0c856e2983a84cd6906271599d907))
+- **Conso:** Display full price for multifluid if > 1000€ ([6f9cc7e](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6f9cc7eefc6f27ee13fa47b5456d1473b63d4846))
+- **Conso:** Fix message shuffling in konnector modal ([2680d10](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2680d10978ab6e74a741f1c1b567d7c29eb0b0a2))
+- **Design:** fix global design issue + design improvements on analysis and consumption ([2218079](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2218079da0635432426c355378b7e863e2731b4a))
+- **Design:** text color and alignement on profil analysis card ([f5fd8f9](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/f5fd8f9803ca162ff71d4a6a2c1b0197d111f068))
+- **Design:** various design return ([1532b2f](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/1532b2f2590fa69d40226feeaf6c2ea63e0a7f32))
+- **Desing:** background color ([8d2d975](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8d2d975d7a8b56284a11dfdd6c94674e66072ee3))
+- **Ecogesture:** add equipment type for ecogesture 52 ([d9b8249](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/d9b82494549b9cd5e95dccb5c43663973e5a596f))
+- **Form:** Add autofocus ([5a09943](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/5a09943ac2119f1ae09b415a0d92bcba85318696))
+- **Mail:** fix month query for newsletter, we had one month offset that is no longer required ([c837ad7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/c837ad75f4b9449b28f8616b95da1a7066744fe9))
+- price estimation pop-up fluid order ([f516e89](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/f516e89ca58309ca72a826d9eff061923beee16a))
+- Scroll to top on every page navigation ([b718bc7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/b718bc7d2538f252c744cbeb435aad0f050be9de))
+
+### [1.4.4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.3...v1.4.4) (2021-11-10)
+
+### Features
+
+- **analysis:** Add new pie chart section ([20ecfec](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/20ecfec1877039bd0723c30b49cdc1f2ff410c39))
+- **Analysis:** update analysis card ([234109e](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/234109ef12255768521ea3b848cc0692602b6620))
+- **faq:** Add 2 more answers about data questions ([3af8f80](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/3af8f808348610148811821e91d396f71f3c4bb6))
+- **HalfHour:** Edited text related to half hour harvest activation ([46dd6f2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/46dd6f28175c262d1f6f83c81a203f181c60b707))
+- **profileType:** Now user can choose fuel or wood as warming type ([82457f9](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/82457f9864c70632d2daca180c2d5e9dd8848803))
+- scaffolding for new analysis page ([8842ba7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8842ba74d51aeac8e57679f92c92f35bd0f8c808))

 ### Bug Fixes

-* **analysis:** error-modal-horizontal-scroll ([8713da4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8713da476bc378954dcee4d8c007ae1e194b6d29))
-* **Cicd:** rollback dependency proxy due to 403 issue when pulling images ([38607cf](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/38607cf29034ba4cfed78d3d50e606ad7c0c5508))
-* **conso:** update konnector card if refresh data ([1fdf29d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/1fdf29dbd1c3692ac28c22a32845e60029da2d41))
-* **design:** update small design issues ([15c5ab5](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/15c5ab5c28577ff46d2deca2321f1bbbb34efd30))
-* **Email:** update consumptionAlert link ([8317107](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8317107c4c01aa73853b350453f8d5ccb0b4e6ef))
-* **tests:** release notes store tests ([a2b8650](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/a2b86503de5cac6dc488a04234c2127a62fd79ad))
+- **analysis:** error-modal-horizontal-scroll ([8713da4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8713da476bc378954dcee4d8c007ae1e194b6d29))
+- **Cicd:** rollback dependency proxy due to 403 issue when pulling images ([38607cf](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/38607cf29034ba4cfed78d3d50e606ad7c0c5508))
+- **conso:** update konnector card if refresh data ([1fdf29d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/1fdf29dbd1c3692ac28c22a32845e60029da2d41))
+- **design:** update small design issues ([15c5ab5](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/15c5ab5c28577ff46d2deca2321f1bbbb34efd30))
+- **Email:** update consumptionAlert link ([8317107](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8317107c4c01aa73853b350453f8d5ccb0b4e6ef))
+- **tests:** release notes store tests ([a2b8650](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/a2b86503de5cac6dc488a04234c2127a62fd79ad))

 ### [1.4.3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.2...v1.4.3) (2021-11-09)

 ### Features

-* **ReleaseNotes:** Added a release note modal to show user new functional evolution after updating ([8df5cce](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8df5cce304873b91fae59dbb463134b2acd2687f))
+- **ReleaseNotes:** Added a release note modal to show user new functional evolution after updating ([8df5cce](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8df5cce304873b91fae59dbb463134b2acd2687f))

 ### Bug Fixes

-* **dacc:** bad indicator format ([2a5fd27](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2a5fd278262920d8568e4a2442d08ef936c812e8))
-* **Faq:** fix faq html links ([21d7c2e](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/21d7c2e34a2e6775dfbc40db36d5b3c91ed02824))
+- **dacc:** bad indicator format ([2a5fd27](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2a5fd278262920d8568e4a2442d08ef936c812e8))
+- **Faq:** fix faq html links ([21d7c2e](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/21d7c2e34a2e6775dfbc40db36d5b3c91ed02824))

 ### [1.4.2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.0...v1.4.2) (2021-11-03)

-
 ### Features

-* **conso:** Comparison graph now scales on comparison data if no actual data instead of default scale ([18c12b7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/18c12b718c476381c1044fc1cfa1e729290660f1))
-* **conso:** Display timestep names in timeStepSelector except for very small screens ([8660adc](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8660adc6010642b6307b2578b7602b1a91d82038))
-* **ProfileType:** First profileType created by user acts as default ([6d41cb2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6d41cb247bf677b0136aafb3385763db5be859ec))
-
+- **conso:** Comparison graph now scales on comparison data if no actual data instead of default scale ([18c12b7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/18c12b718c476381c1044fc1cfa1e729290660f1))
+- **conso:** Display timestep names in timeStepSelector except for very small screens ([8660adc](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8660adc6010642b6307b2578b7602b1a91d82038))
+- **ProfileType:** First profileType created by user acts as default ([6d41cb2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6d41cb247bf677b0136aafb3385763db5be859ec))

 ### Bug Fixes

-* **Analysis:** Fix analysis navigation and bad month issue ([fe9f212](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/fe9f21237950bc3e4ac1462b1ee1eaf5baaf71ff))
-* **analysis:** Prevent user to quit the app if he has no fluid connected and open analysis page without navigate in the app before ([5f6b30b](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/5f6b30bbbaa64623eccb985d5746d5c7412cf9fc))
-* **conso:** Refresh fluidButtons state when konnector update ([44ff1a0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/44ff1a0bd2c8753d04b0915b96cf675d5ddef940))
-* **conso:** remove lastdatadate check from multifluid ([a735e14](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/a735e14df3465e684205a7f4879b76fbd665acc6))
-* **conso:** Replace png error picto with svg and display it in konnector card if outdated data ([2e4f959](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2e4f959a70edc303b3ec305274b7349bce606cc3))
-* **energyPrices:** Fixed price updated date from 06 to 08 ([683f003](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/683f00303b97532a1fbf9541292394fe82ef1253))
-* **konnector:** prevent modal to show success message when login success event and show form in background while loading data ([7818e59](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/7818e59d03e77f2883e362762edf123e54fefa59))
+- **Analysis:** Fix analysis navigation and bad month issue ([fe9f212](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/fe9f21237950bc3e4ac1462b1ee1eaf5baaf71ff))
+- **analysis:** Prevent user to quit the app if he has no fluid connected and open analysis page without navigate in the app before ([5f6b30b](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/5f6b30bbbaa64623eccb985d5746d5c7412cf9fc))
+- **conso:** Refresh fluidButtons state when konnector update ([44ff1a0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/44ff1a0bd2c8753d04b0915b96cf675d5ddef940))
+- **conso:** remove lastdatadate check from multifluid ([a735e14](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/a735e14df3465e684205a7f4879b76fbd665acc6))
+- **conso:** Replace png error picto with svg and display it in konnector card if outdated data ([2e4f959](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/2e4f959a70edc303b3ec305274b7349bce606cc3))
+- **energyPrices:** Fixed price updated date from 06 to 08 ([683f003](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/683f00303b97532a1fbf9541292394fe82ef1253))
+- **konnector:** prevent modal to show success message when login success event and show form in background while loading data ([7818e59](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/7818e59d03e77f2883e362762edf123e54fefa59))

 ### [1.4.2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.0...v1.4.2) (2021-11-03)


--- a/manifest.webapp
+++ b/manifest.webapp
@@ -3,7 +3,7 @@
  "slug": "ecolyo",
  "icon": "icon.svg",
  "categories": ["energy"],
-  "version": "1.4.4",
+  "version": "1.5.0",
  "licence": "AGPL-3.0",
  "editor": "Métropole de Lyon",
  "default_locale": "fr",

--- a/package.json
+++ b/package.json
 {
  "name": "ecolyo",
-  "version": "1.4.4",
+  "version": "1.5.0",
  "scripts": {
    "tx": "tx pull --all || true",
    "lint": "yarn lint:js && yarn lint:styles",

--- a/src/assets/icons/ico/graph-icon.svg
+++ b/src/assets/icons/ico/graph-icon.svg
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 29C0 26.7909 1.79086 25 4 25H6.75556C8.96469 25 10.7556 26.7909 10.7556 29V44H0V29Z" fill="#FFF1C5"/>
+<path d="M0 29C0 26.7909 1.79086 25 4 25H6.75556C8.96469 25 10.7556 26.7909 10.7556 29V44H0V29Z" fill="#261C14" fill-opacity="0.65"/>
+<path d="M16.6221 4C16.6221 1.79086 18.4129 0 20.6221 0H23.3776C25.5868 0 27.3776 1.79086 27.3776 4V44H16.6221V4Z" fill="#E3B82A"/>
+<path d="M33.2446 17C33.2446 14.7909 35.0355 13 37.2446 13H40.0002C42.2093 13 44.0002 14.7909 44.0002 17V44H33.2446V17Z" fill="#FFF1C5"/>
+<path d="M33.2446 17C33.2446 14.7909 35.0355 13 37.2446 13H40.0002C42.2093 13 44.0002 14.7909 44.0002 17V44H33.2446V17Z" fill="#261C14" fill-opacity="0.65"/>
+</svg>
--- a/src/assets/icons/ico/hammer-left.svg
+++ b/src/assets/icons/ico/hammer-left.svg
+<svg width="19" height="16" viewBox="0 0 19 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.8438 6.0625C18.0938 6.29167 18.0938 6.53125 17.8438 6.78125L15.0312 9.59375C14.8021 9.82292 14.5625 9.82292 14.3125 9.59375L13.625 8.875C13.375 8.64583 13.375 8.41667 13.625 8.1875L13.9688 7.8125L13.0625 6.9375C12.3125 7.125 11.6667 6.94792 11.125 6.40625L9.59375 4.875C9.19792 4.47917 9 4.01042 9 3.46875V2.875L6.1875 1.46875C7.16667 0.489583 8.34375 0 9.71875 0C11.0938 0 12.2708 0.489583 13.25 1.46875L14.6562 2.875C15.1979 3.41667 15.375 4.0625 15.1875 4.8125L16.0938 5.71875L16.4375 5.34375C16.6667 5.11458 16.9062 5.11458 17.1562 5.34375L17.8438 6.0625ZM8.90625 5.59375L10.4375 7.125C10.5208 7.20833 10.6354 7.30208 10.7812 7.40625L3.34375 15.375C2.96875 15.7917 2.51042 16 1.96875 16C1.42708 16 0.958333 15.8021 0.5625 15.4062C0.1875 15.0312 0 14.5729 0 14.0312C0 13.4896 0.208333 13.0312 0.625 12.6562L8.59375 5.21875C8.69792 5.36458 8.80208 5.48958 8.90625 5.59375Z" fill="#E2A70D"/>
+</svg>
--- a/src/assets/icons/ico/hammer-right.svg
+++ b/src/assets/icons/ico/hammer-right.svg
+<svg width="19" height="16" viewBox="0 0 19 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.1875 6.0625C-0.0625 6.29167 -0.0625 6.53125 0.1875 6.78125L3 9.59375C3.22917 9.82292 3.46875 9.82292 3.71875 9.59375L4.40625 8.875C4.65625 8.64583 4.65625 8.41667 4.40625 8.1875L4.0625 7.8125L4.96875 6.9375C5.71875 7.125 6.36458 6.94792 6.90625 6.40625L8.4375 4.875C8.83333 4.47917 9.03125 4.01042 9.03125 3.46875V2.875L11.8438 1.46875C10.8646 0.489583 9.6875 0 8.3125 0C6.9375 0 5.76042 0.489583 4.78125 1.46875L3.375 2.875C2.83333 3.41667 2.65625 4.0625 2.84375 4.8125L1.9375 5.71875L1.59375 5.34375C1.36458 5.11458 1.125 5.11458 0.875 5.34375L0.1875 6.0625ZM9.125 5.59375L7.59375 7.125C7.51042 7.20833 7.39583 7.30208 7.25 7.40625L14.6875 15.375C15.0625 15.7917 15.5208 16 16.0625 16C16.6042 16 17.0729 15.8021 17.4688 15.4062C17.8438 15.0312 18.0312 14.5729 18.0312 14.0312C18.0312 13.4896 17.8229 13.0312 17.4062 12.6562L9.4375 5.21875C9.33333 5.36458 9.22917 5.48958 9.125 5.59375Z" fill="#E2A70D"/>
+</svg>
--- a/src/assets/icons/tabbar/analysis/analysis-off.svg
+++ b/src/assets/icons/tabbar/analysis/analysis-off.svg
-<svg width="64" height="36" viewBox="0 0 64 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-outside-1" maskUnits="userSpaceOnUse" x="20" y="9" width="16" height="19" fill="black">
-<rect fill="white" x="20" y="9" width="16" height="19"/>
-<path d="M34.0953 10.2014C32.0606 9.80662 29.9559 9.99468 28.0235 10.7439C26.0911 11.4931 24.4097 12.773 23.173 14.4361C21.9363 16.0993 21.1946 18.0779 21.0333 20.1442C20.8721 22.2105 21.2979 24.2803 22.2616 26.1151L32 21L34.0953 10.2014Z"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-outside-1_6562:815" maskUnits="userSpaceOnUse" x="6" y="9" width="16" height="19" fill="black">
+<rect fill="white" x="6" y="9" width="16" height="19"/>
+<path d="M20.0953 10.2014C18.0606 9.80662 15.9559 9.99468 14.0235 10.7439C12.0911 11.4931 10.4097 12.773 9.17301 14.4361C7.93629 16.0993 7.19458 18.0779 7.03334 20.1442C6.8721 22.2105 7.29788 24.2803 8.26163 26.1151L18 21L20.0953 10.2014Z"/>
 </mask>
-<path d="M34.0953 10.2014C32.0606 9.80662 29.9559 9.99468 28.0235 10.7439C26.0911 11.4931 24.4097 12.773 23.173 14.4361C21.9363 16.0993 21.1946 18.0779 21.0333 20.1442C20.8721 22.2105 21.2979 24.2803 22.2616 26.1151L32 21L34.0953 10.2014Z" stroke="#ABABAB" stroke-width="2" mask="url(#path-1-outside-1)"/>
-<mask id="path-2-outside-2" maskUnits="userSpaceOnUse" x="20" y="9" width="24" height="24" fill="black">
-<rect fill="white" x="20" y="9" width="24" height="24"/>
-<path d="M34.0953 10.2014C31.2708 9.65336 28.344 10.2338 25.9424 11.8182C23.5408 13.4027 21.8555 15.865 21.248 18.6773C20.6405 21.4896 21.159 24.428 22.6924 26.8625C24.2258 29.297 26.6521 31.0338 29.4509 31.7006C32.2498 32.3673 35.1985 31.9109 37.6648 30.4292C40.1311 28.9475 41.9187 26.5585 42.6444 23.7744C43.3701 20.9902 42.976 18.0325 41.5467 15.5355C40.1174 13.0384 37.7666 11.2008 34.9984 10.4165L32 21L34.0953 10.2014Z"/>
+<path d="M20.0953 10.2014C18.0606 9.80662 15.9559 9.99468 14.0235 10.7439C12.0911 11.4931 10.4097 12.773 9.17301 14.4361C7.93629 16.0993 7.19458 18.0779 7.03334 20.1442C6.8721 22.2105 7.29788 24.2803 8.26163 26.1151L18 21L20.0953 10.2014Z" stroke="#ABABAB" stroke-width="2" mask="url(#path-1-outside-1_6562:815)"/>
+<mask id="path-2-outside-2_6562:815" maskUnits="userSpaceOnUse" x="6" y="9" width="24" height="24" fill="black">
+<rect fill="white" x="6" y="9" width="24" height="24"/>
+<path d="M20.0953 10.2014C17.2708 9.65336 14.344 10.2338 11.9424 11.8182C9.54076 13.4027 7.85554 15.865 7.24802 18.6773C6.64049 21.4896 7.15902 24.428 8.69243 26.8625C10.2258 29.297 12.6521 31.0338 15.4509 31.7006C18.2498 32.3673 21.1985 31.9109 23.6648 30.4292C26.1311 28.9475 27.9187 26.5585 28.6444 23.7744C29.3701 20.9902 28.976 18.0325 27.5467 15.5355C26.1174 13.0384 23.7666 11.2008 20.9984 10.4165L18 21L20.0953 10.2014Z"/>
 </mask>
-<path d="M34.0953 10.2014C31.2708 9.65336 28.344 10.2338 25.9424 11.8182C23.5408 13.4027 21.8555 15.865 21.248 18.6773C20.6405 21.4896 21.159 24.428 22.6924 26.8625C24.2258 29.297 26.6521 31.0338 29.4509 31.7006C32.2498 32.3673 35.1985 31.9109 37.6648 30.4292C40.1311 28.9475 41.9187 26.5585 42.6444 23.7744C43.3701 20.9902 42.976 18.0325 41.5467 15.5355C40.1174 13.0384 37.7666 11.2008 34.9984 10.4165L32 21L34.0953 10.2014Z" stroke="#ABABAB" stroke-width="2" stroke-linejoin="round" mask="url(#path-2-outside-2)"/>
-<mask id="path-3-outside-3" maskUnits="userSpaceOnUse" x="20" y="17" width="13" height="11" fill="black">
-<rect fill="white" x="20" y="17" width="13" height="11"/>
-<path d="M22.2943 26.1768C21.0951 23.9285 20.7137 21.3337 21.2151 18.8354L32 21L22.2943 26.1768Z"/>
+<path d="M20.0953 10.2014C17.2708 9.65336 14.344 10.2338 11.9424 11.8182C9.54076 13.4027 7.85554 15.865 7.24802 18.6773C6.64049 21.4896 7.15902 24.428 8.69243 26.8625C10.2258 29.297 12.6521 31.0338 15.4509 31.7006C18.2498 32.3673 21.1985 31.9109 23.6648 30.4292C26.1311 28.9475 27.9187 26.5585 28.6444 23.7744C29.3701 20.9902 28.976 18.0325 27.5467 15.5355C26.1174 13.0384 23.7666 11.2008 20.9984 10.4165L18 21L20.0953 10.2014Z" stroke="#ABABAB" stroke-width="2" stroke-linejoin="round" mask="url(#path-2-outside-2_6562:815)"/>
+<mask id="path-3-outside-3_6562:815" maskUnits="userSpaceOnUse" x="6" y="17" width="13" height="11" fill="black">
+<rect fill="white" x="6" y="17" width="13" height="11"/>
+<path d="M8.29428 26.1768C7.09512 23.9285 6.71367 21.3337 7.21507 18.8354L18 21L8.29428 26.1768Z"/>
 </mask>
-<path d="M22.2943 26.1768C21.0951 23.9285 20.7137 21.3337 21.2151 18.8354L32 21L22.2943 26.1768Z" stroke="#ABABAB" stroke-width="2" stroke-linejoin="round" mask="url(#path-3-outside-3)"/>
+<path d="M8.29428 26.1768C7.09512 23.9285 6.71367 21.3337 7.21507 18.8354L18 21L8.29428 26.1768Z" stroke="#ABABAB" stroke-width="2" stroke-linejoin="round" mask="url(#path-3-outside-3_6562:815)"/>
 </svg>
--- a/src/assets/icons/tabbar/analysis/analysis-on.svg
+++ b/src/assets/icons/tabbar/analysis/analysis-on.svg
-<svg width="64" height="36" viewBox="0 0 64 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-outside-1" maskUnits="userSpaceOnUse" x="20" y="9" width="16" height="14" fill="black">
-<rect fill="white" x="20" y="9" width="16" height="14"/>
-<path d="M34.2215 10.2267C32.8067 9.93492 31.3483 9.92471 29.9296 10.1966C28.5109 10.4685 27.1596 11.0171 25.9529 11.8113C24.7462 12.6054 23.7078 13.6294 22.8969 14.8248C22.0859 16.0203 21.5184 17.3637 21.2267 18.7785L32 21L34.2215 10.2267Z"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="path-1-outside-1_6562:831" maskUnits="userSpaceOnUse" x="6" y="9" width="16" height="14" fill="black">
+<rect fill="white" x="6" y="9" width="16" height="14"/>
+<path d="M20.2215 10.2267C18.8067 9.93492 17.3483 9.92471 15.9296 10.1966C14.5109 10.4685 13.1596 11.0171 11.9529 11.8113C10.7462 12.6054 9.70779 13.6294 8.89686 14.8248C8.08592 16.0203 7.51839 17.3637 7.22666 18.7785L18 21L20.2215 10.2267Z"/>
 </mask>
-<path d="M34.2215 10.2267C32.8067 9.93492 31.3483 9.92471 29.9296 10.1966C28.5109 10.4685 27.1596 11.0171 25.9529 11.8113C24.7462 12.6054 23.7078 13.6294 22.8969 14.8248C22.0859 16.0203 21.5184 17.3637 21.2267 18.7785L32 21L34.2215 10.2267Z" fill="#E3B82A"/>
-<path d="M34.2215 10.2267C32.8067 9.93492 31.3483 9.92471 29.9296 10.1966C28.5109 10.4685 27.1596 11.0171 25.9529 11.8113C24.7462 12.6054 23.7078 13.6294 22.8969 14.8248C22.0859 16.0203 21.5184 17.3637 21.2267 18.7785L32 21L34.2215 10.2267Z" stroke="#E3B82A" stroke-width="2" stroke-linejoin="round" mask="url(#path-1-outside-1)"/>
-<mask id="path-2-outside-2" maskUnits="userSpaceOnUse" x="20" y="17" width="13" height="11" fill="black">
-<rect fill="white" x="20" y="17" width="13" height="11"/>
-<path d="M22.2943 26.1768C21.0951 23.9285 20.7137 21.3337 21.2151 18.8354L32 21L22.2943 26.1768Z"/>
+<path d="M20.2215 10.2267C18.8067 9.93492 17.3483 9.92471 15.9296 10.1966C14.5109 10.4685 13.1596 11.0171 11.9529 11.8113C10.7462 12.6054 9.70779 13.6294 8.89686 14.8248C8.08592 16.0203 7.51839 17.3637 7.22666 18.7785L18 21L20.2215 10.2267Z" fill="#E3B82A"/>
+<path d="M20.2215 10.2267C18.8067 9.93492 17.3483 9.92471 15.9296 10.1966C14.5109 10.4685 13.1596 11.0171 11.9529 11.8113C10.7462 12.6054 9.70779 13.6294 8.89686 14.8248C8.08592 16.0203 7.51839 17.3637 7.22666 18.7785L18 21L20.2215 10.2267Z" stroke="#E3B82A" stroke-width="2" stroke-linejoin="round" mask="url(#path-1-outside-1_6562:831)"/>
+<mask id="path-2-outside-2_6562:831" maskUnits="userSpaceOnUse" x="6" y="17" width="13" height="11" fill="black">
+<rect fill="white" x="6" y="17" width="13" height="11"/>
+<path d="M8.29428 26.1768C7.09512 23.9285 6.71367 21.3337 7.21507 18.8354L18 21L8.29428 26.1768Z"/>
 </mask>
-<path d="M22.2943 26.1768C21.0951 23.9285 20.7137 21.3337 21.2151 18.8354L32 21L22.2943 26.1768Z" stroke="#E3B82A" stroke-width="2" stroke-linejoin="round" mask="url(#path-2-outside-2)"/>
-<circle cx="32" cy="21" r="11.5" stroke="#E3B82A"/>
+<path d="M8.29428 26.1768C7.09512 23.9285 6.71367 21.3337 7.21507 18.8354L18 21L8.29428 26.1768Z" stroke="#E3B82A" stroke-width="2" stroke-linejoin="round" mask="url(#path-2-outside-2_6562:831)"/>
+<circle cx="18" cy="21" r="11.5" stroke="#E3B82A"/>
 </svg>
--- a/src/assets/icons/tabbar/conso/conso-off.svg
+++ b/src/assets/icons/tabbar/conso/conso-off.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M29.5 28.992V29.492H30H34H34.5V28.992V12C34.5 11.6022 34.342 11.2206 34.0607 10.9393C33.7794 10.658 33.3978 10.5 33 10.5H31C30.6022 10.5 30.2206 10.658 29.9393 10.9393C29.658 11.2206 29.5 11.6022 29.5 12V28.992ZM22.5 28.992V29.492H23H27H27.5V28.992V18C27.5 17.6022 27.342 17.2206 27.0607 16.9393C26.7794 16.658 26.3978 16.5 26 16.5H24C23.6022 16.5 23.2206 16.658 22.9393 16.9393C22.658 17.2206 22.5 17.6022 22.5 18V28.992ZM15.5 28.992V29.492H16H20H20.5V28.992V24C20.5 23.6022 20.342 23.2206 20.0607 22.9393C19.7794 22.658 19.3978 22.5 19 22.5H17C16.6022 22.5 16.2206 22.658 15.9393 22.9393C15.658 23.2206 15.5 23.6022 15.5 24V28.992Z" stroke="#ABABAB"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.5 28.992V29.492H23H27H27.5V28.992V12C27.5 11.6022 27.342 11.2206 27.0607 10.9393C26.7794 10.658 26.3978 10.5 26 10.5H24C23.6022 10.5 23.2206 10.658 22.9393 10.9393C22.658 11.2206 22.5 11.6022 22.5 12V28.992ZM15.5 28.992V29.492H16H20H20.5V28.992V18C20.5 17.6022 20.342 17.2206 20.0607 16.9393C19.7794 16.658 19.3978 16.5 19 16.5H17C16.6022 16.5 16.2206 16.658 15.9393 16.9393C15.658 17.2206 15.5 17.6022 15.5 18V28.992ZM8.5 28.992V29.492H9H13H13.5V28.992V24C13.5 23.6022 13.342 23.2206 13.0607 22.9393C12.7794 22.658 12.3978 22.5 12 22.5H10C9.60217 22.5 9.22064 22.658 8.93934 22.9393C8.65804 23.2206 8.5 23.6022 8.5 24V28.992Z" stroke="#ABABAB"/>
 </svg>
--- a/src/assets/icons/tabbar/conso/conso-on.svg
+++ b/src/assets/icons/tabbar/conso/conso-on.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M33 11H31C30.7348 11 30.4804 11.1054 30.2929 11.2929C30.1054 11.4804 30 11.7348 30 12V28.992H34V12C34 11.7348 33.8946 11.4804 33.7071 11.2929C33.5196 11.1054 33.2652 11 33 11ZM26 17H24C23.7348 17 23.4804 17.1054 23.2929 17.2929C23.1054 17.4804 23 17.7348 23 18V28.992H27V18C27 17.7348 26.8946 17.4804 26.7071 17.2929C26.5196 17.1054 26.2652 17 26 17ZM19 23H17C16.7348 23 16.4804 23.1054 16.2929 23.2929C16.1054 23.4804 16 23.7348 16 24V28.992H20V24C20 23.7348 19.8946 23.4804 19.7071 23.2929C19.5196 23.1054 19.2652 23 19 23Z" fill="#E3B82A"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26 11H24C23.7348 11 23.4804 11.1054 23.2929 11.2929C23.1054 11.4804 23 11.7348 23 12V28.992H27V12C27 11.7348 26.8946 11.4804 26.7071 11.2929C26.5196 11.1054 26.2652 11 26 11ZM19 17H17C16.7348 17 16.4804 17.1054 16.2929 17.2929C16.1054 17.4804 16 17.7348 16 18V28.992H20V18C20 17.7348 19.8946 17.4804 19.7071 17.2929C19.5196 17.1054 19.2652 17 19 17ZM12 23H10C9.73478 23 9.48043 23.1054 9.29289 23.2929C9.10536 23.4804 9 23.7348 9 24V28.992H13V24C13 23.7348 12.8946 23.4804 12.7071 23.2929C12.5196 23.1054 12.2652 23 12 23Z" fill="#E3B82A"/>
 </svg>
--- a/src/assets/icons/tabbar/defi/defi-off.svg
+++ b/src/assets/icons/tabbar/defi/defi-off.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M24.3104 29.4627L24.5 29.5404L24.6896 29.4627C28.9601 27.7125 31.0253 25.5476 31.9126 22.8119C32.7071 20.3625 32.5302 17.5035 32.3304 14.2741C32.3126 13.9877 32.2947 13.6983 32.2773 13.406L32.2505 12.957L31.8012 12.9363C29.2157 12.8171 26.9183 11.9841 24.7737 10.5815L24.5 10.4026L24.2263 10.5815C22.0817 11.9841 19.7843 12.8171 17.1988 12.9363L16.7495 12.957L16.7227 13.406C16.7053 13.6983 16.6874 13.9877 16.6696 14.2741C16.4698 17.5035 16.2929 20.3625 17.0874 22.8119C17.9747 25.5476 20.0399 27.7125 24.3104 29.4627Z" stroke="#A0A0A0"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.3104 29.4627L18.5 29.5404L18.6896 29.4627C22.9601 27.7125 25.0253 25.5476 25.9126 22.8119C26.7071 20.3625 26.5302 17.5035 26.3304 14.2741C26.3126 13.9877 26.2947 13.6983 26.2773 13.406L26.2505 12.957L25.8012 12.9363C23.2157 12.8171 20.9183 11.9841 18.7737 10.5815L18.5 10.4026L18.2263 10.5815C16.0817 11.9841 13.7843 12.8171 11.1988 12.9363L10.7495 12.957L10.7227 13.406C10.7053 13.6983 10.6874 13.9877 10.6696 14.2741C10.4698 17.5035 10.2929 20.3625 11.0874 22.8119C11.9747 25.5476 14.0399 27.7125 18.3104 29.4627Z" stroke="#A0A0A0"/>
 </svg>
--- a/src/assets/icons/tabbar/defi/defi-on.svg
+++ b/src/assets/icons/tabbar/defi/defi-on.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M24.5 29C32.8613 25.5734 32.2114 20.7018 31.7782 13.4358C29.0922 13.3119 26.7095 12.445 24.5 11C22.2905 12.445 19.9078 13.3119 17.2218 13.4358C16.7886 20.7018 16.1387 25.5734 24.5 29Z" fill="#E3B82A"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.5 29C26.8613 25.5734 26.2114 20.7018 25.7782 13.4358C23.0922 13.3119 20.7095 12.445 18.5 11C16.2905 12.445 13.9078 13.3119 11.2218 13.4358C10.7886 20.7018 10.1387 25.5734 18.5 29Z" fill="#E3B82A"/>
 </svg>
--- a/src/assets/icons/tabbar/ecogeste/ecogeste-off.svg
+++ b/src/assets/icons/tabbar/ecogeste/ecogeste-off.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.1958 27.1929C17.0042 28.206 16.3638 29.1345 15.5826 30.0887C15.5388 30.1417 15.4946 30.1838 15.4299 30.2428C15.4247 30.2476 15.4193 30.2525 15.4137 30.2576C15.3526 30.3132 15.2711 30.3874 15.1878 30.4814L14.3672 31.4075L15.6008 31.3115C15.8272 31.2939 16.0798 31.2861 16.3487 31.2778C16.4773 31.2739 16.6097 31.2698 16.7447 31.2645C17.1336 31.2492 17.5613 31.2231 17.8778 31.1394C19.0907 30.8187 19.9916 30.2606 21.1581 29.1419L21.1591 29.1409C21.2202 29.082 21.2953 29.0396 21.3774 29.0177C21.4581 28.9962 21.543 28.9952 21.6241 29.0149C22.6848 29.3038 23.8587 29.5 25 29.5C31.3338 29.5 36.5 25.019 36.5 19.5C36.5 13.981 31.3338 9.5 25 9.5C18.6662 9.5 13.5 13.981 13.5 19.5C13.5 22.3519 14.8266 24.9131 17.0244 26.7286C17.0911 26.7846 17.1419 26.8571 17.1719 26.9388C17.2017 27.02 17.2099 27.1076 17.1958 27.1929Z" stroke="#ABABAB"/>
-<path d="M21.5 16.5C22.5 15.5 22.6 15 25 15C28 15 28 16.5 28 17.5C28 18.5 28 19.25 26.5 20C24.8324 20.8338 25 21.5 25 23" stroke="#ABABAB"/>
-<circle cx="25" cy="25" r="0.5" fill="#C4C4C4"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.1958 27.1929C10.0042 28.206 9.36381 29.1345 8.58258 30.0887C8.5388 30.1417 8.49458 30.1838 8.42995 30.2428C8.42471 30.2476 8.41928 30.2525 8.41368 30.2576C8.35264 30.3132 8.2711 30.3874 8.18777 30.4814L7.36721 31.4075L8.60079 31.3115C8.82723 31.2939 9.07982 31.2861 9.34866 31.2778C9.47731 31.2739 9.60968 31.2698 9.74469 31.2645C10.1336 31.2492 10.5613 31.2231 10.8778 31.1394C12.0907 30.8187 12.9916 30.2606 14.1581 29.1419L14.1591 29.1409C14.2202 29.082 14.2953 29.0396 14.3774 29.0177C14.4581 28.9962 14.543 28.9952 14.6241 29.0149C15.6848 29.3038 16.8587 29.5 18 29.5C24.3338 29.5 29.5 25.019 29.5 19.5C29.5 13.981 24.3338 9.5 18 9.5C11.6662 9.5 6.5 13.981 6.5 19.5C6.5 22.3519 7.82661 24.9131 10.0244 26.7286C10.0911 26.7846 10.1419 26.8571 10.1719 26.9388C10.2017 27.02 10.2099 27.1076 10.1958 27.1929Z" stroke="#ABABAB"/>
+<path d="M14.5 16.5C15.5 15.5 15.6 15 18 15C21 15 21 16.5 21 17.5C21 18.5 21 19.25 19.5 20C17.8324 20.8338 18 21.5 18 23" stroke="#ABABAB"/>
+<circle cx="18" cy="25" r="0.5" fill="#C4C4C4"/>
 </svg>
--- a/src/assets/icons/tabbar/ecogeste/ecogeste-on.svg
+++ b/src/assets/icons/tabbar/ecogeste/ecogeste-on.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.1958 27.1929C17.0042 28.206 16.3638 29.1345 15.5826 30.0887C15.5388 30.1417 15.4946 30.1838 15.4299 30.2428C15.4247 30.2476 15.4193 30.2525 15.4137 30.2576C15.3526 30.3132 15.2711 30.3874 15.1878 30.4814L14.3672 31.4075L15.6008 31.3115C15.8272 31.2939 16.0798 31.2861 16.3487 31.2778C16.4773 31.2739 16.6097 31.2698 16.7447 31.2645C17.1336 31.2492 17.5613 31.2231 17.8778 31.1394C19.0907 30.8187 19.9916 30.2606 21.1581 29.1419L21.1591 29.1409C21.2202 29.082 21.2953 29.0396 21.3774 29.0177C21.4581 28.9962 21.543 28.9952 21.6241 29.0149C22.6848 29.3038 23.8587 29.5 25 29.5C31.3338 29.5 36.5 25.019 36.5 19.5C36.5 13.981 31.3338 9.5 25 9.5C18.6662 9.5 13.5 13.981 13.5 19.5C13.5 22.3519 14.8266 24.9131 17.0244 26.7286C17.0911 26.7846 17.1419 26.8571 17.1719 26.9388C17.2017 27.02 17.2099 27.1076 17.1958 27.1929Z" fill="#E3B82A" stroke="#E3B82A"/>
-<path d="M21.5 16.5C22.5 15.5 22.6 15 25 15C28 15 28 16.5 28 17.5C28 18.5 28 19.25 26.5 20C24.8324 20.8338 25 21.5 25 23" stroke="#25262B"/>
-<circle cx="25" cy="25" r="0.5" fill="#25262B"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.1958 27.1929C10.0042 28.206 9.36381 29.1345 8.58258 30.0887C8.5388 30.1417 8.49458 30.1838 8.42995 30.2428C8.42471 30.2476 8.41928 30.2525 8.41368 30.2576C8.35264 30.3132 8.2711 30.3874 8.18777 30.4814L7.36721 31.4075L8.60079 31.3115C8.82723 31.2939 9.07982 31.2861 9.34866 31.2778C9.47731 31.2739 9.60968 31.2698 9.74469 31.2645C10.1336 31.2492 10.5613 31.2231 10.8778 31.1394C12.0907 30.8187 12.9916 30.2606 14.1581 29.1419L14.1591 29.1409C14.2202 29.082 14.2953 29.0396 14.3774 29.0177C14.4581 28.9962 14.543 28.9952 14.6241 29.0149C15.6848 29.3038 16.8587 29.5 18 29.5C24.3338 29.5 29.5 25.019 29.5 19.5C29.5 13.981 24.3338 9.5 18 9.5C11.6662 9.5 6.5 13.981 6.5 19.5C6.5 22.3519 7.82661 24.9131 10.0244 26.7286C10.0911 26.7846 10.1419 26.8571 10.1719 26.9388C10.2017 27.02 10.2099 27.1076 10.1958 27.1929Z" fill="#E3B82A" stroke="#E3B82A"/>
+<path d="M14.5 16.5C15.5 15.5 15.6 15 18 15C21 15 21 16.5 21 17.5C21 18.5 21 19.25 19.5 20C17.8324 20.8338 18 21.5 18 23" stroke="#25262B"/>
+<circle cx="18" cy="25" r="0.5" fill="#25262B"/>
 </svg>
--- a/src/assets/icons/tabbar/parametre/parametre-off.svg
+++ b/src/assets/icons/tabbar/parametre/parametre-off.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="14.5" y1="11.5" x2="35.5" y2="11.5" stroke="#A0A0A0" stroke-linecap="round"/>
-<line x1="14.5" y1="18.5" x2="35.5" y2="18.5" stroke="#A0A0A0" stroke-linecap="round"/>
-<line x1="14.5" y1="25.5" x2="35.5" y2="25.5" stroke="#A0A0A0" stroke-linecap="round"/>
-<circle cx="28.5" cy="11.5" r="2.5" fill="#A0A0A0"/>
-<circle cx="20.5" cy="18.5" r="2.5" fill="#A0A0A0"/>
-<circle cx="29.5" cy="25.5" r="2.5" fill="#A0A0A0"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="7.5" y1="11.5" x2="28.5" y2="11.5" stroke="#A0A0A0" stroke-linecap="round"/>
+<line x1="7.5" y1="18.5" x2="28.5" y2="18.5" stroke="#A0A0A0" stroke-linecap="round"/>
+<line x1="7.5" y1="25.5" x2="28.5" y2="25.5" stroke="#A0A0A0" stroke-linecap="round"/>
+<circle cx="21.5" cy="11.5" r="2.5" fill="#A0A0A0"/>
+<circle cx="13.5" cy="18.5" r="2.5" fill="#A0A0A0"/>
+<circle cx="22.5" cy="25.5" r="2.5" fill="#A0A0A0"/>
 </svg>
--- a/src/assets/icons/tabbar/parametre/parametre-on.svg
+++ b/src/assets/icons/tabbar/parametre/parametre-on.svg
-<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="14.5" y1="11.5" x2="35.5" y2="11.5" stroke="#E3B82A" stroke-linecap="round"/>
-<line x1="14.5" y1="18.5" x2="35.5" y2="18.5" stroke="#E3B82A" stroke-linecap="round"/>
-<line x1="14.5" y1="25.5" x2="35.5" y2="25.5" stroke="#E3B82A" stroke-linecap="round"/>
-<circle cx="28.5" cy="11.5" r="2.5" fill="#E3B82A"/>
-<circle cx="20.5" cy="18.5" r="2.5" fill="#E3B82A"/>
-<circle cx="29.5" cy="25.5" r="2.5" fill="#E3B82A"/>
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="7.5" y1="11.5" x2="28.5" y2="11.5" stroke="#E3B82A" stroke-linecap="round"/>
+<line x1="7.5" y1="18.5" x2="28.5" y2="18.5" stroke="#E3B82A" stroke-linecap="round"/>
+<line x1="7.5" y1="25.5" x2="28.5" y2="25.5" stroke="#E3B82A" stroke-linecap="round"/>
+<circle cx="21.5" cy="11.5" r="2.5" fill="#E3B82A"/>
+<circle cx="13.5" cy="18.5" r="2.5" fill="#E3B82A"/>
+<circle cx="22.5" cy="25.5" r="2.5" fill="#E3B82A"/>
 </svg>
--- a/src/components/Action/ActionView.tsx
+++ b/src/components/Action/ActionView.tsx
@@ -34,7 +34,11 @@ const ActionView: React.FC = () => {

  return (
    <>
-      <CozyBar titleKey={'common.title_action'} displayBackArrow={true} />
+      <CozyBar
+        titleKey={'common.title_action'}
+        displayBackArrow={true}
+        isBuilding={true}
+      />
      <Header
        setHeaderHeight={defineHeaderHeight}
        desktopTitleKey={'common.title_action'}

--- a/src/components/Analysis/AnalysisConsumption.tsx
+++ b/src/components/Analysis/AnalysisConsumption.tsx
@@ -76,7 +76,7 @@ const AnalysisConsumption: React.FC<AnalysisConsumptionProps> = ({
    async function loadAverageComsumption() {
      const profileTypeEntityService = new ProfileTypeEntityService(client)
      const profileType: ProfileType | null = await profileTypeEntityService.getProfileType(
-        analysisDate.plus({ month: -1 })
+        analysisDate.minus({ month: 1 }).startOf('month')
      )
      if (profileType !== null) {
        const profileTypeService: ProfileTypeService = new ProfileTypeService(

--- a/src/components/Analysis/AnalysisView.tsx
+++ b/src/components/Analysis/AnalysisView.tsx
@@ -40,6 +40,45 @@ const AnalysisView: React.FC = () => {
  const query = new URLSearchParams(search)
  const paramToken = query.get('token')

+  // Scroll handling
+  const app = document.querySelector('.app-content')
+  const [scrollPosition, setScrollPosition] = useState(0)
+  /**
+   * Handle Desktop scroll
+   */
+  const handleWindowScroll = () => {
+    const position = window.pageYOffset
+    setScrollPosition(position)
+  }
+  /**
+   * Handle Mobile scroll
+   */
+  const handleScroll = () => {
+    if (app) {
+      const position = app.scrollTop
+      setScrollPosition(position)
+    }
+  }
+
+  /**
+   * Set view according to saved positon
+   */
+  const setView = () => {
+    app && app.scrollTo(0, scrollPosition)
+    window.scrollTo(0, scrollPosition)
+  }
+
+  // Set listners for scroll
+  useEffect(() => {
+    window.addEventListener('scroll', handleWindowScroll, { passive: true })
+    app && app.addEventListener('scroll', handleScroll, { passive: true })
+
+    return () => {
+      window.removeEventListener('scroll', handleWindowScroll)
+      app && app.removeEventListener('scroll', handleScroll)
+    }
+  }, [])
+
  useEffect(() => {
    const updateAnalysisNotification = () => {
      if (analysisNotification) {
@@ -106,7 +145,7 @@ const AnalysisView: React.FC = () => {
        />
      </Header>
      <Content height={headerHeight}>
-        <MonthlyAnalysis analysisDate={currentAnalysisDate} />
+        <MonthlyAnalysis analysisDate={currentAnalysisDate} setView={setView} />
      </Content>
    </>
  )