From 767ccfd08c0f29b2f26871f35c725024ee8d1e94 Mon Sep 17 00:00:00 2001
From: Guilhem CARRON <gcarron@grandlyon.com>
Date: Tue, 21 Dec 2021 13:36:24 +0000
Subject: [PATCH] chore(release): 1.6.0
---
.gitlab-ci.yml | 87 +-
.vscode/settings.json | 2 -
CHANGELOG.md | 33 +
app.config.alpha.js | 3 +-
app.config.environment.alpha.js | 3 +-
app.config.environment.dev.js | 1 +
app.config.environment.prod.js | 33 +
app.config.js | 5 +-
app.config.services.alpha.js | 100 ++
app.config.services.js | 1 +
manifest.webapp | 36 +-
package.json | 2 +-
scripts/createDayDataFiles.js | 2 +-
scripts/importData.bat | 2 +-
src/assets/icons/ico/maxPower.svg | 6 +
src/assets/icons/ico/minimum.svg | 5 +
src/assets/icons/ico/notif_maintenance.svg | 18 +
src/assets/icons/ico/warn-orange.svg | 3 +
src/assets/icons/visu/egl-logo-white.svg | 3 +
src/assets/icons/visu/egl-logo.svg | 4 +-
src/assets/icons/visu/enedis-logo-white.svg | 4 +
src/assets/icons/visu/enedis-logo.svg | 6 +-
src/assets/icons/visu/grdf-logo-white.svg | 9 +
src/assets/icons/visu/grdf-logo.svg | 16 +-
.../visu/onboarding/partners_consent.svg | 42 +
src/assets/icons/visu/partnerSteps/egl.svg | 32 +
.../visu/partnerSteps/electricity_bill.svg | 31 +
src/assets/icons/visu/partnerSteps/enedis.svg | 37 +
.../visu/partnerSteps/france_connect.svg | 28 +
.../icons/visu/partnerSteps/gas_bill.svg | 38 +
src/assets/icons/visu/partnerSteps/grdf.svg | 37 +
.../icons/visu/partnerSteps/water_bill.svg | 36 +
.../ActivateHalfHourLoad.tsx | 2 +-
.../Analysis/ElecHalfHourChart.spec.tsx | 68 +
src/components/Analysis/ElecHalfHourChart.tsx | 120 ++
.../ElecHalfHourMonthlyAnalysis.spec.tsx | 80 +
.../Analysis/ElecHalfHourMonthlyAnalysis.tsx | 223 +++
src/components/Analysis/MonthlyAnalysis.tsx | 8 +
.../ElecHalfHourChart.spec.tsx.snap | 44 +
.../ElecHalfHourMonthlyAnalysis.spec.tsx.snap | 20 +
.../Analysis/elecHalfHourMonthlyAnalysis.scss | 58 +
src/components/App.tsx | 14 +-
.../Challenge/ChallengeCardUnlocked.tsx | 8 +-
.../Challenge/challengeCardOnGoing.scss | 2 +-
src/components/Charts/AxisRight.tsx | 4 +-
src/components/Charts/Bar.tsx | 12 +-
src/components/Connection/Connection.spec.tsx | 48 +
src/components/Connection/Connection.tsx | 36 +
.../Connection/ConnectionForm.spec.tsx | 41 -
src/components/Connection/ConnectionForm.tsx | 56 -
.../Connection/ConnectionFormOAuth.tsx | 146 --
...ionInfoCreationEnedisAccountModal.spec.tsx | 35 -
...nnectionInfoCreationEnedisAccountModal.tsx | 84 -
src/components/Connection/ConnectionLogin.tsx | 67 +
.../ConnectionLoginNoPartnerAccount.tsx | 62 +
.../ConnectionLoginWithPartnerAccount.tsx | 87 +
.../Connection/ConnectionNotFound.spec.tsx | 2 +-
src/components/Connection/ConnectionOAuth.tsx | 125 ++
.../ConnectionOAuthNoPartnerAccount.tsx | 66 +
.../ConnectionOAuthWithPartnerAccount.tsx | 87 +
.../Connection/ConnectionResult.tsx | 488 +++---
...{ConnectionFormLogin.tsx => FormLogin.tsx} | 109 +-
.../{OAuthForm.tsx => FormOAuth.tsx} | 68 +-
src/components/Connection/ModalGRDF.tsx | 100 --
.../__snapshots__/Connection.spec.tsx.snap | 123 ++
.../ConnectionForm.spec.tsx.snap | 55 -
src/components/Connection/auth.scss | 4 +-
src/components/Connection/connection.scss | 11 +
src/components/Connection/connectionForm.scss | 25 -
.../Connection/connectionFormOAuth.scss | 34 -
...nectionInfoCreationEnedisAccountModal.scss | 23 -
.../Connection/connectionLogin.scss | 70 +
.../Connection/connectionOAuth.scss | 71 +
...onnectionFormLogin.scss => formLogin.scss} | 172 +-
.../DataloadComparisonLeft.tsx | 6 +-
.../DataloadConsumptionVisualizer.tsx | 9 +-
.../ConsumptionVisualizer/DataloadNoValue.tsx | 4 +-
.../Feedback/FeedbackModal.spec.tsx | 28 +-
src/components/Feedback/FeedbackModal.tsx | 4 +-
src/components/Home/ConsumptionView.spec.tsx | 4 +-
src/components/Home/ConsumptionView.tsx | 66 +-
src/components/Home/FluidButton.tsx | 21 +-
src/components/Home/FluidButtons.tsx | 8 +-
.../Konnector/KonnectorViewerCard.tsx | 125 +-
.../Onboarding/WelcomeModal.spec.tsx | 147 ++
src/components/Onboarding/WelcomeModal.tsx | 117 ++
.../__snapshots__/WelcomeModal.spec.tsx.snap | 1416 ++++++++++++++++
.../welcomeModal.scss} | 52 +-
src/components/Options/ReportOptions.spec.tsx | 5 +
src/components/Options/ReportOptions.tsx | 64 +-
.../PartnerConnectionStepsModal.spec.tsx | 112 ++
.../PartnerConnectionStepsModal.tsx | 115 ++
.../StepDetail.spec.tsx | 30 +
.../StepDetail.tsx | 29 +
.../PartnerConnectionStepsModal.spec.tsx.snap | 1164 +++++++++++++
.../__snapshots__/StepDetail.spec.tsx.snap | 50 +
.../partnerConnectionStepModal.scss | 44 +
.../stepDetail.scss | 29 +
.../PartnersIssue/PartnersIssueModal.spec.tsx | 54 +
.../PartnersIssue/PartnersIssueModal.tsx | 92 +
.../PartnersIssueModal.spec.tsx.snap | 1093 ++++++++++++
.../PartnersIssue/partnersIssueModal.scss | 34 +
.../FluidPerformanceIndicator.tsx | 2 -
src/components/Routes/Routes.tsx | 9 +-
src/components/Splash/SplashRoot.tsx | 52 +-
.../{CGUModalspec.tsx => CGUModal.spec.tsx} | 5 +-
.../Terms/DataShareConsentContent.spec.tsx | 12 +-
.../Terms/DataShareConsentContent.tsx | 8 +-
.../Terms/LegalNoticeModal.spec.tsx | 5 +-
.../Terms/MinorUpdateContent.spec.tsx | 23 +
src/components/Terms/MinorUpdateContent.tsx | 24 +
src/components/Terms/TermsView.spec.tsx | 10 +-
src/components/Terms/TermsView.tsx | 138 +-
.../__snapshots__/CGUModal.spec.tsx.snap | 1493 +++++++++++++++++
.../DataShareConsentContent.spec.tsx.snap | 200 ++-
.../LegalNoticeModal.spec.tsx.snap | 1441 +++++++++++++++-
.../MinorUpdateContent.spec.tsx.snap | 21 +
.../__snapshots__/TermsView.spec.tsx.snap | 972 ++++++++++-
.../TotalConsumption/TotalConsumption.tsx | 16 +-
.../Tutorial/TutorialWelcome.spec.tsx | 193 ---
src/components/Tutorial/TutorialWelcome.tsx | 193 ---
.../TutorialWelcome.spec.tsx.snap | 3 -
src/components/Tutorial/tutorialWelcome.scss | 91 -
src/constants/config.json | 6 +-
src/db/fluidPrices.json | 434 +++++
src/db/profileData.json | 3 +-
src/db/quizEntity.json | 2 +-
.../com-grandlyon-ecolyo-fluidsprices.ts | 1 +
src/doctypes/com-grandlyon-enedis-maxpower.ts | 1 +
...-grandlyon-enedis-monthly-analysis-data.ts | 2 +
src/doctypes/index.ts | 25 +-
src/enum/dacc.enum.ts | 3 +
src/enum/fluid.enum.ts | 1 +
src/enum/fluidSlug.enum.ts | 5 +
src/locales/fr.json | 213 ++-
src/migrations/migration.data.ts | 55 +
src/migrations/migration.service.ts | 3 +-
src/migrations/migration.spec.ts | 55 +-
src/migrations/migration.ts | 9 +-
src/migrations/migration.type.ts | 1 +
src/models/dataload.model.ts | 2 +
src/models/enedisMonthlyAnalysis.ts | 14 +
src/models/fluidPrice.model.ts | 11 +
src/models/global.model.ts | 4 +-
src/models/index.ts | 1 +
src/models/indicator.model.ts | 1 +
src/models/maxPower.model.ts | 4 +
src/models/partnersInfo.model.ts | 6 +
src/models/profile.model.ts | 11 +-
src/models/step.model.ts | 5 +
src/models/term.model.ts | 6 +
src/services/consumption.service.spec.ts | 877 +++++-----
src/services/consumption.service.ts | 92 +-
src/services/converter.service.spec.ts | 6 +
src/services/converter.service.ts | 27 +-
src/services/dateChart.service.ts | 10 +-
.../enedisMonthlyAnalysisData.service.spec.ts | 96 ++
.../enedisMonthlyAnalysisData.service.ts | 158 ++
src/services/environement.service.spec.ts | 35 +-
...ment.service.ts => environment.service.ts} | 15 +-
src/services/fluid.service.spec.ts | 150 ++
src/services/fluid.service.ts | 82 +-
src/services/fluidsPrices.service.spec.ts | 63 +
src/services/fluidsPrices.service.ts | 46 +
src/services/initialization.service.spec.ts | 20 +-
src/services/initialization.service.ts | 52 +-
src/services/partnersInfo.service.spec.ts | 28 +
src/services/partnersInfo.service.ts | 32 +
src/services/performanceIndicator.service.ts | 18 +-
src/services/profile.service.spec.ts | 4 +
src/services/profile.service.ts | 3 +
src/services/profileTypeEntity.service.ts | 26 +-
src/services/queryRunner.service.spec.ts | 64 +
src/services/queryRunner.service.ts | 19 +
src/services/quiz.service.ts | 48 +-
src/services/terms.service.spec.ts | 24 +
src/services/terms.service.ts | 17 +-
src/services/timePeriod.service.spec.ts | 8 +-
src/services/usageEvent.service.ts | 5 +-
src/store/global/global.actions.ts | 24 +-
src/store/global/global.reducer.ts | 16 +-
src/store/profile/profile.reducer.ts | 3 +-
src/styles/components/_barchart.scss | 14 +
src/styles/components/_buttons.scss | 2 +-
src/styles/index.css | 198 ++-
src/targets/services/aggregatorUsageEvents.ts | 181 +-
src/targets/services/consumptionAlert.ts | 6 +-
.../services/enedisHalfHourMonthlyAnalysis.ts | 292 ++++
src/targets/services/fluidsPrices.ts | 211 +++
.../services/monthlyReportNotification.ts | 26 +-
src/types/cozy-client.d.ts | 754 +++++----
src/utils/decoreText.spec.tsx | 16 +
src/utils/decoreText.tsx | 10 +
src/utils/picto.spec.ts | 39 +-
src/utils/picto.ts | 26 +
src/utils/steps.spec.ts | 36 +
src/utils/steps.ts | 60 +
src/utils/utils.ts | 12 +-
tests/__mocks__/client.ts | 1 +
tests/__mocks__/datachartData.mock.ts | 30 +
.../enedisMonthlyAnalysisData.mock.ts | 106 ++
tests/__mocks__/fluidPrice.mock.ts | 32 +
tests/__mocks__/fluidStatusData.mock.ts | 14 +
tests/__mocks__/globalStateData.mock.ts | 10 +-
tests/__mocks__/loadDayData.mock.ts | 108 +-
tests/__mocks__/profile.mock.ts | 5 +-
tests/__mocks__/stepsData.mock.ts | 50 +
tests/__mocks__/store.ts | 9 +-
yarn.lock | 19 +-
209 files changed, 15716 insertions(+), 2959 deletions(-)
create mode 100644 app.config.environment.prod.js
create mode 100644 app.config.services.alpha.js
create mode 100644 src/assets/icons/ico/maxPower.svg
create mode 100644 src/assets/icons/ico/minimum.svg
create mode 100644 src/assets/icons/ico/notif_maintenance.svg
create mode 100644 src/assets/icons/ico/warn-orange.svg
create mode 100644 src/assets/icons/visu/egl-logo-white.svg
create mode 100644 src/assets/icons/visu/enedis-logo-white.svg
create mode 100644 src/assets/icons/visu/grdf-logo-white.svg
create mode 100644 src/assets/icons/visu/onboarding/partners_consent.svg
create mode 100644 src/assets/icons/visu/partnerSteps/egl.svg
create mode 100644 src/assets/icons/visu/partnerSteps/electricity_bill.svg
create mode 100644 src/assets/icons/visu/partnerSteps/enedis.svg
create mode 100644 src/assets/icons/visu/partnerSteps/france_connect.svg
create mode 100644 src/assets/icons/visu/partnerSteps/gas_bill.svg
create mode 100644 src/assets/icons/visu/partnerSteps/grdf.svg
create mode 100644 src/assets/icons/visu/partnerSteps/water_bill.svg
create mode 100644 src/components/Analysis/ElecHalfHourChart.spec.tsx
create mode 100644 src/components/Analysis/ElecHalfHourChart.tsx
create mode 100644 src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
create mode 100644 src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx
create mode 100644 src/components/Analysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap
create mode 100644 src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
create mode 100644 src/components/Analysis/elecHalfHourMonthlyAnalysis.scss
create mode 100644 src/components/Connection/Connection.spec.tsx
create mode 100644 src/components/Connection/Connection.tsx
delete mode 100644 src/components/Connection/ConnectionForm.spec.tsx
delete mode 100644 src/components/Connection/ConnectionForm.tsx
delete mode 100644 src/components/Connection/ConnectionFormOAuth.tsx
delete mode 100644 src/components/Connection/ConnectionInfoCreationEnedisAccountModal.spec.tsx
delete mode 100644 src/components/Connection/ConnectionInfoCreationEnedisAccountModal.tsx
create mode 100644 src/components/Connection/ConnectionLogin.tsx
create mode 100644 src/components/Connection/ConnectionLoginNoPartnerAccount.tsx
create mode 100644 src/components/Connection/ConnectionLoginWithPartnerAccount.tsx
create mode 100644 src/components/Connection/ConnectionOAuth.tsx
create mode 100644 src/components/Connection/ConnectionOAuthNoPartnerAccount.tsx
create mode 100644 src/components/Connection/ConnectionOAuthWithPartnerAccount.tsx
rename src/components/Connection/{ConnectionFormLogin.tsx => FormLogin.tsx} (72%)
rename src/components/Connection/{OAuthForm.tsx => FormOAuth.tsx} (57%)
delete mode 100644 src/components/Connection/ModalGRDF.tsx
create mode 100644 src/components/Connection/__snapshots__/Connection.spec.tsx.snap
delete mode 100644 src/components/Connection/__snapshots__/ConnectionForm.spec.tsx.snap
create mode 100644 src/components/Connection/connection.scss
delete mode 100644 src/components/Connection/connectionForm.scss
delete mode 100644 src/components/Connection/connectionFormOAuth.scss
delete mode 100644 src/components/Connection/connectionInfoCreationEnedisAccountModal.scss
create mode 100644 src/components/Connection/connectionLogin.scss
create mode 100644 src/components/Connection/connectionOAuth.scss
rename src/components/Connection/{connectionFormLogin.scss => formLogin.scss} (90%)
create mode 100644 src/components/Onboarding/WelcomeModal.spec.tsx
create mode 100644 src/components/Onboarding/WelcomeModal.tsx
create mode 100644 src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
rename src/components/{Connection/modalGRDF.scss => Onboarding/welcomeModal.scss} (81%)
create mode 100644 src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.spec.tsx
create mode 100644 src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.tsx
create mode 100644 src/components/PartnerConnectionStepsModal/StepDetail.spec.tsx
create mode 100644 src/components/PartnerConnectionStepsModal/StepDetail.tsx
create mode 100644 src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap
create mode 100644 src/components/PartnerConnectionStepsModal/__snapshots__/StepDetail.spec.tsx.snap
create mode 100644 src/components/PartnerConnectionStepsModal/partnerConnectionStepModal.scss
create mode 100644 src/components/PartnerConnectionStepsModal/stepDetail.scss
create mode 100644 src/components/PartnersIssue/PartnersIssueModal.spec.tsx
create mode 100644 src/components/PartnersIssue/PartnersIssueModal.tsx
create mode 100644 src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap
create mode 100644 src/components/PartnersIssue/partnersIssueModal.scss
rename src/components/Terms/{CGUModalspec.tsx => CGUModal.spec.tsx} (82%)
create mode 100644 src/components/Terms/MinorUpdateContent.spec.tsx
create mode 100644 src/components/Terms/MinorUpdateContent.tsx
create mode 100644 src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap
create mode 100644 src/components/Terms/__snapshots__/MinorUpdateContent.spec.tsx.snap
delete mode 100644 src/components/Tutorial/TutorialWelcome.spec.tsx
delete mode 100644 src/components/Tutorial/TutorialWelcome.tsx
delete mode 100644 src/components/Tutorial/__snapshots__/TutorialWelcome.spec.tsx.snap
delete mode 100644 src/components/Tutorial/tutorialWelcome.scss
create mode 100644 src/db/fluidPrices.json
create mode 100644 src/doctypes/com-grandlyon-ecolyo-fluidsprices.ts
create mode 100644 src/doctypes/com-grandlyon-enedis-maxpower.ts
create mode 100644 src/doctypes/com-grandlyon-enedis-monthly-analysis-data.ts
create mode 100644 src/enum/fluidSlug.enum.ts
create mode 100644 src/models/enedisMonthlyAnalysis.ts
create mode 100644 src/models/fluidPrice.model.ts
create mode 100644 src/models/maxPower.model.ts
create mode 100644 src/models/partnersInfo.model.ts
create mode 100644 src/models/step.model.ts
create mode 100644 src/services/enedisMonthlyAnalysisData.service.spec.ts
create mode 100644 src/services/enedisMonthlyAnalysisData.service.ts
rename src/services/{environement.service.ts => environment.service.ts} (50%)
create mode 100644 src/services/fluidsPrices.service.spec.ts
create mode 100644 src/services/fluidsPrices.service.ts
create mode 100644 src/services/partnersInfo.service.spec.ts
create mode 100644 src/services/partnersInfo.service.ts
create mode 100644 src/targets/services/enedisHalfHourMonthlyAnalysis.ts
create mode 100644 src/targets/services/fluidsPrices.ts
create mode 100644 src/utils/decoreText.spec.tsx
create mode 100644 src/utils/steps.spec.ts
create mode 100644 src/utils/steps.ts
create mode 100644 tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
create mode 100644 tests/__mocks__/fluidPrice.mock.ts
create mode 100644 tests/__mocks__/stepsData.mock.ts
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f36569b7..690954bfb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,26 @@
-# You can override the included template(s) by including variable overrides
-# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
-# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
-# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
-# Note that environment variables can be set in several places
-# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
-image: docker:git
-services:
- - docker:dind
-variables:
- DOCKER_DRIVER: overlay2
- DOCKER_TLS_CERTDIR: ''
+default:
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:14.15.4-alpine
+ services:
+ - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.9-dind
+ alias: docker
stages:
+ - quality
- test
- build
- - quality
- deploy
- publish
+# Sast analysis should be fixed
+# sast:
+# stage: test
+# rules:
+# - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "dev"'
+# include:
+# - template: Security/SAST.gitlab-ci.yml
+
test:
stage: test
- image: node:14.18-alpine
before_script:
- apk add git
script:
@@ -39,7 +39,6 @@ test:
build-test:
stage: build
- image: node:14.18-alpine
before_script:
- apk add git
- apk add bash
@@ -54,7 +53,6 @@ build-test:
build-dev:
stage: build
- image: node:14.18-alpine
before_script:
- apk add git
- apk add bash
@@ -73,7 +71,6 @@ build-dev:
build:
stage: build
- image: node:14.18-alpine
before_script:
- apk add git
- apk add bash
@@ -92,6 +89,8 @@ build:
build_stack:
stage: build
+ before_script:
+ - docker login ${CI_DEPENDENCY_PROXY_SERVER} -u ${CI_DEPENDENCY_PROXY_USER} -p ${CI_DEPENDENCY_PROXY_PASSWORD}
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker build -t "$CI_REGISTRY_IMAGE/cozy-env:latest" ./docker/
@@ -102,7 +101,6 @@ build_stack:
publish:
stage: publish
- image: node:14.18-alpine
before_script:
- apk add git
script:
@@ -115,29 +113,49 @@ sonarqube:
stage: quality
only:
- dev
- image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
+ when: manual
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/skilldlabs/sonar-scanner:4.0.0
+ variables:
+ GIT_STRATEGY: clone
+ GIT_DEPTH: 0
before_script:
- - export NODE_PATH=$NODE_PATH:`npm root -g`
- - npm install -g typescript
+ - npm install --save sonar-scanner
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=ecolyo
+ -Dsonar.login=${SONAR_TOKEN}
+ -Dsonar.cpd.exclusions=tests/**,src/**/*.spec.ts*
+ -Dsonar.qualitygate.wait=true
sonarqube-mr:
stage: quality
only:
- merge_requests
- image: registry.forge.grandlyon.com/apoyen2/sonnar-scanner-gl:master
+ when: manual
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/skilldlabs/sonar-scanner:4.0.0
+ variables:
+ GIT_STRATEGY: clone
+ GIT_DEPTH: 0
before_script:
- - export NODE_PATH=$NODE_PATH:`npm root -g`
- - npm install -g typescript
+ - npm install --save sonar-scanner
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
@@ -158,8 +176,3 @@ deploy_alpha:
- './update_all_ecolyo_dev.sh'
only:
- tags
-
-sast:
- stage: test
-include:
- - template: Security/SAST.gitlab-ci.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 69e1c61ed..6c8a184c1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,14 +17,12 @@
},
"editor.tabSize": 2,
"editor.defaultFormatter": "esbenp.prettier-vscode",
- "editor.formatOnPaste": true,
"editor.formatOnSave": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
- }
],
"gitlab.instanceUrl": "https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo",
"gitlab.ignoreCertificateErrors": true,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a2cb6e02..0c0601736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,39 @@
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.6.0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.5.0...v1.6.0) (2021-12-21)
+
+
+### Features
+
+* add __IS_ALPHA__ env in webpack config ([8f60b37](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8f60b376c672e4fea41e70569c198ea90edbec57))
+* **analysis:** Add electricity consumption profile in analysis ([e6b7435](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/e6b743553b45b5b4348bbe74e4239afcd28c904a))
+* **ci:** use dependency check ([25024bc](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/25024bc0f19ae018147e77f9e912d2a83ec10a7e))
+* **conso:** add price history. A new service running at night is processing fluid data to index the right price on it. ([6fbddff](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6fbddffd65299e26a6d639f5d475df78a3a3dfc0))
+* create partners connection modals ([1dfd4cf](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/1dfd4cf70ee2e8e5fd4c11965681205b0404715b))
+* **konnectors:** Fix display when konnector is not installed and prevent water consumption alert to be sent in this case ([0e8538b](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0e8538b28352bf529871d00f3f5b98a321534a13))
+* **onboarding:** onboarding popup ([9decadc](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/9decadcbf461692f2b10c392fb71e6e475ab313e))
+* **Partners:** Add partners check modal ([5e1279f](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/5e1279f4989ed0664dbc96cf0c71f1e5a70dfca3))
+* **Terms:** Add Minor version upgrade support ([c8048e4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/c8048e47bfe5e5f5a140eefaa35af07bc6ed6679))
+
+
+### Bug Fixes
+
+* **alpha:** Fix alpha issue with oauth konnectors ([c5ffee2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/c5ffee2c1e554a4fc76d0906517314f1d7fa91ff))
+* **analysis:** fix previous month display ([b6c82a3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/b6c82a3470090d30a56af7d895616754ace58de5))
+* **analysis:** fix setview loop bug ([0ec71a6](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0ec71a66e4fd0e2b6d48eff79126b4d8ec385c31))
+* **analysis:** Show no data if no enedis analysis ([2467583](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/24675834e854c480e41fd6b2faa3ddb17bbf81a6))
+* **ci:** delete unused variables ([53c7562](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/53c7562bf8720c4a6e917e65cead62048db2f02a))
+* **ci:** update DOCKER_HOST ([3855c1d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/3855c1dc7754bc52f94843f5668b5eb0a0f357e8))
+* **conso:** Fix data offset delay issue and edit number of day displayed when outdated ([fa415ad](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/fa415ad6f20f6db16c00d7b1f9c18cfc4a717f45))
+* **design:** Design fixs 1.5.1 konnector modal message + css after completing profile ([3790817](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/379081718f8a302ceb18ea37dca517bd4aa6345b))
+* **newsletter:** Fix month display + symbol revert ([b625561](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/b625561b8dd0ad275e2476d72f95e17403e396c1))
+* **newsletter:** Fix month display + symbol revert ([c6e5ad0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/c6e5ad0b7b90205fd7e506b817e047be5aec00b3))
+* **PartnersIssue:** Now refresh konnector state when connect konnector and partner issue active ([c3b7412](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/c3b74122717c7c8a8674c24b5eca9e8c26db612c))
+* **Quiz:** Jean-Jacques Ruisseau's quiz is no longer stuck in loading ([c1412a3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/c1412a3a535adcc150175f794d45ab6c222580b9))
+* review texts for partners connection modals ([0d1b31a](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0d1b31ab4e2619f638bd79270d132451ba83f9ec))
+* update date processing for fluidPrice service ([0a7bbf1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/0a7bbf1d8348f40f0baa14a1157ae3d7e8a29cc6))
+
### [1.5.1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.4...v1.5.1) (2021-11-29)
diff --git a/app.config.alpha.js b/app.config.alpha.js
index 8c1500828..23d023ab4 100644
--- a/app.config.alpha.js
+++ b/app.config.alpha.js
@@ -25,11 +25,12 @@ const configs = [
require('cozy-scripts/config/webpack.config.progress'),
addAnalyzer ? require('cozy-scripts/config/webpack.config.analyzer') : null,
// require('cozy-scripts/config/webpack.config.services'),
- require('./app.config.services'), // Override the services config
+ require('./app.config.services.alpha'), // Override the services config
require(`cozy-scripts/config/webpack.target.${target}`),
]
configs.push(require('./app.config.environment.alpha'))
//module.exports = merge.apply(null, configs)
+// eslint-disable-next-line prefer-spread
module.exports = [merge.apply(null, configs)] // cozy builder expects an array
diff --git a/app.config.environment.alpha.js b/app.config.environment.alpha.js
index fc29ceef5..65e849511 100644
--- a/app.config.environment.alpha.js
+++ b/app.config.environment.alpha.js
@@ -12,7 +12,8 @@ module.exports = {
new webpack.HashedModuleIdsPlugin(),
new webpack.optimize.OccurrenceOrderPlugin(),
new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify('development'), // to compile on production mode (redux)
+ 'process.env.NODE_ENV': JSON.stringify('production'), // to compile on production mode (redux)
+ __IS_ALPHA__: true,
__DEVELOPMENT__: false,
__DEVTOOLS__: false,
__STACK_ASSETS__: target !== 'mobile',
diff --git a/app.config.environment.dev.js b/app.config.environment.dev.js
index c1c0f9834..86282e3bc 100644
--- a/app.config.environment.dev.js
+++ b/app.config.environment.dev.js
@@ -18,6 +18,7 @@ const stackProvidedLibsConfig = {
plugins: [
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('development'),
+ __IS_ALPHA__: true,
__STACK_ASSETS__: true,
}),
],
diff --git a/app.config.environment.prod.js b/app.config.environment.prod.js
new file mode 100644
index 000000000..9e5401b8d
--- /dev/null
+++ b/app.config.environment.prod.js
@@ -0,0 +1,33 @@
+'use strict'
+
+const webpack = require('webpack')
+const TerserPlugin = require('terser-webpack-plugin')
+
+const { target } = require('cozy-scripts/config/webpack.vars')
+
+module.exports = {
+ mode: 'production',
+ plugins: [
+ // use a hash as chunk id to avoid id changes of not changing chunk
+ new webpack.HashedModuleIdsPlugin(),
+ new webpack.optimize.OccurrenceOrderPlugin(),
+ new webpack.DefinePlugin({
+ 'process.env.NODE_ENV': JSON.stringify('production'), // to compile on production mode (redux)
+ __IS_ALPHA__: false,
+ __DEVELOPMENT__: false,
+ __DEVTOOLS__: false,
+ __STACK_ASSETS__: target !== 'mobile',
+ }),
+ ],
+ optimization: {
+ minimizer: [
+ new TerserPlugin({
+ parallel: true,
+ //To fix a SAfari 10 bug : https://github.com/zeit/next.js/issues/5630
+ terserOptions: {
+ safari10: true,
+ },
+ }),
+ ],
+ },
+}
diff --git a/app.config.js b/app.config.js
index ab21d2835..5bd0f5e6b 100644
--- a/app.config.js
+++ b/app.config.js
@@ -17,7 +17,6 @@ const {
const configs = [
require('cozy-scripts/config/webpack.config.base'),
require('cozy-scripts/config/webpack.config.chunks'),
- //require('cozy-scripts/config/webpack.config.react'),
require('./app.config.react'), // Override the react config
require('cozy-scripts/config/webpack.config.cozy-ui'),
require('cozy-scripts/config/webpack.config.cozy-ui.react'),
@@ -28,16 +27,16 @@ const configs = [
require('cozy-scripts/config/webpack.config.manifest'),
require('cozy-scripts/config/webpack.config.progress'),
addAnalyzer ? require('cozy-scripts/config/webpack.config.analyzer') : null,
- // require('cozy-scripts/config/webpack.config.services'),
require('./app.config.services'), // Override the services config
require(`cozy-scripts/config/webpack.target.${target}`),
]
if (environment === 'production') {
- configs.push(require('cozy-scripts/config/webpack.environment.prod'))
+ configs.push(require('./app.config.environment.prod'))
} else {
configs.push(require('./app.config.environment.dev'))
}
//module.exports = merge.apply(null, configs)
+// eslint-disable-next-line prefer-spread
module.exports = [merge.apply(null, configs)] // cozy builder expects an array
diff --git a/app.config.services.alpha.js b/app.config.services.alpha.js
new file mode 100644
index 000000000..f7edfa487
--- /dev/null
+++ b/app.config.services.alpha.js
@@ -0,0 +1,100 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+'use strict'
+
+/**
+ * This file overrides the default services webpack config.
+ * This services config enables the use of TypeScript.
+ *
+ * @override node_modules/cozy-scripts/config/webpack.config.services.js
+ */
+
+const webpack = require('webpack')
+const path = require('path')
+const fs = require('fs-extra')
+const paths = require('cozy-scripts/utils/paths')
+const {
+ eslintFix,
+ getFilename,
+ target,
+} = require('cozy-scripts/config/webpack.vars')
+
+const servicesFolder = paths.appServicesFolder()
+const servicesPaths = fs.existsSync(servicesFolder)
+ ? fs.readdirSync(servicesFolder)
+ : []
+
+const servicesEntries = {}
+servicesPaths.forEach(file => {
+ if (!file.match(/^[^.]*.ts$/)) return
+ const filename = file.match(/^([^.]*).ts$/)[1]
+ servicesEntries[filename] = path.resolve(path.join(servicesFolder, file))
+})
+
+const config = {
+ __mergeStrategy: {
+ smart: false,
+ strategy: {
+ plugins: 'replace',
+ output: 'replace',
+ entry: 'replace',
+ optimization: 'replace',
+ module: 'replace',
+ externals: 'replace',
+ },
+ },
+ entry: servicesEntries,
+ output: {
+ path: paths.appServicesBuild(),
+ filename: `${getFilename(false)}.js`,
+ },
+ target: 'node',
+ optimization: {}, // reset optimization property
+ devtool: false,
+ externals: [], // reset externals property
+ module: {
+ rules: [
+ {
+ enforce: 'pre',
+ test: /\.ts$/,
+ loader: require.resolve('cozy-scripts/node_modules/eslint-loader'),
+ exclude: /node_modules/,
+ options: {
+ extends: ['cozy-app'],
+ fix: eslintFix,
+ emitWarning: true,
+ },
+ },
+ {
+ test: /\.hbs$/,
+ loader: 'handlebars-loader',
+ },
+ {
+ test: path.resolve(__dirname, 'node_modules/uglify-js/tools/node.js'),
+ loader: 'null-loader',
+ },
+ {
+ test: /\.ts$/,
+ exclude: /(node_modules|cozy-(bar|client-js))/,
+ loader: require.resolve('cozy-scripts/node_modules/babel-loader'),
+ options: {
+ cacheDirectory: 'cozy-scripts/node_modules/.cache/babel-loader/node',
+ babelrc: false,
+ presets: [['cozy-app', { node: true, react: false }]],
+ },
+ },
+ ],
+ },
+ plugins: [
+ new webpack.DefinePlugin({
+ __TARGET__: JSON.stringify('services'),
+ __IS_ALPHA__: true,
+ }),
+ ],
+}
+
+/* We don't build services if no services and if on mobile build */
+const addServicesConfig =
+ target === 'browser' && Object.keys(servicesEntries).length
+
+// only for browser target (services are usable only on cozy-stack)
+module.exports = addServicesConfig ? { multiple: { services: config } } : {}
diff --git a/app.config.services.js b/app.config.services.js
index 8dd5d50ea..edc28bebe 100644
--- a/app.config.services.js
+++ b/app.config.services.js
@@ -87,6 +87,7 @@ const config = {
plugins: [
new webpack.DefinePlugin({
__TARGET__: JSON.stringify('services'),
+ __IS_ALPHA__: false,
}),
],
}
diff --git a/manifest.webapp b/manifest.webapp
index 480d3f13a..70fde8768 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -3,7 +3,7 @@
"slug": "ecolyo",
"icon": "icon.svg",
"categories": ["energy"],
- "version": "1.5.1",
+ "version": "1.6.0",
"licence": "AGPL-3.0",
"editor": "Métropole de Lyon",
"default_locale": "fr",
@@ -59,6 +59,12 @@
},
"backoffice": {
"description": "Requis pour la récupération et l’envoi de statistiques d’utilisation anonymisées."
+ },
+ "backoffice-partners-info-rec": {
+ "description": "Requis pour la récupération du status des services partenaires"
+ },
+ "backoffice-partners-info": {
+ "description": "Requis pour la récupération du status des services partenaires"
}
}
},
@@ -109,10 +115,16 @@
"description": "Required for sending cozy anonymized stats."
},
"backoffice-rec": {
- "description": "Required for gathering and sending anonymous usage statistics."
+ "description": "Required for retrieving newsletter informations from backoffice rec."
},
"backoffice": {
- "description": "Required for gathering and sending anonymous usage statistics."
+ "description": "Required for retrieving newsletter informations from backoffice prod."
+ },
+ "backoffice-partners-info-rec": {
+ "description": "Required for getting the status of partners' services"
+ },
+ "backoffice-partners-info": {
+ "description": "Required for getting the status of partners' services"
}
}
}
@@ -130,6 +142,11 @@
}
},
"services": {
+ "enedisHalfHourMonthlyAnalysis": {
+ "type": "node",
+ "file": "services/enedisHalfHourMonthlyAnalysis/ecolyo.js",
+ "trigger": "@cron 0 0 8 3 * *"
+ },
"monthlyReportNotification": {
"type": "node",
"file": "services/monthlyReportNotification/ecolyo.js",
@@ -144,6 +161,11 @@
"type": "node",
"file": "services/aggregatorUsageEvents/ecolyo.js",
"trigger": "@cron 0 1 * * *"
+ },
+ "fluidsPrices": {
+ "type": "node",
+ "file": "services/fluidsPrices/ecolyo.js",
+ "trigger": "@cron 0 2 * * *"
}
},
"permissions": {
@@ -201,6 +223,14 @@
"backoffice-prod": {
"type": "org.ecolyo.backoffice",
"verbs": ["ALL"]
+ },
+ "backoffice-partners-info-rec": {
+ "type": "org.ecolyo.backoffice.partners.info.rec",
+ "verbs": ["ALL"]
+ },
+ "backoffice-partners-info": {
+ "type": "org.ecolyo.backoffice.partners.info",
+ "verbs": ["ALL"]
}
}
}
diff --git a/package.json b/package.json
index c3136719e..7e36f9230 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ecolyo",
- "version": "1.5.1",
+ "version": "1.6.0",
"scripts": {
"tx": "tx pull --all || true",
"lint": "yarn lint:js && yarn lint:styles",
diff --git a/scripts/createDayDataFiles.js b/scripts/createDayDataFiles.js
index 40586040a..a6130c335 100644
--- a/scripts/createDayDataFiles.js
+++ b/scripts/createDayDataFiles.js
@@ -107,7 +107,7 @@ const generateHalfAnHourData = (_startingdate, _endingDate, min, max) => {
hour: 0,
minute: 0,
})
-
+
monthDumpArray.push({
load: Math.round(monthlyLoad * 100) / 100,
year: lastYear,
diff --git a/scripts/importData.bat b/scripts/importData.bat
index 7e88f9f12..2f3eb2efe 100644
--- a/scripts/importData.bat
+++ b/scripts/importData.bat
@@ -1,4 +1,4 @@
@echo off
echo Please provide cozysessid (can be found after connection in browser dev tool)
set /p token="CozySessid ? : "
-ACH -t %token% import ./data/dayData.json
+ACH -t %token% -u http://cozy.tools:8080 import ./data/dayData.json
diff --git a/src/assets/icons/ico/maxPower.svg b/src/assets/icons/ico/maxPower.svg
new file mode 100644
index 000000000..15c86fcec
--- /dev/null
+++ b/src/assets/icons/ico/maxPower.svg
@@ -0,0 +1,6 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="7" y="6" width="25" height="2" rx="1" fill="white"/>
+<path d="M17 14C17 12.8954 17.8954 12 19 12H20C21.1046 12 22 12.8954 22 14V33H17V14Z" fill="#D87B39"/>
+<path d="M9 24C9 22.8954 9.89543 22 11 22H12C13.1046 22 14 22.8954 14 24V33H9V24Z" fill="#D87B39"/>
+<path d="M25 28C25 26.8954 25.8954 26 27 26H28C29.1046 26 30 26.8954 30 28V33H25V28Z" fill="#D87B39"/>
+</svg>
diff --git a/src/assets/icons/ico/minimum.svg b/src/assets/icons/ico/minimum.svg
new file mode 100644
index 000000000..601fc8101
--- /dev/null
+++ b/src/assets/icons/ico/minimum.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0636 23.2831C26.3793 27.021 21.6698 29.0536 16.8631 28.0942C10.3113 26.7865 6.05999 20.4151 7.36766 13.8632C8.03388 10.5253 10.0144 7.78445 12.6635 6.07163C7.31475 7.17394 2.8792 11.3674 1.74304 17.0599C0.228052 24.6505 5.15331 32.0321 12.7439 33.5471C20.086 35.0125 27.2325 30.4524 29.0636 23.2831Z" fill="#D87B39"/>
+<path d="M24 9.75311C24 9.9864 23.9379 10.1994 23.8138 10.3921L18.4996 18.3645H23.8782V20H16V19.1936C16 19.0922 16.0167 18.9959 16.0501 18.9046C16.0836 18.8082 16.1265 18.7195 16.1791 18.6383L21.5076 10.6279H16.3366V9H24V9.75311Z" fill="white"/>
+<path d="M35 5.75311C35 5.9864 34.9379 6.1994 34.8138 6.39212L29.4996 14.3645H34.8782V16H27V15.1936C27 15.0922 27.0167 14.9959 27.0501 14.9046C27.0836 14.8082 27.1265 14.7195 27.1791 14.6383L32.5076 6.62794H27.3366V5H35V5.75311Z" fill="white"/>
+</svg>
diff --git a/src/assets/icons/ico/notif_maintenance.svg b/src/assets/icons/ico/notif_maintenance.svg
new file mode 100644
index 000000000..f1ce1f02a
--- /dev/null
+++ b/src/assets/icons/ico/notif_maintenance.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_9986_55791)">
+<circle cx="13" cy="11" r="11" fill="#383941"/>
+<circle cx="13" cy="11" r="10.5" stroke="white"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 11.7213V10.2471H17.4414C17.3295 9.5783 17.0672 8.94367 16.6741 8.39114L17.7757 7.28962L16.711 6.225L15.6094 7.32652C15.0568 6.93317 14.4222 6.67033 13.7533 6.55779V5H12.2474V6.55779C11.5784 6.66998 10.9437 6.93285 10.3914 7.32652L9.28977 6.225L8.24691 7.26703L9.34549 8.36554C8.94176 8.92382 8.67224 9.56769 8.55788 10.2471H7V11.7213H8.55337C8.66213 12.4016 8.92651 13.0475 9.32591 13.6089L8.22432 14.7104L9.28901 15.775L10.3906 14.6735C10.9327 15.0597 11.563 15.3263 12.2467 15.4422V17H13.7526V15.4422C14.432 15.3277 15.0759 15.0582 15.6342 14.6547L16.7321 15.7524L17.7749 14.7104L16.6733 13.6089C17.0726 13.0474 17.3369 12.4015 17.4459 11.7213H19ZM13.0154 13.2972C12.41 13.2817 11.8345 13.0304 11.4118 12.5968C10.989 12.1631 10.7524 11.5815 10.7524 10.9759C10.7524 10.3703 10.989 9.78868 11.4118 9.35505C11.8345 8.92141 12.41 8.67008 13.0154 8.65466C13.6209 8.67008 14.1963 8.92141 14.6191 9.35505C15.0418 9.78868 15.2784 10.3703 15.2784 10.9759C15.2784 11.5815 15.0418 12.1631 14.6191 12.5968C14.1963 13.0304 13.6209 13.2817 13.0154 13.2972Z" fill="white"/>
+<defs>
+<filter id="filter0_d_9986_55791" x="0" y="0" width="26" height="26" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.7 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_9986_55791"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_9986_55791" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/src/assets/icons/ico/warn-orange.svg b/src/assets/icons/ico/warn-orange.svg
new file mode 100644
index 000000000..2a82160c8
--- /dev/null
+++ b/src/assets/icons/ico/warn-orange.svg
@@ -0,0 +1,3 @@
+<svg width="38" height="34" viewBox="0 0 38 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.5217 32.1521C38.1367 31.0979 38.1586 30.0437 37.5876 28.9896L21.7751 1.58125C21.1602 0.527083 20.2378 0 19.0079 0C17.7781 0 16.8557 0.527083 16.2407 1.58125L0.428255 28.9896C-0.142752 30.0437 -0.142752 31.0979 0.428255 32.1521C1.04318 33.2062 1.96558 33.7333 3.19544 33.7333H34.8204C36.0503 33.7333 36.9507 33.2062 37.5217 32.1521ZM20.564 19.292V13H17.374V19.292C17.374 19.9667 17.4143 20.6377 17.495 21.305C17.5757 21.965 17.682 22.6397 17.814 23.329H20.124C20.256 22.6397 20.3623 21.965 20.443 21.305C20.5237 20.6377 20.564 19.9667 20.564 19.292ZM17.143 26.563C17.0477 26.7903 17 27.036 17 27.3C17 27.564 17.0477 27.8133 17.143 28.048C17.2457 28.2753 17.3813 28.4733 17.55 28.642C17.726 28.8107 17.9313 28.9427 18.166 29.038C18.4007 29.1333 18.6573 29.181 18.936 29.181C19.2073 29.181 19.4603 29.1333 19.695 29.038C19.9297 28.9427 20.135 28.8107 20.311 28.642C20.487 28.4733 20.6227 28.2753 20.718 28.048C20.8207 27.8133 20.872 27.564 20.872 27.3C20.872 27.036 20.8207 26.7903 20.718 26.563C20.6227 26.3357 20.487 26.1377 20.311 25.969C20.135 25.8003 19.9297 25.6683 19.695 25.573C19.4603 25.4703 19.2073 25.419 18.936 25.419C18.6573 25.419 18.4007 25.4703 18.166 25.573C17.9313 25.6683 17.726 25.8003 17.55 25.969C17.3813 26.1377 17.2457 26.3357 17.143 26.563Z" fill="#EC9D41"/>
+</svg>
diff --git a/src/assets/icons/visu/egl-logo-white.svg b/src/assets/icons/visu/egl-logo-white.svg
new file mode 100644
index 000000000..e19312144
--- /dev/null
+++ b/src/assets/icons/visu/egl-logo-white.svg
@@ -0,0 +1,3 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.5207 29.0575C63.1884 29.1115 64.0552 28.9388 64.641 29.1546C64.8284 29.3165 64.7815 29.5754 64.7815 29.8775V35.4341C64.805 36.6102 64.805 37.8402 64.3247 38.9191V38.9515H64.313C64.3013 38.9947 64.2895 39.0486 64.2778 39.0918H64.2661V39.1241H64.2544V39.1673H64.2427C64.2427 39.1889 64.231 39.2212 64.231 39.2428H64.2192V39.2752H64.2075V39.3183C64.1607 39.3076 64.1958 39.3939 64.1607 39.3831V39.4262C64.1138 39.4154 64.149 39.5018 64.1138 39.491V39.5233H64.1021V39.5665H64.0904V39.5989C64.0435 39.5881 64.0787 39.6744 64.0435 39.6636V39.696H64.0318V39.7283H64.0201V39.7607H64.0084V39.7931H63.9967V39.8254H63.985V39.8578H63.9733V39.8902H63.9615V39.9226H63.9498C63.9147 40.0412 63.7975 40.1383 63.7624 40.2462H63.7507C63.7272 40.3326 63.6335 40.3757 63.6101 40.462C63.5867 40.4728 63.5398 40.5268 63.5398 40.5591C62.9892 41.3036 62.1107 42.0912 61.3141 42.5876C61.1501 42.6415 61.0095 42.7818 60.8338 42.8357V42.8465C60.787 42.8357 60.7752 42.8897 60.7284 42.8789C60.7167 42.9005 60.705 42.9112 60.6815 42.9112C60.6698 42.9328 60.6464 42.9544 60.6112 42.9436V42.9544H60.5761V42.9652H60.541V42.976H60.5058C60.5175 43.0191 60.4238 42.9868 60.4355 43.0191H60.4004V43.0299H60.3652V43.0407H60.3301V43.0515H60.295C60.3067 43.0947 60.213 43.0623 60.2247 43.0947H60.1895V43.1055H60.1427V43.1162H60.1075C60.1192 43.1594 60.0255 43.127 60.0372 43.1594H59.9904V43.1702H59.9552V43.181H59.9084C59.9201 43.2241 59.8264 43.1918 59.8381 43.2241C59.803 43.2241 59.7678 43.2349 59.7327 43.2349V43.2457H59.6975V43.2565C59.6624 43.2565 59.6272 43.2673 59.5921 43.2673V43.2781H59.5569V43.2889C59.5218 43.2889 59.4867 43.2997 59.4515 43.2997V43.3105H59.4047V43.3212H59.3578V43.332H59.3109V43.3428H59.2641V43.3536H59.2172V43.3644H59.1469V43.3752H59.1001V43.386C59.065 43.386 59.0181 43.3968 58.983 43.3968V43.4076H58.9127V43.4183C58.8658 43.4183 58.819 43.4291 58.7721 43.4291V43.4399H58.7018V43.4507H58.6315V43.4615H58.5495V43.4723H58.4675V43.4831H58.3855V43.4939H58.3035V43.5047C58.2332 43.5047 58.1512 43.5155 58.0809 43.5155V43.5262H57.9638V43.537H57.8232V43.5478H57.6709V43.5586H57.4718V43.5694H57.1438V43.5802H56.6167V43.5694C56.1715 43.5802 55.7615 43.5047 55.3749 43.4615V43.4507H55.2929V43.4399H55.2109V43.4291H55.1407V43.4183H55.0587V43.4076H54.9884V43.3968H54.9181V43.386H54.8478V43.3752H54.7775V43.3644H54.7307V43.3536C54.4847 43.3105 54.1801 43.2133 53.9692 43.1162H53.9341V43.1055H53.8872V43.0947H53.8521V43.0839H53.8052C53.8169 43.0407 53.7232 43.0731 53.7349 43.0407H53.6881C53.6998 42.9976 53.6061 43.0299 53.6178 42.9976H53.5826V42.9868H53.5358V42.976H53.5007C53.5124 42.9328 53.4187 42.9652 53.4304 42.9328H53.3952V42.922H53.3601V42.9112H53.3249V42.9005H53.2898V42.8897H53.2547V42.8789H53.2195V42.8681H53.1844V42.8573C53.1609 42.8681 53.1375 42.8465 53.1141 42.8249C53.0672 42.8357 53.0789 42.7818 53.0321 42.7926V42.7818C52.7978 42.6955 52.5987 42.5336 52.3878 42.4365C52.0832 42.2099 51.7084 41.9941 51.4038 41.6812C50.6892 41.0986 50.2206 40.4728 49.8106 39.7715H49.7989V39.7391H49.7872V39.7068H49.7755V39.6744H49.7638V39.642H49.7521V39.6097H49.7404V39.5773H49.7286V39.5449C49.6818 39.5449 49.7052 39.4478 49.6584 39.4478C49.6584 39.4262 49.6466 39.3939 49.6466 39.3723C49.5998 39.3831 49.6349 39.2968 49.5998 39.3076V39.2644C49.5061 39.1997 49.5178 38.9947 49.4358 38.9191V38.8868H49.4241V38.8436H49.4124V38.8004H49.4006V38.7573H49.3889V38.7141H49.3772V38.671H49.3655V38.6278H49.3538V38.5847H49.3421V38.5415H49.3304V38.4983H49.3186V38.4552H49.3069C49.3069 38.4228 49.2952 38.3797 49.2952 38.3473H49.2835C49.2835 38.3041 49.2718 38.261 49.2718 38.2178H49.2601V38.1531H49.2484V38.0883H49.2366V38.0236H49.2249V37.9589H49.2132C49.1898 37.7107 49.0961 37.4625 49.0961 37.2036H49.0844V37.0525H49.0726V36.8475H49.0609V29.5323C49.0375 29.3165 49.0844 29.0899 49.3186 29.036V29.0252H49.3655V29.0144H49.4475V29.0036H50.9235C51.2515 28.9928 51.5092 28.9928 51.6498 29.2086C51.7435 31.6254 51.6498 34.0746 51.6849 36.4915H51.6966V36.7936H51.7084V36.9447H51.7201V37.0525H51.7318C51.7435 37.1712 51.7669 37.2899 51.7787 37.4086H51.7904V37.4733H51.8021V37.5381H51.8138V37.6028H51.8255V37.6675H51.8372V37.7323H51.8489V37.7754H51.8606V37.8186H51.8724V37.8618H51.8841V37.9049H51.8958V37.9481H51.9075V37.9912H51.9192C51.9192 38.0236 51.9309 38.056 51.9309 38.0883H51.9426V38.1207H51.9544V38.1639H51.9661V38.1962H51.9778V38.2394C52.0247 38.2286 51.9895 38.3149 52.0247 38.3041V38.3473H52.0364V38.3797C52.0832 38.3689 52.0481 38.4552 52.0832 38.4444V38.4768H52.0949V38.5091H52.1066V38.5415H52.1184V38.5739H52.1301V38.6062H52.1418V38.6386H52.1535V38.671H52.1652C52.2121 38.822 52.3644 38.9515 52.4229 39.0918C52.7509 39.491 53.2195 40.0197 53.7115 40.311C53.8169 40.3973 53.9458 40.4728 54.0629 40.5268V40.5376C54.1215 40.5376 54.1684 40.6131 54.2269 40.6131V40.6239H54.2621V40.6347C54.2855 40.6239 54.3089 40.6454 54.3324 40.667C54.4027 40.6994 54.4964 40.7318 54.5549 40.7749H54.6018V40.7857H54.6369C54.6369 40.8289 54.7424 40.8073 54.7424 40.8504H54.7892V40.8612H54.8244V40.872H54.8712V40.8828H54.9064C55.1289 40.9799 55.4335 41.0662 55.6912 41.0986V41.1094H55.7615V41.1202H55.8435V41.131H55.9489V41.1418H56.0544V41.1526H56.1715V41.1633H56.3238V41.1741C56.7104 41.2065 57.1907 41.1957 57.5772 41.1633V41.1526H57.6944V41.1418H57.7998V41.131H57.9052V41.1202H57.9872V41.1094H58.0575V41.0986H58.1395V41.0878C58.1864 41.0878 58.2332 41.077 58.2801 41.077V41.0662C58.3152 41.0662 58.3621 41.0555 58.3972 41.0555V41.0447H58.4441V41.0339H58.4909V41.0231H58.5378V41.0123H58.5847V41.0015H58.6315V40.9907H58.6784V40.9799H58.7252V40.9691H58.7604V40.9583C58.7955 40.9583 58.8307 40.9476 58.8658 40.9476C58.8541 40.9044 58.9478 40.9368 58.9361 40.9044H58.983V40.8936H59.0181V40.8828H59.0532V40.872H59.0884V40.8612H59.1352C59.1352 40.8181 59.2407 40.8397 59.2407 40.7965H59.2758V40.7857H59.3109V40.7749C59.5218 40.7102 59.6975 40.5591 59.885 40.4728C60.3887 40.1491 60.9744 39.5881 61.3258 39.1241C61.3258 39.0702 61.4078 39.027 61.4078 38.9731H61.4195C61.443 38.8868 61.5367 38.8112 61.5601 38.7249H61.5718V38.6926H61.5835V38.6602H61.5952V38.6278H61.607V38.5954H61.6187V38.5631H61.6304V38.5307H61.6421V38.4983H61.6538V38.466C61.7007 38.4768 61.6655 38.3904 61.7007 38.4012V38.3689H61.7124V38.3257C61.7592 38.3365 61.7241 38.2502 61.7592 38.261V38.2178H61.771V38.1854H61.7827C61.7827 38.1531 61.7944 38.1207 61.7944 38.0883H61.8061V38.056C61.8881 37.8941 61.9701 37.646 61.9935 37.441H62.0052V37.3762H62.017V37.3007H62.0287V37.2036H62.0404V37.1065H62.0521V36.977H62.0638V36.8368H62.0755C62.1224 34.4739 62.0755 32.0894 62.0872 29.7157C62.0638 29.4567 62.0521 29.1007 62.345 29.0467V29.036C62.3801 29.036 62.427 29.0252 62.4621 29.0252C62.5207 29.0683 62.5207 29.0575 62.5207 29.0575ZM47.1281 42.2423C47.1046 40.0844 47.1749 37.9049 47.0929 35.747H47.0812C47.0695 35.3046 46.9289 34.8731 46.8469 34.4523H46.8352C46.8352 34.4199 46.8235 34.3768 46.8235 34.3444H46.8118C46.8001 34.2904 46.7883 34.2365 46.7766 34.1933H46.7649V34.1502H46.7532V34.107H46.7415C46.7415 34.0746 46.7298 34.0423 46.7298 34.0099H46.7181V33.9775H46.7064C46.6946 33.9344 46.6829 33.8804 46.6712 33.8373H46.6595V33.8049H46.6478V33.7617H46.6361C46.6361 33.7402 46.6244 33.7078 46.6244 33.6862H46.6126V33.6539H46.6009V33.6107C46.5541 33.6215 46.5892 33.5352 46.5541 33.546V33.5028C46.5072 33.5136 46.5424 33.4273 46.5072 33.4381V33.3949H46.4955V33.3625C46.4486 33.3733 46.4838 33.287 46.4486 33.2978V33.2654H46.4369V33.2331H46.4252V33.2007H46.4135V33.1683H46.4018V33.136H46.3901V33.1036H46.3783V33.0712H46.3666V33.0389H46.3549C46.3666 33.0173 46.3432 32.9957 46.3198 32.9741C46.3198 32.9417 46.3081 32.931 46.2846 32.931C46.2964 32.8878 46.2378 32.877 46.2495 32.8339H46.2378C46.1441 32.6289 45.9684 32.4454 45.8629 32.2512C45.3241 31.5283 44.4103 30.7407 43.6606 30.266C43.6255 30.266 43.5786 30.2228 43.5552 30.2012C43.3795 30.1365 43.2155 29.9962 43.0281 29.9315V29.9207H42.9929V29.9099H42.9578V29.8991H42.9226V29.8883H42.8875V29.8775H42.8523V29.8667H42.8172V29.856H42.7821C42.7703 29.8128 42.6649 29.8236 42.6415 29.7804H42.6063V29.7696H42.5595C42.5712 29.7265 42.4775 29.7588 42.4892 29.7265H42.4541V29.7157H42.4072C42.4189 29.6725 42.3252 29.7049 42.3369 29.6725H42.2901V29.6617H42.2549V29.651H42.2081V29.6402H42.1729V29.6294C42.1378 29.6294 42.1026 29.6186 42.0675 29.6186V29.6078H42.0323V29.597C41.9972 29.597 41.9621 29.5862 41.9269 29.5862V29.5754H41.8918V29.5646C41.8566 29.5646 41.8215 29.5538 41.7863 29.5538V29.5431H41.7395V29.5323H41.6926V29.5215H41.6458V29.5107H41.5755V29.4999H41.5286V29.4891H41.4818V29.4783C41.4232 29.4675 41.3529 29.4567 41.2943 29.4459V29.4352C41.2241 29.4244 41.1538 29.4136 41.0952 29.4028V29.392C40.8961 29.392 40.6735 29.2841 40.4626 29.2949V29.2841H40.3455V29.2733H40.2283V29.2625H40.0643V29.2517C39.7246 29.241 39.42 29.2086 39.0569 29.2194C38.9983 29.2841 38.7523 29.187 38.7055 29.2517H38.5063V29.2625H38.3423V29.2733H38.2252V29.2841H38.108V29.2949C37.8269 29.2949 37.5575 29.392 37.2763 29.4352V29.4459C37.2178 29.4567 37.1475 29.4675 37.0889 29.4783V29.4891C37.0303 29.4999 36.9718 29.5107 36.9249 29.5215V29.5323H36.878V29.5431H36.8312V29.5538H36.7843V29.5646C36.7492 29.5646 36.714 29.5754 36.6789 29.5754V29.5862H36.6438V29.597C36.5969 29.6078 36.5383 29.6186 36.4915 29.6294V29.6402H36.4563V29.651H36.4095V29.6617C36.386 29.6617 36.3509 29.6725 36.3275 29.6725V29.6833H36.2923V29.6941H36.2455V29.7049H36.2103V29.7157H36.1635C36.1752 29.7588 36.0815 29.7265 36.0932 29.7588H36.0463C36.0463 29.802 35.9409 29.7804 35.9409 29.8236H35.9058V29.8344H35.8706V29.8452H35.8238C35.8238 29.8883 35.7183 29.8667 35.7183 29.9099H35.6832V29.9207H35.648V29.9315H35.6129V29.9423H35.5778V29.9531C35.5543 29.9423 35.5309 29.9638 35.5075 29.9854C35.4723 29.9854 35.4606 29.9962 35.4606 30.0178C35.3669 30.0286 35.32 30.1041 35.238 30.1149C35.0858 30.2444 34.8749 30.3091 34.7343 30.4386C34.0198 30.8486 33.2232 31.6362 32.7429 32.2512C32.6843 32.3807 32.5555 32.4886 32.5086 32.6073H32.4969C32.4617 32.7152 32.3446 32.8231 32.3095 32.931H32.2977V32.9633C32.2509 32.9849 32.2392 33.082 32.1923 33.1036V33.136C32.1455 33.136 32.1689 33.2331 32.122 33.2331V33.2762C32.0752 33.2762 32.0986 33.3733 32.0518 33.3733V33.4057H32.04V33.4381H32.0283V33.4812H32.0166V33.5136H32.0049V33.546H31.9932V33.5783H31.9815V33.6215H31.9697V33.6539H31.958V33.697H31.9463C31.9463 33.7186 31.9346 33.751 31.9346 33.7725H31.9229V33.8049H31.9112V33.8481H31.8995V33.8804H31.8877C31.8877 33.9128 31.876 33.9452 31.876 33.9775H31.8643V34.0099C31.6535 34.5062 31.5129 35.0996 31.4543 35.6499H31.4426C31.3957 36.1246 31.3957 36.6425 31.4309 37.1065H31.4426V37.2575H31.4543V37.387H31.466V37.5165H31.4777V37.6136H31.4895C31.4895 37.8618 31.6183 38.1207 31.6418 38.3689H31.6535C31.6652 38.4444 31.6886 38.5199 31.7003 38.5847H31.712V38.6278H31.7237V38.671H31.7355V38.7141H31.7472V38.7573H31.7589V38.822H31.7706V38.8544H31.7823V38.8976H31.794C31.8057 38.9407 31.8175 38.9947 31.8292 39.0378H31.8409C31.8409 39.0594 31.8526 39.0918 31.8526 39.1133H31.8643V39.1457H31.876C31.876 39.1781 31.8877 39.2105 31.8877 39.2428C31.9346 39.232 31.8995 39.3183 31.9346 39.3076V39.3507H31.9463V39.3831H31.958V39.4262C32.0049 39.4154 31.9697 39.5018 32.0049 39.491V39.5233H32.0166V39.5665C32.0635 39.5665 32.04 39.6636 32.0869 39.6636V39.696H32.0986V39.7283H32.1103V39.7607H32.122V39.7931H32.1337C32.122 39.8147 32.1455 39.8362 32.1689 39.8578C32.1689 39.8902 32.1806 39.901 32.204 39.901C32.1923 39.9441 32.2509 39.9549 32.2392 39.9981H32.2509C32.7663 40.9368 33.762 41.897 34.7343 42.5336C34.9218 42.6199 35.074 42.7602 35.2732 42.8357V42.8465C35.32 42.8357 35.3083 42.8897 35.3552 42.8789C35.3669 42.9005 35.3903 42.922 35.4255 42.9112V42.922H35.4606V42.9328C35.5075 42.922 35.4958 42.976 35.5426 42.9652C35.5543 42.9868 35.5778 43.0084 35.6129 42.9976V43.0083H35.648V43.0191H35.6832V43.0299H35.7183C35.7183 43.0731 35.8238 43.0515 35.8238 43.0947H35.8706C35.8706 43.1378 35.976 43.1162 35.976 43.1594H36.0112V43.1702H36.058C36.0463 43.2133 36.14 43.181 36.1283 43.2134H36.1752C36.1635 43.2565 36.2572 43.2241 36.2455 43.2565H36.2923V43.2673H36.3275V43.2781C36.3509 43.2781 36.386 43.2889 36.4095 43.2889V43.2997C36.4446 43.2997 36.4798 43.3105 36.5149 43.3105V43.3212H36.5501V43.332C36.5969 43.3428 36.6555 43.3536 36.7023 43.3644V43.3752H36.7492V43.386H36.796V43.3968H36.8429V43.4076H36.8898V43.4183H36.9366V43.4291C36.9718 43.4291 37.0186 43.4399 37.0538 43.4399V43.4507C37.0889 43.4507 37.1358 43.4615 37.1709 43.4615V43.4723C37.616 43.5478 38.0612 43.6665 38.518 43.6773V43.6881C41.1772 43.7312 43.8832 43.6881 46.5541 43.6989C46.8352 43.7097 47.0344 43.7097 47.1866 43.5478C47.2101 43.2349 47.0929 42.6739 47.1281 42.2423ZM44.4806 41.3468H38.6938C38.2252 41.2928 37.7098 41.2173 37.2998 41.0447H37.2646V41.0339H37.2178V41.0231C37.1943 41.0231 37.1592 41.0123 37.1358 41.0123V41.0015H37.1006V40.9907H37.0538C37.0655 40.9476 36.9718 40.9799 36.9835 40.9476H36.9366C36.9366 40.9044 36.8312 40.926 36.8312 40.8828H36.796V40.872H36.7609V40.8612H36.7258V40.8504C36.7023 40.8612 36.6789 40.8397 36.6555 40.8181C36.6203 40.8181 36.6086 40.8073 36.6086 40.7857C36.5618 40.7965 36.55 40.7426 36.5032 40.7533V40.7426C36.3509 40.6994 36.2338 40.5699 36.0932 40.5268C35.7418 40.311 35.3786 39.9657 35.0389 39.6528C34.9335 39.5018 34.8046 39.3615 34.6992 39.232C34.6758 39.1457 34.582 39.1026 34.5586 39.0162H34.5469C34.3712 38.671 34.0783 38.2825 34.008 37.8618H33.9963V37.8186H33.9846V37.7754H33.9729V37.7107H33.9612V37.646H33.9495V37.5812H33.9378C33.9378 37.5381 33.926 37.4841 33.926 37.441H33.9143V37.3439H33.9026V37.2468H33.8909V37.1497H33.8792C33.8323 36.7936 33.8323 36.2757 33.8675 35.9089H33.8792C33.8909 35.6175 33.9846 35.3478 34.0432 35.0673H34.0549V35.0241H34.0666V34.981H34.0783V34.9378H34.09V34.8946H34.1018V34.8515H34.1135V34.8083H34.1252C34.1252 34.776 34.1369 34.7436 34.1369 34.7112H34.1486V34.6789H34.1603V34.6357H34.172V34.6033H34.1838V34.5602C34.2306 34.571 34.1955 34.4847 34.2306 34.4954V34.4631H34.2423V34.4199C34.2892 34.4199 34.2657 34.3228 34.3126 34.3228V34.2904C34.3477 34.2689 34.3829 34.1825 34.3946 34.1502C34.418 34.1394 34.4415 34.1178 34.4297 34.0854H34.4415C34.4298 34.0423 34.4883 34.0531 34.4766 34.0099H34.4883C34.5117 33.9128 34.6172 33.8481 34.6406 33.7617C34.992 33.3086 35.566 32.7475 36.0815 32.4131C36.2455 32.3483 36.3978 32.2081 36.5852 32.1433V32.1325H36.6203V32.1218H36.6555V32.111H36.6906V32.1002H36.7258V32.0894H36.7609V32.0786H36.796V32.0678H36.8312V32.057H36.8663C36.8546 32.0139 36.9483 32.0462 36.9366 32.0139H36.9718V32.0031H37.0186C37.0069 31.9599 37.1006 31.9923 37.0889 31.9599H37.1358V31.9491H37.1709V31.9383H37.2178V31.9275H37.2529V31.9167C37.2881 31.9167 37.3232 31.906 37.3583 31.906V31.8952H37.4052V31.8844H37.452V31.8736H37.4989V31.8628H37.5458V31.852H37.5926V31.8412C37.6395 31.8412 37.6863 31.8304 37.7332 31.8304V31.8196H37.7801V31.8089C37.8269 31.8089 37.8855 31.7981 37.9323 31.7981V31.7873H38.0026V31.7765H38.108V31.7657H38.1901V31.7549H38.2955V31.7441H38.4361V31.7333H38.5883V31.7225C38.7875 31.7549 39.1858 31.647 39.3732 31.7225H39.6075V31.7333H39.7598V31.7441C40.158 31.7765 40.6032 31.8736 40.9429 32.0139H40.9781V32.0246H41.0249V32.0354H41.0601V32.0462H41.1069C41.0952 32.0894 41.1889 32.057 41.1772 32.0894H41.224C41.224 32.1325 41.3295 32.111 41.3295 32.1541H41.3646V32.1649H41.3998V32.1757H41.4349C41.6223 32.2728 41.8449 32.3807 42.0089 32.4778C42.5946 32.8662 43.2975 33.4596 43.6255 34.0315H43.6372C43.6372 34.0854 43.7192 34.1286 43.7192 34.1825C43.7426 34.1933 43.7661 34.2149 43.7544 34.2473H43.7661C43.7895 34.3012 43.8246 34.3768 43.8715 34.4199V34.4631C43.9184 34.4523 43.8832 34.5386 43.9183 34.5278V34.5602H43.9301V34.5925C43.9769 34.5925 43.9535 34.6896 44.0003 34.6896V34.7328H44.0121V34.7652C44.1058 34.927 44.1995 35.1752 44.2346 35.3802H44.2463V35.4449H44.2581V35.5096H44.2698V35.5852H44.2815C44.2815 35.7362 44.3635 35.8981 44.3518 36.0491H44.3635V36.2002H44.3752C44.5041 37.7862 44.4689 39.5773 44.4806 41.3468ZM29.5566 37.592C29.7206 37.4194 29.7323 37.3007 29.7206 36.9986V35.5744H29.7089C29.7089 35.542 29.6972 35.4989 29.6972 35.4665H29.6855V35.4341H29.6737C29.6737 35.2075 29.5683 34.9918 29.5566 34.776H29.5449C29.5332 34.7112 29.5215 34.6465 29.5097 34.5925H29.498C29.4863 34.5386 29.4746 34.4739 29.4629 34.4199H29.4512V34.3768H29.4395V34.3336H29.4277V34.2904H29.416V34.2257H29.4043V34.1825H29.3926V34.1394H29.3809V34.0962H29.3692V34.0531H29.3575V34.0207H29.3457C29.334 33.9775 29.3223 33.9236 29.3106 33.8804H29.2989V33.8481H29.2872V33.8049H29.2755V33.7725H29.2637V33.7294H29.252V33.697H29.2403V33.6539H29.2286V33.6215H29.2169V33.5783H29.2052V33.546H29.1935V33.5136H29.1817V33.4812H29.17V33.4381C29.1232 33.4381 29.1466 33.341 29.0997 33.341V33.3086H29.088V33.2762H29.0763V33.2331C29.0295 33.2331 29.0529 33.136 29.006 33.136V33.1036C28.9592 33.0712 28.9357 32.9525 28.8889 32.931V32.8986H28.8772C28.8303 32.7583 28.7015 32.6504 28.6546 32.521H28.6429C28.6077 32.4239 28.5023 32.3591 28.4789 32.2512C28.2797 32.0138 28.0689 31.7225 27.7995 31.496C27.3777 30.9996 26.7803 30.6328 26.3 30.2875H26.2649C26.1829 30.212 26.054 30.1365 25.9603 30.1041V30.0933C25.89 30.0717 25.808 30.0178 25.7612 29.9854H25.726V29.9746H25.6909V29.9639H25.6557V29.9531H25.6206V29.9423H25.5854C25.5972 29.8991 25.5034 29.9315 25.5152 29.8991H25.48V29.8883H25.4449V29.8775H25.4097C25.4097 29.8344 25.3043 29.856 25.3043 29.8128C25.2809 29.8128 25.2457 29.802 25.2223 29.802C25.234 29.7589 25.1403 29.7912 25.152 29.7588H25.1052V29.7481H25.07V29.7373C25.0466 29.7373 25.0114 29.7265 24.988 29.7265V29.7157H24.9412C24.9529 29.6725 24.8592 29.7049 24.8709 29.6725H24.824V29.6617H24.7772V29.651H24.742V29.6402C24.7069 29.6402 24.6717 29.6294 24.6366 29.6294V29.6186H24.6015C24.5312 29.5431 24.3086 29.5646 24.25 29.4891H24.1797V29.4783H24.1329V29.4675H24.086V29.4567C23.922 29.4567 23.758 29.3596 23.594 29.3596V29.3488H23.5237V29.3381H23.4417V29.3273H23.3363V29.3165H23.2543V29.3057H23.1489V29.2949C22.8794 29.2949 22.5983 29.2194 22.3289 29.2302V29.2194C21.8954 29.2086 21.462 29.2194 21.0403 29.2517V29.2625C20.8412 29.2517 20.642 29.3273 20.4429 29.3273V29.3381C20.3843 29.3381 20.3257 29.3488 20.2789 29.3488V29.3596H20.1969V29.3704C20.1266 29.3812 20.0446 29.392 19.9743 29.4028V29.4136H19.904V29.4244H19.8337V29.4352H19.7869V29.4459C19.74 29.4459 19.6931 29.4567 19.6463 29.4567V29.4675H19.5994V29.4783H19.5526V29.4891H19.4823V29.4999H19.4354V29.5107H19.3886V29.5215H19.3417V29.5323C19.3066 29.5323 19.2714 29.5431 19.2363 29.5431V29.5538H19.2011V29.5646C19.166 29.5646 19.1309 29.5754 19.0957 29.5754V29.5862H19.0606V29.597C19.0254 29.597 18.9903 29.6078 18.9551 29.6078V29.6186H18.92V29.6294H18.8732V29.6402H18.838V29.651H18.7911V29.6617H18.756V29.6725H18.7091C18.7209 29.7157 18.6272 29.6833 18.6389 29.7157H18.592C18.6037 29.7588 18.51 29.7265 18.5217 29.7588H18.4866V29.7696H18.4397V29.7804H18.4046C18.4163 29.8236 18.3226 29.7912 18.3343 29.8236H18.2991V29.8344H18.264V29.8452H18.2289V29.856H18.1937V29.8667H18.1586V29.8775H18.1234V29.8883H18.0883V29.8991C17.8071 30.0178 17.5612 30.1796 17.3386 30.3415C16.6123 30.7623 15.8626 31.496 15.3471 32.1218C15.3471 32.1541 15.3003 32.1973 15.2768 32.2189C15.1831 32.4023 15.0074 32.5749 14.9254 32.7799H14.9137C14.6677 33.2546 14.3514 33.7941 14.2226 34.3552H14.2108C14.2108 34.3875 14.1991 34.4307 14.1991 34.4631H14.1874V34.5062H14.1757V34.571H14.164C14.164 34.6141 14.1523 34.6573 14.1523 34.7004H14.1406V34.776H14.1289V34.8407H14.1171V34.9162H14.1054V34.9918H14.0937V35.0673H14.082C14.082 35.132 14.0703 35.1968 14.0703 35.2507H14.0586C14.0586 35.3262 14.0468 35.4018 14.0468 35.4881H14.0351V35.6175H14.0234V35.801H14.0117V36.1139H14V36.6425C14.0703 36.7612 14.0117 36.9878 14.0351 37.1281H14.0468V37.2683H14.0586V37.3978H14.0703C14.0586 37.6028 14.1757 37.8078 14.1757 38.0128H14.1874C14.1991 38.0776 14.2108 38.1423 14.2226 38.1962H14.2343C14.2343 38.2394 14.246 38.2826 14.246 38.3257H14.2577C14.2577 38.3581 14.2694 38.4012 14.2694 38.4336H14.2811V38.4768H14.2929V38.5199H14.3046V38.5847H14.3163V38.6278H14.328V38.671H14.3397V38.7141H14.3514V38.7573H14.3631C14.3631 38.7897 14.3749 38.822 14.3749 38.8544H14.3866V38.8868H14.3983C14.3983 38.9191 14.41 38.9515 14.41 38.9839H14.4217V39.0162H14.4334V39.0594H14.4451C14.4451 39.081 14.4568 39.1133 14.4568 39.1349H14.4686V39.1673H14.4803V39.2104H14.492V39.2428H14.5037V39.286C14.5506 39.2752 14.5154 39.3615 14.5506 39.3507V39.3939C14.5974 39.3939 14.574 39.491 14.6208 39.491V39.5233H14.6326V39.5557H14.6443V39.5989C14.6911 39.5989 14.6677 39.696 14.7146 39.696V39.7283H14.7263V39.7607C14.7614 39.7823 14.7966 39.8686 14.8083 39.901C14.8317 39.9118 14.8551 39.9333 14.8434 39.9657H14.8551C15.3823 40.8936 16.3897 41.8539 17.3737 42.4797C17.5611 42.5552 17.7251 42.7062 17.936 42.7818V42.7926C18.018 42.8465 18.182 42.8789 18.264 42.9436H18.2991V42.9544H18.3343V42.9652H18.3694V42.976H18.4046C18.4163 43.0191 18.5217 43.0084 18.5451 43.0515H18.5803V43.0623H18.6272C18.6154 43.1055 18.7092 43.0731 18.6974 43.1055H18.7443C18.7326 43.1486 18.8263 43.1162 18.8146 43.1486H18.8614V43.1594H18.8966V43.1702H18.9434V43.181H18.9786C19.5174 43.3968 20.1734 43.5478 20.7826 43.6018V43.6126H20.9232V43.6234H21.0754V43.6341H21.2629V43.6449H21.5909V43.6557H22.1532V43.6449C22.3289 43.6449 22.4929 43.6341 22.6569 43.6341V43.6234C23.0786 43.6126 23.4886 43.5047 23.8986 43.4399V43.4291C23.9572 43.4184 24.0274 43.4076 24.086 43.3968V43.386C24.1446 43.3752 24.2032 43.3644 24.25 43.3536V43.3428H24.2969V43.332H24.3437V43.3212H24.3906V43.3105H24.4374V43.2997C24.4843 43.2889 24.5429 43.2781 24.5897 43.2673V43.2565H24.6249V43.2457C24.66 43.2457 24.6952 43.2349 24.7303 43.2349V43.2241H24.7654V43.2134C24.8006 43.2134 24.8357 43.2026 24.8709 43.2026V43.1918H24.906V43.181H24.9529C24.9412 43.1378 25.0349 43.1702 25.0232 43.1378H25.07V43.127H25.1052V43.1162H25.152C25.1403 43.0731 25.234 43.1055 25.2223 43.0731H25.2575V43.0623C25.3043 43.0623 25.3629 43.0299 25.398 42.9976H25.4332V42.9868H25.4683V42.976C25.8197 42.8465 26.1243 42.6091 26.4172 42.4581C26.4757 42.3934 26.5929 42.3502 26.6515 42.2855C26.9092 42.1344 27.1552 41.9294 27.3777 41.7028C27.5066 41.6597 27.5769 41.4978 27.6472 41.4223V41.3899H27.6589C27.7877 40.8612 27.1786 40.6347 26.874 40.3002C26.6632 40.1276 26.4992 39.8794 26.2766 39.7715C26.2883 39.7283 26.1946 39.7607 26.2063 39.7283H26.1594V39.7176H26.0775V39.7068H25.9954V39.7176H25.9134C25.4917 39.9333 25.1286 40.3433 24.742 40.5591C24.6366 40.5807 24.5663 40.6778 24.4492 40.6994V40.7102H24.414V40.721C24.3437 40.7533 24.25 40.7857 24.1915 40.8289H24.1446V40.8397H24.1094C24.1094 40.8828 24.004 40.8612 24.004 40.9044H23.9572C23.9689 40.9476 23.8752 40.9152 23.8869 40.9476H23.84V40.9583H23.8049V40.9691C23.7697 40.9691 23.7346 40.9799 23.6994 40.9799V40.9907H23.6643C23.3363 41.1202 22.9146 41.2065 22.5397 41.2389V41.2497H22.3992V41.2604C22.0712 41.282 21.6377 41.282 21.3097 41.2604V41.2497H21.1574V41.2389H21.0169V41.2281H20.9114V41.2173C20.5834 41.1849 20.2203 41.0986 19.9392 40.9799H19.904V40.9691H19.8572V40.9583C19.8337 40.9583 19.7986 40.9476 19.7751 40.9476V40.9368H19.74V40.926H19.6932C19.7049 40.8828 19.6112 40.9152 19.6229 40.8828H19.576C19.576 40.8397 19.4706 40.8612 19.4706 40.8181H19.4354V40.8073H19.4003V40.7965H19.3651V40.7857H19.33V40.7749C19.1074 40.6994 18.92 40.5483 18.7326 40.462C18.0649 40.0089 17.4089 39.3615 17.0691 38.6926H17.0574V38.6602H17.0457V38.6278H17.034V38.5954H17.0223V38.5631H17.0106V38.5307H16.9989V38.4983H16.9871V38.466H16.9754C16.9754 38.4444 16.9637 38.412 16.9637 38.3904C16.9169 38.4012 16.952 38.3149 16.9169 38.3257V38.2826H16.9051V38.2502H16.8934C16.8934 38.2286 16.8817 38.1962 16.8817 38.1747H16.87V38.1315H16.8583V38.0991H16.8466C16.8231 37.9481 16.7294 37.8294 16.706 37.6568C20.8646 37.592 25.2809 37.8186 29.5566 37.592ZM16.6357 34.9486V34.9054H16.6474C16.6474 34.8731 16.6591 34.8407 16.6591 34.8083H16.6709C16.6826 34.7652 16.6943 34.7112 16.706 34.6681H16.7177V34.6357H16.7294C16.7294 34.6033 16.7411 34.571 16.7411 34.5386C16.788 34.5494 16.7529 34.4631 16.788 34.4739V34.4307C16.8349 34.4307 16.8114 34.3336 16.8583 34.3336V34.3012H16.87V34.2689H16.8817V34.2365H16.8934V34.2041H16.9051V34.1718H16.9169V34.1394H16.9286C16.952 34.0531 17.0457 33.9775 17.0691 33.8912H17.0809C17.3971 33.341 18.0414 32.7583 18.6037 32.3699C18.8029 32.2836 18.9786 32.1325 19.2011 32.057V32.0462H19.2363V32.0354H19.2714V32.0246H19.3066V32.0139H19.3417V32.0031H19.3769V31.9923H19.412C19.412 31.9491 19.5174 31.9707 19.5174 31.9275H19.5643C20.3609 31.5715 21.4034 31.4528 22.3289 31.5499V31.5607H22.446V31.5715H22.5514V31.5823H22.6569V31.5931H22.7389V31.6038H22.8092V31.6146H22.8912V31.6254H22.9614V31.6362H23.0317V31.647C23.0903 31.6578 23.1606 31.6686 23.2192 31.6794V31.6902H23.266V31.701H23.3129V31.7117H23.3597V31.7225H23.4066V31.7333H23.4534V31.7441C23.5003 31.7549 23.5589 31.7657 23.6057 31.7765V31.7873H23.6409V31.7981H23.6877C23.676 31.8412 23.7697 31.8089 23.758 31.8412H23.8049V31.852H23.84C23.8283 31.8952 23.922 31.8628 23.9103 31.8952H23.9454V31.906H23.9806V31.9167H24.0157V31.9275H24.0509V31.9383H24.086V31.9491H24.1212V31.9599H24.1563V31.9707H24.1915V31.9815C25.0935 32.3915 25.9369 33.1683 26.382 33.9991H26.3937C26.4289 34.0639 26.464 34.1502 26.5109 34.2041V34.2473H26.5226V34.2796C26.5694 34.2796 26.546 34.3768 26.5929 34.3768V34.4199H26.6046V34.4523H26.6163C26.6163 34.4846 26.628 34.517 26.628 34.5494H26.6397V34.5818H26.6515C26.6515 34.6141 26.6632 34.6465 26.6632 34.6789H26.6749C26.6749 34.7112 26.6866 34.7436 26.6866 34.776H26.6983V34.8191H26.71V34.8623H26.7217V34.9054H26.7335V34.9702H26.7452C26.7452 35.0025 26.7569 35.0457 26.7569 35.0781H26.7686V35.0889H16.3897C16.5889 35.1428 16.5771 35.0025 16.6357 34.9486ZM26.8857 48.9965C25.8197 48.9642 25.89 49.2555 25.9134 48.1873H27.9283C27.9283 48.6944 27.9517 49.2123 27.858 49.7086H27.8463C27.8463 49.741 27.8346 49.7842 27.8346 49.8165H27.8229V49.8597H27.8112V49.9028H27.7995V49.946C27.7526 49.946 27.776 50.0431 27.7292 50.0431V50.0755H27.7175V50.1078C27.5417 50.4099 27.1552 50.6905 26.8389 50.8415C26.8155 50.8415 26.7803 50.8523 26.7569 50.8523V50.8631H26.71V50.8739H26.6632V50.8847H26.6163V50.8955H26.5694V50.9063H26.4992V50.917C26.218 50.9602 25.8197 50.9818 25.5152 50.9278V50.917H25.4449V50.9063H25.3746V50.8955H25.3277V50.8847H25.2575V50.8739H25.2223V50.8631H25.1754V50.8523H25.1403V50.8415H25.0934C24.2852 50.4855 23.922 49.7949 23.9689 48.7807C23.9337 47.6802 23.922 46.7415 24.8357 46.2128C24.9177 46.1697 25.0466 46.1157 25.1286 46.0726H25.1637V46.0618H25.2106V46.051H25.2457V46.0402C26.0189 45.8136 27.0732 45.9755 27.6237 46.5689C27.3777 46.7847 27.1552 47.0328 26.8975 47.227C26.6163 46.8926 26.1126 46.7307 25.644 46.8494V46.8602H25.6089V46.871H25.562V46.8818H25.5269V46.8926C25.3394 46.9465 25.234 47.1407 25.1403 47.281V47.3241H25.1286V47.3889H25.1169V47.4644H25.1052V47.5723H25.0934C25.0817 47.8097 25.07 48.0686 25.0817 48.3276H25.07C25.0935 48.7484 25.07 49.2015 25.152 49.5792H25.1637V49.6223C25.2574 49.7734 25.3863 49.9676 25.5854 50.0323V50.0431H25.6323V50.0539H25.6792V50.0647H25.726V50.0755H25.808C26.4523 50.2373 26.956 49.7518 26.8857 48.9965ZM19.7283 45.9647C19.7869 47.2163 19.5877 48.6081 19.8337 49.8165C19.8806 49.8057 19.8454 49.892 19.8806 49.8813V49.9136H19.8923C19.9977 50.1726 20.3374 50.4531 20.7123 50.4963V50.507H20.7943V50.5178H21.0169V50.5286C21.052 50.5286 21.052 50.5178 21.052 50.5178H21.2746V50.507H21.38V50.4963H21.4503V50.4855H21.4972V50.4747H21.544V50.4639H21.5909C21.8603 50.3452 22.1063 50.1294 22.2352 49.8813V49.8381H22.2469V49.8057H22.2586V49.7626C22.4812 48.6189 22.2703 47.2055 22.3406 45.997H22.9146V49.5144H22.9029V49.6439H22.8912V49.741H22.8794V49.8057H22.8677V49.8705H22.856V49.9136H22.8443V49.9568H22.8326V49.9999C22.7857 49.9892 22.8209 50.0755 22.7857 50.0647V50.1078H22.774V50.1402H22.7623C22.7623 50.1942 22.6803 50.2373 22.6803 50.2913H22.6686C22.5749 50.4747 22.3523 50.6257 22.1883 50.7444C22.118 50.7552 22.0477 50.8307 21.9892 50.8415V50.8523H21.9423C21.954 50.8955 21.8603 50.8631 21.872 50.8955H21.8252V50.9063H21.7783V50.917H21.7314V50.9278H21.6846V50.9386H21.6143V50.9494H21.5323V50.9602H21.4503V50.971H21.3097C21.1457 51.0465 20.8294 50.9494 20.642 50.9602V50.9494C20.5952 50.9494 20.5483 50.9386 20.5014 50.9386V50.9278H20.4546V50.917H20.4077V50.9063H20.3609V50.8955H20.314C20.3257 50.8523 20.232 50.8847 20.2437 50.8523C19.8923 50.7444 19.6111 50.4531 19.4237 50.1834V50.151C19.3769 50.151 19.4003 50.0539 19.3534 50.0539V50.0107H19.3417V49.9784H19.33C19.3183 49.9352 19.3066 49.8813 19.2949 49.8381H19.2832C19.1192 48.6189 19.2597 47.2594 19.2129 46.0078C19.2714 45.9323 19.5643 45.9647 19.7283 45.9647ZM38.3306 45.9647C38.6469 45.997 39.0686 45.8891 39.3146 46.0078C39.3381 46.0941 39.4435 46.1589 39.4669 46.256C39.5372 46.3315 39.6075 46.4286 39.6543 46.5257C39.7246 46.6013 39.7949 46.6984 39.8418 46.7955C39.9121 46.871 39.9823 46.9681 40.0292 47.0652C40.1581 47.2163 40.2752 47.3781 40.3689 47.5507C40.4392 47.6263 40.5095 47.7234 40.5563 47.8205C40.6266 47.896 40.6969 47.9931 40.7438 48.0902C41.0015 48.3815 41.1538 48.7052 41.4232 49.0289V45.9755H42.4775V50.9602C41.8449 50.9171 41.5286 51.1544 41.2709 50.5718C41.1421 50.4207 41.0249 50.2589 40.9312 50.0863C40.8023 49.9352 40.6852 49.7734 40.5915 49.6007C40.4626 49.4497 40.3455 49.2878 40.2518 49.1152C39.9355 48.7376 39.7129 48.2952 39.3849 47.9284V50.9602H38.3306V45.9647ZM48.4518 45.9647H49.5061V50.097H51.9661V50.9602H48.4518V45.9647ZM51.4624 45.9647C51.7318 46.0186 52.6338 45.8136 52.6689 46.1049H52.6807V46.1373H52.6924V46.1697C52.7509 46.202 52.7509 46.3423 52.8095 46.3747V46.4178C52.8564 46.4178 52.8329 46.5149 52.8798 46.5149V46.5473H52.8915V46.5797H52.9032V46.6228C52.9501 46.6228 52.9267 46.7199 52.9735 46.7199V46.7523C53.0204 46.7415 52.9852 46.8278 53.0204 46.817V46.8602C53.0672 46.8602 53.0438 46.9573 53.0907 46.9573V46.9897H53.1024V47.022H53.1141V47.0652C53.1726 47.0868 53.1609 47.1947 53.2195 47.2163V47.2486H53.2312V47.2918C53.2781 47.2918 53.2547 47.3889 53.3015 47.3889V47.4213H53.3132V47.4536H53.3249V47.4968C53.3718 47.4968 53.3484 47.5939 53.3952 47.5939V47.6263H53.4069V47.6586H53.4187V47.7018H53.4304C53.4421 47.7989 53.5358 47.8528 53.5475 47.9715H53.5826C53.5944 47.8744 53.6647 47.842 53.6647 47.7557H53.6764V47.7234H53.6881V47.691H53.6998V47.6586H53.7115V47.6263H53.7232V47.5939H53.7349V47.5507C53.7818 47.5507 53.7584 47.4536 53.8052 47.4536V47.4213C53.8638 47.4105 53.8404 47.2918 53.8872 47.281V47.2486H53.8989C53.8989 47.227 53.9107 47.1947 53.9107 47.1731C53.9575 47.1731 53.9341 47.076 53.9809 47.076V47.0328C54.0278 47.0328 54.0044 46.9357 54.0512 46.9357V46.9034H54.0629V46.871H54.0747V46.8278C54.1215 46.8278 54.0981 46.7307 54.1449 46.7307V46.6984H54.1567C54.1567 46.6768 54.1684 46.6444 54.1684 46.6228C54.2152 46.6228 54.1918 46.5257 54.2387 46.5257V46.4826C54.2855 46.4826 54.2621 46.3855 54.3089 46.3855V46.3531H54.3207V46.3099C54.3675 46.3099 54.3441 46.2128 54.3909 46.2128V46.1805H54.4026V46.1481H54.4144V46.1049C54.4495 46.1049 54.4729 45.9755 54.4964 45.9647H55.6327C55.5389 46.1913 55.3867 46.3962 55.2929 46.6012H55.2812V46.6336H55.2695V46.666C55.2227 46.6552 55.2578 46.7415 55.2227 46.7307V46.7631C55.1758 46.7523 55.2109 46.8386 55.1758 46.8278V46.8602H55.1641V46.8926H55.1524V46.9249H55.1407V46.9573H55.1289V46.9897C55.0469 47.0976 54.9532 47.281 54.8947 47.4105H54.8829V47.4428C54.8361 47.4536 54.8478 47.5507 54.8009 47.5723V47.6047H54.7892V47.637H54.7775V47.6694H54.7658V47.7018H54.7541V47.7341C54.6955 47.7665 54.6955 47.8852 54.6369 47.9176V47.9499H54.6252V47.9823H54.6135V48.0147H54.6018V48.047C54.5784 48.0686 54.5432 48.1226 54.5315 48.1549C54.5081 48.1657 54.4847 48.1873 54.4964 48.2197H54.4847V48.252C54.4144 48.2952 54.4144 48.4247 54.3441 48.4678V48.5002H54.3324V48.5326H54.3207V48.5649H54.3089V48.5973C54.2621 48.5973 54.2855 48.6944 54.2387 48.6944V48.7268H54.2269V48.7591H54.2152V48.7915H54.2035V48.8239C54.1567 48.8131 54.1918 48.8994 54.1567 48.8886V48.921H54.1449V48.9534H54.1332V50.9818H53.1024V48.9534H53.0907C53.0907 48.9102 53.0555 48.8455 53.0204 48.8239V48.7915H53.0087V48.7591H52.9969V48.7268H52.9852V48.6944H52.9735V48.662C52.8915 48.5865 52.8681 48.4247 52.7861 48.3491V48.3168H52.7744V48.2844H52.7626V48.252H52.7509V48.2197H52.7392V48.1873H52.7275C52.7392 48.1657 52.7158 48.1442 52.6924 48.1226C52.6806 48.0902 52.6572 48.0255 52.6221 48.0147V47.9823H52.6104V47.9499H52.5987V47.9176H52.5869V47.8852C52.4932 47.7773 52.4464 47.5831 52.3526 47.4752V47.4428H52.3409V47.4105H52.3292V47.3781H52.3175V47.3457C52.2707 47.3134 52.2472 47.1947 52.2004 47.1731V47.1407H52.1887V47.1084H52.1769V47.076H52.1652V47.0436H52.1535V47.0113H52.1418V46.9789C52.0949 46.9681 52.1066 46.871 52.0598 46.8494V46.817H52.0481V46.7847H52.0364V46.7523H52.0247V46.7199C51.9778 46.7307 52.0129 46.6444 51.9778 46.6552V46.6228H51.9661V46.5905H51.9544V46.5581H51.9426V46.5257H51.9309V46.4934C51.6498 46.3639 51.5561 46.1481 51.4624 45.9647ZM60.9392 45.9647C61.2438 46.0186 61.8764 45.8136 61.9701 46.1157C62.0404 46.1912 62.1107 46.2884 62.1575 46.3855C62.2278 46.461 62.2981 46.5581 62.345 46.6552C62.4152 46.7307 62.4855 46.8278 62.5324 46.9249C62.6027 47.0005 62.673 47.0976 62.7198 47.1947C62.7901 47.2702 62.8604 47.3673 62.9072 47.4644C62.9775 47.5399 63.0478 47.637 63.0947 47.7341C63.165 47.8097 63.2352 47.9068 63.2821 48.0039C63.5515 48.3276 63.739 48.6836 64.0318 49.0397V45.9863H65.0861V50.971C64.2544 50.9494 64.149 51.1544 63.7741 50.4423C63.6452 50.2913 63.5281 50.1294 63.4344 49.9568C63.3641 49.8813 63.2938 49.7842 63.247 49.687C63.1181 49.536 63.001 49.3742 62.9072 49.2015C62.5675 48.8023 62.3567 48.3815 61.9935 47.9391V50.971H60.9392V45.9647ZM17.9946 47.4644H17.9829V47.3565H17.9711V47.281H17.9594V47.2055H17.9477V47.1407H17.936V47.0976H17.9243V47.0544H17.9126V47.0113H17.9009C17.9009 46.9789 17.8891 46.9465 17.8891 46.9141C17.8306 46.8602 17.7954 46.7523 17.7486 46.6768C17.1746 45.8352 15.9094 45.9755 14.9254 45.9755C14.7497 45.9755 14.4334 45.9431 14.2929 45.9863V50.9602C15.0777 50.9386 15.9563 51.0034 16.7177 50.917V50.9063H16.788V50.8955C16.8349 50.8847 16.8934 50.8739 16.9403 50.8631V50.8523H16.9754V50.8415H17.0223C17.0223 50.7984 17.1277 50.8199 17.1277 50.7768H17.1629C17.2917 50.7013 17.4206 50.6042 17.5494 50.507C17.6549 50.3668 17.7603 50.2481 17.8423 50.097V50.0539H17.854V50.0215H17.8657V49.9784H17.8774V49.9352H17.8891V49.892H17.9009V49.8489H17.9126C17.9126 49.8057 17.9243 49.7626 17.9243 49.7194H17.936V49.6439H17.9477V49.5468H17.9594V49.4173H17.9711C18.0297 48.7592 18.0414 48.0902 17.9946 47.4644ZM17.444 48.6836H17.4323C17.444 48.9642 17.4089 49.2663 17.3854 49.5252H17.3737V49.5899H17.362V49.6547H17.3503V49.7194H17.3386V49.7626H17.3269V49.8057C17.28 49.7949 17.3152 49.8813 17.28 49.8705C17.198 50.0971 16.9637 50.2805 16.7177 50.356V50.3668H16.6826V50.3776H16.6357V50.3884H16.5889V50.3992H16.542V50.4099H16.46V50.4207H16.378V50.4315C15.8977 50.4639 15.3706 50.4423 14.8786 50.4423V46.407C15.7103 46.4286 16.87 46.2236 17.2917 46.9681V47.0005C17.3386 47.0005 17.3151 47.0976 17.362 47.0976V47.1407H17.3737V47.1839H17.3854V47.2486H17.3972V47.3134H17.4089V47.4105H17.4206V47.5076H17.4323V47.6586H17.444C17.4206 48.0255 17.4557 48.3492 17.444 48.6836ZM59.1352 46.2128C59.0767 46.2128 59.0298 46.1373 58.9712 46.1373C58.6432 45.9431 58.1864 45.9215 57.753 45.9323C57.5304 45.9755 57.2258 46.0186 57.0618 46.1373H57.0267C56.6987 46.3099 56.3589 46.6013 56.1949 46.9465V46.9789H56.1832V47.022H56.1715V47.0544H56.1598C55.9841 47.7341 56.0427 48.662 56.0544 49.3957H56.0661C56.0778 49.4928 56.0895 49.5899 56.1012 49.6978H56.1129V49.7626H56.1247V49.8057H56.1364V49.8489H56.1481V49.892H56.1598V49.9352C56.2067 49.9352 56.1832 50.0323 56.2301 50.0323V50.0647H56.2418V50.097C56.2652 50.1186 56.3004 50.1726 56.3121 50.2049C56.5229 50.4531 56.7924 50.7121 57.1321 50.8199C57.3898 50.9602 57.9052 51.0357 58.2215 50.971H58.3621V50.9602H58.4675V50.9494H58.5495V50.9386C58.5847 50.9386 58.6315 50.9278 58.6667 50.9278V50.917H58.7135V50.9063C59.8147 50.5934 60.0724 49.5899 60.0021 48.5865C60.0607 47.6586 59.9787 46.6984 59.1352 46.2128ZM58.4792 50.0107C58.4792 50.0539 58.3738 50.0323 58.3738 50.0755H58.3269V50.0863C58.2801 50.0863 58.2332 50.097 58.1864 50.097C58.1629 50.1402 57.7412 50.1186 57.7412 50.0863H57.6944V50.0755H57.6475C57.4484 49.9892 57.2727 49.8381 57.1672 49.6547V49.6115H57.1555V49.5468H57.1438V49.482H57.1321V49.3849H57.1204V49.2555H57.1087C57.0852 48.6728 57.0501 47.9176 57.1555 47.3673H57.1672V47.3241H57.179V47.281H57.1907V47.2486C57.2727 47.0976 57.4367 46.9573 57.6007 46.871H57.6358V46.8602H57.6827V46.8494H57.7295V46.8386H57.7998V46.8278H57.9404V46.817C58.3035 46.817 58.491 46.9249 58.7018 47.0868C58.8307 47.2594 58.9478 47.486 58.9244 47.7449H58.9361C58.8892 48.4463 59.1938 49.6115 58.4792 50.0107ZM32.7195 50.5934H32.7078V50.561H32.696V50.5286H32.6843V50.4963H32.6726V50.4639H32.6609V50.4315H32.6492V50.3992C32.5555 50.302 32.4969 50.0863 32.3915 49.9784V49.946H32.3797C32.3212 49.8273 32.2392 49.6655 32.1572 49.5576V49.5252H32.1455V49.4928H32.1337C32.1455 49.4713 32.122 49.4497 32.0986 49.4281C32.0986 49.3957 32.0869 49.3849 32.0635 49.3849C32.0635 49.331 32.0049 49.3094 32.0166 49.2555H32.0049V49.2231H31.9932V49.1907C31.9229 49.072 31.8175 48.9426 31.7706 48.7807C32.1337 48.6836 32.4149 48.4247 32.5906 48.1549V48.1226C32.6375 48.1226 32.614 48.0255 32.6609 48.0255C32.6609 47.9931 32.6726 47.9607 32.6726 47.9284H32.6843C32.7663 47.6047 32.7546 47.2378 32.6492 46.9141H32.6375V46.8818H32.6258V46.8386C32.4969 46.612 32.2978 46.3639 32.0518 46.2128C32.0166 46.202 31.9463 46.1805 31.9346 46.1481H31.8995V46.1373H31.8643C31.8643 46.0941 31.7589 46.1157 31.7589 46.0726H31.712V46.0618H31.6652V46.051H31.6183V46.0402H31.5715V46.0294C30.7046 45.9215 29.744 45.9539 28.8889 45.9863V50.9602H29.9549V48.9749H30.7046C30.728 48.9857 30.7515 49.1152 30.7866 49.1152V49.1476H30.7983V49.1799H30.81V49.2123H30.8217V49.2447C30.8803 49.2878 30.892 49.4173 30.9623 49.4605V49.4928H30.974V49.5252H30.9858V49.5576H30.9975V49.5899H31.0092V49.6223H31.0209V49.6655C31.0677 49.6655 31.0443 49.7626 31.0912 49.7626V49.7949H31.1029V49.8273H31.1146V49.8597H31.1263V49.892H31.138V49.9244C31.1966 49.946 31.1849 50.0539 31.2435 50.0755V50.1078H31.2552V50.1402H31.2669V50.1726H31.2786V50.2049H31.2903V50.2373H31.302V50.2697H31.3137V50.3021H31.3255V50.3344C31.384 50.3452 31.3606 50.4639 31.4075 50.4747V50.507H31.4192V50.5394H31.4309V50.5718H31.4426V50.6042C31.5129 50.7013 31.5832 50.8415 31.6418 50.9818H32.86C32.86 50.8199 32.7546 50.7013 32.7195 50.5934ZM31.5949 47.7449C31.5597 47.7881 31.5129 47.8744 31.4777 47.9284C31.4192 47.9499 31.384 48.0363 31.3137 48.0363C31.3137 48.0794 31.2083 48.0578 31.2083 48.101H31.1615C30.8218 48.2197 30.2829 48.1118 29.8846 48.1442V46.8278C30.3063 46.8386 30.81 46.7955 31.2083 46.871V46.8818H31.2435C31.2786 46.9141 31.3606 46.9573 31.4075 46.9789C31.4309 47.0328 31.5246 47.0652 31.5246 47.1299C31.5715 47.1299 31.548 47.227 31.5949 47.227V47.2702H31.6066V47.3349C31.6769 47.3889 31.6066 47.7126 31.5949 47.7449ZM46.4721 46.1157H46.4252V46.1049H46.3901V46.0941H46.3432V46.0834H46.2964V46.0726C46.2612 46.0726 46.2144 46.0618 46.1792 46.0618V46.051C46.1206 46.051 46.0621 46.0402 46.0152 46.0402V46.0294C45.2538 45.9647 44.3986 46.0078 43.6255 45.997V50.9818C44.3986 50.971 45.2186 51.0142 45.9801 50.971V50.9602H46.0855V50.9494H46.1558V50.9386H46.2261V50.9278C46.7298 50.8307 47.1632 50.4963 47.3272 50.097H47.3389V50.0647C47.3858 50.0755 47.3506 49.9892 47.3858 49.9999V49.9568H47.3975V49.9136H47.4092V49.8705H47.4209C47.4209 49.8381 47.4326 49.7949 47.4326 49.7626H47.4444V49.687H47.4561V49.6115H47.4678V49.482H47.4795C47.5264 48.2089 47.7841 46.6336 46.4721 46.1157ZM44.6563 50.0863V46.8278C45.4646 46.8063 46.1089 46.7739 46.3666 47.3241C46.3666 47.3565 46.3783 47.3889 46.3783 47.4213H46.3901V47.4968H46.4018V47.5723H46.4135V47.7126H46.4252C46.4721 49.2015 46.7884 50.3021 44.6563 50.0863ZM37.7215 50.6797H37.7098V50.6473H37.698C37.6863 50.6042 37.6746 50.5502 37.6629 50.507H37.6512V50.4747H37.6395C37.6395 50.4423 37.6278 50.4099 37.6278 50.3776H37.616V50.3452H37.6043C37.6043 50.3128 37.5926 50.2805 37.5926 50.2481H37.5809V50.2049H37.5692V50.1726H37.5575C37.5575 50.1402 37.5458 50.1078 37.5458 50.0755H37.534C37.4755 49.8057 37.288 49.536 37.2295 49.2663H37.2178V49.2231H37.206V49.1907H37.1943C37.1943 49.1584 37.1826 49.126 37.1826 49.0936H37.1709C37.1123 48.8023 36.9132 48.5218 36.8429 48.2305H36.8312V48.1981H36.8195C36.8078 48.1549 36.7961 48.101 36.7843 48.0578H36.7726V48.0255H36.7609C36.7492 47.9823 36.7375 47.9284 36.7258 47.8852H36.714V47.8528H36.7023C36.6906 47.8097 36.6789 47.7557 36.6672 47.7126H36.6555V47.6802H36.6438C36.6438 47.6478 36.632 47.6155 36.632 47.5831H36.6203V47.5507H36.6086V47.5076H36.5969C36.5969 47.4752 36.5852 47.4428 36.5852 47.4105H36.5735V47.3781H36.5618V47.3349H36.5501C36.5501 47.3026 36.5383 47.2702 36.5383 47.2378H36.5266V47.2055H36.5149C36.5032 47.1623 36.4915 47.1084 36.4798 47.0652H36.468V47.0328H36.4563C36.4446 46.9897 36.4329 46.9357 36.4212 46.8926H36.4095V46.8602H36.3978C35.9643 45.8568 36.3509 45.9215 35.2146 45.9323C35.2029 46.0186 35.1326 46.0726 35.1443 46.1481H35.1326V46.1805H35.1209C35.1092 46.2236 35.0975 46.2776 35.0858 46.3207H35.074V46.3531H35.0623C34.992 46.6768 34.7812 46.9897 34.7109 47.3026H34.6992V47.3457H34.6875V47.3781H34.6758C34.6758 47.4105 34.664 47.4428 34.664 47.4752H34.6523V47.5184H34.6406V47.5507H34.6289C34.6289 47.5831 34.6172 47.6155 34.6172 47.6478H34.6055V47.6802H34.5938C34.582 47.7234 34.5703 47.7773 34.5586 47.8205H34.5469V47.8528H34.5352C34.3946 48.3492 34.1252 48.8347 33.9729 49.3202H33.9612V49.3634H33.9495V49.3957H33.9378V49.4389H33.926C33.926 49.4713 33.9143 49.5036 33.9143 49.536H33.9026V49.5684H33.8909C33.8089 49.9136 33.598 50.2265 33.516 50.5718H33.5043V50.6042H33.4926C33.4926 50.7228 33.3989 50.7876 33.3872 50.917H34.4883C34.5352 50.8199 34.5352 50.6581 34.6055 50.5934V50.5502H34.6172V50.507H34.6289V50.4639H34.6406V50.4207H34.6523V50.3884H34.664C34.6757 50.2697 34.746 50.1834 34.7695 50.0647H36.7023C37.0655 51.2084 36.8898 50.9063 38.108 50.9386C37.7918 50.8415 37.7332 50.7876 37.7215 50.6797ZM34.7695 49.2447C34.8398 49.072 34.9217 48.9102 34.9569 48.7268H34.9686V48.6944H34.9803C34.9803 48.662 34.992 48.6297 34.992 48.5973H35.0038V48.5542H35.0155V48.511H35.0272V48.4678H35.0389V48.4247H35.0506V48.3815H35.0623V48.3491H35.074V48.306C35.156 48.2413 35.1326 48.0363 35.2146 47.9823V47.9499H35.2263C35.2263 47.9176 35.238 47.8852 35.238 47.8528H35.2498V47.8097H35.2615V47.7665H35.2732V47.7234H35.2849V47.6802H35.2966V47.637H35.3083V47.6047H35.32C35.32 47.5723 35.3318 47.5399 35.3318 47.5076H35.3435V47.4752H35.3552C35.3552 47.5076 35.3669 47.5399 35.3669 47.5723H35.3786V47.6155H35.3903V47.6586H35.402V47.7018H35.4138V47.7449H35.4255V47.7881H35.4372V47.8313H35.4489V47.8744H35.4606C35.5075 48.1442 35.6832 48.4031 35.73 48.6728H35.7418V48.716H35.7535V48.7591H35.7652V48.8023H35.7769C35.7886 48.8455 35.8003 48.8994 35.812 48.9426H35.8238V48.9749H35.8355V49.0181H35.8472C35.8472 49.1044 35.894 49.1584 35.9175 49.2339C35.6598 49.2447 35.2146 49.2447 34.7695 49.2447Z" fill="#A0A0A0"/>
+</svg>
diff --git a/src/assets/icons/visu/egl-logo.svg b/src/assets/icons/visu/egl-logo.svg
index 05ed2017f..883341a19 100644
--- a/src/assets/icons/visu/egl-logo.svg
+++ b/src/assets/icons/visu/egl-logo.svg
@@ -1,3 +1,3 @@
-<svg width="48" height="23" viewBox="0 0 48 23" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M45.4113 0.55753C46.0263 0.611478 46.8248 0.438849 47.3642 0.654638C47.5369 0.816481 47.4937 1.07542 47.4937 1.37753V6.93412C47.5153 8.11018 47.5153 9.34018 47.0729 10.4191V10.4515H47.0621C47.0514 10.4947 47.0406 10.5486 47.0298 10.5918H47.019V10.6241H47.0082V10.6673H46.9974C46.9974 10.6889 46.9866 10.7212 46.9866 10.7428H46.9758V10.7752H46.965V10.8183C46.9219 10.8076 46.9542 10.8939 46.9219 10.8831V10.9262C46.8787 10.9154 46.9111 11.0018 46.8787 10.991V11.0233H46.8679V11.0665H46.8571V11.0989C46.814 11.0881 46.8464 11.1744 46.814 11.1636V11.196H46.8032V11.2283H46.7924V11.2607H46.7816V11.2931H46.7708V11.3254H46.76V11.3578H46.7492V11.3902H46.7385V11.4226H46.7277C46.6953 11.5412 46.5874 11.6383 46.555 11.7462H46.5442C46.5227 11.8326 46.4364 11.8757 46.4148 11.962C46.3932 11.9728 46.35 12.0268 46.35 12.0591C45.8429 12.8036 45.0337 13.5912 44.3 14.0876C44.149 14.1415 44.0195 14.2818 43.8577 14.3357V14.3465C43.8145 14.3357 43.8037 14.3897 43.7605 14.3789C43.7498 14.4005 43.739 14.4112 43.7174 14.4112C43.7066 14.4328 43.685 14.4544 43.6527 14.4436V14.4544H43.6203V14.4652H43.5879V14.476H43.5556C43.5663 14.5191 43.48 14.4868 43.4908 14.5191H43.4585V14.5299H43.4261V14.5407H43.3937V14.5515H43.3613C43.3721 14.5947 43.2858 14.5623 43.2966 14.5947H43.2642V14.6055H43.2211V14.6162H43.1887C43.1995 14.6594 43.1132 14.627 43.124 14.6594H43.0808V14.6702H43.0484V14.681H43.0053C43.0161 14.7241 42.9298 14.6918 42.9406 14.7241C42.9082 14.7241 42.8758 14.7349 42.8434 14.7349V14.7457H42.8111V14.7565C42.7787 14.7565 42.7463 14.7673 42.714 14.7673V14.7781H42.6816V14.7889C42.6492 14.7889 42.6169 14.7997 42.5845 14.7997V14.8105H42.5413V14.8212H42.4982V14.832H42.455V14.8428H42.4119V14.8536H42.3687V14.8644H42.304V14.8752H42.2608V14.886C42.2285 14.886 42.1853 14.8968 42.1529 14.8968V14.9076H42.0882V14.9183C42.045 14.9183 42.0019 14.9291 41.9587 14.9291V14.9399H41.894V14.9507H41.8292V14.9615H41.7537V14.9723H41.6782V14.9831H41.6026V14.9939H41.5271V15.0047C41.4624 15.0047 41.3869 15.0155 41.3221 15.0155V15.0262H41.2142V15.037H41.0848V15.0478H40.9445V15.0586H40.7611V15.0694H40.459V15.0802H39.9734V15.0694C39.5634 15.0802 39.1858 15.0047 38.8298 14.9615V14.9507H38.7542V14.9399H38.6787V14.9291H38.614V14.9183H38.5384V14.9076H38.4737V14.8968H38.409V14.886H38.3442V14.8752H38.2795V14.8644H38.2363V14.8536C38.0098 14.8105 37.7292 14.7133 37.535 14.6162H37.5026V14.6055H37.4595V14.5947H37.4271V14.5839H37.384C37.3947 14.5407 37.3084 14.5731 37.3192 14.5407H37.2761C37.2869 14.4976 37.2005 14.5299 37.2113 14.4976H37.179V14.4868H37.1358V14.476H37.1034C37.1142 14.4328 37.0279 14.4652 37.0387 14.4328H37.0063V14.422H36.974V14.4112H36.9416V14.4005H36.9092V14.3897H36.8769V14.3789H36.8445V14.3681H36.8121V14.3573C36.7905 14.3681 36.769 14.3465 36.7474 14.3249C36.7042 14.3357 36.715 14.2818 36.6719 14.2926V14.2818C36.4561 14.1955 36.2726 14.0336 36.0784 13.9365C35.7979 13.7099 35.4526 13.4941 35.1721 13.1812C34.514 12.5986 34.0824 11.9728 33.7047 11.2715H33.694V11.2391H33.6832V11.2068H33.6724V11.1744H33.6616V11.142H33.6508V11.1097H33.64V11.0773H33.6292V11.0449C33.5861 11.0449 33.6076 10.9478 33.5645 10.9478C33.5645 10.9262 33.5537 10.8939 33.5537 10.8723C33.5105 10.8831 33.5429 10.7968 33.5105 10.8076V10.7644C33.4242 10.6997 33.435 10.4947 33.3595 10.4191V10.3868H33.3487V10.3436H33.3379V10.3004H33.3271V10.2573H33.3163V10.2141H33.3055V10.171H33.2947V10.1278H33.284V10.0847H33.2732V10.0415H33.2624V9.99834H33.2516V9.95518H33.2408C33.2408 9.92281 33.23 9.87965 33.23 9.84729H33.2192C33.2192 9.80413 33.2084 9.76097 33.2084 9.71782H33.1976V9.65308H33.1868V9.58834H33.1761V9.5236H33.1653V9.45887H33.1545C33.1329 9.21071 33.0466 8.96255 33.0466 8.7036H33.0358V8.55255H33.025V8.34755H33.0142V1.03227C32.9926 0.816481 33.0358 0.589898 33.2516 0.53595V0.525163H33.2947V0.51437H33.3703V0.503583H34.7297C35.0318 0.492793 35.2692 0.492796 35.3987 0.708586C35.485 3.12543 35.3987 5.57465 35.4311 7.9915H35.4418V8.2936H35.4526V8.44465H35.4634V8.55255H35.4742C35.485 8.67123 35.5066 8.78992 35.5174 8.9086H35.5282V8.97334H35.539V9.03807H35.5497V9.10281H35.5605V9.16755H35.5713V9.23229H35.5821V9.27544H35.5929V9.3186H35.6037V9.36176H35.6145V9.40492H35.6253V9.44808H35.6361V9.49123H35.6469C35.6469 9.5236 35.6576 9.55597 35.6576 9.58834H35.6684V9.62071H35.6792V9.66387H35.69V9.69624H35.7008V9.73939C35.744 9.7286 35.7116 9.81492 35.744 9.80413V9.84729H35.7547V9.87966C35.7979 9.86887 35.7655 9.95518 35.7979 9.94439V9.97676H35.8087V10.0091H35.8195V10.0415H35.8303V10.0739H35.8411V10.1062H35.8519V10.1386H35.8626V10.171H35.8734C35.9166 10.322 36.0569 10.4515 36.1108 10.5918C36.4129 10.991 36.8445 11.5197 37.2976 11.811C37.3948 11.8973 37.5134 11.9728 37.6213 12.0268V12.0376C37.6753 12.0376 37.7184 12.1131 37.7724 12.1131V12.1239H37.8048V12.1347C37.8263 12.1239 37.8479 12.1454 37.8695 12.167C37.9342 12.1994 38.0205 12.2318 38.0745 12.2749H38.1176V12.2857H38.15C38.15 12.3289 38.2471 12.3073 38.2471 12.3504H38.2903V12.3612H38.3227V12.372H38.3658V12.3828H38.3982C38.6032 12.4799 38.8837 12.5662 39.1211 12.5986V12.6094H39.1858V12.6202H39.2613V12.631H39.3584V12.6418H39.4556V12.6526H39.5634V12.6633H39.7037V12.6741C40.0598 12.7065 40.5021 12.6957 40.8582 12.6633V12.6526H40.9661V12.6418H41.0632V12.631H41.1603V12.6202H41.2358V12.6094H41.3006V12.5986H41.3761V12.5878C41.4192 12.5878 41.4624 12.577 41.5056 12.577V12.5662C41.5379 12.5662 41.5811 12.5555 41.6134 12.5555V12.5447H41.6566V12.5339H41.6998V12.5231H41.7429V12.5123H41.7861V12.5015H41.8292V12.4907H41.8724V12.4799H41.9155V12.4691H41.9479V12.4583C41.9803 12.4583 42.0127 12.4476 42.045 12.4476C42.0342 12.4044 42.1206 12.4368 42.1098 12.4044H42.1529V12.3936H42.1853V12.3828H42.2177V12.372H42.25V12.3612H42.2932C42.2932 12.3181 42.3903 12.3397 42.3903 12.2965H42.4227V12.2857H42.455V12.2749C42.6492 12.2102 42.8111 12.0591 42.9837 11.9728C43.4477 11.6491 43.9871 11.0881 44.3108 10.6241C44.3108 10.5702 44.3863 10.527 44.3863 10.4731H44.3971C44.4187 10.3868 44.505 10.3112 44.5266 10.2249H44.5374V10.1926H44.5482V10.1602H44.559V10.1278H44.5698V10.0954H44.5806V10.0631H44.5913V10.0307H44.6021V9.99834H44.6129V9.96597C44.6561 9.97676 44.6237 9.89044 44.6561 9.90123V9.86887H44.6669V9.82571C44.71 9.8365 44.6777 9.75018 44.71 9.76097V9.71782H44.7208V9.68544H44.7316C44.7316 9.65307 44.7424 9.62071 44.7424 9.58834H44.7532V9.55597C44.8287 9.39413 44.9042 9.14597 44.9258 8.94097H44.9366V8.87623H44.9474V8.80071H44.9582V8.7036H44.969V8.60649H44.9798V8.47702H44.9906V8.33676H45.0013C45.0445 5.97386 45.0014 3.58938 45.0121 1.21569C44.9906 0.956739 44.9798 0.600691 45.2495 0.546744V0.53595C45.2819 0.53595 45.325 0.525163 45.3574 0.525163C45.4113 0.568321 45.4113 0.55753 45.4113 0.55753ZM31.2339 13.7423C31.2124 11.5844 31.2771 9.40492 31.2016 7.24702H31.1908C31.18 6.80465 31.0505 6.37307 30.975 5.95228H30.9642C30.9642 5.91991 30.9534 5.87675 30.9534 5.84438H30.9426C30.9318 5.79044 30.921 5.73649 30.9103 5.69333H30.8995V5.65017H30.8887V5.60701H30.8779C30.8779 5.57465 30.8671 5.54228 30.8671 5.50991H30.8563V5.47754H30.8455C30.8347 5.43438 30.8239 5.38043 30.8132 5.33728H30.8024V5.30491H30.7916V5.26175H30.7808C30.7808 5.24017 30.77 5.20781 30.77 5.18623H30.7592V5.15385H30.7484V5.1107C30.7053 5.12149 30.7376 5.03517 30.7053 5.04596V5.0028C30.6621 5.01359 30.6945 4.92727 30.6621 4.93806V4.89491H30.6513V4.86254C30.6082 4.87333 30.6405 4.78701 30.6082 4.7978V4.76543H30.5974V4.73307H30.5866V4.7007H30.5758V4.66833H30.565V4.63596H30.5542V4.60359H30.5434V4.57122H30.5326V4.53886H30.5218C30.5326 4.51728 30.511 4.4957 30.4895 4.47412C30.4895 4.44175 30.4787 4.43096 30.4571 4.43096C30.4679 4.3878 30.4139 4.37701 30.4247 4.33385H30.4139C30.3276 4.12885 30.1658 3.94543 30.0687 3.75122C29.5724 3.02832 28.7308 2.24069 28.0403 1.76596C28.0079 1.76596 27.9647 1.72279 27.9431 1.70121C27.7813 1.63648 27.6303 1.49621 27.4576 1.43148V1.42069H27.4253V1.4099H27.3929V1.39911H27.3605V1.38832H27.3282V1.37753H27.2958V1.36674H27.2634V1.35596H27.231C27.2203 1.3128 27.1232 1.32359 27.1016 1.28043H27.0692V1.26963H27.026C27.0368 1.22648 26.9505 1.25885 26.9613 1.22648H26.9289V1.21569H26.8858C26.8966 1.17253 26.8102 1.2049 26.821 1.17253H26.7779V1.16174H26.7455V1.15095H26.7024V1.14017H26.67V1.12937C26.6376 1.12937 26.6053 1.11859 26.5729 1.11859V1.10779H26.5405V1.09701C26.5081 1.09701 26.4758 1.08622 26.4434 1.08622V1.07542H26.411V1.06464C26.3787 1.06464 26.3463 1.05384 26.3139 1.05384V1.04306H26.2708V1.03227H26.2276V1.02148H26.1845V1.01069H26.1197V0.999897H26.0766V0.98911H26.0334V0.978323C25.9795 0.967534 25.9147 0.956739 25.8608 0.94595V0.935163C25.796 0.924373 25.7313 0.913585 25.6774 0.902796V0.892002C25.4939 0.892002 25.2889 0.784111 25.0947 0.794901V0.784107H24.9868V0.77332H24.8789V0.762533H24.7279V0.75174C24.415 0.740951 24.1345 0.708583 23.8 0.719373C23.746 0.78411 23.5195 0.687003 23.4763 0.75174H23.2929V0.762533H23.1418V0.77332H23.0339V0.784107H22.926V0.794901C22.6671 0.794901 22.4189 0.892005 22.16 0.935163V0.94595C22.106 0.956739 22.0413 0.967534 21.9874 0.978323V0.98911C21.9334 0.9999 21.8795 1.01069 21.8363 1.02148V1.03227H21.7931V1.04306H21.75V1.05384H21.7068V1.06464C21.6745 1.06464 21.6421 1.07542 21.6097 1.07542V1.08622H21.5773V1.09701C21.5342 1.10779 21.4802 1.11858 21.4371 1.12937V1.14017H21.4047V1.15095H21.3616V1.16174C21.34 1.16174 21.3076 1.17253 21.286 1.17253V1.18332H21.2537V1.19411H21.2105V1.2049H21.1781V1.21569H21.135C21.1458 1.25885 21.0595 1.22648 21.0702 1.25885H21.0271C21.0271 1.30201 20.93 1.28042 20.93 1.32358H20.8976V1.33438H20.8652V1.34516H20.8221C20.8221 1.38832 20.725 1.36675 20.725 1.4099H20.6926V1.42069H20.6602V1.43148H20.6279V1.44227H20.5955V1.45306C20.5739 1.44227 20.5523 1.46385 20.5308 1.48542C20.4984 1.48542 20.4876 1.49622 20.4876 1.5178C20.4013 1.52859 20.3581 1.60411 20.2826 1.6149C20.1423 1.74437 19.9481 1.80911 19.8187 1.93858C19.1605 2.34859 18.4268 3.13622 17.9844 3.75122C17.9305 3.88069 17.8118 3.98859 17.7687 4.10728H17.7579C17.7255 4.21517 17.6176 4.32307 17.5852 4.43096H17.5744V4.46333C17.5313 4.48491 17.5205 4.58201 17.4773 4.60359V4.63596C17.4342 4.63596 17.4558 4.73307 17.4126 4.73307V4.77622C17.3694 4.77622 17.391 4.87333 17.3479 4.87333V4.9057H17.3371V4.93806H17.3263V4.98122H17.3155V5.01359H17.3047V5.04596H17.2939V5.07833H17.2831V5.12149H17.2723V5.15385H17.2615V5.19701H17.2508C17.2508 5.21859 17.24 5.25096 17.24 5.27254H17.2292V5.30491H17.2184V5.34807H17.2076V5.38044H17.1968C17.1968 5.41281 17.186 5.44517 17.186 5.47754H17.1752V5.50991C16.981 6.00623 16.8516 6.59965 16.7976 7.14991H16.7868C16.7436 7.62465 16.7436 8.14254 16.776 8.60649H16.7868V8.75755H16.7976V8.88702H16.8084V9.0165H16.8192V9.1136H16.83C16.83 9.36176 16.9487 9.62071 16.9702 9.86887H16.981C16.9918 9.94439 17.0134 10.0199 17.0242 10.0847H17.035V10.1278H17.0458V10.171H17.0565V10.2141H17.0673V10.2573H17.0781V10.322H17.0889V10.3544H17.0997V10.3976H17.1105C17.1213 10.4407 17.1321 10.4947 17.1429 10.5378H17.1537C17.1537 10.5594 17.1644 10.5918 17.1644 10.6133H17.1752V10.6457H17.186C17.186 10.6781 17.1968 10.7105 17.1968 10.7428C17.24 10.732 17.2076 10.8183 17.24 10.8076V10.8507H17.2508V10.8831H17.2615V10.9262C17.3047 10.9154 17.2723 11.0018 17.3047 10.991V11.0233H17.3155V11.0665C17.3587 11.0665 17.3371 11.1636 17.3802 11.1636V11.196H17.391V11.2283H17.4018V11.2607H17.4126V11.2931H17.4234C17.4126 11.3147 17.4342 11.3362 17.4558 11.3578C17.4558 11.3902 17.4665 11.401 17.4881 11.401C17.4773 11.4441 17.5313 11.4549 17.5205 11.4981H17.5313C18.006 12.4368 18.9231 13.397 19.8187 14.0336C19.9913 14.1199 20.1316 14.2602 20.315 14.3357V14.3465C20.3581 14.3357 20.3473 14.3897 20.3905 14.3789C20.4013 14.4005 20.4229 14.422 20.4552 14.4112V14.422H20.4876V14.4328C20.5308 14.422 20.52 14.476 20.5631 14.4652C20.5739 14.4868 20.5955 14.5084 20.6279 14.4976V14.5083H20.6602V14.5191H20.6926V14.5299H20.725C20.725 14.5731 20.8221 14.5515 20.8221 14.5947H20.8652C20.8652 14.6378 20.9623 14.6162 20.9623 14.6594H20.9947V14.6702H21.0379C21.0271 14.7133 21.1134 14.681 21.1026 14.7134H21.1458C21.135 14.7565 21.2213 14.7241 21.2105 14.7565H21.2537V14.7673H21.286V14.7781C21.3076 14.7781 21.34 14.7889 21.3616 14.7889V14.7997C21.3939 14.7997 21.4263 14.8105 21.4587 14.8105V14.8212H21.491V14.832C21.5342 14.8428 21.5881 14.8536 21.6313 14.8644V14.8752H21.6745V14.886H21.7176V14.8968H21.7608V14.9076H21.8039V14.9183H21.8471V14.9291C21.8794 14.9291 21.9226 14.9399 21.955 14.9399V14.9507C21.9873 14.9507 22.0305 14.9615 22.0629 14.9615V14.9723C22.4729 15.0478 22.8829 15.1665 23.3037 15.1773V15.1881C25.7529 15.2312 28.2453 15.1881 30.7053 15.1989C30.9642 15.2097 31.1476 15.2097 31.2879 15.0478C31.3095 14.7349 31.2016 14.1739 31.2339 13.7423ZM28.7955 12.8468H23.4655C23.0339 12.7928 22.5592 12.7173 22.1816 12.5447H22.1492V12.5339H22.106V12.5231C22.0845 12.5231 22.0521 12.5123 22.0305 12.5123V12.5015H21.9981V12.4907H21.955C21.9658 12.4476 21.8795 12.4799 21.8902 12.4476H21.8471C21.8471 12.4044 21.75 12.426 21.75 12.3828H21.7176V12.372H21.6852V12.3612H21.6529V12.3504C21.6313 12.3612 21.6097 12.3397 21.5881 12.3181C21.5558 12.3181 21.545 12.3073 21.545 12.2857C21.5018 12.2965 21.491 12.2426 21.4479 12.2533V12.2426C21.3076 12.1994 21.1997 12.0699 21.0702 12.0268C20.7466 11.811 20.4121 11.4657 20.0992 11.1528C20.0021 11.0018 19.8834 10.8615 19.7863 10.732C19.7647 10.6457 19.6784 10.6026 19.6568 10.5162H19.646C19.4842 10.171 19.2144 9.78255 19.1497 9.36176H19.1389V9.3186H19.1281V9.27544H19.1173V9.21071H19.1065V9.14597H19.0958V9.08123H19.085C19.085 9.03808 19.0742 8.98413 19.0742 8.94097H19.0634V8.84386H19.0526V8.74676H19.0418V8.64965H19.031C18.9879 8.2936 18.9879 7.7757 19.0202 7.40886H19.031C19.0418 7.11755 19.1281 6.84781 19.1821 6.56728H19.1929V6.52412H19.2037V6.48097H19.2144V6.43781H19.2252V6.39465H19.236V6.35149H19.2468V6.30833H19.2576C19.2576 6.27596 19.2684 6.2436 19.2684 6.21123H19.2792V6.17886H19.29V6.1357H19.3008V6.10333H19.3116V6.06017C19.3547 6.07096 19.3223 5.98465 19.3547 5.99544V5.96307H19.3655V5.91991C19.4087 5.91991 19.3871 5.8228 19.4302 5.8228V5.79044C19.4626 5.76886 19.495 5.68254 19.5058 5.65017C19.5273 5.63938 19.5489 5.6178 19.5381 5.58543H19.5489C19.5381 5.54228 19.5921 5.55307 19.5813 5.50991H19.5921C19.6137 5.41281 19.7108 5.34806 19.7323 5.26175C20.056 4.80859 20.5847 4.24754 21.0595 3.91306C21.2105 3.84832 21.3508 3.70806 21.5234 3.64332V3.63254H21.5558V3.62175H21.5881V3.61096H21.6205V3.60017H21.6529V3.58938H21.6852V3.57859H21.7176V3.5678H21.75V3.55701H21.7823C21.7716 3.51385 21.8579 3.54622 21.8471 3.51386H21.8795V3.50306H21.9226C21.9118 3.4599 21.9981 3.49228 21.9874 3.45991H22.0305V3.44911H22.0629V3.43833H22.106V3.42753H22.1384V3.41675C22.1708 3.41675 22.2031 3.40596 22.2355 3.40596V3.39517H22.2787V3.38438H22.3218V3.37359H22.365V3.3628H22.4081V3.35201H22.4513V3.34122C22.4944 3.34122 22.5376 3.33043 22.5808 3.33043V3.31964H22.6239V3.30885C22.6671 3.30885 22.721 3.29807 22.7642 3.29807V3.28727H22.8289V3.27648H22.926V3.26569H23.0016V3.2549H23.0987V3.24412H23.2281V3.23332H23.3684V3.22254C23.5518 3.25491 23.9187 3.14701 24.0913 3.22254H24.3071V3.23332H24.4473V3.24412C24.8142 3.27649 25.2242 3.37359 25.5371 3.51386H25.5695V3.52464H25.6126V3.53543H25.645V3.54622H25.6881C25.6774 3.58938 25.7637 3.55701 25.7529 3.58938H25.796C25.796 3.63253 25.8931 3.61096 25.8931 3.65412H25.9255V3.6649H25.9579V3.6757H25.9903C26.1629 3.7728 26.3679 3.8807 26.5189 3.9778C27.0584 4.36622 27.7058 4.95964 28.0079 5.53149H28.0187C28.0187 5.58543 28.0942 5.62859 28.0942 5.68254C28.1158 5.69333 28.1374 5.71491 28.1266 5.74728H28.1374C28.1589 5.80122 28.1913 5.87675 28.2345 5.91991V5.96307C28.2776 5.95228 28.2453 6.0386 28.2776 6.02781V6.06017H28.2884V6.09254C28.3316 6.09254 28.31 6.18965 28.3532 6.18965V6.2328H28.3639V6.26518C28.4503 6.42702 28.5366 6.67517 28.5689 6.88017H28.5797V6.94491H28.5905V7.00965H28.6013V7.08518H28.6121C28.6121 7.23623 28.6876 7.39807 28.6768 7.54912H28.6876V7.70018H28.6984C28.8171 9.28623 28.7847 11.0773 28.7955 12.8468ZM15.0497 9.09202C15.2008 8.91939 15.2115 8.8007 15.2008 8.4986V7.07439H15.19C15.19 7.04202 15.1792 6.99886 15.1792 6.96649H15.1684V6.93412H15.1576C15.1576 6.70754 15.0605 6.49175 15.0497 6.27596H15.0389C15.0281 6.21123 15.0173 6.14649 15.0065 6.09254H14.9958C14.985 6.03859 14.9742 5.97386 14.9634 5.91991H14.9526V5.87675H14.9418V5.8336H14.931V5.79044H14.9202V5.7257H14.9094V5.68254H14.8986V5.63938H14.8879V5.59623H14.8771V5.55307H14.8663V5.5207H14.8555C14.8447 5.47754 14.8339 5.42359 14.8231 5.38044H14.8123V5.34807H14.8015V5.30491H14.7907V5.27254H14.78V5.22938H14.7692V5.19701H14.7584V5.15385H14.7476V5.12149H14.7368V5.07833H14.726V5.04596H14.7152V5.01359H14.7044V4.98122H14.6937V4.93806C14.6505 4.93806 14.6721 4.84096 14.6289 4.84096V4.80859H14.6181V4.77622H14.6073V4.73307C14.5642 4.73307 14.5858 4.63596 14.5426 4.63596V4.60359C14.4994 4.57122 14.4779 4.45254 14.4347 4.43096V4.39859H14.4239C14.3808 4.25833 14.2621 4.15043 14.2189 4.02096H14.2081C14.1758 3.92385 14.0786 3.85911 14.0571 3.75122C13.8736 3.51385 13.6794 3.22253 13.4313 2.99595C13.0429 2.49964 12.4926 2.1328 12.0502 1.78754H12.0179C11.9423 1.71201 11.8236 1.63648 11.7373 1.60411V1.59332C11.6726 1.57174 11.5971 1.51779 11.5539 1.48542H11.5215V1.47464H11.4892V1.46385H11.4568V1.45306H11.4244V1.44227H11.3921C11.4028 1.39911 11.3165 1.43148 11.3273 1.39911H11.295V1.38832H11.2626V1.37753H11.2302C11.2302 1.33437 11.1331 1.35595 11.1331 1.3128C11.1115 1.3128 11.0792 1.30201 11.0576 1.30201C11.0684 1.25885 10.9821 1.29122 10.9928 1.25885H10.9497V1.24806H10.9173V1.23727C10.8957 1.23727 10.8634 1.22648 10.8418 1.22648V1.21569H10.7986C10.8094 1.17253 10.7231 1.2049 10.7339 1.17253H10.6907V1.16174H10.6476V1.15095H10.6152V1.14017C10.5828 1.14017 10.5505 1.12937 10.5181 1.12937V1.11859H10.4857C10.421 1.04306 10.216 1.06464 10.1621 0.98911H10.0973V0.978323H10.0542V0.96753H10.011V0.956743C9.85995 0.956743 9.70889 0.859635 9.55784 0.859635V0.848848H9.49311V0.838055H9.41759V0.827268H9.32048V0.816481H9.24496V0.805687H9.14785V0.794901C8.89969 0.794901 8.64074 0.71937 8.39258 0.73016V0.719373C7.99337 0.708583 7.59416 0.719372 7.20574 0.75174V0.762533C7.02232 0.751744 6.8389 0.827268 6.65548 0.827268V0.838055C6.60153 0.838055 6.54758 0.848848 6.50442 0.848848V0.859635H6.42889V0.870428C6.36415 0.881218 6.28863 0.892006 6.2239 0.902796V0.913582H6.15915V0.924376H6.09441V0.935163H6.05125V0.94595C6.0081 0.94595 5.96494 0.956743 5.92179 0.956743V0.96753H5.87862V0.978323H5.83546V0.98911H5.77073V0.999897H5.72757V1.01069H5.68442V1.02148H5.64126V1.03227C5.60889 1.03227 5.57652 1.04306 5.54415 1.04306V1.05384H5.51178V1.06464C5.47941 1.06464 5.44705 1.07542 5.41468 1.07542V1.08622H5.38231V1.09701C5.34994 1.09701 5.31757 1.10779 5.2852 1.10779V1.11859H5.25284V1.12937H5.20968V1.14017H5.17731V1.15095H5.13415V1.16174H5.10179V1.17253H5.05863C5.06941 1.21569 4.9831 1.18332 4.99389 1.21569H4.95073C4.96152 1.25885 4.87521 1.22648 4.886 1.25885H4.85362V1.26963H4.81046V1.28043H4.7781C4.78889 1.32359 4.70258 1.29121 4.71337 1.32358H4.68099V1.33438H4.64862V1.34516H4.61626V1.35596H4.58388V1.36674H4.55152V1.37753H4.51915V1.38832H4.48678V1.39911C4.22783 1.51779 4.00126 1.67964 3.79626 1.84148C3.12731 2.26227 2.43678 2.99596 1.96204 3.62175C1.96204 3.65412 1.91888 3.69727 1.8973 3.71885C1.81098 3.90227 1.64914 4.07491 1.57361 4.27991H1.56283C1.33625 4.75464 1.04493 5.29412 0.926242 5.85517H0.915456C0.915456 5.88754 0.904669 5.9307 0.904669 5.96307H0.893882V6.00623H0.883095V6.07096H0.872295C0.872295 6.11412 0.861508 6.15728 0.861508 6.20044H0.850721V6.27596H0.839934V6.3407H0.829147V6.41623H0.818347V6.49175H0.807561V6.56728H0.796774C0.796774 6.63202 0.785987 6.69676 0.785987 6.7507H0.7752C0.7752 6.82623 0.7644 6.90175 0.7644 6.98807H0.753613V7.11754H0.742826V7.30097H0.732039V7.61386H0.721252V8.14255C0.785989 8.26123 0.732034 8.48781 0.753613 8.62807H0.7644V8.76834H0.7752V8.89781H0.785987C0.775197 9.10281 0.883095 9.30781 0.883095 9.51281H0.893882C0.904671 9.57755 0.915453 9.64229 0.926242 9.69624H0.937042C0.937042 9.73939 0.947829 9.78255 0.947829 9.82571H0.958616C0.958616 9.85808 0.969403 9.90124 0.969403 9.93361H0.98019V9.97676H0.99099V10.0199H1.00178V10.0847H1.01256V10.1278H1.02335V10.171H1.03414V10.2141H1.04494V10.2573H1.05572C1.05572 10.2897 1.06651 10.322 1.06651 10.3544H1.0773V10.3868H1.08808C1.08808 10.4191 1.09888 10.4515 1.09888 10.4839H1.10967V10.5162H1.12046V10.5594H1.13125C1.13125 10.581 1.14203 10.6133 1.14203 10.6349H1.15283V10.6673H1.16362V10.7104H1.17441V10.7428H1.18519V10.786C1.22835 10.7752 1.19599 10.8615 1.22835 10.8507V10.8939C1.27151 10.8939 1.24993 10.991 1.29309 10.991V11.0233H1.30387V11.0557H1.31467V11.0989C1.35783 11.0989 1.33625 11.196 1.37941 11.196V11.2283H1.3902V11.2607C1.42256 11.2823 1.45493 11.3686 1.46572 11.401C1.4873 11.4118 1.50888 11.4333 1.49809 11.4657H1.50888C1.99441 12.3936 2.9223 13.3539 3.82862 13.9797C4.00125 14.0552 4.15231 14.2062 4.34652 14.2818V14.2926C4.42205 14.3465 4.57309 14.3789 4.64862 14.4436H4.68099V14.4544H4.71337V14.4652H4.74573V14.476H4.7781C4.78889 14.5191 4.88599 14.5084 4.90757 14.5515H4.93994V14.5623H4.9831C4.97231 14.6055 5.05863 14.5731 5.04784 14.6055H5.091C5.08021 14.6486 5.16652 14.6162 5.15573 14.6486H5.19889V14.6594H5.23125V14.6702H5.27442V14.681H5.30679C5.80311 14.8968 6.40731 15.0478 6.96836 15.1018V15.1126H7.09784V15.1234H7.2381V15.1341H7.41074V15.1449H7.71284V15.1557H8.23074V15.1449C8.39258 15.1449 8.54363 15.1341 8.69468 15.1341V15.1234C9.0831 15.1126 9.46075 15.0047 9.83838 14.9399V14.9291C9.89233 14.9184 9.95706 14.9076 10.011 14.8968V14.886C10.065 14.8752 10.1189 14.8644 10.1621 14.8536V14.8428H10.2052V14.832H10.2484V14.8212H10.2915V14.8105H10.3347V14.7997C10.3779 14.7889 10.4318 14.7781 10.4749 14.7673V14.7565H10.5073V14.7457C10.5397 14.7457 10.5721 14.7349 10.6044 14.7349V14.7241H10.6368V14.7134C10.6692 14.7134 10.7015 14.7026 10.7339 14.7026V14.6918H10.7663V14.681H10.8094C10.7986 14.6378 10.885 14.6702 10.8742 14.6378H10.9173V14.627H10.9497V14.6162H10.9928C10.9821 14.5731 11.0684 14.6055 11.0576 14.5731H11.09V14.5623C11.1331 14.5623 11.1871 14.5299 11.2194 14.4976H11.2518V14.4868H11.2842V14.476C11.6078 14.3465 11.8884 14.1091 12.1581 13.9581C12.2121 13.8934 12.32 13.8502 12.3739 13.7855C12.6113 13.6344 12.8379 13.4294 13.0429 13.2028C13.1615 13.1597 13.2263 12.9978 13.291 12.9223V12.8899H13.3018C13.4205 12.3612 12.8594 12.1347 12.5789 11.8002C12.3847 11.6276 12.2336 11.3794 12.0286 11.2715C12.0394 11.2283 11.9531 11.2607 11.9639 11.2283H11.9207V11.2176H11.8452V11.2068H11.7697V11.2176H11.6942C11.3057 11.4333 10.9713 11.8433 10.6152 12.0591C10.5181 12.0807 10.4534 12.1778 10.3455 12.1994V12.2102H10.3131V12.221C10.2484 12.2533 10.1621 12.2857 10.1081 12.3289H10.065V12.3397H10.0326C10.0326 12.3828 9.93547 12.3612 9.93547 12.4044H9.89233C9.90312 12.4476 9.81679 12.4152 9.82758 12.4476H9.78443V12.4583H9.75206V12.4691C9.71969 12.4691 9.68732 12.4799 9.65495 12.4799V12.4907H9.62259C9.32048 12.6202 8.93205 12.7065 8.58679 12.7389V12.7497H8.45732V12.7604C8.15521 12.782 7.75599 12.782 7.45389 12.7604V12.7497H7.31363V12.7389H7.18415V12.7281H7.08706V12.7173C6.78495 12.6849 6.45047 12.5986 6.19152 12.4799H6.15915V12.4691H6.116V12.4583C6.09442 12.4583 6.06205 12.4476 6.04047 12.4476V12.4368H6.00811V12.426H5.96495C5.97574 12.3828 5.88942 12.4152 5.90021 12.3828H5.85705C5.85705 12.3397 5.75994 12.3612 5.75994 12.3181H5.72757V12.3073H5.69521V12.2965H5.66283V12.2857H5.63047V12.2749C5.42547 12.1994 5.25283 12.0483 5.0802 11.962C4.4652 11.5089 3.86099 10.8615 3.5481 10.1926H3.53731V10.1602H3.52652V10.1278H3.51572V10.0954H3.50494V10.0631H3.49415V10.0307H3.48336V9.99834H3.47257V9.96597H3.46177C3.46177 9.9444 3.45099 9.91202 3.45099 9.89045C3.40783 9.90124 3.4402 9.81492 3.40783 9.82571V9.78255H3.39704V9.75018H3.38625C3.38625 9.7286 3.37547 9.69623 3.37547 9.67466H3.36468V9.6315H3.35388V9.59913H3.34309C3.32151 9.44808 3.2352 9.32939 3.21362 9.15676C7.0439 9.09202 11.1115 9.3186 15.0497 9.09202ZM3.14889 6.44859V6.40544H3.15968C3.15968 6.37307 3.17046 6.3407 3.17046 6.30833H3.18125C3.19204 6.26517 3.20283 6.21123 3.21362 6.16807H3.22441V6.1357H3.2352C3.2352 6.10333 3.24598 6.07096 3.24598 6.03859C3.28914 6.04938 3.25678 5.96307 3.28914 5.97386V5.9307C3.3323 5.9307 3.31072 5.8336 3.35388 5.8336V5.80122H3.36468V5.76886H3.37547V5.73649H3.38625V5.70412H3.39704V5.67175H3.40783V5.63938H3.41863C3.44021 5.55306 3.52652 5.47754 3.5481 5.39122H3.55888C3.8502 4.84096 4.44362 4.25833 4.96152 3.86991C5.14494 3.78359 5.30678 3.63254 5.51178 3.55701V3.54622H5.54415V3.53543H5.57653V3.52464H5.60889V3.51386H5.64126V3.50306H5.67362V3.49227H5.706C5.706 3.44912 5.8031 3.47069 5.8031 3.42753H5.84626C6.57995 3.07148 7.54021 2.9528 8.39258 3.0499V3.06069H8.50048V3.07148H8.59759V3.08228H8.69468V3.09306H8.77022V3.10385H8.83495V3.11464H8.91047V3.12543H8.97522V3.13622H9.03995V3.14701C9.0939 3.1578 9.15863 3.16859 9.21258 3.17938V3.19017H9.25574V3.20096H9.2989V3.21174H9.34205V3.22254H9.38521V3.23332H9.42837V3.24412C9.47153 3.25491 9.52548 3.2657 9.56864 3.27648V3.28727H9.601V3.29807H9.64416C9.63337 3.34122 9.71969 3.30885 9.7089 3.34122H9.75206V3.35201H9.78443C9.77364 3.39517 9.85995 3.3628 9.84916 3.39517H9.88153V3.40596H9.9139V3.41675H9.94627V3.42753H9.97863V3.43833H10.011V3.44911H10.0434V3.45991H10.0757V3.47069H10.1081V3.48148C10.9389 3.89148 11.7157 4.66833 12.1257 5.49912H12.1365C12.1689 5.56386 12.2013 5.65017 12.2444 5.70412V5.74728H12.2552V5.77965C12.2984 5.77965 12.2768 5.87675 12.32 5.87675V5.91991H12.3307V5.95228H12.3415C12.3415 5.98465 12.3523 6.01702 12.3523 6.04939H12.3631V6.08175H12.3739C12.3739 6.11412 12.3847 6.14649 12.3847 6.17886H12.3955C12.3955 6.21122 12.4063 6.2436 12.4063 6.27596H12.4171V6.31912H12.4279V6.36228H12.4386V6.40544H12.4494V6.47017H12.4602C12.4602 6.50254 12.471 6.5457 12.471 6.57807H12.4818V6.58886H2.9223C3.10572 6.64281 3.09494 6.50254 3.14889 6.44859ZM12.5897 20.4965C11.6079 20.4642 11.6726 20.7555 11.6942 19.6873H13.55C13.55 20.1944 13.5715 20.7123 13.4852 21.2086H13.4744C13.4744 21.241 13.4636 21.2842 13.4636 21.3165H13.4529V21.3597H13.4421V21.4028H13.4313V21.446C13.3881 21.446 13.4097 21.5431 13.3665 21.5431V21.5755H13.3558V21.6078C13.1939 21.9099 12.8379 22.1905 12.5465 22.3415C12.525 22.3415 12.4926 22.3523 12.471 22.3523V22.3631H12.4279V22.3739H12.3847V22.3847H12.3415V22.3955H12.2984V22.4063H12.2336V22.417C11.9747 22.4602 11.6078 22.4818 11.3273 22.4278V22.417H11.2626V22.4063H11.1979V22.3955H11.1547V22.3847H11.09V22.3739H11.0576V22.3631H11.0144V22.3523H10.9821V22.3415H10.9389C10.1944 21.9855 9.85995 21.2949 9.90311 20.2807C9.87074 19.1802 9.85996 18.2415 10.7015 17.7128C10.7771 17.6697 10.8957 17.6157 10.9713 17.5726H11.0036V17.5618H11.0468V17.551H11.0792V17.5402C11.7913 17.3136 12.7623 17.4755 13.2694 18.0689C13.0429 18.2847 12.8379 18.5328 12.6005 18.727C12.3415 18.3926 11.8776 18.2307 11.446 18.3494V18.3602H11.4136V18.371H11.3705V18.3818H11.3381V18.3926C11.1655 18.4465 11.0684 18.6407 10.9821 18.781V18.8241H10.9713V18.8889H10.9605V18.9644H10.9497V19.0723H10.9389C10.9281 19.3097 10.9173 19.5686 10.9281 19.8276H10.9173C10.9389 20.2484 10.9173 20.7015 10.9928 21.0792H11.0036V21.1223C11.09 21.2734 11.2086 21.4676 11.3921 21.5323V21.5431H11.4352V21.5539H11.4784V21.5647H11.5215V21.5755H11.5971C12.1905 21.7373 12.6544 21.2518 12.5897 20.4965ZM5.99731 17.4647C6.05125 18.7163 5.86784 20.1081 6.09441 21.3165C6.13757 21.3057 6.10521 21.392 6.13758 21.3813V21.4136H6.14836C6.24547 21.6726 6.55836 21.9531 6.90363 21.9963V22.007H6.97916V22.0178H7.18415V22.0286C7.21652 22.0286 7.21653 22.0178 7.21653 22.0178H7.42153V22.007H7.51864V21.9963H7.58337V21.9855H7.62653V21.9747H7.66968V21.9639H7.71284C7.961 21.8452 8.18758 21.6294 8.30626 21.3813V21.3381H8.31705V21.3057H8.32785V21.2626C8.53285 20.1189 8.33863 18.7055 8.40337 17.497H8.93206V21.0144H8.92127V21.1439H8.91047V21.241H8.89968V21.3057H8.8889V21.3705H8.87811V21.4136H8.86732V21.4568H8.85652V21.4999C8.81336 21.4892 8.84574 21.5755 8.81338 21.5647V21.6078H8.80258V21.6402H8.79179C8.79179 21.6942 8.71627 21.7373 8.71627 21.7913H8.70548C8.61916 21.9747 8.41415 22.1257 8.2631 22.2444C8.19836 22.2552 8.13363 22.3307 8.07968 22.3415V22.3523H8.03652C8.04731 22.3955 7.961 22.3631 7.97179 22.3955H7.92863V22.4063H7.88547V22.417H7.84232V22.4278H7.79916V22.4386H7.73443V22.4494H7.65889V22.4602H7.58337V22.471H7.45389C7.30284 22.5465 7.01152 22.4494 6.83889 22.4602V22.4494C6.79573 22.4494 6.75258 22.4386 6.70942 22.4386V22.4278H6.66626V22.417H6.6231V22.4063H6.57994V22.3955H6.53678C6.54757 22.3523 6.46126 22.3847 6.47205 22.3523C6.14836 22.2444 5.88941 21.9531 5.71678 21.6834V21.651C5.67362 21.651 5.69521 21.5539 5.65205 21.5539V21.5107H5.64126V21.4784H5.63047C5.61968 21.4352 5.60889 21.3813 5.5981 21.3381H5.58731C5.43626 20.1189 5.56574 18.7594 5.52258 17.5078C5.57653 17.4323 5.84625 17.4647 5.99731 17.4647ZM23.131 17.4647C23.4223 17.497 23.8108 17.3891 24.0374 17.5078C24.0589 17.5941 24.156 17.6589 24.1776 17.756C24.2423 17.8315 24.3071 17.9286 24.3503 18.0257C24.415 18.1013 24.4797 18.1984 24.5229 18.2955C24.5876 18.371 24.6524 18.4681 24.6955 18.5652C24.8142 18.7163 24.9221 18.8781 25.0084 19.0507C25.0731 19.1263 25.1379 19.2234 25.181 19.3205C25.2458 19.396 25.3105 19.4931 25.3537 19.5902C25.591 19.8815 25.7313 20.2052 25.9795 20.5289V17.4755H26.9505V22.4602C26.3679 22.4171 26.0766 22.6544 25.8392 22.0718C25.7205 21.9207 25.6126 21.7589 25.5263 21.5863C25.4076 21.4352 25.2997 21.2734 25.2134 21.1007C25.0947 20.9497 24.9868 20.7878 24.9005 20.6152C24.6092 20.2376 24.4042 19.7952 24.1021 19.4284V22.4602H23.131V17.4647ZM32.4532 17.4647H33.4242V21.597H35.69V22.4602H32.4532V17.4647ZM35.2261 17.4647C35.4742 17.5186 36.305 17.3136 36.3374 17.6049H36.3482V17.6373H36.359V17.6697C36.4129 17.702 36.4129 17.8423 36.4669 17.8747V17.9178C36.51 17.9178 36.4884 18.0149 36.5316 18.0149V18.0473H36.5424V18.0797H36.5532V18.1228C36.5963 18.1228 36.5747 18.2199 36.6179 18.2199V18.2523C36.6611 18.2415 36.6287 18.3278 36.6611 18.317V18.3602C36.7042 18.3602 36.6826 18.4573 36.7258 18.4573V18.4897H36.7366V18.522H36.7474V18.5652C36.8013 18.5868 36.7905 18.6947 36.8445 18.7163V18.7486H36.8553V18.7918C36.8984 18.7918 36.8769 18.8889 36.92 18.8889V18.9213H36.9308V18.9536H36.9416V18.9968C36.9847 18.9968 36.9632 19.0939 37.0063 19.0939V19.1263H37.0171V19.1586H37.0279V19.2018H37.0387C37.0495 19.2989 37.1358 19.3528 37.1466 19.4715H37.179C37.1897 19.3744 37.2545 19.342 37.2545 19.2557H37.2653V19.2234H37.2761V19.191H37.2868V19.1586H37.2976V19.1263H37.3084V19.0939H37.3192V19.0507C37.3624 19.0507 37.3408 18.9536 37.384 18.9536V18.9213C37.4379 18.9105 37.4163 18.7918 37.4595 18.781V18.7486H37.4703C37.4703 18.727 37.4811 18.6947 37.4811 18.6731C37.5242 18.6731 37.5026 18.576 37.5458 18.576V18.5328C37.589 18.5328 37.5674 18.4357 37.6105 18.4357V18.4034H37.6213V18.371H37.6321V18.3278C37.6753 18.3278 37.6537 18.2307 37.6969 18.2307V18.1984H37.7076C37.7076 18.1768 37.7184 18.1444 37.7184 18.1228C37.7616 18.1228 37.74 18.0257 37.7832 18.0257V17.9826C37.8263 17.9826 37.8048 17.8855 37.8479 17.8855V17.8531H37.8587V17.8099C37.9019 17.8099 37.8803 17.7128 37.9234 17.7128V17.6805H37.9342V17.6481H37.945V17.6049C37.9774 17.6049 37.999 17.4755 38.0205 17.4647H39.0671C38.9808 17.6913 38.8405 17.8962 38.7542 18.1012H38.7434V18.1336H38.7326V18.166C38.6895 18.1552 38.7219 18.2415 38.6895 18.2307V18.2631C38.6463 18.2523 38.6787 18.3386 38.6463 18.3278V18.3602H38.6355V18.3926H38.6248V18.4249H38.614V18.4573H38.6032V18.4897C38.5276 18.5976 38.4413 18.781 38.3874 18.9105H38.3766V18.9428C38.3334 18.9536 38.3442 19.0507 38.3011 19.0723V19.1047H38.2903V19.137H38.2795V19.1694H38.2687V19.2018H38.2579V19.2341C38.204 19.2665 38.204 19.3852 38.15 19.4176V19.4499H38.1392V19.4823H38.1284V19.5147H38.1176V19.547C38.0961 19.5686 38.0637 19.6226 38.0529 19.6549C38.0313 19.6657 38.0098 19.6873 38.0205 19.7197H38.0098V19.752C37.945 19.7952 37.945 19.9247 37.8803 19.9678V20.0002H37.8695V20.0326H37.8587V20.0649H37.8479V20.0973C37.8048 20.0973 37.8263 20.1944 37.7832 20.1944V20.2268H37.7724V20.2591H37.7616V20.2915H37.7508V20.3239C37.7076 20.3131 37.74 20.3994 37.7076 20.3886V20.421H37.6969V20.4534H37.6861V22.4818H36.7366V20.4534H36.7258C36.7258 20.4102 36.6934 20.3455 36.6611 20.3239V20.2915H36.6503V20.2591H36.6395V20.2268H36.6287V20.1944H36.6179V20.162C36.5424 20.0865 36.5208 19.9247 36.4453 19.8491V19.8168H36.4345V19.7844H36.4237V19.752H36.4129V19.7197H36.4021V19.6873H36.3913C36.4021 19.6657 36.3805 19.6442 36.359 19.6226C36.3482 19.5902 36.3266 19.5255 36.2942 19.5147V19.4823H36.2834V19.4499H36.2726V19.4176H36.2618V19.3852C36.1755 19.2773 36.1324 19.0831 36.0461 18.9752V18.9428H36.0353V18.9105H36.0245V18.8781H36.0137V18.8457C35.9705 18.8134 35.949 18.6947 35.9058 18.6731V18.6407H35.895V18.6084H35.8842V18.576H35.8734V18.5436H35.8626V18.5113H35.8519V18.4789C35.8087 18.4681 35.8195 18.371 35.7763 18.3494V18.317H35.7655V18.2847H35.7547V18.2523H35.744V18.2199C35.7008 18.2307 35.7332 18.1444 35.7008 18.1552V18.1228H35.69V18.0905H35.6792V18.0581H35.6684V18.0257H35.6576V17.9934C35.3987 17.8639 35.3124 17.6481 35.2261 17.4647ZM43.9548 17.4647C44.2353 17.5186 44.8179 17.3136 44.9042 17.6157C44.969 17.6912 45.0337 17.7884 45.0769 17.8855C45.1416 17.961 45.2063 18.0581 45.2495 18.1552C45.3142 18.2307 45.379 18.3278 45.4221 18.4249C45.4869 18.5005 45.5516 18.5976 45.5948 18.6947C45.6595 18.7702 45.7242 18.8673 45.7674 18.9644C45.8321 19.0399 45.8969 19.137 45.94 19.2341C46.0048 19.3097 46.0695 19.4068 46.1127 19.5039C46.3608 19.8276 46.5335 20.1836 46.8032 20.5397V17.4863H47.7743V22.471C47.0082 22.4494 46.9111 22.6544 46.5658 21.9423C46.4471 21.7913 46.3392 21.6294 46.2529 21.4568C46.1882 21.3813 46.1234 21.2842 46.0803 21.187C45.9616 21.036 45.8537 20.8742 45.7674 20.7015C45.4545 20.3023 45.2603 19.8815 44.9258 19.4391V22.471H43.9548V17.4647ZM4.40047 18.9644H4.38968V18.8565H4.37888V18.781H4.36809V18.7055H4.35731V18.6407H4.34652V18.5976H4.33573V18.5544H4.32493V18.5113H4.31415C4.31415 18.4789 4.30336 18.4465 4.30336 18.4141C4.24941 18.3602 4.21705 18.2523 4.17389 18.1768C3.64521 17.3352 2.47993 17.4755 1.57361 17.4755C1.41177 17.4755 1.12046 17.4431 0.99099 17.4863V22.4602C1.71389 22.4386 2.52309 22.5034 3.22441 22.417V22.4063H3.28914V22.3955C3.3323 22.3847 3.38626 22.3739 3.42941 22.3631V22.3523H3.46177V22.3415H3.50494C3.50494 22.2984 3.60204 22.3199 3.60204 22.2768H3.63442C3.7531 22.2013 3.87178 22.1042 3.99046 22.007C4.08757 21.8668 4.18467 21.7481 4.2602 21.597V21.5539H4.27099V21.5215H4.28179V21.4784H4.29257V21.4352H4.30336V21.392H4.31415V21.3489H4.32493C4.32493 21.3057 4.33573 21.2626 4.33573 21.2194H4.34652V21.1439H4.35731V21.0468H4.36809V20.9173H4.37888C4.43283 20.2592 4.44363 19.5902 4.40047 18.9644ZM3.89335 20.1836H3.88257C3.89336 20.4642 3.86099 20.7663 3.83941 21.0252H3.82862V21.0899H3.81783V21.1547H3.80705V21.2194H3.79626V21.2626H3.78546V21.3057C3.7423 21.2949 3.77468 21.3813 3.74231 21.3705C3.66679 21.5971 3.45099 21.7805 3.22441 21.856V21.8668H3.19204V21.8776H3.14889V21.8884H3.10573V21.8992H3.06257V21.9099H2.98705V21.9207H2.91151V21.9315C2.46914 21.9639 1.98362 21.9423 1.53046 21.9423V17.907C2.29652 17.9286 3.36468 17.7236 3.7531 18.4681V18.5005C3.79626 18.5005 3.77468 18.5976 3.81783 18.5976V18.6407H3.82862V18.6839H3.83941V18.7486H3.85021V18.8134H3.86099V18.9105H3.87178V19.0076H3.88257V19.1586H3.89335C3.87178 19.5255 3.90414 19.8492 3.89335 20.1836ZM42.2932 17.7128C42.2392 17.7128 42.1961 17.6373 42.1421 17.6373C41.84 17.4431 41.4192 17.4215 41.02 17.4323C40.815 17.4755 40.5345 17.5186 40.3834 17.6373H40.3511C40.049 17.8099 39.7361 18.1013 39.585 18.4465V18.4789H39.5742V18.522H39.5634V18.5544H39.5526C39.3908 19.2341 39.4448 20.162 39.4556 20.8957H39.4663C39.4771 20.9928 39.4879 21.0899 39.4987 21.1978H39.5095V21.2626H39.5203V21.3057H39.5311V21.3489H39.5419V21.392H39.5526V21.4352C39.5958 21.4352 39.5742 21.5323 39.6174 21.5323V21.5647H39.6282V21.597C39.6498 21.6186 39.6821 21.6726 39.6929 21.7049C39.8871 21.9531 40.1353 22.2121 40.4482 22.3199C40.6855 22.4602 41.1603 22.5357 41.4516 22.471H41.5811V22.4602H41.6782V22.4494H41.7537V22.4386C41.7861 22.4386 41.8292 22.4278 41.8616 22.4278V22.417H41.9048V22.4063C42.919 22.0934 43.1563 21.0899 43.0916 20.0865C43.1456 19.1586 43.07 18.1984 42.2932 17.7128ZM41.689 21.5107C41.689 21.5539 41.5919 21.5323 41.5919 21.5755H41.5487V21.5863C41.5055 21.5863 41.4624 21.597 41.4192 21.597C41.3977 21.6402 41.0092 21.6186 41.0092 21.5863H40.9661V21.5755H40.9229C40.7395 21.4892 40.5777 21.3381 40.4806 21.1547V21.1115H40.4698V21.0468H40.459V20.982H40.4482V20.8849H40.4374V20.7555H40.4266C40.405 20.1728 40.3726 19.4176 40.4698 18.8673H40.4806V18.8241H40.4913V18.781H40.5021V18.7486C40.5777 18.5976 40.7287 18.4573 40.8798 18.371H40.9121V18.3602H40.9553V18.3494H40.9984V18.3386H41.0632V18.3278H41.1927V18.317C41.5271 18.317 41.6998 18.4249 41.894 18.5868C42.0127 18.7594 42.1206 18.986 42.099 19.2449H42.1098C42.0666 19.9463 42.3471 21.1115 41.689 21.5107ZM17.9629 22.0934H17.9521V22.061H17.9413V22.0286H17.9305V21.9963H17.9197V21.9639H17.9089V21.9315H17.8981V21.8992C17.8118 21.802 17.7579 21.5863 17.6608 21.4784V21.446H17.65C17.596 21.3273 17.5205 21.1655 17.445 21.0576V21.0252H17.4342V20.9928H17.4234C17.4342 20.9713 17.4126 20.9497 17.391 20.9281C17.391 20.8957 17.3802 20.8849 17.3587 20.8849C17.3587 20.831 17.3047 20.8094 17.3155 20.7555H17.3047V20.7231H17.2939V20.6907C17.2292 20.572 17.1321 20.4426 17.0889 20.2807C17.4234 20.1836 17.6823 19.9247 17.8442 19.6549V19.6226C17.8873 19.6226 17.8658 19.5255 17.9089 19.5255C17.9089 19.4931 17.9197 19.4607 17.9197 19.4284H17.9305C18.006 19.1047 17.9952 18.7378 17.8981 18.4141H17.8873V18.3818H17.8766V18.3386C17.7579 18.112 17.5744 17.8639 17.3479 17.7128C17.3155 17.702 17.2508 17.6805 17.24 17.6481H17.2076V17.6373H17.1752C17.1752 17.5941 17.0781 17.6157 17.0781 17.5726H17.035V17.5618H16.9918V17.551H16.9486V17.5402H16.9055V17.5294C16.1071 17.4215 15.2223 17.4539 14.4347 17.4863V22.4602H15.4165V20.4749H16.1071C16.1287 20.4857 16.1502 20.6152 16.1826 20.6152V20.6476H16.1934V20.6799H16.2042V20.7123H16.215V20.7447C16.2689 20.7878 16.2797 20.9173 16.3444 20.9605V20.9928H16.3552V21.0252H16.366V21.0576H16.3768V21.0899H16.3876V21.1223H16.3984V21.1655C16.4415 21.1655 16.42 21.2626 16.4631 21.2626V21.2949H16.4739V21.3273H16.4847V21.3597H16.4955V21.392H16.5063V21.4244C16.5602 21.446 16.5494 21.5539 16.6034 21.5755V21.6078H16.6142V21.6402H16.625V21.6726H16.6358V21.7049H16.6465V21.7373H16.6573V21.7697H16.6681V21.8021H16.6789V21.8344C16.7329 21.8452 16.7113 21.9639 16.7544 21.9747V22.007H16.7652V22.0394H16.776V22.0718H16.7868V22.1042C16.8515 22.2013 16.9163 22.3415 16.9702 22.4818H18.0923C18.0923 22.3199 17.9952 22.2013 17.9629 22.0934ZM16.9271 19.2449C16.8947 19.2881 16.8515 19.3744 16.8192 19.4284C16.7652 19.4499 16.7329 19.5363 16.6681 19.5363C16.6681 19.5794 16.571 19.5578 16.571 19.601H16.5279C16.215 19.7197 15.7187 19.6118 15.3518 19.6442V18.3278C15.7402 18.3386 16.2042 18.2955 16.571 18.371V18.3818H16.6034C16.6358 18.4141 16.7113 18.4573 16.7544 18.4789C16.776 18.5328 16.8623 18.5652 16.8623 18.6299C16.9055 18.6299 16.8839 18.727 16.9271 18.727V18.7702H16.9379V18.8349C17.0026 18.8889 16.9379 19.2126 16.9271 19.2449ZM30.6297 17.6157H30.5866V17.6049H30.5542V17.5941H30.5111V17.5834H30.4679V17.5726C30.4355 17.5726 30.3924 17.5618 30.36 17.5618V17.551C30.3061 17.551 30.2521 17.5402 30.2089 17.5402V17.5294C29.5076 17.4647 28.72 17.5078 28.0079 17.497V22.4818C28.72 22.471 29.4753 22.5142 30.1766 22.471V22.4602H30.2737V22.4494H30.3384V22.4386H30.4032V22.4278C30.8671 22.3307 31.2663 21.9963 31.4174 21.597H31.4282V21.5647C31.4713 21.5755 31.439 21.4892 31.4713 21.4999V21.4568H31.4821V21.4136H31.4929V21.3705H31.5037C31.5037 21.3381 31.5145 21.2949 31.5145 21.2626H31.5253V21.187H31.5361V21.1115H31.5468V20.982H31.5576C31.6008 19.7089 31.8382 18.1336 30.6297 17.6157ZM28.9574 21.5863V18.3278C29.7018 18.3063 30.2953 18.2739 30.5326 18.8241C30.5326 18.8565 30.5434 18.8889 30.5434 18.9213H30.5542V18.9968H30.565V19.0723H30.5758V19.2126H30.5866C30.6297 20.7015 30.9211 21.8021 28.9574 21.5863ZM22.57 22.1797H22.5592V22.1473H22.5484C22.5376 22.1042 22.5268 22.0502 22.516 22.007H22.5052V21.9747H22.4945C22.4945 21.9423 22.4837 21.9099 22.4837 21.8776H22.4729V21.8452H22.4621C22.4621 21.8128 22.4513 21.7805 22.4513 21.7481H22.4405V21.7049H22.4297V21.6726H22.4189C22.4189 21.6402 22.4081 21.6078 22.4081 21.5755H22.3973C22.3434 21.3057 22.1708 21.036 22.1168 20.7663H22.106V20.7231H22.0952V20.6907H22.0845C22.0845 20.6584 22.0737 20.626 22.0737 20.5936H22.0629C22.0089 20.3023 21.8255 20.0218 21.7608 19.7305H21.75V19.6981H21.7392C21.7284 19.6549 21.7176 19.601 21.7068 19.5578H21.696V19.5255H21.6852C21.6744 19.4823 21.6637 19.4284 21.6529 19.3852H21.6421V19.3528H21.6313C21.6205 19.3097 21.6097 19.2557 21.5989 19.2126H21.5881V19.1802H21.5773C21.5773 19.1478 21.5666 19.1155 21.5666 19.0831H21.5558V19.0507H21.545V19.0076H21.5342C21.5342 18.9752 21.5234 18.9428 21.5234 18.9105H21.5126V18.8781H21.5018V18.8349H21.491C21.491 18.8026 21.4802 18.7702 21.4802 18.7378H21.4694V18.7055H21.4587C21.4479 18.6623 21.4371 18.6084 21.4263 18.5652H21.4155V18.5328H21.4047C21.3939 18.4897 21.3831 18.4357 21.3723 18.3926H21.3616V18.3602H21.3508C20.9516 17.3568 21.3076 17.4215 20.261 17.4323C20.2502 17.5186 20.1855 17.5726 20.1963 17.6481H20.1855V17.6805H20.1747C20.1639 17.7236 20.1531 17.7776 20.1423 17.8207H20.1315V17.8531H20.1208C20.056 18.1768 19.8618 18.4897 19.7971 18.8026H19.7863V18.8457H19.7755V18.8781H19.7647C19.7647 18.9105 19.7539 18.9428 19.7539 18.9752H19.7431V19.0184H19.7323V19.0507H19.7216C19.7216 19.0831 19.7108 19.1155 19.7108 19.1478H19.7V19.1802H19.6892C19.6784 19.2234 19.6676 19.2773 19.6568 19.3205H19.646V19.3528H19.6352C19.5058 19.8492 19.2576 20.3347 19.1173 20.8202H19.1065V20.8634H19.0958V20.8957H19.085V20.9389H19.0742C19.0742 20.9713 19.0634 21.0036 19.0634 21.036H19.0526V21.0684H19.0418C18.9663 21.4136 18.7721 21.7265 18.6966 22.0718H18.6858V22.1042H18.675C18.675 22.2228 18.5887 22.2876 18.5779 22.417H19.5921C19.6352 22.3199 19.6352 22.1581 19.7 22.0934V22.0502H19.7108V22.007H19.7216V21.9639H19.7323V21.9207H19.7431V21.8884H19.7539C19.7647 21.7697 19.8294 21.6834 19.851 21.5647H21.6313C21.9658 22.7084 21.8039 22.4063 22.926 22.4386C22.6347 22.3415 22.5808 22.2876 22.57 22.1797ZM19.851 20.7447C19.9158 20.572 19.9913 20.4102 20.0237 20.2268H20.0345V20.1944H20.0452C20.0452 20.162 20.056 20.1297 20.056 20.0973H20.0668V20.0542H20.0776V20.011H20.0884V19.9678H20.0992V19.9247H20.11V19.8815H20.1208V19.8491H20.1315V19.806C20.2071 19.7413 20.1855 19.5363 20.261 19.4823V19.4499H20.2718C20.2718 19.4176 20.2826 19.3852 20.2826 19.3528H20.2934V19.3097H20.3042V19.2665H20.315V19.2234H20.3258V19.1802H20.3366V19.137H20.3473V19.1047H20.3581C20.3581 19.0723 20.3689 19.0399 20.3689 19.0076H20.3797V18.9752H20.3905C20.3905 19.0076 20.4013 19.0399 20.4013 19.0723H20.4121V19.1155H20.4229V19.1586H20.4337V19.2018H20.4444V19.2449H20.4552V19.2881H20.466V19.3313H20.4768V19.3744H20.4876C20.5308 19.6442 20.6926 19.9031 20.7358 20.1728H20.7466V20.216H20.7573V20.2591H20.7681V20.3023H20.7789C20.7897 20.3455 20.8005 20.3994 20.8113 20.4426H20.8221V20.4749H20.8329V20.5181H20.8437C20.8437 20.6044 20.8868 20.6584 20.9084 20.7339C20.671 20.7447 20.261 20.7447 19.851 20.7447Z" fill="#020304"/>
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.5207 29.0575C63.1884 29.1115 64.0552 28.9388 64.641 29.1546C64.8284 29.3165 64.7815 29.5754 64.7815 29.8775V35.4341C64.805 36.6102 64.805 37.8402 64.3247 38.9191V38.9515H64.313C64.3013 38.9947 64.2895 39.0486 64.2778 39.0918H64.2661V39.1241H64.2544V39.1673H64.2427C64.2427 39.1889 64.231 39.2212 64.231 39.2428H64.2192V39.2752H64.2075V39.3183C64.1607 39.3076 64.1958 39.3939 64.1607 39.3831V39.4262C64.1138 39.4154 64.149 39.5018 64.1138 39.491V39.5233H64.1021V39.5665H64.0904V39.5989C64.0435 39.5881 64.0787 39.6744 64.0435 39.6636V39.696H64.0318V39.7283H64.0201V39.7607H64.0084V39.7931H63.9967V39.8254H63.985V39.8578H63.9733V39.8902H63.9615V39.9226H63.9498C63.9147 40.0412 63.7975 40.1383 63.7624 40.2462H63.7507C63.7272 40.3326 63.6335 40.3757 63.6101 40.462C63.5867 40.4728 63.5398 40.5268 63.5398 40.5591C62.9892 41.3036 62.1107 42.0912 61.3141 42.5876C61.1501 42.6415 61.0095 42.7818 60.8338 42.8357V42.8465C60.787 42.8357 60.7752 42.8897 60.7284 42.8789C60.7167 42.9005 60.705 42.9112 60.6815 42.9112C60.6698 42.9328 60.6464 42.9544 60.6112 42.9436V42.9544H60.5761V42.9652H60.541V42.976H60.5058C60.5175 43.0191 60.4238 42.9868 60.4355 43.0191H60.4004V43.0299H60.3652V43.0407H60.3301V43.0515H60.295C60.3067 43.0947 60.213 43.0623 60.2247 43.0947H60.1895V43.1055H60.1427V43.1162H60.1075C60.1192 43.1594 60.0255 43.127 60.0372 43.1594H59.9904V43.1702H59.9552V43.181H59.9084C59.9201 43.2241 59.8264 43.1918 59.8381 43.2241C59.803 43.2241 59.7678 43.2349 59.7327 43.2349V43.2457H59.6975V43.2565C59.6624 43.2565 59.6272 43.2673 59.5921 43.2673V43.2781H59.5569V43.2889C59.5218 43.2889 59.4867 43.2997 59.4515 43.2997V43.3105H59.4047V43.3212H59.3578V43.332H59.3109V43.3428H59.2641V43.3536H59.2172V43.3644H59.1469V43.3752H59.1001V43.386C59.065 43.386 59.0181 43.3968 58.983 43.3968V43.4076H58.9127V43.4183C58.8658 43.4183 58.819 43.4291 58.7721 43.4291V43.4399H58.7018V43.4507H58.6315V43.4615H58.5495V43.4723H58.4675V43.4831H58.3855V43.4939H58.3035V43.5047C58.2332 43.5047 58.1512 43.5155 58.0809 43.5155V43.5262H57.9638V43.537H57.8232V43.5478H57.6709V43.5586H57.4718V43.5694H57.1438V43.5802H56.6167V43.5694C56.1715 43.5802 55.7615 43.5047 55.3749 43.4615V43.4507H55.2929V43.4399H55.2109V43.4291H55.1407V43.4183H55.0587V43.4076H54.9884V43.3968H54.9181V43.386H54.8478V43.3752H54.7775V43.3644H54.7307V43.3536C54.4847 43.3105 54.1801 43.2133 53.9692 43.1162H53.9341V43.1055H53.8872V43.0947H53.8521V43.0839H53.8052C53.8169 43.0407 53.7232 43.0731 53.7349 43.0407H53.6881C53.6998 42.9976 53.6061 43.0299 53.6178 42.9976H53.5826V42.9868H53.5358V42.976H53.5007C53.5124 42.9328 53.4187 42.9652 53.4304 42.9328H53.3952V42.922H53.3601V42.9112H53.3249V42.9005H53.2898V42.8897H53.2547V42.8789H53.2195V42.8681H53.1844V42.8573C53.1609 42.8681 53.1375 42.8465 53.1141 42.8249C53.0672 42.8357 53.0789 42.7818 53.0321 42.7926V42.7818C52.7978 42.6955 52.5987 42.5336 52.3878 42.4365C52.0832 42.2099 51.7084 41.9941 51.4038 41.6812C50.6892 41.0986 50.2206 40.4728 49.8106 39.7715H49.7989V39.7391H49.7872V39.7068H49.7755V39.6744H49.7638V39.642H49.7521V39.6097H49.7404V39.5773H49.7286V39.5449C49.6818 39.5449 49.7052 39.4478 49.6584 39.4478C49.6584 39.4262 49.6466 39.3939 49.6466 39.3723C49.5998 39.3831 49.6349 39.2968 49.5998 39.3076V39.2644C49.5061 39.1997 49.5178 38.9947 49.4358 38.9191V38.8868H49.4241V38.8436H49.4124V38.8004H49.4006V38.7573H49.3889V38.7141H49.3772V38.671H49.3655V38.6278H49.3538V38.5847H49.3421V38.5415H49.3304V38.4983H49.3186V38.4552H49.3069C49.3069 38.4228 49.2952 38.3797 49.2952 38.3473H49.2835C49.2835 38.3041 49.2718 38.261 49.2718 38.2178H49.2601V38.1531H49.2484V38.0883H49.2366V38.0236H49.2249V37.9589H49.2132C49.1898 37.7107 49.0961 37.4625 49.0961 37.2036H49.0844V37.0525H49.0726V36.8475H49.0609V29.5323C49.0375 29.3165 49.0844 29.0899 49.3186 29.036V29.0252H49.3655V29.0144H49.4475V29.0036H50.9235C51.2515 28.9928 51.5092 28.9928 51.6498 29.2086C51.7435 31.6254 51.6498 34.0746 51.6849 36.4915H51.6966V36.7936H51.7084V36.9447H51.7201V37.0525H51.7318C51.7435 37.1712 51.7669 37.2899 51.7787 37.4086H51.7904V37.4733H51.8021V37.5381H51.8138V37.6028H51.8255V37.6675H51.8372V37.7323H51.8489V37.7754H51.8606V37.8186H51.8724V37.8618H51.8841V37.9049H51.8958V37.9481H51.9075V37.9912H51.9192C51.9192 38.0236 51.9309 38.056 51.9309 38.0883H51.9426V38.1207H51.9544V38.1639H51.9661V38.1962H51.9778V38.2394C52.0247 38.2286 51.9895 38.3149 52.0247 38.3041V38.3473H52.0364V38.3797C52.0832 38.3689 52.0481 38.4552 52.0832 38.4444V38.4768H52.0949V38.5091H52.1066V38.5415H52.1184V38.5739H52.1301V38.6062H52.1418V38.6386H52.1535V38.671H52.1652C52.2121 38.822 52.3644 38.9515 52.4229 39.0918C52.7509 39.491 53.2195 40.0197 53.7115 40.311C53.8169 40.3973 53.9458 40.4728 54.0629 40.5268V40.5376C54.1215 40.5376 54.1684 40.6131 54.2269 40.6131V40.6239H54.2621V40.6347C54.2855 40.6239 54.3089 40.6454 54.3324 40.667C54.4027 40.6994 54.4964 40.7318 54.5549 40.7749H54.6018V40.7857H54.6369C54.6369 40.8289 54.7424 40.8073 54.7424 40.8504H54.7892V40.8612H54.8244V40.872H54.8712V40.8828H54.9064C55.1289 40.9799 55.4335 41.0662 55.6912 41.0986V41.1094H55.7615V41.1202H55.8435V41.131H55.9489V41.1418H56.0544V41.1526H56.1715V41.1633H56.3238V41.1741C56.7104 41.2065 57.1907 41.1957 57.5772 41.1633V41.1526H57.6944V41.1418H57.7998V41.131H57.9052V41.1202H57.9872V41.1094H58.0575V41.0986H58.1395V41.0878C58.1864 41.0878 58.2332 41.077 58.2801 41.077V41.0662C58.3152 41.0662 58.3621 41.0555 58.3972 41.0555V41.0447H58.4441V41.0339H58.4909V41.0231H58.5378V41.0123H58.5847V41.0015H58.6315V40.9907H58.6784V40.9799H58.7252V40.9691H58.7604V40.9583C58.7955 40.9583 58.8307 40.9476 58.8658 40.9476C58.8541 40.9044 58.9478 40.9368 58.9361 40.9044H58.983V40.8936H59.0181V40.8828H59.0532V40.872H59.0884V40.8612H59.1352C59.1352 40.8181 59.2407 40.8397 59.2407 40.7965H59.2758V40.7857H59.3109V40.7749C59.5218 40.7102 59.6975 40.5591 59.885 40.4728C60.3887 40.1491 60.9744 39.5881 61.3258 39.1241C61.3258 39.0702 61.4078 39.027 61.4078 38.9731H61.4195C61.443 38.8868 61.5367 38.8112 61.5601 38.7249H61.5718V38.6926H61.5835V38.6602H61.5952V38.6278H61.607V38.5954H61.6187V38.5631H61.6304V38.5307H61.6421V38.4983H61.6538V38.466C61.7007 38.4768 61.6655 38.3904 61.7007 38.4012V38.3689H61.7124V38.3257C61.7592 38.3365 61.7241 38.2502 61.7592 38.261V38.2178H61.771V38.1854H61.7827C61.7827 38.1531 61.7944 38.1207 61.7944 38.0883H61.8061V38.056C61.8881 37.8941 61.9701 37.646 61.9935 37.441H62.0052V37.3762H62.017V37.3007H62.0287V37.2036H62.0404V37.1065H62.0521V36.977H62.0638V36.8368H62.0755C62.1224 34.4739 62.0755 32.0894 62.0872 29.7157C62.0638 29.4567 62.0521 29.1007 62.345 29.0467V29.036C62.3801 29.036 62.427 29.0252 62.4621 29.0252C62.5207 29.0683 62.5207 29.0575 62.5207 29.0575ZM47.1281 42.2423C47.1046 40.0844 47.1749 37.9049 47.0929 35.747H47.0812C47.0695 35.3046 46.9289 34.8731 46.8469 34.4523H46.8352C46.8352 34.4199 46.8235 34.3768 46.8235 34.3444H46.8118C46.8001 34.2904 46.7883 34.2365 46.7766 34.1933H46.7649V34.1502H46.7532V34.107H46.7415C46.7415 34.0746 46.7298 34.0423 46.7298 34.0099H46.7181V33.9775H46.7064C46.6946 33.9344 46.6829 33.8804 46.6712 33.8373H46.6595V33.8049H46.6478V33.7617H46.6361C46.6361 33.7402 46.6244 33.7078 46.6244 33.6862H46.6126V33.6539H46.6009V33.6107C46.5541 33.6215 46.5892 33.5352 46.5541 33.546V33.5028C46.5072 33.5136 46.5424 33.4273 46.5072 33.4381V33.3949H46.4955V33.3625C46.4486 33.3733 46.4838 33.287 46.4486 33.2978V33.2654H46.4369V33.2331H46.4252V33.2007H46.4135V33.1683H46.4018V33.136H46.3901V33.1036H46.3783V33.0712H46.3666V33.0389H46.3549C46.3666 33.0173 46.3432 32.9957 46.3198 32.9741C46.3198 32.9417 46.3081 32.931 46.2846 32.931C46.2964 32.8878 46.2378 32.877 46.2495 32.8339H46.2378C46.1441 32.6289 45.9684 32.4454 45.8629 32.2512C45.3241 31.5283 44.4103 30.7407 43.6606 30.266C43.6255 30.266 43.5786 30.2228 43.5552 30.2012C43.3795 30.1365 43.2155 29.9962 43.0281 29.9315V29.9207H42.9929V29.9099H42.9578V29.8991H42.9226V29.8883H42.8875V29.8775H42.8523V29.8667H42.8172V29.856H42.7821C42.7703 29.8128 42.6649 29.8236 42.6415 29.7804H42.6063V29.7696H42.5595C42.5712 29.7265 42.4775 29.7588 42.4892 29.7265H42.4541V29.7157H42.4072C42.4189 29.6725 42.3252 29.7049 42.3369 29.6725H42.2901V29.6617H42.2549V29.651H42.2081V29.6402H42.1729V29.6294C42.1378 29.6294 42.1026 29.6186 42.0675 29.6186V29.6078H42.0323V29.597C41.9972 29.597 41.9621 29.5862 41.9269 29.5862V29.5754H41.8918V29.5646C41.8566 29.5646 41.8215 29.5538 41.7863 29.5538V29.5431H41.7395V29.5323H41.6926V29.5215H41.6458V29.5107H41.5755V29.4999H41.5286V29.4891H41.4818V29.4783C41.4232 29.4675 41.3529 29.4567 41.2943 29.4459V29.4352C41.2241 29.4244 41.1538 29.4136 41.0952 29.4028V29.392C40.8961 29.392 40.6735 29.2841 40.4626 29.2949V29.2841H40.3455V29.2733H40.2283V29.2625H40.0643V29.2517C39.7246 29.241 39.42 29.2086 39.0569 29.2194C38.9983 29.2841 38.7523 29.187 38.7055 29.2517H38.5063V29.2625H38.3423V29.2733H38.2252V29.2841H38.108V29.2949C37.8269 29.2949 37.5575 29.392 37.2763 29.4352V29.4459C37.2178 29.4567 37.1475 29.4675 37.0889 29.4783V29.4891C37.0303 29.4999 36.9718 29.5107 36.9249 29.5215V29.5323H36.878V29.5431H36.8312V29.5538H36.7843V29.5646C36.7492 29.5646 36.714 29.5754 36.6789 29.5754V29.5862H36.6438V29.597C36.5969 29.6078 36.5383 29.6186 36.4915 29.6294V29.6402H36.4563V29.651H36.4095V29.6617C36.386 29.6617 36.3509 29.6725 36.3275 29.6725V29.6833H36.2923V29.6941H36.2455V29.7049H36.2103V29.7157H36.1635C36.1752 29.7588 36.0815 29.7265 36.0932 29.7588H36.0463C36.0463 29.802 35.9409 29.7804 35.9409 29.8236H35.9058V29.8344H35.8706V29.8452H35.8238C35.8238 29.8883 35.7183 29.8667 35.7183 29.9099H35.6832V29.9207H35.648V29.9315H35.6129V29.9423H35.5778V29.9531C35.5543 29.9423 35.5309 29.9638 35.5075 29.9854C35.4723 29.9854 35.4606 29.9962 35.4606 30.0178C35.3669 30.0286 35.32 30.1041 35.238 30.1149C35.0858 30.2444 34.8749 30.3091 34.7343 30.4386C34.0198 30.8486 33.2232 31.6362 32.7429 32.2512C32.6843 32.3807 32.5555 32.4886 32.5086 32.6073H32.4969C32.4617 32.7152 32.3446 32.8231 32.3095 32.931H32.2977V32.9633C32.2509 32.9849 32.2392 33.082 32.1923 33.1036V33.136C32.1455 33.136 32.1689 33.2331 32.122 33.2331V33.2762C32.0752 33.2762 32.0986 33.3733 32.0518 33.3733V33.4057H32.04V33.4381H32.0283V33.4812H32.0166V33.5136H32.0049V33.546H31.9932V33.5783H31.9815V33.6215H31.9697V33.6539H31.958V33.697H31.9463C31.9463 33.7186 31.9346 33.751 31.9346 33.7725H31.9229V33.8049H31.9112V33.8481H31.8995V33.8804H31.8877C31.8877 33.9128 31.876 33.9452 31.876 33.9775H31.8643V34.0099C31.6535 34.5062 31.5129 35.0996 31.4543 35.6499H31.4426C31.3957 36.1246 31.3957 36.6425 31.4309 37.1065H31.4426V37.2575H31.4543V37.387H31.466V37.5165H31.4777V37.6136H31.4895C31.4895 37.8618 31.6183 38.1207 31.6418 38.3689H31.6535C31.6652 38.4444 31.6886 38.5199 31.7003 38.5847H31.712V38.6278H31.7237V38.671H31.7355V38.7141H31.7472V38.7573H31.7589V38.822H31.7706V38.8544H31.7823V38.8976H31.794C31.8057 38.9407 31.8175 38.9947 31.8292 39.0378H31.8409C31.8409 39.0594 31.8526 39.0918 31.8526 39.1133H31.8643V39.1457H31.876C31.876 39.1781 31.8877 39.2105 31.8877 39.2428C31.9346 39.232 31.8995 39.3183 31.9346 39.3076V39.3507H31.9463V39.3831H31.958V39.4262C32.0049 39.4154 31.9697 39.5018 32.0049 39.491V39.5233H32.0166V39.5665C32.0635 39.5665 32.04 39.6636 32.0869 39.6636V39.696H32.0986V39.7283H32.1103V39.7607H32.122V39.7931H32.1337C32.122 39.8147 32.1455 39.8362 32.1689 39.8578C32.1689 39.8902 32.1806 39.901 32.204 39.901C32.1923 39.9441 32.2509 39.9549 32.2392 39.9981H32.2509C32.7663 40.9368 33.762 41.897 34.7343 42.5336C34.9218 42.6199 35.074 42.7602 35.2732 42.8357V42.8465C35.32 42.8357 35.3083 42.8897 35.3552 42.8789C35.3669 42.9005 35.3903 42.922 35.4255 42.9112V42.922H35.4606V42.9328C35.5075 42.922 35.4958 42.976 35.5426 42.9652C35.5543 42.9868 35.5778 43.0084 35.6129 42.9976V43.0083H35.648V43.0191H35.6832V43.0299H35.7183C35.7183 43.0731 35.8238 43.0515 35.8238 43.0947H35.8706C35.8706 43.1378 35.976 43.1162 35.976 43.1594H36.0112V43.1702H36.058C36.0463 43.2133 36.14 43.181 36.1283 43.2134H36.1752C36.1635 43.2565 36.2572 43.2241 36.2455 43.2565H36.2923V43.2673H36.3275V43.2781C36.3509 43.2781 36.386 43.2889 36.4095 43.2889V43.2997C36.4446 43.2997 36.4798 43.3105 36.5149 43.3105V43.3212H36.5501V43.332C36.5969 43.3428 36.6555 43.3536 36.7023 43.3644V43.3752H36.7492V43.386H36.796V43.3968H36.8429V43.4076H36.8898V43.4183H36.9366V43.4291C36.9718 43.4291 37.0186 43.4399 37.0538 43.4399V43.4507C37.0889 43.4507 37.1358 43.4615 37.1709 43.4615V43.4723C37.616 43.5478 38.0612 43.6665 38.518 43.6773V43.6881C41.1772 43.7312 43.8832 43.6881 46.5541 43.6989C46.8352 43.7097 47.0344 43.7097 47.1866 43.5478C47.2101 43.2349 47.0929 42.6739 47.1281 42.2423ZM44.4806 41.3468H38.6938C38.2252 41.2928 37.7098 41.2173 37.2998 41.0447H37.2646V41.0339H37.2178V41.0231C37.1943 41.0231 37.1592 41.0123 37.1358 41.0123V41.0015H37.1006V40.9907H37.0538C37.0655 40.9476 36.9718 40.9799 36.9835 40.9476H36.9366C36.9366 40.9044 36.8312 40.926 36.8312 40.8828H36.796V40.872H36.7609V40.8612H36.7258V40.8504C36.7023 40.8612 36.6789 40.8397 36.6555 40.8181C36.6203 40.8181 36.6086 40.8073 36.6086 40.7857C36.5618 40.7965 36.55 40.7426 36.5032 40.7533V40.7426C36.3509 40.6994 36.2338 40.5699 36.0932 40.5268C35.7418 40.311 35.3786 39.9657 35.0389 39.6528C34.9335 39.5018 34.8046 39.3615 34.6992 39.232C34.6758 39.1457 34.582 39.1026 34.5586 39.0162H34.5469C34.3712 38.671 34.0783 38.2825 34.008 37.8618H33.9963V37.8186H33.9846V37.7754H33.9729V37.7107H33.9612V37.646H33.9495V37.5812H33.9378C33.9378 37.5381 33.926 37.4841 33.926 37.441H33.9143V37.3439H33.9026V37.2468H33.8909V37.1497H33.8792C33.8323 36.7936 33.8323 36.2757 33.8675 35.9089H33.8792C33.8909 35.6175 33.9846 35.3478 34.0432 35.0673H34.0549V35.0241H34.0666V34.981H34.0783V34.9378H34.09V34.8946H34.1018V34.8515H34.1135V34.8083H34.1252C34.1252 34.776 34.1369 34.7436 34.1369 34.7112H34.1486V34.6789H34.1603V34.6357H34.172V34.6033H34.1838V34.5602C34.2306 34.571 34.1955 34.4847 34.2306 34.4954V34.4631H34.2423V34.4199C34.2892 34.4199 34.2657 34.3228 34.3126 34.3228V34.2904C34.3477 34.2689 34.3829 34.1825 34.3946 34.1502C34.418 34.1394 34.4415 34.1178 34.4297 34.0854H34.4415C34.4298 34.0423 34.4883 34.0531 34.4766 34.0099H34.4883C34.5117 33.9128 34.6172 33.8481 34.6406 33.7617C34.992 33.3086 35.566 32.7475 36.0815 32.4131C36.2455 32.3483 36.3978 32.2081 36.5852 32.1433V32.1325H36.6203V32.1218H36.6555V32.111H36.6906V32.1002H36.7258V32.0894H36.7609V32.0786H36.796V32.0678H36.8312V32.057H36.8663C36.8546 32.0139 36.9483 32.0462 36.9366 32.0139H36.9718V32.0031H37.0186C37.0069 31.9599 37.1006 31.9923 37.0889 31.9599H37.1358V31.9491H37.1709V31.9383H37.2178V31.9275H37.2529V31.9167C37.2881 31.9167 37.3232 31.906 37.3583 31.906V31.8952H37.4052V31.8844H37.452V31.8736H37.4989V31.8628H37.5458V31.852H37.5926V31.8412C37.6395 31.8412 37.6863 31.8304 37.7332 31.8304V31.8196H37.7801V31.8089C37.8269 31.8089 37.8855 31.7981 37.9323 31.7981V31.7873H38.0026V31.7765H38.108V31.7657H38.1901V31.7549H38.2955V31.7441H38.4361V31.7333H38.5883V31.7225C38.7875 31.7549 39.1858 31.647 39.3732 31.7225H39.6075V31.7333H39.7598V31.7441C40.158 31.7765 40.6032 31.8736 40.9429 32.0139H40.9781V32.0246H41.0249V32.0354H41.0601V32.0462H41.1069C41.0952 32.0894 41.1889 32.057 41.1772 32.0894H41.224C41.224 32.1325 41.3295 32.111 41.3295 32.1541H41.3646V32.1649H41.3998V32.1757H41.4349C41.6223 32.2728 41.8449 32.3807 42.0089 32.4778C42.5946 32.8662 43.2975 33.4596 43.6255 34.0315H43.6372C43.6372 34.0854 43.7192 34.1286 43.7192 34.1825C43.7426 34.1933 43.7661 34.2149 43.7544 34.2473H43.7661C43.7895 34.3012 43.8246 34.3768 43.8715 34.4199V34.4631C43.9184 34.4523 43.8832 34.5386 43.9183 34.5278V34.5602H43.9301V34.5925C43.9769 34.5925 43.9535 34.6896 44.0003 34.6896V34.7328H44.0121V34.7652C44.1058 34.927 44.1995 35.1752 44.2346 35.3802H44.2463V35.4449H44.2581V35.5096H44.2698V35.5852H44.2815C44.2815 35.7362 44.3635 35.8981 44.3518 36.0491H44.3635V36.2002H44.3752C44.5041 37.7862 44.4689 39.5773 44.4806 41.3468ZM29.5566 37.592C29.7206 37.4194 29.7323 37.3007 29.7206 36.9986V35.5744H29.7089C29.7089 35.542 29.6972 35.4989 29.6972 35.4665H29.6855V35.4341H29.6737C29.6737 35.2075 29.5683 34.9918 29.5566 34.776H29.5449C29.5332 34.7112 29.5215 34.6465 29.5097 34.5925H29.498C29.4863 34.5386 29.4746 34.4739 29.4629 34.4199H29.4512V34.3768H29.4395V34.3336H29.4277V34.2904H29.416V34.2257H29.4043V34.1825H29.3926V34.1394H29.3809V34.0962H29.3692V34.0531H29.3575V34.0207H29.3457C29.334 33.9775 29.3223 33.9236 29.3106 33.8804H29.2989V33.8481H29.2872V33.8049H29.2755V33.7725H29.2637V33.7294H29.252V33.697H29.2403V33.6539H29.2286V33.6215H29.2169V33.5783H29.2052V33.546H29.1935V33.5136H29.1817V33.4812H29.17V33.4381C29.1232 33.4381 29.1466 33.341 29.0997 33.341V33.3086H29.088V33.2762H29.0763V33.2331C29.0295 33.2331 29.0529 33.136 29.006 33.136V33.1036C28.9592 33.0712 28.9357 32.9525 28.8889 32.931V32.8986H28.8772C28.8303 32.7583 28.7015 32.6504 28.6546 32.521H28.6429C28.6077 32.4239 28.5023 32.3591 28.4789 32.2512C28.2797 32.0138 28.0689 31.7225 27.7995 31.496C27.3777 30.9996 26.7803 30.6328 26.3 30.2875H26.2649C26.1829 30.212 26.054 30.1365 25.9603 30.1041V30.0933C25.89 30.0717 25.808 30.0178 25.7612 29.9854H25.726V29.9746H25.6909V29.9639H25.6557V29.9531H25.6206V29.9423H25.5854C25.5972 29.8991 25.5034 29.9315 25.5152 29.8991H25.48V29.8883H25.4449V29.8775H25.4097C25.4097 29.8344 25.3043 29.856 25.3043 29.8128C25.2809 29.8128 25.2457 29.802 25.2223 29.802C25.234 29.7589 25.1403 29.7912 25.152 29.7588H25.1052V29.7481H25.07V29.7373C25.0466 29.7373 25.0114 29.7265 24.988 29.7265V29.7157H24.9412C24.9529 29.6725 24.8592 29.7049 24.8709 29.6725H24.824V29.6617H24.7772V29.651H24.742V29.6402C24.7069 29.6402 24.6717 29.6294 24.6366 29.6294V29.6186H24.6015C24.5312 29.5431 24.3086 29.5646 24.25 29.4891H24.1797V29.4783H24.1329V29.4675H24.086V29.4567C23.922 29.4567 23.758 29.3596 23.594 29.3596V29.3488H23.5237V29.3381H23.4417V29.3273H23.3363V29.3165H23.2543V29.3057H23.1489V29.2949C22.8794 29.2949 22.5983 29.2194 22.3289 29.2302V29.2194C21.8954 29.2086 21.462 29.2194 21.0403 29.2517V29.2625C20.8412 29.2517 20.642 29.3273 20.4429 29.3273V29.3381C20.3843 29.3381 20.3257 29.3488 20.2789 29.3488V29.3596H20.1969V29.3704C20.1266 29.3812 20.0446 29.392 19.9743 29.4028V29.4136H19.904V29.4244H19.8337V29.4352H19.7869V29.4459C19.74 29.4459 19.6931 29.4567 19.6463 29.4567V29.4675H19.5994V29.4783H19.5526V29.4891H19.4823V29.4999H19.4354V29.5107H19.3886V29.5215H19.3417V29.5323C19.3066 29.5323 19.2714 29.5431 19.2363 29.5431V29.5538H19.2011V29.5646C19.166 29.5646 19.1309 29.5754 19.0957 29.5754V29.5862H19.0606V29.597C19.0254 29.597 18.9903 29.6078 18.9551 29.6078V29.6186H18.92V29.6294H18.8732V29.6402H18.838V29.651H18.7911V29.6617H18.756V29.6725H18.7091C18.7209 29.7157 18.6272 29.6833 18.6389 29.7157H18.592C18.6037 29.7588 18.51 29.7265 18.5217 29.7588H18.4866V29.7696H18.4397V29.7804H18.4046C18.4163 29.8236 18.3226 29.7912 18.3343 29.8236H18.2991V29.8344H18.264V29.8452H18.2289V29.856H18.1937V29.8667H18.1586V29.8775H18.1234V29.8883H18.0883V29.8991C17.8071 30.0178 17.5612 30.1796 17.3386 30.3415C16.6123 30.7623 15.8626 31.496 15.3471 32.1218C15.3471 32.1541 15.3003 32.1973 15.2768 32.2189C15.1831 32.4023 15.0074 32.5749 14.9254 32.7799H14.9137C14.6677 33.2546 14.3514 33.7941 14.2226 34.3552H14.2108C14.2108 34.3875 14.1991 34.4307 14.1991 34.4631H14.1874V34.5062H14.1757V34.571H14.164C14.164 34.6141 14.1523 34.6573 14.1523 34.7004H14.1406V34.776H14.1289V34.8407H14.1171V34.9162H14.1054V34.9918H14.0937V35.0673H14.082C14.082 35.132 14.0703 35.1968 14.0703 35.2507H14.0586C14.0586 35.3262 14.0468 35.4018 14.0468 35.4881H14.0351V35.6175H14.0234V35.801H14.0117V36.1139H14V36.6425C14.0703 36.7612 14.0117 36.9878 14.0351 37.1281H14.0468V37.2683H14.0586V37.3978H14.0703C14.0586 37.6028 14.1757 37.8078 14.1757 38.0128H14.1874C14.1991 38.0776 14.2108 38.1423 14.2226 38.1962H14.2343C14.2343 38.2394 14.246 38.2826 14.246 38.3257H14.2577C14.2577 38.3581 14.2694 38.4012 14.2694 38.4336H14.2811V38.4768H14.2929V38.5199H14.3046V38.5847H14.3163V38.6278H14.328V38.671H14.3397V38.7141H14.3514V38.7573H14.3631C14.3631 38.7897 14.3749 38.822 14.3749 38.8544H14.3866V38.8868H14.3983C14.3983 38.9191 14.41 38.9515 14.41 38.9839H14.4217V39.0162H14.4334V39.0594H14.4451C14.4451 39.081 14.4568 39.1133 14.4568 39.1349H14.4686V39.1673H14.4803V39.2104H14.492V39.2428H14.5037V39.286C14.5506 39.2752 14.5154 39.3615 14.5506 39.3507V39.3939C14.5974 39.3939 14.574 39.491 14.6208 39.491V39.5233H14.6326V39.5557H14.6443V39.5989C14.6911 39.5989 14.6677 39.696 14.7146 39.696V39.7283H14.7263V39.7607C14.7614 39.7823 14.7966 39.8686 14.8083 39.901C14.8317 39.9118 14.8551 39.9333 14.8434 39.9657H14.8551C15.3823 40.8936 16.3897 41.8539 17.3737 42.4797C17.5611 42.5552 17.7251 42.7062 17.936 42.7818V42.7926C18.018 42.8465 18.182 42.8789 18.264 42.9436H18.2991V42.9544H18.3343V42.9652H18.3694V42.976H18.4046C18.4163 43.0191 18.5217 43.0084 18.5451 43.0515H18.5803V43.0623H18.6272C18.6154 43.1055 18.7092 43.0731 18.6974 43.1055H18.7443C18.7326 43.1486 18.8263 43.1162 18.8146 43.1486H18.8614V43.1594H18.8966V43.1702H18.9434V43.181H18.9786C19.5174 43.3968 20.1734 43.5478 20.7826 43.6018V43.6126H20.9232V43.6234H21.0754V43.6341H21.2629V43.6449H21.5909V43.6557H22.1532V43.6449C22.3289 43.6449 22.4929 43.6341 22.6569 43.6341V43.6234C23.0786 43.6126 23.4886 43.5047 23.8986 43.4399V43.4291C23.9572 43.4184 24.0274 43.4076 24.086 43.3968V43.386C24.1446 43.3752 24.2032 43.3644 24.25 43.3536V43.3428H24.2969V43.332H24.3437V43.3212H24.3906V43.3105H24.4374V43.2997C24.4843 43.2889 24.5429 43.2781 24.5897 43.2673V43.2565H24.6249V43.2457C24.66 43.2457 24.6952 43.2349 24.7303 43.2349V43.2241H24.7654V43.2134C24.8006 43.2134 24.8357 43.2026 24.8709 43.2026V43.1918H24.906V43.181H24.9529C24.9412 43.1378 25.0349 43.1702 25.0232 43.1378H25.07V43.127H25.1052V43.1162H25.152C25.1403 43.0731 25.234 43.1055 25.2223 43.0731H25.2575V43.0623C25.3043 43.0623 25.3629 43.0299 25.398 42.9976H25.4332V42.9868H25.4683V42.976C25.8197 42.8465 26.1243 42.6091 26.4172 42.4581C26.4757 42.3934 26.5929 42.3502 26.6515 42.2855C26.9092 42.1344 27.1552 41.9294 27.3777 41.7028C27.5066 41.6597 27.5769 41.4978 27.6472 41.4223V41.3899H27.6589C27.7877 40.8612 27.1786 40.6347 26.874 40.3002C26.6632 40.1276 26.4992 39.8794 26.2766 39.7715C26.2883 39.7283 26.1946 39.7607 26.2063 39.7283H26.1594V39.7176H26.0775V39.7068H25.9954V39.7176H25.9134C25.4917 39.9333 25.1286 40.3433 24.742 40.5591C24.6366 40.5807 24.5663 40.6778 24.4492 40.6994V40.7102H24.414V40.721C24.3437 40.7533 24.25 40.7857 24.1915 40.8289H24.1446V40.8397H24.1094C24.1094 40.8828 24.004 40.8612 24.004 40.9044H23.9572C23.9689 40.9476 23.8752 40.9152 23.8869 40.9476H23.84V40.9583H23.8049V40.9691C23.7697 40.9691 23.7346 40.9799 23.6994 40.9799V40.9907H23.6643C23.3363 41.1202 22.9146 41.2065 22.5397 41.2389V41.2497H22.3992V41.2604C22.0712 41.282 21.6377 41.282 21.3097 41.2604V41.2497H21.1574V41.2389H21.0169V41.2281H20.9114V41.2173C20.5834 41.1849 20.2203 41.0986 19.9392 40.9799H19.904V40.9691H19.8572V40.9583C19.8337 40.9583 19.7986 40.9476 19.7751 40.9476V40.9368H19.74V40.926H19.6932C19.7049 40.8828 19.6112 40.9152 19.6229 40.8828H19.576C19.576 40.8397 19.4706 40.8612 19.4706 40.8181H19.4354V40.8073H19.4003V40.7965H19.3651V40.7857H19.33V40.7749C19.1074 40.6994 18.92 40.5483 18.7326 40.462C18.0649 40.0089 17.4089 39.3615 17.0691 38.6926H17.0574V38.6602H17.0457V38.6278H17.034V38.5954H17.0223V38.5631H17.0106V38.5307H16.9989V38.4983H16.9871V38.466H16.9754C16.9754 38.4444 16.9637 38.412 16.9637 38.3904C16.9169 38.4012 16.952 38.3149 16.9169 38.3257V38.2826H16.9051V38.2502H16.8934C16.8934 38.2286 16.8817 38.1962 16.8817 38.1747H16.87V38.1315H16.8583V38.0991H16.8466C16.8231 37.9481 16.7294 37.8294 16.706 37.6568C20.8646 37.592 25.2809 37.8186 29.5566 37.592ZM16.6357 34.9486V34.9054H16.6474C16.6474 34.8731 16.6591 34.8407 16.6591 34.8083H16.6709C16.6826 34.7652 16.6943 34.7112 16.706 34.6681H16.7177V34.6357H16.7294C16.7294 34.6033 16.7411 34.571 16.7411 34.5386C16.788 34.5494 16.7529 34.4631 16.788 34.4739V34.4307C16.8349 34.4307 16.8114 34.3336 16.8583 34.3336V34.3012H16.87V34.2689H16.8817V34.2365H16.8934V34.2041H16.9051V34.1718H16.9169V34.1394H16.9286C16.952 34.0531 17.0457 33.9775 17.0691 33.8912H17.0809C17.3971 33.341 18.0414 32.7583 18.6037 32.3699C18.8029 32.2836 18.9786 32.1325 19.2011 32.057V32.0462H19.2363V32.0354H19.2714V32.0246H19.3066V32.0139H19.3417V32.0031H19.3769V31.9923H19.412C19.412 31.9491 19.5174 31.9707 19.5174 31.9275H19.5643C20.3609 31.5715 21.4034 31.4528 22.3289 31.5499V31.5607H22.446V31.5715H22.5514V31.5823H22.6569V31.5931H22.7389V31.6038H22.8092V31.6146H22.8912V31.6254H22.9614V31.6362H23.0317V31.647C23.0903 31.6578 23.1606 31.6686 23.2192 31.6794V31.6902H23.266V31.701H23.3129V31.7117H23.3597V31.7225H23.4066V31.7333H23.4534V31.7441C23.5003 31.7549 23.5589 31.7657 23.6057 31.7765V31.7873H23.6409V31.7981H23.6877C23.676 31.8412 23.7697 31.8089 23.758 31.8412H23.8049V31.852H23.84C23.8283 31.8952 23.922 31.8628 23.9103 31.8952H23.9454V31.906H23.9806V31.9167H24.0157V31.9275H24.0509V31.9383H24.086V31.9491H24.1212V31.9599H24.1563V31.9707H24.1915V31.9815C25.0935 32.3915 25.9369 33.1683 26.382 33.9991H26.3937C26.4289 34.0639 26.464 34.1502 26.5109 34.2041V34.2473H26.5226V34.2796C26.5694 34.2796 26.546 34.3768 26.5929 34.3768V34.4199H26.6046V34.4523H26.6163C26.6163 34.4846 26.628 34.517 26.628 34.5494H26.6397V34.5818H26.6515C26.6515 34.6141 26.6632 34.6465 26.6632 34.6789H26.6749C26.6749 34.7112 26.6866 34.7436 26.6866 34.776H26.6983V34.8191H26.71V34.8623H26.7217V34.9054H26.7335V34.9702H26.7452C26.7452 35.0025 26.7569 35.0457 26.7569 35.0781H26.7686V35.0889H16.3897C16.5889 35.1428 16.5771 35.0025 16.6357 34.9486ZM26.8857 48.9965C25.8197 48.9642 25.89 49.2555 25.9134 48.1873H27.9283C27.9283 48.6944 27.9517 49.2123 27.858 49.7086H27.8463C27.8463 49.741 27.8346 49.7842 27.8346 49.8165H27.8229V49.8597H27.8112V49.9028H27.7995V49.946C27.7526 49.946 27.776 50.0431 27.7292 50.0431V50.0755H27.7175V50.1078C27.5417 50.4099 27.1552 50.6905 26.8389 50.8415C26.8155 50.8415 26.7803 50.8523 26.7569 50.8523V50.8631H26.71V50.8739H26.6632V50.8847H26.6163V50.8955H26.5694V50.9063H26.4992V50.917C26.218 50.9602 25.8197 50.9818 25.5152 50.9278V50.917H25.4449V50.9063H25.3746V50.8955H25.3277V50.8847H25.2575V50.8739H25.2223V50.8631H25.1754V50.8523H25.1403V50.8415H25.0934C24.2852 50.4855 23.922 49.7949 23.9689 48.7807C23.9337 47.6802 23.922 46.7415 24.8357 46.2128C24.9177 46.1697 25.0466 46.1157 25.1286 46.0726H25.1637V46.0618H25.2106V46.051H25.2457V46.0402C26.0189 45.8136 27.0732 45.9755 27.6237 46.5689C27.3777 46.7847 27.1552 47.0328 26.8975 47.227C26.6163 46.8926 26.1126 46.7307 25.644 46.8494V46.8602H25.6089V46.871H25.562V46.8818H25.5269V46.8926C25.3394 46.9465 25.234 47.1407 25.1403 47.281V47.3241H25.1286V47.3889H25.1169V47.4644H25.1052V47.5723H25.0934C25.0817 47.8097 25.07 48.0686 25.0817 48.3276H25.07C25.0935 48.7484 25.07 49.2015 25.152 49.5792H25.1637V49.6223C25.2574 49.7734 25.3863 49.9676 25.5854 50.0323V50.0431H25.6323V50.0539H25.6792V50.0647H25.726V50.0755H25.808C26.4523 50.2373 26.956 49.7518 26.8857 48.9965ZM19.7283 45.9647C19.7869 47.2163 19.5877 48.6081 19.8337 49.8165C19.8806 49.8057 19.8454 49.892 19.8806 49.8813V49.9136H19.8923C19.9977 50.1726 20.3374 50.4531 20.7123 50.4963V50.507H20.7943V50.5178H21.0169V50.5286C21.052 50.5286 21.052 50.5178 21.052 50.5178H21.2746V50.507H21.38V50.4963H21.4503V50.4855H21.4972V50.4747H21.544V50.4639H21.5909C21.8603 50.3452 22.1063 50.1294 22.2352 49.8813V49.8381H22.2469V49.8057H22.2586V49.7626C22.4812 48.6189 22.2703 47.2055 22.3406 45.997H22.9146V49.5144H22.9029V49.6439H22.8912V49.741H22.8794V49.8057H22.8677V49.8705H22.856V49.9136H22.8443V49.9568H22.8326V49.9999C22.7857 49.9892 22.8209 50.0755 22.7857 50.0647V50.1078H22.774V50.1402H22.7623C22.7623 50.1942 22.6803 50.2373 22.6803 50.2913H22.6686C22.5749 50.4747 22.3523 50.6257 22.1883 50.7444C22.118 50.7552 22.0477 50.8307 21.9892 50.8415V50.8523H21.9423C21.954 50.8955 21.8603 50.8631 21.872 50.8955H21.8252V50.9063H21.7783V50.917H21.7314V50.9278H21.6846V50.9386H21.6143V50.9494H21.5323V50.9602H21.4503V50.971H21.3097C21.1457 51.0465 20.8294 50.9494 20.642 50.9602V50.9494C20.5952 50.9494 20.5483 50.9386 20.5014 50.9386V50.9278H20.4546V50.917H20.4077V50.9063H20.3609V50.8955H20.314C20.3257 50.8523 20.232 50.8847 20.2437 50.8523C19.8923 50.7444 19.6111 50.4531 19.4237 50.1834V50.151C19.3769 50.151 19.4003 50.0539 19.3534 50.0539V50.0107H19.3417V49.9784H19.33C19.3183 49.9352 19.3066 49.8813 19.2949 49.8381H19.2832C19.1192 48.6189 19.2597 47.2594 19.2129 46.0078C19.2714 45.9323 19.5643 45.9647 19.7283 45.9647ZM38.3306 45.9647C38.6469 45.997 39.0686 45.8891 39.3146 46.0078C39.3381 46.0941 39.4435 46.1589 39.4669 46.256C39.5372 46.3315 39.6075 46.4286 39.6543 46.5257C39.7246 46.6013 39.7949 46.6984 39.8418 46.7955C39.9121 46.871 39.9823 46.9681 40.0292 47.0652C40.1581 47.2163 40.2752 47.3781 40.3689 47.5507C40.4392 47.6263 40.5095 47.7234 40.5563 47.8205C40.6266 47.896 40.6969 47.9931 40.7438 48.0902C41.0015 48.3815 41.1538 48.7052 41.4232 49.0289V45.9755H42.4775V50.9602C41.8449 50.9171 41.5286 51.1544 41.2709 50.5718C41.1421 50.4207 41.0249 50.2589 40.9312 50.0863C40.8023 49.9352 40.6852 49.7734 40.5915 49.6007C40.4626 49.4497 40.3455 49.2878 40.2518 49.1152C39.9355 48.7376 39.7129 48.2952 39.3849 47.9284V50.9602H38.3306V45.9647ZM48.4518 45.9647H49.5061V50.097H51.9661V50.9602H48.4518V45.9647ZM51.4624 45.9647C51.7318 46.0186 52.6338 45.8136 52.6689 46.1049H52.6807V46.1373H52.6924V46.1697C52.7509 46.202 52.7509 46.3423 52.8095 46.3747V46.4178C52.8564 46.4178 52.8329 46.5149 52.8798 46.5149V46.5473H52.8915V46.5797H52.9032V46.6228C52.9501 46.6228 52.9267 46.7199 52.9735 46.7199V46.7523C53.0204 46.7415 52.9852 46.8278 53.0204 46.817V46.8602C53.0672 46.8602 53.0438 46.9573 53.0907 46.9573V46.9897H53.1024V47.022H53.1141V47.0652C53.1726 47.0868 53.1609 47.1947 53.2195 47.2163V47.2486H53.2312V47.2918C53.2781 47.2918 53.2547 47.3889 53.3015 47.3889V47.4213H53.3132V47.4536H53.3249V47.4968C53.3718 47.4968 53.3484 47.5939 53.3952 47.5939V47.6263H53.4069V47.6586H53.4187V47.7018H53.4304C53.4421 47.7989 53.5358 47.8528 53.5475 47.9715H53.5826C53.5944 47.8744 53.6647 47.842 53.6647 47.7557H53.6764V47.7234H53.6881V47.691H53.6998V47.6586H53.7115V47.6263H53.7232V47.5939H53.7349V47.5507C53.7818 47.5507 53.7584 47.4536 53.8052 47.4536V47.4213C53.8638 47.4105 53.8404 47.2918 53.8872 47.281V47.2486H53.8989C53.8989 47.227 53.9107 47.1947 53.9107 47.1731C53.9575 47.1731 53.9341 47.076 53.9809 47.076V47.0328C54.0278 47.0328 54.0044 46.9357 54.0512 46.9357V46.9034H54.0629V46.871H54.0747V46.8278C54.1215 46.8278 54.0981 46.7307 54.1449 46.7307V46.6984H54.1567C54.1567 46.6768 54.1684 46.6444 54.1684 46.6228C54.2152 46.6228 54.1918 46.5257 54.2387 46.5257V46.4826C54.2855 46.4826 54.2621 46.3855 54.3089 46.3855V46.3531H54.3207V46.3099C54.3675 46.3099 54.3441 46.2128 54.3909 46.2128V46.1805H54.4026V46.1481H54.4144V46.1049C54.4495 46.1049 54.4729 45.9755 54.4964 45.9647H55.6327C55.5389 46.1913 55.3867 46.3962 55.2929 46.6012H55.2812V46.6336H55.2695V46.666C55.2227 46.6552 55.2578 46.7415 55.2227 46.7307V46.7631C55.1758 46.7523 55.2109 46.8386 55.1758 46.8278V46.8602H55.1641V46.8926H55.1524V46.9249H55.1407V46.9573H55.1289V46.9897C55.0469 47.0976 54.9532 47.281 54.8947 47.4105H54.8829V47.4428C54.8361 47.4536 54.8478 47.5507 54.8009 47.5723V47.6047H54.7892V47.637H54.7775V47.6694H54.7658V47.7018H54.7541V47.7341C54.6955 47.7665 54.6955 47.8852 54.6369 47.9176V47.9499H54.6252V47.9823H54.6135V48.0147H54.6018V48.047C54.5784 48.0686 54.5432 48.1226 54.5315 48.1549C54.5081 48.1657 54.4847 48.1873 54.4964 48.2197H54.4847V48.252C54.4144 48.2952 54.4144 48.4247 54.3441 48.4678V48.5002H54.3324V48.5326H54.3207V48.5649H54.3089V48.5973C54.2621 48.5973 54.2855 48.6944 54.2387 48.6944V48.7268H54.2269V48.7591H54.2152V48.7915H54.2035V48.8239C54.1567 48.8131 54.1918 48.8994 54.1567 48.8886V48.921H54.1449V48.9534H54.1332V50.9818H53.1024V48.9534H53.0907C53.0907 48.9102 53.0555 48.8455 53.0204 48.8239V48.7915H53.0087V48.7591H52.9969V48.7268H52.9852V48.6944H52.9735V48.662C52.8915 48.5865 52.8681 48.4247 52.7861 48.3491V48.3168H52.7744V48.2844H52.7626V48.252H52.7509V48.2197H52.7392V48.1873H52.7275C52.7392 48.1657 52.7158 48.1442 52.6924 48.1226C52.6806 48.0902 52.6572 48.0255 52.6221 48.0147V47.9823H52.6104V47.9499H52.5987V47.9176H52.5869V47.8852C52.4932 47.7773 52.4464 47.5831 52.3526 47.4752V47.4428H52.3409V47.4105H52.3292V47.3781H52.3175V47.3457C52.2707 47.3134 52.2472 47.1947 52.2004 47.1731V47.1407H52.1887V47.1084H52.1769V47.076H52.1652V47.0436H52.1535V47.0113H52.1418V46.9789C52.0949 46.9681 52.1066 46.871 52.0598 46.8494V46.817H52.0481V46.7847H52.0364V46.7523H52.0247V46.7199C51.9778 46.7307 52.0129 46.6444 51.9778 46.6552V46.6228H51.9661V46.5905H51.9544V46.5581H51.9426V46.5257H51.9309V46.4934C51.6498 46.3639 51.5561 46.1481 51.4624 45.9647ZM60.9392 45.9647C61.2438 46.0186 61.8764 45.8136 61.9701 46.1157C62.0404 46.1912 62.1107 46.2884 62.1575 46.3855C62.2278 46.461 62.2981 46.5581 62.345 46.6552C62.4152 46.7307 62.4855 46.8278 62.5324 46.9249C62.6027 47.0005 62.673 47.0976 62.7198 47.1947C62.7901 47.2702 62.8604 47.3673 62.9072 47.4644C62.9775 47.5399 63.0478 47.637 63.0947 47.7341C63.165 47.8097 63.2352 47.9068 63.2821 48.0039C63.5515 48.3276 63.739 48.6836 64.0318 49.0397V45.9863H65.0861V50.971C64.2544 50.9494 64.149 51.1544 63.7741 50.4423C63.6452 50.2913 63.5281 50.1294 63.4344 49.9568C63.3641 49.8813 63.2938 49.7842 63.247 49.687C63.1181 49.536 63.001 49.3742 62.9072 49.2015C62.5675 48.8023 62.3567 48.3815 61.9935 47.9391V50.971H60.9392V45.9647ZM17.9946 47.4644H17.9829V47.3565H17.9711V47.281H17.9594V47.2055H17.9477V47.1407H17.936V47.0976H17.9243V47.0544H17.9126V47.0113H17.9009C17.9009 46.9789 17.8891 46.9465 17.8891 46.9141C17.8306 46.8602 17.7954 46.7523 17.7486 46.6768C17.1746 45.8352 15.9094 45.9755 14.9254 45.9755C14.7497 45.9755 14.4334 45.9431 14.2929 45.9863V50.9602C15.0777 50.9386 15.9563 51.0034 16.7177 50.917V50.9063H16.788V50.8955C16.8349 50.8847 16.8934 50.8739 16.9403 50.8631V50.8523H16.9754V50.8415H17.0223C17.0223 50.7984 17.1277 50.8199 17.1277 50.7768H17.1629C17.2917 50.7013 17.4206 50.6042 17.5494 50.507C17.6549 50.3668 17.7603 50.2481 17.8423 50.097V50.0539H17.854V50.0215H17.8657V49.9784H17.8774V49.9352H17.8891V49.892H17.9009V49.8489H17.9126C17.9126 49.8057 17.9243 49.7626 17.9243 49.7194H17.936V49.6439H17.9477V49.5468H17.9594V49.4173H17.9711C18.0297 48.7592 18.0414 48.0902 17.9946 47.4644ZM17.444 48.6836H17.4323C17.444 48.9642 17.4089 49.2663 17.3854 49.5252H17.3737V49.5899H17.362V49.6547H17.3503V49.7194H17.3386V49.7626H17.3269V49.8057C17.28 49.7949 17.3152 49.8813 17.28 49.8705C17.198 50.0971 16.9637 50.2805 16.7177 50.356V50.3668H16.6826V50.3776H16.6357V50.3884H16.5889V50.3992H16.542V50.4099H16.46V50.4207H16.378V50.4315C15.8977 50.4639 15.3706 50.4423 14.8786 50.4423V46.407C15.7103 46.4286 16.87 46.2236 17.2917 46.9681V47.0005C17.3386 47.0005 17.3151 47.0976 17.362 47.0976V47.1407H17.3737V47.1839H17.3854V47.2486H17.3972V47.3134H17.4089V47.4105H17.4206V47.5076H17.4323V47.6586H17.444C17.4206 48.0255 17.4557 48.3492 17.444 48.6836ZM59.1352 46.2128C59.0767 46.2128 59.0298 46.1373 58.9712 46.1373C58.6432 45.9431 58.1864 45.9215 57.753 45.9323C57.5304 45.9755 57.2258 46.0186 57.0618 46.1373H57.0267C56.6987 46.3099 56.3589 46.6013 56.1949 46.9465V46.9789H56.1832V47.022H56.1715V47.0544H56.1598C55.9841 47.7341 56.0427 48.662 56.0544 49.3957H56.0661C56.0778 49.4928 56.0895 49.5899 56.1012 49.6978H56.1129V49.7626H56.1247V49.8057H56.1364V49.8489H56.1481V49.892H56.1598V49.9352C56.2067 49.9352 56.1832 50.0323 56.2301 50.0323V50.0647H56.2418V50.097C56.2652 50.1186 56.3004 50.1726 56.3121 50.2049C56.5229 50.4531 56.7924 50.7121 57.1321 50.8199C57.3898 50.9602 57.9052 51.0357 58.2215 50.971H58.3621V50.9602H58.4675V50.9494H58.5495V50.9386C58.5847 50.9386 58.6315 50.9278 58.6667 50.9278V50.917H58.7135V50.9063C59.8147 50.5934 60.0724 49.5899 60.0021 48.5865C60.0607 47.6586 59.9787 46.6984 59.1352 46.2128ZM58.4792 50.0107C58.4792 50.0539 58.3738 50.0323 58.3738 50.0755H58.3269V50.0863C58.2801 50.0863 58.2332 50.097 58.1864 50.097C58.1629 50.1402 57.7412 50.1186 57.7412 50.0863H57.6944V50.0755H57.6475C57.4484 49.9892 57.2727 49.8381 57.1672 49.6547V49.6115H57.1555V49.5468H57.1438V49.482H57.1321V49.3849H57.1204V49.2555H57.1087C57.0852 48.6728 57.0501 47.9176 57.1555 47.3673H57.1672V47.3241H57.179V47.281H57.1907V47.2486C57.2727 47.0976 57.4367 46.9573 57.6007 46.871H57.6358V46.8602H57.6827V46.8494H57.7295V46.8386H57.7998V46.8278H57.9404V46.817C58.3035 46.817 58.491 46.9249 58.7018 47.0868C58.8307 47.2594 58.9478 47.486 58.9244 47.7449H58.9361C58.8892 48.4463 59.1938 49.6115 58.4792 50.0107ZM32.7195 50.5934H32.7078V50.561H32.696V50.5286H32.6843V50.4963H32.6726V50.4639H32.6609V50.4315H32.6492V50.3992C32.5555 50.302 32.4969 50.0863 32.3915 49.9784V49.946H32.3797C32.3212 49.8273 32.2392 49.6655 32.1572 49.5576V49.5252H32.1455V49.4928H32.1337C32.1455 49.4713 32.122 49.4497 32.0986 49.4281C32.0986 49.3957 32.0869 49.3849 32.0635 49.3849C32.0635 49.331 32.0049 49.3094 32.0166 49.2555H32.0049V49.2231H31.9932V49.1907C31.9229 49.072 31.8175 48.9426 31.7706 48.7807C32.1337 48.6836 32.4149 48.4247 32.5906 48.1549V48.1226C32.6375 48.1226 32.614 48.0255 32.6609 48.0255C32.6609 47.9931 32.6726 47.9607 32.6726 47.9284H32.6843C32.7663 47.6047 32.7546 47.2378 32.6492 46.9141H32.6375V46.8818H32.6258V46.8386C32.4969 46.612 32.2978 46.3639 32.0518 46.2128C32.0166 46.202 31.9463 46.1805 31.9346 46.1481H31.8995V46.1373H31.8643C31.8643 46.0941 31.7589 46.1157 31.7589 46.0726H31.712V46.0618H31.6652V46.051H31.6183V46.0402H31.5715V46.0294C30.7046 45.9215 29.744 45.9539 28.8889 45.9863V50.9602H29.9549V48.9749H30.7046C30.728 48.9857 30.7515 49.1152 30.7866 49.1152V49.1476H30.7983V49.1799H30.81V49.2123H30.8217V49.2447C30.8803 49.2878 30.892 49.4173 30.9623 49.4605V49.4928H30.974V49.5252H30.9858V49.5576H30.9975V49.5899H31.0092V49.6223H31.0209V49.6655C31.0677 49.6655 31.0443 49.7626 31.0912 49.7626V49.7949H31.1029V49.8273H31.1146V49.8597H31.1263V49.892H31.138V49.9244C31.1966 49.946 31.1849 50.0539 31.2435 50.0755V50.1078H31.2552V50.1402H31.2669V50.1726H31.2786V50.2049H31.2903V50.2373H31.302V50.2697H31.3137V50.3021H31.3255V50.3344C31.384 50.3452 31.3606 50.4639 31.4075 50.4747V50.507H31.4192V50.5394H31.4309V50.5718H31.4426V50.6042C31.5129 50.7013 31.5832 50.8415 31.6418 50.9818H32.86C32.86 50.8199 32.7546 50.7013 32.7195 50.5934ZM31.5949 47.7449C31.5597 47.7881 31.5129 47.8744 31.4777 47.9284C31.4192 47.9499 31.384 48.0363 31.3137 48.0363C31.3137 48.0794 31.2083 48.0578 31.2083 48.101H31.1615C30.8218 48.2197 30.2829 48.1118 29.8846 48.1442V46.8278C30.3063 46.8386 30.81 46.7955 31.2083 46.871V46.8818H31.2435C31.2786 46.9141 31.3606 46.9573 31.4075 46.9789C31.4309 47.0328 31.5246 47.0652 31.5246 47.1299C31.5715 47.1299 31.548 47.227 31.5949 47.227V47.2702H31.6066V47.3349C31.6769 47.3889 31.6066 47.7126 31.5949 47.7449ZM46.4721 46.1157H46.4252V46.1049H46.3901V46.0941H46.3432V46.0834H46.2964V46.0726C46.2612 46.0726 46.2144 46.0618 46.1792 46.0618V46.051C46.1206 46.051 46.0621 46.0402 46.0152 46.0402V46.0294C45.2538 45.9647 44.3986 46.0078 43.6255 45.997V50.9818C44.3986 50.971 45.2186 51.0142 45.9801 50.971V50.9602H46.0855V50.9494H46.1558V50.9386H46.2261V50.9278C46.7298 50.8307 47.1632 50.4963 47.3272 50.097H47.3389V50.0647C47.3858 50.0755 47.3506 49.9892 47.3858 49.9999V49.9568H47.3975V49.9136H47.4092V49.8705H47.4209C47.4209 49.8381 47.4326 49.7949 47.4326 49.7626H47.4444V49.687H47.4561V49.6115H47.4678V49.482H47.4795C47.5264 48.2089 47.7841 46.6336 46.4721 46.1157ZM44.6563 50.0863V46.8278C45.4646 46.8063 46.1089 46.7739 46.3666 47.3241C46.3666 47.3565 46.3783 47.3889 46.3783 47.4213H46.3901V47.4968H46.4018V47.5723H46.4135V47.7126H46.4252C46.4721 49.2015 46.7884 50.3021 44.6563 50.0863ZM37.7215 50.6797H37.7098V50.6473H37.698C37.6863 50.6042 37.6746 50.5502 37.6629 50.507H37.6512V50.4747H37.6395C37.6395 50.4423 37.6278 50.4099 37.6278 50.3776H37.616V50.3452H37.6043C37.6043 50.3128 37.5926 50.2805 37.5926 50.2481H37.5809V50.2049H37.5692V50.1726H37.5575C37.5575 50.1402 37.5458 50.1078 37.5458 50.0755H37.534C37.4755 49.8057 37.288 49.536 37.2295 49.2663H37.2178V49.2231H37.206V49.1907H37.1943C37.1943 49.1584 37.1826 49.126 37.1826 49.0936H37.1709C37.1123 48.8023 36.9132 48.5218 36.8429 48.2305H36.8312V48.1981H36.8195C36.8078 48.1549 36.7961 48.101 36.7843 48.0578H36.7726V48.0255H36.7609C36.7492 47.9823 36.7375 47.9284 36.7258 47.8852H36.714V47.8528H36.7023C36.6906 47.8097 36.6789 47.7557 36.6672 47.7126H36.6555V47.6802H36.6438C36.6438 47.6478 36.632 47.6155 36.632 47.5831H36.6203V47.5507H36.6086V47.5076H36.5969C36.5969 47.4752 36.5852 47.4428 36.5852 47.4105H36.5735V47.3781H36.5618V47.3349H36.5501C36.5501 47.3026 36.5383 47.2702 36.5383 47.2378H36.5266V47.2055H36.5149C36.5032 47.1623 36.4915 47.1084 36.4798 47.0652H36.468V47.0328H36.4563C36.4446 46.9897 36.4329 46.9357 36.4212 46.8926H36.4095V46.8602H36.3978C35.9643 45.8568 36.3509 45.9215 35.2146 45.9323C35.2029 46.0186 35.1326 46.0726 35.1443 46.1481H35.1326V46.1805H35.1209C35.1092 46.2236 35.0975 46.2776 35.0858 46.3207H35.074V46.3531H35.0623C34.992 46.6768 34.7812 46.9897 34.7109 47.3026H34.6992V47.3457H34.6875V47.3781H34.6758C34.6758 47.4105 34.664 47.4428 34.664 47.4752H34.6523V47.5184H34.6406V47.5507H34.6289C34.6289 47.5831 34.6172 47.6155 34.6172 47.6478H34.6055V47.6802H34.5938C34.582 47.7234 34.5703 47.7773 34.5586 47.8205H34.5469V47.8528H34.5352C34.3946 48.3492 34.1252 48.8347 33.9729 49.3202H33.9612V49.3634H33.9495V49.3957H33.9378V49.4389H33.926C33.926 49.4713 33.9143 49.5036 33.9143 49.536H33.9026V49.5684H33.8909C33.8089 49.9136 33.598 50.2265 33.516 50.5718H33.5043V50.6042H33.4926C33.4926 50.7228 33.3989 50.7876 33.3872 50.917H34.4883C34.5352 50.8199 34.5352 50.6581 34.6055 50.5934V50.5502H34.6172V50.507H34.6289V50.4639H34.6406V50.4207H34.6523V50.3884H34.664C34.6757 50.2697 34.746 50.1834 34.7695 50.0647H36.7023C37.0655 51.2084 36.8898 50.9063 38.108 50.9386C37.7918 50.8415 37.7332 50.7876 37.7215 50.6797ZM34.7695 49.2447C34.8398 49.072 34.9217 48.9102 34.9569 48.7268H34.9686V48.6944H34.9803C34.9803 48.662 34.992 48.6297 34.992 48.5973H35.0038V48.5542H35.0155V48.511H35.0272V48.4678H35.0389V48.4247H35.0506V48.3815H35.0623V48.3491H35.074V48.306C35.156 48.2413 35.1326 48.0363 35.2146 47.9823V47.9499H35.2263C35.2263 47.9176 35.238 47.8852 35.238 47.8528H35.2498V47.8097H35.2615V47.7665H35.2732V47.7234H35.2849V47.6802H35.2966V47.637H35.3083V47.6047H35.32C35.32 47.5723 35.3318 47.5399 35.3318 47.5076H35.3435V47.4752H35.3552C35.3552 47.5076 35.3669 47.5399 35.3669 47.5723H35.3786V47.6155H35.3903V47.6586H35.402V47.7018H35.4138V47.7449H35.4255V47.7881H35.4372V47.8313H35.4489V47.8744H35.4606C35.5075 48.1442 35.6832 48.4031 35.73 48.6728H35.7418V48.716H35.7535V48.7591H35.7652V48.8023H35.7769C35.7886 48.8455 35.8003 48.8994 35.812 48.9426H35.8238V48.9749H35.8355V49.0181H35.8472C35.8472 49.1044 35.894 49.1584 35.9175 49.2339C35.6598 49.2447 35.2146 49.2447 34.7695 49.2447Z" fill="#020304"/>
</svg>
diff --git a/src/assets/icons/visu/enedis-logo-white.svg b/src/assets/icons/visu/enedis-logo-white.svg
new file mode 100644
index 000000000..2e93ddf0e
--- /dev/null
+++ b/src/assets/icons/visu/enedis-logo-white.svg
@@ -0,0 +1,4 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26 16C20.4772 16 16 20.4772 16 26V37H45C46.6569 37 48 35.6569 48 34V32C48 30.3431 46.6569 29 45 29H35C33.3431 29 32 30.3431 32 32V35H25V28C25 24.6863 27.6863 22 31 22H49C52.3137 22 55 24.6863 55 28V38C55 41.3137 52.3137 44 49 44H32V46C32 48.7615 34.2386 51 37 51H64V26C64 20.4772 59.5229 16 54 16H26Z" fill="#E0E0E0"/>
+<path d="M63.2141 57.8925C63.1989 57.9284 63.1835 57.9643 63.1679 58H37C30.3726 58 25 52.6274 25 46V44H16V64H54C58.1421 64 61.6961 61.4816 63.2141 57.8925Z" fill="#E0E0E0"/>
+</svg>
diff --git a/src/assets/icons/visu/enedis-logo.svg b/src/assets/icons/visu/enedis-logo.svg
index c9bab7de0..4e0312002 100644
--- a/src/assets/icons/visu/enedis-logo.svg
+++ b/src/assets/icons/visu/enedis-logo.svg
@@ -1,4 +1,4 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 0C4.47715 0 0 4.47715 0 10V21H29C30.6569 21 32 19.6569 32 18V16C32 14.3431 30.6569 13 29 13H19C17.3431 13 16 14.3431 16 16V19H9V12C9 8.68628 11.6863 6 15 6H33C36.3137 6 39 8.68628 39 12V22C39 25.3137 36.3137 28 33 28H16V30C16 32.7615 18.2386 35 21 35H48V10C48 4.47715 43.5229 0 38 0H10Z" fill="black"/>
-<path d="M47.2141 41.8925C47.1989 41.9284 47.1835 41.9643 47.1679 42H21C14.3726 42 9 36.6274 9 30V28H0V48H38C42.1421 48 45.6961 45.4816 47.2141 41.8925Z" fill="black"/>
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26 16C20.4772 16 16 20.4772 16 26V37H45C46.6569 37 48 35.6569 48 34V32C48 30.3431 46.6569 29 45 29H35C33.3431 29 32 30.3431 32 32V35H25V28C25 24.6863 27.6863 22 31 22H49C52.3137 22 55 24.6863 55 28V38C55 41.3137 52.3137 44 49 44H32V46C32 48.7615 34.2386 51 37 51H64V26C64 20.4772 59.5229 16 54 16H26Z" fill="black"/>
+<path d="M63.2141 57.8925C63.1989 57.9284 63.1835 57.9643 63.1679 58H37C30.3726 58 25 52.6274 25 46V44H16V64H54C58.1421 64 61.6961 61.4816 63.2141 57.8925Z" fill="black"/>
</svg>
diff --git a/src/assets/icons/visu/grdf-logo-white.svg b/src/assets/icons/visu/grdf-logo-white.svg
new file mode 100644
index 000000000..65da9c450
--- /dev/null
+++ b/src/assets/icons/visu/grdf-logo-white.svg
@@ -0,0 +1,9 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.3263 36.7197C24.3672 36.7636 24.5097 37.6053 24.5268 37.8259V42.1903C24.5033 42.2177 24.4795 42.2456 24.4555 42.2738C24.3526 42.3946 24.2455 42.5204 24.1343 42.6335C23.9307 42.8372 23.6054 43.1515 23.4832 43.2571C21.2467 45.1895 18.619 45.8932 16.1679 45.8932C14.1533 45.8932 11.3813 45.3135 9.01992 43.2531C5.01385 39.7429 4.97366 34.122 9.01771 30.6451C9.76686 30.0056 10.0569 29.7666 11.2492 29.15C12.8944 28.2958 14.7593 28 16.2658 28C17.5885 28 19.0367 28.2605 20.1211 28.6684C20.3737 28.7615 20.6589 28.8726 21.0172 29.0608C21.9766 29.5658 23.2355 30.4514 23.8646 31.8514V31.8578H12.0324V38.3987C12.1222 39.5646 12.4007 40.4899 13.1873 41.1404C13.8225 41.6678 14.7929 42.0135 16.2658 42.1494C16.7376 42.1957 17.266 42.2181 17.8528 42.2181L20.4244 42.2127C20.4002 42.2052 20.3027 42.1494 19.9461 41.746C19.5024 41.2385 19.4028 40.3699 19.4028 39.721H19.4006V36.7188L23.3263 36.7197Z" fill="#E0E0E0"/>
+<path d="M60.7194 28.0364V36.8039C61.5869 36.156 62.9647 35.9398 65.1229 35.8128L65.118 31.8614H68.5648C70.3774 31.7871 74.4082 31.2961 74.4 28.0364H60.7194Z" fill="#E0E0E0"/>
+<path d="M46.0852 52.1797C46.0852 52.4656 45.8259 52.6942 45.5133 52.6942H34.9647C34.6543 52.6942 34.4016 52.4656 34.4016 52.1797V50.7035C34.4016 50.4191 34.6543 50.188 34.9647 50.188H45.5133C45.8259 50.188 46.0852 50.4191 46.0852 50.7035V52.1797Z" fill="#E0E0E0"/>
+<path d="M71.1433 35.7125H72.0565C72.0565 35.7125 72.0543 36.3051 72.0543 36.5367C72.0543 38.3571 70.2912 39.2799 66.8224 39.2799H65.1182V42.2951C65.1182 43.3564 64.8397 45.8058 62.196 45.8571H60.7191V41.4404C61.1375 36.3435 68.5562 35.7672 71.1433 35.7125Z" fill="#E0E0E0"/>
+<path d="M51.0715 28.0408L41.4746 28.0378V45.8568C44.8196 45.4823 46.0427 44.0454 46.2199 41.9272V31.8593H50.4385C50.4904 31.8624 50.5493 31.8654 50.6085 31.8684C50.7105 31.8735 50.8134 31.8787 50.8827 31.8847C52.884 32.1008 54.1594 32.8967 54.2888 36.5499C54.3036 36.6929 54.2989 36.8537 54.2947 36.9997C54.2928 37.0642 54.291 37.126 54.291 37.1819C54.188 43.1001 49.211 44.9125 46.4539 45.5739L46.4395 45.5784C46.4065 45.5909 46.3829 45.6058 46.3829 45.6362V45.7956C46.3829 45.8279 46.4109 45.8523 46.4395 45.8558L46.4489 45.8568H46.772C50.7907 45.8568 58.8673 44.9728 58.8673 36.9867V36.8407C58.8199 29.9194 55.5239 28.0408 51.0715 28.0408Z" fill="#E0E0E0"/>
+<path d="M33.1002 31.8759L30.8318 31.859C30.6871 31.859 30.5462 31.8535 30.402 31.844C27.6063 31.6632 26.0089 29.7353 25.3578 28.7243C25.2086 28.5171 25.0666 28.3044 24.9323 28.0798C24.9323 28.0798 24.9185 28.0365 24.9416 28.0365H31.4296C33.6005 28.0365 34.5049 28.158 35.466 28.4987C35.6927 28.5754 35.9289 28.67 36.1793 28.7751C37.5725 29.3678 38.5165 30.4296 38.8941 31.7917C38.9502 31.9795 38.986 32.1802 39.0168 32.3809C39.0592 32.6454 39.0834 32.9208 39.0834 33.2057C39.0878 35.3239 37.922 36.5316 36.3092 37.3773C36.307 37.3808 36.2806 37.3947 36.2806 37.3947C36.2586 37.4022 36.2586 37.4022 36.2459 37.4117C36.2281 37.4196 36.2123 37.4282 36.1975 37.4364C36.188 37.4416 36.1789 37.4466 36.17 37.451C36.165 37.451 36.1413 37.4669 36.1413 37.4669C35.9531 37.5526 35.7681 37.6054 35.5959 37.6437C35.5688 37.6488 35.5429 37.6551 35.5185 37.6611C35.4973 37.6662 35.4772 37.6712 35.4588 37.6746V33.5025C35.3994 32.2166 34.1488 31.8804 33.4293 31.8804C33.4066 31.8804 33.3831 31.8806 33.3589 31.8808C33.2802 31.8816 33.1941 31.8824 33.1002 31.8759Z" fill="#E0E0E0"/>
+<path d="M28.2799 36.7198C27.1868 36.7581 27.0811 37.67 27.0684 37.8488V40.5393H31.1741C31.5201 40.9994 31.8645 41.4549 32.1846 41.8785L32.5486 42.3601C33.0109 42.9623 33.4546 43.5305 33.639 43.7482C33.6516 43.7633 33.6662 43.782 33.6833 43.804C33.9164 44.103 34.6185 45.0036 37.0429 45.5421C37.9298 45.7381 38.9071 45.7964 39.4538 45.829C39.5528 45.8349 39.6383 45.84 39.7059 45.8449L39.9492 45.8559L39.9233 45.8131C39.9233 45.8131 39.4841 45.2622 38.9292 44.3936L38.8083 44.2042C38.0444 43.0071 35.4535 38.9468 34.9562 38.1541C34.5081 37.4394 33.7948 37.1212 33.0649 36.928H33.0577C32.5348 36.7965 31.9607 36.7462 31.5308 36.7262C31.5118 36.7255 31.4932 36.7245 31.4747 36.7234C31.4422 36.7216 31.41 36.7198 31.3767 36.7198H28.2799Z" fill="#E0E0E0"/>
+</svg>
diff --git a/src/assets/icons/visu/grdf-logo.svg b/src/assets/icons/visu/grdf-logo.svg
index be7f04a50..4b0c7e3bc 100644
--- a/src/assets/icons/visu/grdf-logo.svg
+++ b/src/assets/icons/visu/grdf-logo.svg
@@ -1,9 +1,9 @@
-<svg width="64" height="25" viewBox="0 0 64 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.1324 8.8727C17.0911 8.91653 17.2224 9.75822 17.2382 9.97886V14.3432C17.2165 14.3706 17.1946 14.3985 17.1725 14.4267C17.0777 14.5475 16.979 14.6734 16.8767 14.7865C16.6891 14.9902 16.3895 15.3044 16.2769 15.41C14.2171 17.3424 11.7967 18.0462 9.53916 18.0462C7.68361 18.0462 5.13046 17.4664 2.95551 15.406C-0.734287 11.8958 -0.771297 6.27491 2.95348 2.79806C3.64348 2.15858 3.91066 1.91952 5.00878 1.30294C6.52415 0.448792 8.24179 0.152954 9.6294 0.152954C10.8477 0.152954 12.1815 0.413432 13.1803 0.82133C13.413 0.914464 13.6756 1.02553 14.0056 1.21379C14.8893 1.7188 16.0488 2.60433 16.6283 4.00433V4.0108H5.73021V10.5516C5.81285 11.7175 6.06938 12.6429 6.79386 13.2933C7.37891 13.8208 8.27272 14.1664 9.6294 14.3024C10.0639 14.3487 10.5506 14.3711 11.091 14.3711L13.4596 14.3656C13.4373 14.3582 13.3476 14.3024 13.0191 13.899C12.6104 13.3915 12.5187 12.5229 12.5187 11.8739H12.5166V8.87171L16.1324 8.8727Z" fill="#121212"/>
-<path d="M50.5735 0.189338V8.9569C51.3725 8.30894 52.6415 8.09279 54.6293 7.96579L54.6248 4.01431H57.7995C59.469 3.9401 63.1816 3.44903 63.174 0.189338H50.5735Z" fill="#121212"/>
-<path d="M37.0946 24.3327C37.0946 24.6186 36.8558 24.8472 36.5678 24.8472H26.8521C26.5661 24.8472 26.3334 24.6186 26.3334 24.3327V22.8565C26.3334 22.5721 26.5661 22.341 26.8521 22.341H36.5678C36.8558 22.341 37.0946 22.5721 37.0946 22.8565V24.3327Z" fill="#121212"/>
-<path d="M60.1744 7.8654H61.0155C61.0155 7.8654 61.0135 8.45808 61.0135 8.68967C61.0135 10.51 59.3896 11.4329 56.1946 11.4329H54.625V14.448C54.625 15.5094 54.3685 17.9588 51.9334 18.01H50.5732V13.5934C50.9585 8.49643 57.7916 7.92019 60.1744 7.8654Z" fill="#121212"/>
-<path d="M41.6872 0.19375L32.848 0.190762V18.0098C35.9289 17.6352 37.0554 16.1984 37.2187 14.0802V4.01225H41.1042C41.152 4.01536 41.2063 4.01834 41.2608 4.02132C41.3548 4.02647 41.4495 4.03166 41.5133 4.03765C43.3567 4.2538 44.5314 5.04967 44.6505 8.70282C44.6642 8.84585 44.6599 9.00661 44.6559 9.1527C44.6542 9.21713 44.6525 9.27891 44.6525 9.33484C44.5577 15.2531 39.9736 17.0655 37.4341 17.7269L37.421 17.7314C37.3905 17.7438 37.3687 17.7588 37.3687 17.7891V17.9485C37.3687 17.9809 37.3946 18.0053 37.421 18.0088L37.4296 18.0098H37.7272C41.4286 18.0098 48.8676 17.1257 48.8676 9.13961V8.99368C48.824 2.07237 45.7882 0.19375 41.6872 0.19375Z" fill="#121212"/>
-<path d="M25.1347 4.02886L23.0454 4.01192C22.9121 4.01192 22.7823 4.00644 22.6495 3.99698C20.0745 3.81619 18.6033 1.88826 18.0035 0.877235C17.8661 0.670049 17.7353 0.457385 17.6116 0.232767C17.6116 0.232767 17.599 0.189437 17.6203 0.189437H23.596C25.5956 0.189437 26.4285 0.31096 27.3137 0.651622C27.5226 0.728321 27.7401 0.822949 27.9708 0.928036C29.2539 1.52071 30.1234 2.58254 30.4712 3.94469C30.5229 4.13245 30.5558 4.33316 30.5842 4.53387C30.6233 4.79833 30.6456 5.07375 30.6456 5.35863C30.6496 7.47681 29.5758 8.68457 28.0904 9.53025C28.0884 9.53373 28.064 9.54768 28.064 9.54768C28.0438 9.55515 28.0438 9.55515 28.0321 9.56461C28.0157 9.57253 28.0011 9.58119 27.9875 9.58934C27.9788 9.59452 27.9704 9.59951 27.9621 9.60396C27.9576 9.60396 27.9358 9.61989 27.9358 9.61989C27.7624 9.70556 27.592 9.75835 27.4334 9.7967C27.4084 9.80175 27.3845 9.80809 27.3621 9.81403C27.3426 9.8192 27.3241 9.82411 27.3071 9.82758V5.65547C27.2524 4.36952 26.1005 4.03334 25.4379 4.03334C25.4169 4.03334 25.3953 4.03356 25.373 4.03379C25.3005 4.03452 25.2212 4.03533 25.1347 4.02886Z" fill="#121212"/>
-<path d="M20.695 8.87273C19.6881 8.91108 19.5908 9.823 19.5791 10.0018V12.6922H23.3607C23.6794 13.1524 23.9965 13.6079 24.2914 14.0314L24.6266 14.5131C25.0525 15.1152 25.4611 15.6835 25.631 15.9011C25.6425 15.9162 25.656 15.935 25.6718 15.957C25.8865 16.2559 26.5331 17.1565 28.7661 17.6951C29.5831 17.8911 30.4832 17.9494 30.9867 17.982C31.0779 17.9879 31.1566 17.993 31.2189 17.9979L31.443 18.0088L31.4192 17.966C31.4192 17.966 31.0146 17.4152 30.5035 16.5466L30.3922 16.3571C29.6886 15.16 27.3022 11.0997 26.8442 10.3071C26.4315 9.5924 25.7744 9.27415 25.1022 9.08091H25.0956C24.614 8.94943 24.0852 8.89913 23.6892 8.8792C23.6717 8.87848 23.6546 8.87743 23.6375 8.87638C23.6076 8.87455 23.5779 8.87273 23.5473 8.87273H20.695Z" fill="#121212"/>
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.3263 36.7197C24.3672 36.7636 24.5097 37.6053 24.5268 37.8259V42.1903C24.5033 42.2177 24.4795 42.2456 24.4555 42.2738C24.3526 42.3946 24.2455 42.5204 24.1343 42.6335C23.9307 42.8372 23.6054 43.1515 23.4832 43.2571C21.2467 45.1895 18.619 45.8932 16.1679 45.8932C14.1533 45.8932 11.3813 45.3135 9.01992 43.2531C5.01385 39.7429 4.97366 34.122 9.01771 30.6451C9.76686 30.0056 10.0569 29.7666 11.2492 29.15C12.8944 28.2958 14.7593 28 16.2658 28C17.5885 28 19.0367 28.2605 20.1211 28.6684C20.3737 28.7615 20.6589 28.8726 21.0172 29.0608C21.9766 29.5658 23.2355 30.4514 23.8646 31.8514V31.8578H12.0324V38.3987C12.1222 39.5646 12.4007 40.4899 13.1873 41.1404C13.8225 41.6678 14.7929 42.0135 16.2658 42.1494C16.7376 42.1957 17.266 42.2181 17.8528 42.2181L20.4244 42.2127C20.4002 42.2052 20.3027 42.1494 19.9461 41.746C19.5024 41.2385 19.4028 40.3699 19.4028 39.721H19.4006V36.7188L23.3263 36.7197Z" fill="#121212"/>
+<path d="M60.7194 28.0364V36.8039C61.5869 36.156 62.9647 35.9398 65.1229 35.8128L65.118 31.8614H68.5648C70.3774 31.7871 74.4082 31.2961 74.4 28.0364H60.7194Z" fill="#121212"/>
+<path d="M46.0852 52.1797C46.0852 52.4656 45.8259 52.6942 45.5133 52.6942H34.9647C34.6543 52.6942 34.4016 52.4656 34.4016 52.1797V50.7035C34.4016 50.4191 34.6543 50.188 34.9647 50.188H45.5133C45.8259 50.188 46.0852 50.4191 46.0852 50.7035V52.1797Z" fill="#121212"/>
+<path d="M71.1433 35.7125H72.0565C72.0565 35.7125 72.0543 36.3051 72.0543 36.5367C72.0543 38.3571 70.2912 39.2799 66.8224 39.2799H65.1182V42.2951C65.1182 43.3564 64.8397 45.8058 62.196 45.8571H60.7191V41.4404C61.1375 36.3435 68.5562 35.7672 71.1433 35.7125Z" fill="#121212"/>
+<path d="M51.0715 28.0408L41.4746 28.0378V45.8568C44.8196 45.4823 46.0427 44.0454 46.2199 41.9272V31.8593H50.4385C50.4904 31.8624 50.5493 31.8654 50.6085 31.8684C50.7105 31.8735 50.8134 31.8787 50.8827 31.8847C52.884 32.1008 54.1594 32.8967 54.2888 36.5499C54.3036 36.6929 54.2989 36.8537 54.2947 36.9997C54.2928 37.0642 54.291 37.126 54.291 37.1819C54.188 43.1001 49.211 44.9125 46.4539 45.5739L46.4395 45.5784C46.4065 45.5909 46.3829 45.6058 46.3829 45.6362V45.7956C46.3829 45.8279 46.4109 45.8523 46.4395 45.8558L46.4489 45.8568H46.772C50.7907 45.8568 58.8673 44.9728 58.8673 36.9867V36.8407C58.8199 29.9194 55.5239 28.0408 51.0715 28.0408Z" fill="#121212"/>
+<path d="M33.1002 31.8759L30.8318 31.859C30.6871 31.859 30.5462 31.8535 30.402 31.844C27.6063 31.6632 26.0089 29.7353 25.3578 28.7243C25.2086 28.5171 25.0666 28.3044 24.9323 28.0798C24.9323 28.0798 24.9185 28.0365 24.9416 28.0365H31.4296C33.6005 28.0365 34.5049 28.158 35.466 28.4987C35.6927 28.5754 35.9289 28.67 36.1793 28.7751C37.5725 29.3678 38.5165 30.4296 38.8941 31.7917C38.9502 31.9795 38.986 32.1802 39.0168 32.3809C39.0592 32.6454 39.0834 32.9208 39.0834 33.2057C39.0878 35.3239 37.922 36.5316 36.3092 37.3773C36.307 37.3808 36.2806 37.3947 36.2806 37.3947C36.2586 37.4022 36.2586 37.4022 36.2459 37.4117C36.2281 37.4196 36.2123 37.4282 36.1975 37.4364C36.188 37.4416 36.1789 37.4466 36.17 37.451C36.165 37.451 36.1413 37.4669 36.1413 37.4669C35.9531 37.5526 35.7681 37.6054 35.5959 37.6437C35.5688 37.6488 35.5429 37.6551 35.5185 37.6611C35.4973 37.6662 35.4772 37.6712 35.4588 37.6746V33.5025C35.3994 32.2166 34.1488 31.8804 33.4293 31.8804C33.4066 31.8804 33.3831 31.8806 33.3589 31.8808C33.2802 31.8816 33.1941 31.8824 33.1002 31.8759Z" fill="#121212"/>
+<path d="M28.2799 36.7198C27.1868 36.7581 27.0811 37.67 27.0684 37.8488V40.5393H31.1741C31.5201 40.9994 31.8645 41.4549 32.1846 41.8785L32.5486 42.3601C33.0109 42.9623 33.4546 43.5305 33.639 43.7482C33.6516 43.7633 33.6662 43.782 33.6833 43.804C33.9164 44.103 34.6185 45.0036 37.0429 45.5421C37.9298 45.7381 38.9071 45.7964 39.4538 45.829C39.5528 45.8349 39.6383 45.84 39.7059 45.8449L39.9492 45.8559L39.9233 45.8131C39.9233 45.8131 39.4841 45.2622 38.9292 44.3936L38.8083 44.2042C38.0444 43.0071 35.4535 38.9468 34.9562 38.1541C34.5081 37.4394 33.7948 37.1212 33.0649 36.928H33.0577C32.5348 36.7965 31.9607 36.7462 31.5308 36.7262C31.5118 36.7255 31.4932 36.7245 31.4747 36.7234C31.4422 36.7216 31.41 36.7198 31.3767 36.7198H28.2799Z" fill="#121212"/>
</svg>
diff --git a/src/assets/icons/visu/onboarding/partners_consent.svg b/src/assets/icons/visu/onboarding/partners_consent.svg
new file mode 100644
index 000000000..754c3387d
--- /dev/null
+++ b/src/assets/icons/visu/onboarding/partners_consent.svg
@@ -0,0 +1,42 @@
+<svg width="191" height="142" viewBox="0 0 191 142" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 6.3035L98.374 0C105.955 12.2568 116.145 28.4708 117.414 45.7004C120.587 88.7743 110.01 111.012 106.307 126.595L2.11557 135C4.93633 129.747 11.953 116.615 17.4534 101.907C24.329 83.5214 18.5112 56.7315 16.3957 45.1751C14.7032 35.93 4.76003 15.4086 0 6.3035Z" fill="url(#paint0_linear_11182_68748)"/>
+<path d="M87.487 111.853C85.9862 111.489 83.5827 110.805 82.2251 111.991C80.5632 113.442 80.6408 115.889 82.1632 117.411C83.6463 118.894 85.4429 119.278 86.6261 117.328C87.3907 116.068 88.6238 114.319 87.611 112.969" stroke="#121212" stroke-width="2" stroke-linecap="round"/>
+<path d="M89.7188 108.754C90.9892 112.005 91.8263 115.288 91.8263 118.796" stroke="#121212" stroke-width="2" stroke-linecap="round"/>
+<path d="M91.2061 114.085C92.9063 112.551 95.0518 110.648 96.7297 109.029C97.5397 108.248 98.5142 107.36 99.0851 106.35C99.1458 106.243 99.2642 105.903 99.2642 106.027" stroke="#121212" stroke-width="2" stroke-linecap="round"/>
+<path d="M93.1895 113.961C94.6129 114.714 95.9659 115.563 97.308 116.454C98.4338 117.202 99.8259 118.01 100.765 119.03C100.884 119.158 100.946 119.379 101 119.54" stroke="#121212" stroke-width="2" stroke-linecap="round"/>
+<path d="M65.5996 35.9149C64.2289 36.0203 63.034 35.1133 62.938 33.8641L62.9068 33.4584L68.2142 33.0503C70.0455 32.9096 71.4436 31.4381 71.3164 29.7832L71.1694 27.872C71.0414 26.2064 69.4466 24.9758 67.6044 25.1174L62.9768 25.4731C62.7136 25.4934 62.4614 25.5128 62.2023 25.5864C60.7246 26.0222 59.7671 27.3416 59.8746 28.7403L59.96 29.8507C59.9797 30.107 60.1817 30.2955 60.423 30.277L62.2214 30.1387C62.4516 30.121 62.6334 29.903 62.6137 29.6467L62.5924 29.3691L62.5587 28.9314C62.5144 28.3548 63.0047 27.8446 63.6626 27.794L67.2923 27.5149C67.9393 27.4652 68.5127 27.8937 68.557 28.4702L68.6441 29.602C68.6884 30.1785 68.1981 30.6888 67.5402 30.7394L58.5592 31.4298L58.7398 33.7787L60.253 33.6624L60.2842 34.0681C60.4796 36.6092 62.9518 38.492 65.7919 38.2736L73.4571 37.6844L73.2757 35.3248L65.5996 35.9149Z" fill="#91C21D"/>
+<path d="M53.1787 28.5999C54.5494 28.4945 55.7459 29.4228 55.8411 30.6614L56.4493 38.573C56.4666 38.7972 56.6897 38.9734 56.9529 38.9531L58.6526 38.8224C58.9158 38.8022 59.1101 38.6047 59.0921 38.3698L58.4839 30.4582C58.2885 27.9171 55.8264 26.0228 52.9973 26.2403L47.5253 26.661C47.295 26.6787 47.1133 26.8967 47.133 27.153L48.0572 39.1752C48.0769 39.4314 48.2789 39.62 48.5202 39.6014L50.3186 39.4632C50.5488 39.4455 50.7306 39.2274 50.7109 38.9712L49.9328 28.8494L53.1787 28.5999Z" fill="#0063A6"/>
+<path d="M38.3204 29.7429L45.2947 29.2068C45.5469 29.1874 45.7413 28.9898 45.724 28.7656L45.605 27.2175C45.5878 26.9933 45.3764 26.8269 45.1133 26.8472L38.0842 27.3875C36.1323 27.5376 34.6412 29.0914 34.7759 30.8424L35.2823 37.4301C35.4169 39.1811 37.117 40.4896 39.0798 40.3387L46.1089 39.7983C46.3611 39.7789 46.5555 39.5814 46.5383 39.3571L46.4193 37.809C46.402 37.5848 46.1797 37.4193 45.9275 37.4387L38.9533 37.9748C38.4379 38.0145 37.9798 37.6523 37.9437 37.1825L37.805 35.3781L41.972 35.0578C42.2242 35.0384 42.4186 34.8408 42.4014 34.6166L42.2848 33.1005C42.2676 32.8763 42.0453 32.7108 41.7931 32.7302L37.6261 33.0505L37.4438 30.6803C37.4077 30.2105 37.805 29.7826 38.3204 29.7429Z" fill="#0063A6"/>
+<path d="M100.989 31.0784C100.98 30.961 100.971 30.8435 100.95 30.7163C100.707 29.285 99.0994 28.3131 97.4984 28.4362L93.5178 28.7422L93.4191 28.7498C92.7831 28.7987 92.225 28.2831 92.1733 27.6105L92.106 26.735C92.0583 26.1157 92.579 25.5709 93.2808 25.517L94.849 25.3964L94.8599 25.3956L98.8295 25.0904C99.0379 25.0744 99.2043 24.9434 99.257 24.7675C99.2756 24.7231 99.2723 24.6804 99.2691 24.6377L99.1509 23.1002C99.1336 22.876 98.9105 22.6999 98.6473 22.7201L92.4516 23.1964C90.6532 23.3347 89.2738 24.7617 89.3986 26.3846L89.5398 28.2211C89.6744 29.9721 91.1323 31.2884 92.7991 31.1603L97.1416 30.8264C97.7776 30.7775 98.3357 31.2931 98.3874 31.9658L98.4096 32.254C98.4572 32.8733 97.9365 33.4181 97.2457 33.4712L90.4688 33.9922C90.2604 34.0082 90.094 34.1392 90.0414 34.3151C90.0227 34.3595 90.026 34.4022 90.0293 34.4449L90.1475 35.9824C90.1647 36.2066 90.3878 36.3827 90.651 36.3625L96.1997 35.9359L98.0858 35.7909C99.8842 35.6527 101.231 34.2281 101.106 32.6052L100.989 31.0784Z" fill="#0063A6"/>
+<path d="M78.6576 24.2676L72.8896 24.711C72.6593 24.7287 72.4775 24.9468 72.4972 25.203L73.0825 32.8157C73.1022 33.0719 73.3042 33.2604 73.5454 33.2419L75.3438 33.1036C75.5741 33.0859 75.7559 32.8679 75.7362 32.6116L75.297 26.8995L78.5429 26.65C79.9137 26.5446 81.1101 27.4729 81.2054 28.7114L81.5247 32.8647C81.6199 34.1033 80.5457 34.7658 79.175 34.8712L73.2762 35.3354L73.4576 37.695L79.3572 37.2415C82.1864 37.024 84.3644 35.224 84.1682 32.6722L83.8465 28.4869C83.6585 26.0419 81.3881 24.0577 78.6576 24.2676Z" fill="#0063A6"/>
+<path d="M88.2869 31.722L87.9545 27.3978C87.9348 27.1415 87.7328 26.953 87.4915 26.9716L85.704 27.109C85.4738 27.1267 85.292 27.3447 85.3117 27.601L85.6441 31.9251L85.9765 36.2493C85.9962 36.5055 86.1983 36.6941 86.4395 36.6755L88.227 36.5381C88.4573 36.5204 88.639 36.3024 88.6193 36.0461L88.2869 31.722Z" fill="#0063A6"/>
+<path d="M87.7359 24.5577L87.6957 24.0346C87.676 23.7783 87.474 23.5898 87.2327 23.6083L85.4453 23.7458C85.215 23.7635 85.0332 23.9815 85.0529 24.2377L85.0931 24.7609L85.1637 25.6791C85.1834 25.9354 85.3854 26.1239 85.6267 26.1054L87.4141 25.9679C87.6444 25.9502 87.8262 25.7322 87.8065 25.476L87.7359 24.5577Z" fill="#0063A6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60.2359 92.9966C59.3763 93.0107 59.4455 93.2626 59.4182 92.328L61.0402 92.2479C61.0621 92.6911 61.1033 93.1429 61.0493 93.5804L61.0399 93.5809C61.0413 93.6091 61.0337 93.6473 61.0351 93.6756L61.0257 93.6761L61.0276 93.7138L61.0181 93.7143L61.02 93.752L61.0106 93.7525L61.0124 93.7902C60.9747 93.792 60.9977 93.876 60.96 93.8779L60.9614 93.9061L60.952 93.9066L60.9534 93.9349C60.825 94.2059 60.5259 94.4665 60.2778 94.6111C60.2589 94.612 60.2311 94.6228 60.2122 94.6238L60.2127 94.6332L60.175 94.6351L60.1755 94.6445L60.1377 94.6464L60.1382 94.6558L60.1005 94.6577L60.1009 94.6671L60.0632 94.669L60.0637 94.6784L60.0071 94.6812L60.0076 94.6906C59.7831 94.7395 59.4634 94.7742 59.2159 94.7392L59.2154 94.7297L59.1588 94.7325L59.1584 94.7231L59.1018 94.7259L59.1013 94.7165L59.0636 94.7183L59.0631 94.7089L59.0066 94.7117L59.0061 94.7023L58.9778 94.7037L58.9773 94.6942L58.9396 94.6961L58.9391 94.6867L58.9109 94.688L58.9104 94.6786L58.8727 94.6805C58.2066 94.4014 57.8845 93.8123 57.8784 92.924C57.8026 91.9635 57.7527 91.1435 58.4654 90.6451C58.5296 90.6041 58.631 90.5519 58.6951 90.5109L58.7234 90.5095L58.7229 90.5001L58.7607 90.4982L58.7602 90.4888L58.7885 90.4874L58.788 90.4779C59.4006 90.2492 60.2564 90.3487 60.7252 90.8455C60.5365 91.0439 60.368 91.2696 60.1689 91.4496C59.9282 91.1684 59.5157 91.047 59.1436 91.1694L59.144 91.1788L59.1158 91.1802L59.1162 91.1896L59.0785 91.1915L59.079 91.2009L59.0507 91.2023L59.0511 91.2118C58.9026 91.2664 58.8261 91.4403 58.7567 91.5666L58.7586 91.6043L58.7491 91.6048L58.7519 91.6614L58.7425 91.6619L58.7458 91.7279L58.7363 91.7283L58.741 91.8226L58.7316 91.8231C58.7324 92.031 58.7341 92.2578 58.7547 92.4837L58.7453 92.4841C58.7823 92.851 58.783 93.248 58.8653 93.5748L58.8748 93.5743L58.8766 93.6121C58.9586 93.7404 59.0707 93.905 59.2338 93.9537L59.2343 93.9631L59.272 93.9612L59.2725 93.9706L59.3102 93.9688L59.3107 93.9782L59.3484 93.9764L59.3488 93.9858L59.4148 93.9825C59.9405 94.0984 60.3251 93.654 60.2359 92.9966ZM54.3431 90.6313C54.4443 91.7229 54.344 92.9473 54.5942 93.9937C54.6315 93.9824 54.6069 94.0593 54.6347 94.0484L54.6361 94.0767L54.6456 94.0763C54.7416 94.2984 55.0272 94.5301 55.3308 94.5529L55.3313 94.5623L55.3973 94.5591L55.3978 94.5685L55.5769 94.5596L55.5774 94.5691C55.6057 94.5677 55.6052 94.5582 55.6052 94.5582L55.7844 94.5494L55.784 94.54L55.8688 94.5358L55.8684 94.5263L55.9249 94.5236L55.9245 94.5141L55.9622 94.5123L55.9617 94.5028L55.9994 94.501L55.999 94.4915L56.0367 94.4897C56.2485 94.3752 56.4372 94.1768 56.5302 93.9548L56.5284 93.9171L56.5378 93.9166L56.5364 93.8883L56.5458 93.8879L56.544 93.8502C56.6738 92.8417 56.443 91.6147 56.4474 90.5557L56.9095 90.5329L57.0613 93.6072L57.0519 93.6076L57.0575 93.7208L57.0481 93.7213L57.0523 93.8061L57.0428 93.8066L57.0456 93.8632L57.0362 93.8637L57.039 93.9202L57.0296 93.9207L57.0314 93.9584L57.022 93.9589L57.0239 93.9966L57.0144 93.9971L57.0163 94.0348C56.9781 94.0272 57.0101 94.1013 56.9814 94.0932L56.9832 94.131L56.9738 94.1314L56.9752 94.1597L56.9658 94.1602C56.9681 94.2073 56.9039 94.2483 56.9063 94.2955L56.8968 94.2959C56.8293 94.46 56.6567 94.6009 56.5298 94.7111C56.4736 94.7233 56.4203 94.7921 56.3736 94.8039L56.3741 94.8133L56.3364 94.8152C56.3477 94.8524 56.2708 94.8279 56.2817 94.8557L56.2439 94.8576L56.2444 94.867L56.2067 94.8689L56.2071 94.8783L56.1694 94.8802L56.1699 94.8896L56.1322 94.8914L56.1326 94.9009L56.0761 94.9037L56.0765 94.9131L56.0105 94.9164L56.011 94.9258L55.945 94.9291L55.9454 94.9385L55.8323 94.9441C55.7035 95.0166 55.4447 94.9443 55.2943 94.9612L55.2938 94.9518C55.2561 94.9536 55.2179 94.9461 55.1802 94.9479L55.1797 94.9385L55.142 94.9403L55.1415 94.9309L55.1038 94.9328L55.1033 94.9233L55.0656 94.9252L55.0651 94.9158L55.0274 94.9176C55.035 94.8795 54.9609 94.9115 54.969 94.8827C54.6814 94.8024 54.4425 94.5589 54.28 94.3306L54.2786 94.3023C54.2409 94.3042 54.2555 94.2184 54.2178 94.2203L54.216 94.1825L54.2065 94.183L54.2051 94.1547L54.1957 94.1552C54.1844 94.1179 54.1726 94.0712 54.1614 94.034L54.1519 94.0345C53.9673 92.9753 54.0218 91.7815 53.93 90.6895C53.9739 90.6211 54.2111 90.6378 54.3431 90.6313ZM69.3184 89.8917C69.5744 89.9074 69.9093 89.7964 70.1124 89.8903C70.135 89.9648 70.2227 90.0172 70.2457 90.1012C70.3056 90.1644 70.3664 90.2465 70.4083 90.3295C70.4681 90.3927 70.5289 90.4748 70.5708 90.5578C70.6306 90.621 70.6914 90.7031 70.7333 90.7861C70.8436 90.913 70.9449 91.0498 71.0278 91.1969C71.0876 91.2602 71.1484 91.3422 71.1903 91.4253C71.2501 91.4885 71.3109 91.5706 71.3528 91.6536C71.5728 91.8979 71.7094 92.1748 71.9403 92.447L71.8085 89.7782L72.6572 89.7363L72.8724 94.0931C72.3613 94.0805 72.1169 94.3006 71.8843 93.8016C71.774 93.6747 71.6727 93.5379 71.5898 93.3907C71.4796 93.2638 71.3783 93.127 71.2954 92.9799C71.1852 92.853 71.0839 92.7162 71.001 92.569C70.7301 92.2515 70.5318 91.8737 70.2519 91.5661L70.3828 94.216L69.534 94.258L69.3184 89.8917ZM77.4662 89.4894L78.3149 89.4474L78.4933 93.0592L80.4737 92.9614L80.5109 93.7159L77.6818 93.8556L77.4662 89.4894ZM79.8898 89.3697C80.109 89.4061 80.8263 89.1911 80.8672 89.4443L80.8766 89.4438L80.878 89.4721L80.8874 89.4716L80.8888 89.4999C80.9374 89.5259 80.9434 89.6485 80.992 89.6745L80.9938 89.7122C81.0316 89.7103 81.0169 89.7961 81.0546 89.7943L81.056 89.8225L81.0655 89.8221L81.0668 89.8504L81.0763 89.8499L81.0781 89.8876C81.1159 89.8858 81.1012 89.9716 81.1389 89.9697L81.1403 89.998C81.1776 89.9867 81.153 90.0635 81.1808 90.0527L81.1827 90.0904C81.2204 90.0886 81.2057 90.1744 81.2435 90.1725L81.2449 90.2008L81.2543 90.2003L81.2557 90.2286L81.2651 90.2282L81.267 90.2659C81.3151 90.2824 81.3103 90.3772 81.3584 90.3937L81.3598 90.422L81.3692 90.4215L81.3711 90.4593C81.4088 90.4574 81.3941 90.5432 81.4318 90.5413L81.4332 90.5696L81.4427 90.5692L81.4441 90.5975L81.4535 90.597L81.4554 90.6347C81.4931 90.6329 81.4784 90.7187 81.5161 90.7168L81.5175 90.7451L81.5269 90.7446L81.5283 90.7729L81.5378 90.7724L81.5396 90.8102L81.5491 90.8097C81.5627 90.8941 81.6405 90.9375 81.655 91.0408L81.6833 91.0394C81.6885 90.9541 81.7437 90.923 81.74 90.8475L81.7494 90.8471L81.748 90.8188L81.7575 90.8183L81.7561 90.79L81.7655 90.7896L81.7641 90.7613L81.7735 90.7608L81.7721 90.7325L81.7816 90.732L81.7802 90.7038L81.7896 90.7033L81.7877 90.6656C81.8255 90.6637 81.8024 90.5798 81.8401 90.5779L81.8387 90.5496C81.8854 90.5379 81.8614 90.435 81.8987 90.4238L81.8973 90.3955L81.9067 90.395C81.9058 90.3761 81.9138 90.3474 81.9129 90.3285C81.9506 90.3267 81.9276 90.2427 81.9653 90.2409L81.9634 90.2031C82.0011 90.2013 81.9781 90.1173 82.0158 90.1155L82.0144 90.0872L82.0238 90.0867L82.0225 90.0584L82.0319 90.0579L82.03 90.0202C82.0677 90.0184 82.0447 89.9344 82.0824 89.9326L82.081 89.9043L82.0904 89.9038C82.0895 89.8849 82.0975 89.8562 82.0966 89.8373C82.1343 89.8355 82.1113 89.7515 82.149 89.7497L82.1471 89.7119C82.1849 89.7101 82.1618 89.6261 82.1995 89.6243L82.1981 89.596L82.2076 89.5955L82.2057 89.5578C82.2434 89.5559 82.2204 89.472 82.2581 89.4701L82.2567 89.4418L82.2661 89.4414L82.2647 89.4131L82.2742 89.4126L82.2723 89.3749C82.3006 89.3735 82.3139 89.2594 82.3323 89.249L83.247 89.2039C83.1813 89.4056 83.0676 89.5909 83.001 89.7738L82.9916 89.7742L82.993 89.8025L82.9835 89.803L82.9849 89.8313C82.9467 89.8237 82.9787 89.8977 82.95 89.8897L82.9514 89.918C82.9132 89.9104 82.9452 89.9845 82.9165 89.9765L82.9179 90.0047L82.9084 90.0052L82.9098 90.0335L82.9004 90.034L82.9018 90.0623L82.8924 90.0627L82.8938 90.091L82.8843 90.0915L82.8857 90.1198C82.8244 90.2173 82.7569 90.3814 82.7153 90.4969L82.7059 90.4973L82.7073 90.5256C82.67 90.5369 82.6836 90.6213 82.6468 90.642L82.6482 90.6703L82.6388 90.6708L82.6402 90.6991L82.6308 90.6996L82.6322 90.7279L82.6227 90.7283L82.6241 90.7566L82.6147 90.7571L82.6161 90.7854C82.5703 90.816 82.5755 90.9197 82.5297 90.9503L82.5311 90.9786L82.5217 90.9791L82.5231 91.0074L82.5136 91.0079L82.515 91.0361L82.5056 91.0366L82.507 91.0649C82.4891 91.0847 82.4631 91.1332 82.4551 91.162C82.4367 91.1724 82.4188 91.1921 82.4296 91.22L82.4202 91.2204L82.4216 91.2487C82.3668 91.2892 82.3724 91.4024 82.3177 91.4429L82.3191 91.4712L82.3097 91.4717L82.3111 91.5L82.3016 91.5004L82.303 91.5287L82.2936 91.5292L82.295 91.5575C82.2573 91.5593 82.2803 91.6433 82.2426 91.6452L82.244 91.6734L82.2346 91.6739L82.236 91.7022L82.2265 91.7027L82.2279 91.731L82.2185 91.7314L82.2199 91.7597C82.1817 91.7521 82.2137 91.8262 82.185 91.8182L82.1864 91.8464L82.1769 91.8469L82.1783 91.8752L82.1689 91.8757L82.2565 93.6486L81.4266 93.6896L81.339 91.9167L81.3296 91.9171C81.3278 91.8794 81.2967 91.8242 81.2674 91.8068L81.2661 91.7785L81.2566 91.7789L81.2552 91.7506L81.2458 91.7511L81.2444 91.7228L81.235 91.7233L81.2336 91.695L81.2241 91.6955L81.2227 91.6672C81.1535 91.6044 81.1276 91.4639 81.0584 91.4011L81.057 91.3728L81.0475 91.3733L81.0461 91.345L81.0367 91.3455L81.0353 91.3172L81.0259 91.3177L81.0245 91.2894L81.015 91.2898L81.0136 91.2615L81.0042 91.262C81.0127 91.2427 80.9929 91.2248 80.9731 91.2068C80.9623 91.179 80.9406 91.1233 80.9119 91.1153L80.9105 91.087L80.9011 91.0875L80.8997 91.0592L80.8902 91.0597L80.8888 91.0314L80.8794 91.0318L80.878 91.0035C80.7979 90.913 80.7518 90.7451 80.6717 90.6545L80.6703 90.6262L80.6609 90.6267L80.6595 90.5984L80.65 90.5989L80.6487 90.5706L80.6392 90.571L80.6378 90.5427C80.5987 90.5163 80.5747 90.4135 80.5361 90.3965L80.5347 90.3682L80.5252 90.3687L80.5239 90.3404L80.5144 90.3409L80.513 90.3126L80.5036 90.313L80.5022 90.2847L80.4928 90.2852L80.4914 90.2569L80.4819 90.2574L80.4805 90.2291C80.4424 90.2215 80.4476 90.1362 80.4089 90.1192L80.4075 90.0909L80.3981 90.0914L80.3967 90.0631L80.3873 90.0635L80.3859 90.0353L80.3765 90.0357L80.3751 90.0074C80.3378 90.0187 80.3624 89.9419 80.3345 89.9527L80.3331 89.9244L80.3237 89.9249L80.3223 89.8966L80.3129 89.8971L80.3115 89.8688L80.3021 89.8692L80.3007 89.8409L80.2912 89.8414L80.2898 89.8131C80.0579 89.7111 79.9732 89.5263 79.8898 89.3697ZM87.5189 88.9929C87.7664 89.0279 88.2668 88.8236 88.3553 89.0839C88.4152 89.1472 88.4759 89.2292 88.5178 89.3122C88.5777 89.3755 88.6385 89.4575 88.6804 89.5405C88.7402 89.6038 88.801 89.6858 88.8429 89.7689C88.9027 89.8321 88.9635 89.9142 89.0054 89.9972C89.0653 90.0604 89.126 90.1425 89.168 90.2255C89.2278 90.2887 89.2886 90.3708 89.3305 90.4538C89.3903 90.517 89.4511 90.5991 89.493 90.6821C89.7239 90.9543 89.8901 91.258 90.1413 91.5576L90.0095 88.8888L90.8582 88.8469L91.0733 93.2037C90.4029 93.2179 90.3268 93.4013 89.9943 92.7938C89.8841 92.6669 89.7828 92.5301 89.6999 92.3829C89.6401 92.3197 89.5793 92.2376 89.5374 92.1546C89.4271 92.0277 89.3258 91.8909 89.2429 91.7438C88.9522 91.4083 88.7643 91.0489 88.4529 90.6767L88.5837 93.3266L87.735 93.3686L87.5189 88.9929ZM53.0121 92.011L53.0027 92.0115L52.998 91.9172L52.9886 91.9176L52.9853 91.8516L52.9759 91.8521L52.9727 91.7861L52.9632 91.7866L52.9604 91.73L52.951 91.7304L52.9491 91.6927L52.9397 91.6932L52.9379 91.6555L52.9284 91.6559L52.9266 91.6182L52.9171 91.6187C52.9157 91.5904 52.9049 91.5626 52.9035 91.5343C52.854 91.4894 52.8211 91.3965 52.7801 91.3324C52.2817 90.6196 51.2693 90.7925 50.4771 90.8317C50.3357 90.8386 50.0797 90.8229 49.9684 90.8662L50.183 95.2136C50.8139 95.1635 51.524 95.1852 52.1333 95.0795L52.1328 95.07L52.1894 95.0673L52.1889 95.0578C52.2262 95.0465 52.2728 95.0348 52.3101 95.0235L52.3096 95.014L52.3379 95.0127L52.3375 95.0032L52.3752 95.0014C52.3733 94.9636 52.4591 94.9783 52.4573 94.9406L52.4856 94.9392C52.586 94.8681 52.6856 94.7781 52.7851 94.6881C52.8639 94.5613 52.9437 94.4534 53.0032 94.3181L53.0013 94.2803L53.0107 94.2799L53.0093 94.2516L53.0188 94.2511L53.0169 94.2134L53.0263 94.2129L53.0245 94.1752L53.0339 94.1748L53.032 94.137L53.0415 94.1366L53.0396 94.0988L53.049 94.0984C53.0472 94.0607 53.0547 94.0225 53.0529 93.9847L53.0623 93.9843L53.0591 93.9183L53.0685 93.9178L53.0643 93.8329L53.0737 93.8325L53.0681 93.7193L53.0776 93.7188C53.0963 93.1413 53.0769 92.5561 53.0121 92.011ZM52.6215 93.0985L52.6121 93.099C52.6336 93.3437 52.6184 93.6092 52.6107 93.8364L52.6013 93.8369L52.6041 93.8935L52.5946 93.8939L52.5974 93.9505L52.588 93.951L52.5908 94.0076L52.5814 94.008L52.5832 94.0458L52.5738 94.0462L52.5757 94.0839C52.5375 94.0764 52.5695 94.1504 52.5407 94.1424C52.4845 94.3437 52.3038 94.5133 52.109 94.5891L52.1095 94.5985L52.0812 94.5999L52.0817 94.6094L52.044 94.6112L52.0444 94.6207L52.0067 94.6225L52.0072 94.6319L51.9694 94.6338L51.9699 94.6432L51.9039 94.6465L51.9044 94.6559L51.8384 94.6592L51.8388 94.6686C51.4536 94.716 51.0283 94.7181 50.6322 94.7377L50.458 91.2107C51.1285 91.1965 52.0533 90.9712 52.4249 91.6052L52.4263 91.6335C52.464 91.6316 52.4493 91.7174 52.4871 91.7155L52.4889 91.7533L52.4983 91.7528L52.5002 91.7905L52.5096 91.79L52.5124 91.8466L52.5219 91.8462L52.5247 91.9027L52.5341 91.9023L52.5383 91.9871L52.5477 91.9867L52.5519 92.0716L52.5613 92.0711L52.5679 92.2031L52.5773 92.2027C52.5743 92.5242 52.6165 92.8057 52.6215 93.0985ZM86.0774 89.2815C86.0302 89.2838 85.9892 89.2197 85.9421 89.222C85.6696 89.0653 85.3009 89.0646 84.9525 89.0913C84.7752 89.1379 84.5318 89.1877 84.4049 89.2979L84.3766 89.2993C84.1201 89.4633 83.8591 89.7314 83.742 90.0397L83.7434 90.068L83.734 90.0684L83.7359 90.1061L83.7264 90.1066L83.7278 90.1349L83.7184 90.1354C83.6063 90.7365 83.6935 91.5451 83.7346 92.1859L83.744 92.1855C83.7576 92.2699 83.7713 92.3543 83.7853 92.4481L83.7948 92.4477L83.7976 92.5042L83.807 92.5038L83.8089 92.5415L83.8183 92.541L83.8202 92.5788L83.8296 92.5783L83.8314 92.616L83.8409 92.6155L83.8427 92.6533C83.8805 92.6514 83.8658 92.7372 83.9035 92.7353L83.9049 92.7636L83.9143 92.7632L83.9157 92.7915C83.9355 92.8094 83.9661 92.8551 83.977 92.883C84.1574 93.0915 84.3855 93.3071 84.6636 93.3879C84.8772 93.5002 85.2954 93.5458 85.5472 93.4766L85.6603 93.471L85.6599 93.4616L85.7448 93.4574L85.7443 93.448L85.8103 93.4447L85.8098 93.4353C85.8381 93.4339 85.8754 93.4226 85.9037 93.4212L85.9032 93.4118L85.9409 93.4099L85.9405 93.4005C86.8134 93.0832 86.9776 92.1959 86.8777 91.3217C86.8848 90.5084 86.7773 89.6723 86.0774 89.2815ZM85.7132 92.6271C85.7151 92.6648 85.6293 92.6501 85.6311 92.6878L85.5934 92.6897L85.5939 92.6991C85.5561 92.701 85.5189 92.7123 85.4812 92.7141C85.4642 92.7528 85.1237 92.7507 85.1223 92.7224L85.0846 92.7243L85.0842 92.7148L85.0464 92.7167C84.8824 92.6492 84.7344 92.5241 84.6416 92.368L84.6398 92.3303L84.6303 92.3308L84.6275 92.2742L84.6181 92.2747L84.6153 92.2181L84.6059 92.2185L84.6017 92.1337L84.5923 92.1341L84.5867 92.021L84.5773 92.0214C84.5333 91.5131 84.4723 90.8544 84.5335 90.3693L84.5429 90.3688L84.541 90.3311L84.5505 90.3306L84.5486 90.2929L84.558 90.2924L84.5566 90.2641C84.6161 90.1288 84.7421 89.9997 84.8704 89.9178L84.8987 89.9164L84.8982 89.9069L84.9359 89.9051L84.9355 89.8957L84.9732 89.8938L84.9727 89.8844L85.0293 89.8816L85.0289 89.8721L85.142 89.8665L85.1416 89.8571C85.4339 89.8427 85.5894 89.9295 85.7662 90.0626C85.8774 90.2084 85.9814 90.4017 85.9738 90.629L85.9832 90.6285C85.9757 91.2434 86.2712 92.2497 85.7132 92.6271ZM65.0011 94.1604L64.9917 94.1609L64.9903 94.1326L64.9808 94.133L64.9794 94.1048L64.97 94.1052L64.9686 94.0769L64.9592 94.0774L64.9578 94.0491L64.9483 94.0496L64.947 94.0213L64.9375 94.0217L64.9361 93.9935C64.8565 93.9123 64.8 93.726 64.7105 93.6359L64.7091 93.6076L64.6997 93.6081C64.6474 93.5067 64.5744 93.3685 64.5037 93.2775L64.5023 93.2492L64.4929 93.2496L64.4915 93.2213L64.4821 93.2218C64.4906 93.2025 64.4708 93.1845 64.451 93.1666C64.4496 93.1383 64.4397 93.1294 64.4208 93.1303C64.4185 93.0831 64.3704 93.0666 64.3775 93.019L64.3681 93.0195L64.3667 92.9912L64.3573 92.9916L64.3559 92.9633C64.2942 92.8624 64.2037 92.7534 64.159 92.6138C64.4471 92.5145 64.6623 92.277 64.7921 92.0343L64.7907 92.006C64.8284 92.0041 64.8054 91.9202 64.8431 91.9183C64.8417 91.89 64.8497 91.8613 64.8483 91.833L64.8578 91.8325C64.9098 91.5463 64.8845 91.2262 64.7857 90.9475L64.7763 90.9479L64.7749 90.9196L64.7654 90.9201L64.7636 90.8824C64.6501 90.6895 64.479 90.4805 64.2745 90.3582C64.2457 90.3502 64.1882 90.3341 64.1774 90.3063L64.1491 90.3077L64.1486 90.2983L64.1203 90.2997C64.1185 90.262 64.0345 90.285 64.0327 90.2473L63.9949 90.2492L63.9945 90.2397L63.9568 90.2416L63.9563 90.2322L63.9186 90.234L63.9181 90.2246L63.8804 90.2265L63.8799 90.217C63.1774 90.1572 62.4055 90.2237 61.7185 90.286L61.9332 94.6333L62.7914 94.5909L62.7057 92.8558L63.3092 92.826C63.3285 92.8345 63.353 92.9467 63.3813 92.9453L63.3827 92.9736L63.3921 92.9731L63.3935 93.0014L63.4029 93.0009L63.4043 93.0292L63.4138 93.0288L63.4152 93.0571C63.4642 93.0925 63.4792 93.2052 63.5376 93.2401L63.539 93.2684L63.5485 93.2679L63.5499 93.2962L63.5593 93.2957L63.5607 93.324L63.5701 93.3236L63.5715 93.3518L63.581 93.3514L63.5824 93.3797L63.5918 93.3792L63.5936 93.4169C63.6314 93.4151 63.6167 93.5009 63.6544 93.499L63.6558 93.5273L63.6652 93.5268L63.6666 93.5551L63.6761 93.5547L63.6775 93.5829L63.6869 93.5825L63.6883 93.6108L63.6977 93.6103L63.6991 93.6386C63.7472 93.6551 63.7424 93.7499 63.7905 93.7664L63.7919 93.7947L63.8013 93.7943L63.8027 93.8225L63.8122 93.8221L63.8136 93.8504L63.823 93.8499L63.8244 93.8782L63.8338 93.8777L63.8352 93.906L63.8447 93.9056L63.8461 93.9338L63.8555 93.9334L63.8569 93.9617L63.8663 93.9612L63.8677 93.9895C63.9153 93.9966 63.9016 94.1013 63.9398 94.1088L63.9412 94.1371L63.9506 94.1367L63.952 94.1649L63.9614 94.1645L63.9628 94.1928L63.9723 94.1923L63.9736 94.2206C64.0344 94.3027 64.0971 94.4225 64.1503 94.5427L65.131 94.4943C65.124 94.3529 65.034 94.2533 65.0011 94.1604ZM63.9728 91.7155C63.9464 91.7546 63.9124 91.8319 63.8864 91.8805C63.8402 91.9017 63.8157 91.9785 63.7591 91.9813C63.7609 92.019 63.6751 92.0044 63.677 92.0421L63.6393 92.0439C63.3709 92.1612 62.9325 92.0883 62.6132 92.1324L62.5564 90.9819C62.8964 90.9746 63.3 90.9168 63.6239 90.967L63.6244 90.9765L63.6527 90.9751C63.6824 91.002 63.7502 91.0364 63.7889 91.0534C63.8101 91.0996 63.8869 91.1242 63.8897 91.1808C63.9274 91.1789 63.9128 91.2647 63.9505 91.2629L63.9523 91.3006L63.9618 91.3001L63.9646 91.3567C64.0235 91.4011 63.9809 91.6868 63.9728 91.7155ZM75.879 89.7001L75.8413 89.7019L75.8408 89.6925L75.8125 89.6939L75.8121 89.6845L75.7743 89.6863L75.7739 89.6769L75.7362 89.6788L75.7357 89.6693C75.7074 89.6707 75.6692 89.6632 75.6409 89.6646L75.6405 89.6551C75.5933 89.6575 75.5457 89.6504 75.508 89.6522L75.5075 89.6428C74.8917 89.6165 74.2052 89.6882 73.5823 89.7095L73.7975 94.0663C74.4194 94.0262 75.0814 94.0313 75.6925 93.9633L75.692 93.9538L75.7769 93.9497L75.7764 93.9402L75.833 93.9374L75.8326 93.928L75.8891 93.9252L75.8887 93.9158C76.29 93.8109 76.6245 93.5013 76.7393 93.1459L76.7487 93.1454L76.7473 93.1171C76.7855 93.1247 76.7535 93.0506 76.7822 93.0587L76.7804 93.0209L76.7898 93.0205L76.7879 92.9828L76.7974 92.9823L76.7955 92.9446L76.8049 92.9441C76.8035 92.9158 76.8111 92.8776 76.8097 92.8493L76.8191 92.8489L76.8159 92.7829L76.8253 92.7824L76.822 92.7164L76.8315 92.7159L76.8259 92.6027L76.8353 92.6023C76.8181 91.4876 76.9576 90.1006 75.879 89.7001ZM74.5887 93.2426L74.448 90.3947C75.0978 90.3437 75.6151 90.2898 75.8463 90.7605C75.8477 90.7888 75.8585 90.8166 75.8599 90.8449L75.8694 90.8444L75.8726 90.9104L75.882 90.91L75.8853 90.976L75.8947 90.9755L75.9008 91.0981L75.9102 91.0976C76.0122 92.3972 76.3143 93.3465 74.5887 93.2426ZM69.0316 94.037L69.0221 94.0375L69.0207 94.0092L69.0113 94.0096C69 93.9724 68.9883 93.9257 68.977 93.8884L68.9675 93.8889L68.9661 93.8606L68.9567 93.8611C68.9553 93.8328 68.9445 93.805 68.9431 93.7767L68.9337 93.7771L68.9323 93.7488L68.9228 93.7493C68.9214 93.721 68.9106 93.6932 68.9092 93.6649L68.8998 93.6654L68.8979 93.6276L68.8885 93.6281L68.8871 93.5998L68.8776 93.6003C68.8763 93.572 68.8654 93.5442 68.864 93.5159L68.8546 93.5163C68.7958 93.2829 68.6333 93.0546 68.5745 92.8212L68.565 92.8216L68.5632 92.7839L68.5538 92.7844L68.5524 92.7561L68.5429 92.7566C68.5415 92.7283 68.5307 92.7004 68.5293 92.6722L68.5199 92.6726C68.4601 92.4203 68.2877 92.1831 68.2186 91.9312L68.2091 91.9317L68.2077 91.9034L68.1983 91.9039C68.187 91.8666 68.1753 91.8199 68.164 91.7827L68.1545 91.7831L68.1531 91.7549L68.1437 91.7553C68.1324 91.7181 68.1207 91.6714 68.1094 91.6341L68.0999 91.6346L68.0985 91.6063L68.0891 91.6068C68.0778 91.5695 68.0661 91.5228 68.0548 91.4856L68.0453 91.486L68.0439 91.4577L68.0345 91.4582C68.0331 91.4299 68.0223 91.4021 68.0209 91.3738L68.0115 91.3743L68.0101 91.346L68.0006 91.3464L67.9988 91.3087L67.9893 91.3092C67.9879 91.2809 67.9771 91.2531 67.9757 91.2248L67.9663 91.2252L67.9649 91.197L67.9555 91.1974L67.9536 91.1597L67.9442 91.1602C67.9428 91.1319 67.9319 91.104 67.9305 91.0758L67.9211 91.0762L67.9197 91.0479L67.9103 91.0484C67.899 91.0111 67.8872 90.9645 67.8759 90.9272L67.8665 90.9277L67.8651 90.8994L67.8557 90.8998C67.8444 90.8626 67.8326 90.8159 67.8213 90.7786L67.8119 90.7791L67.8105 90.7508L67.8011 90.7513C67.4088 89.8915 67.7228 89.9327 66.8086 89.9873C66.8029 90.0632 66.7486 90.1132 66.7613 90.1787L66.7519 90.1792L66.7533 90.2075L66.7438 90.2079C66.7363 90.2461 66.7292 90.2937 66.7216 90.3319L66.7122 90.3324L66.7136 90.3607L66.7041 90.3611C66.6615 90.6469 66.5053 90.9287 66.4622 91.205L66.4528 91.2055L66.4546 91.2432L66.4452 91.2436L66.4466 91.2719L66.4372 91.2724C66.4386 91.3007 66.4305 91.3294 66.4319 91.3577L66.4225 91.3582L66.4244 91.3959L66.4149 91.3964L66.4163 91.4247L66.4069 91.4251C66.4083 91.4534 66.4003 91.4822 66.4017 91.5105L66.3922 91.511L66.3936 91.5392L66.3842 91.5397C66.3766 91.5779 66.3695 91.6255 66.362 91.6637L66.3525 91.6642L66.3539 91.6925L66.3445 91.6929C66.2528 92.1323 66.0568 92.5674 65.9552 92.9978L65.9457 92.9983L65.9476 93.036L65.9382 93.0365L65.9396 93.0647L65.9301 93.0652L65.932 93.1029L65.9226 93.1034C65.924 93.1317 65.916 93.1604 65.9173 93.1887L65.9079 93.1892L65.9093 93.2175L65.8999 93.218C65.8488 93.523 65.6925 93.8048 65.6414 94.1099L65.632 94.1103L65.6334 94.1386L65.624 94.1391C65.6291 94.2428 65.5564 94.3031 65.5526 94.4168L66.439 94.373C66.4726 94.2863 66.4656 94.1448 66.5194 94.0854L66.5175 94.0477L66.5269 94.0472L66.5251 94.0095L66.5345 94.0091L66.5326 93.9713L66.5421 93.9709L66.5402 93.9331L66.5496 93.9327L66.5482 93.9044L66.5577 93.9039C66.562 93.7997 66.6148 93.7215 66.6286 93.6168L68.1846 93.54C68.5263 94.5252 68.3718 94.2681 69.3539 94.2479C69.0951 94.1756 69.0457 94.1308 69.0316 94.037ZM66.5932 92.9001C66.6423 92.7464 66.7013 92.6017 66.7217 92.44L66.7311 92.4395L66.7298 92.4113L66.7392 92.4108C66.7378 92.3825 66.7458 92.3537 66.7444 92.3254L66.7538 92.325L66.752 92.2873L66.7614 92.2868L66.7595 92.2491L66.769 92.2486L66.7671 92.2109L66.7765 92.2104L66.7747 92.1727L66.7841 92.1722L66.7823 92.1345L66.7917 92.134L66.7903 92.1058L66.7997 92.1053L66.7978 92.0676C66.8611 92.0077 66.8334 91.8295 66.897 91.7791L66.8956 91.7508L66.9051 91.7503C66.9037 91.722 66.9117 91.6933 66.9103 91.665L66.9197 91.6645L66.9179 91.6268L66.9273 91.6263L66.9255 91.5886L66.9349 91.5881L66.933 91.5504L66.9425 91.55L66.9406 91.5122L66.95 91.5118L66.9482 91.474L66.9576 91.4736L66.9562 91.4453L66.9656 91.4448C66.9642 91.4165 66.9723 91.3878 66.9709 91.3595L66.9803 91.359L66.9789 91.3307L66.9883 91.3303C66.9897 91.3586 67.0005 91.3864 67.0019 91.4147L67.0114 91.4142L67.0132 91.4519L67.0227 91.4515L67.0245 91.4892L67.034 91.4887L67.0358 91.5264L67.0452 91.526L67.0471 91.5637L67.0565 91.5632L67.0584 91.6009L67.0678 91.6005L67.0697 91.6382L67.0791 91.6377L67.081 91.6755L67.0904 91.675C67.1398 91.9089 67.2924 92.1282 67.3418 92.3621L67.3512 92.3617L67.3531 92.3994L67.3625 92.3989L67.3644 92.4366L67.3738 92.4362L67.3757 92.4739L67.3851 92.4734C67.3964 92.5107 67.4081 92.5574 67.4194 92.5946L67.4289 92.5942L67.4303 92.6224L67.4397 92.622L67.4416 92.6597L67.451 92.6592C67.4547 92.7347 67.4948 92.78 67.5169 92.845C67.3099 92.8647 66.9515 92.8824 66.5932 92.9001Z" fill="#020304"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.0628 74.1525C88.6027 74.1732 89.2931 73.9878 89.7739 74.1531C89.9318 74.2871 89.9052 74.5153 89.9183 74.7794L90.1581 79.636C90.2277 80.6629 90.2808 81.738 89.9408 82.7001L89.9422 82.7284L89.9327 82.7289C89.9252 82.7671 89.9181 82.8147 89.9105 82.8529L89.9011 82.8533L89.9025 82.8816L89.893 82.8821L89.8949 82.9198L89.8855 82.9203C89.8864 82.9392 89.8784 82.9679 89.8793 82.9868L89.8699 82.9872L89.8713 83.0155L89.8618 83.016L89.8637 83.0537C89.8255 83.0461 89.8575 83.1202 89.8288 83.1122L89.8306 83.1499C89.7924 83.1423 89.8245 83.2164 89.7957 83.2083L89.7971 83.2366L89.7877 83.2371L89.7895 83.2748L89.7801 83.2753L89.7815 83.3036C89.7433 83.296 89.7753 83.37 89.7466 83.362L89.748 83.3903L89.7385 83.3908L89.7399 83.4191L89.7305 83.4195L89.7319 83.4478L89.7225 83.4483L89.7239 83.4766L89.7144 83.477L89.7158 83.5053L89.7064 83.5058L89.7078 83.5341L89.6984 83.5345L89.6998 83.5628L89.6903 83.5633L89.6917 83.5916L89.6823 83.5921C89.6591 83.6972 89.569 83.7867 89.5454 83.8824L89.536 83.8829C89.5208 83.9593 89.4473 84.0007 89.4321 84.0771C89.4137 84.0874 89.3783 84.1364 89.3797 84.1647C88.9686 84.8373 88.2954 85.5607 87.6755 86.0261C87.5458 86.0798 87.4387 86.208 87.2996 86.2621L87.3 86.2715C87.2619 86.264 87.2548 86.3116 87.2166 86.304C87.2081 86.3234 87.1991 86.3333 87.1803 86.3342C87.1718 86.3535 87.1538 86.3733 87.1251 86.3653L87.1255 86.3747L87.0972 86.3761L87.0977 86.3855L87.0694 86.3869L87.0699 86.3964L87.0416 86.3978C87.0529 86.435 86.976 86.4104 86.9869 86.4383L86.9586 86.4397L86.959 86.4491L86.9308 86.4505L86.9312 86.4599L86.9029 86.4613L86.9034 86.4707L86.8751 86.4721C86.8864 86.5094 86.8096 86.4848 86.8204 86.5127L86.7921 86.5141L86.7926 86.5235L86.7548 86.5254L86.7553 86.5348L86.727 86.5362C86.7383 86.5734 86.6615 86.5489 86.6723 86.5767L86.6346 86.5786L86.635 86.588L86.6067 86.5894L86.6072 86.5988L86.5695 86.6007C86.5808 86.6379 86.5039 86.6134 86.5148 86.6412C86.4865 86.6426 86.4587 86.6534 86.4304 86.6548L86.4308 86.6642L86.4025 86.6656L86.403 86.6751C86.3747 86.6765 86.3469 86.6873 86.3186 86.6887L86.3191 86.6981L86.2908 86.6995L86.2912 86.709C86.2629 86.7104 86.2351 86.7212 86.2068 86.7226L86.2073 86.732L86.1696 86.7339L86.17 86.7433L86.1323 86.7452L86.1328 86.7546L86.0951 86.7565L86.0955 86.7659L86.0578 86.7678L86.0583 86.7772L86.0206 86.779L86.021 86.7885L85.9644 86.7913L85.9649 86.8007L85.9272 86.8026L85.9277 86.812C85.8994 86.8134 85.8621 86.8247 85.8338 86.8261L85.8343 86.8355L85.7777 86.8383L85.7782 86.8477C85.7404 86.8496 85.7032 86.8609 85.6655 86.8628L85.6659 86.8722L85.6094 86.875L85.6098 86.8844L85.5532 86.8872L85.5537 86.8966L85.4877 86.8999L85.4881 86.9093L85.4221 86.9126L85.4226 86.922L85.3566 86.9253L85.3571 86.9347L85.291 86.938L85.2915 86.9474C85.2349 86.9502 85.1694 86.9629 85.1128 86.9657L85.1133 86.9751L85.019 86.9798L85.0194 86.9892L84.9063 86.9948L84.9067 87.0042L84.7841 87.0103L84.7846 87.0197L84.6243 87.0276L84.6248 87.037L84.3607 87.0501L84.3612 87.0595L83.9368 87.0805L83.9363 87.071C83.5785 87.0982 83.2451 87.0485 82.9321 87.0261L82.9316 87.0167L82.8656 87.0199L82.8651 87.0105L82.7991 87.0138L82.7986 87.0043L82.7421 87.0071L82.7416 86.9977L82.6756 87.0009L82.6751 86.9915L82.6185 86.9943L82.6181 86.9849L82.5615 86.9877L82.561 86.9782L82.5044 86.981L82.504 86.9716L82.4474 86.9744L82.4469 86.965L82.4092 86.9668L82.4087 86.9574C82.2088 86.9295 81.9595 86.8567 81.7855 86.7802L81.7572 86.7816L81.7568 86.7722L81.7191 86.774L81.7186 86.7646L81.6903 86.766L81.6898 86.7566L81.6521 86.7584C81.6597 86.7203 81.5856 86.7523 81.5937 86.7235L81.5559 86.7254C81.5635 86.6872 81.4895 86.7192 81.4975 86.6905L81.4692 86.6918L81.4687 86.6824L81.431 86.6843L81.4306 86.6749L81.4023 86.6762C81.4098 86.6381 81.3358 86.6701 81.3438 86.6413L81.3155 86.6427L81.3151 86.6333L81.2868 86.6347L81.2863 86.6253L81.258 86.6267L81.2576 86.6172L81.2293 86.6186L81.2288 86.6092L81.2005 86.6106L81.2 86.6012L81.1717 86.6025L81.1713 86.5931L81.143 86.5945L81.1425 86.5851C81.1241 86.5955 81.1043 86.5775 81.0845 86.5596C81.0473 86.5709 81.0544 86.5233 81.0171 86.5346L81.0167 86.5251C80.8243 86.459 80.657 86.3255 80.4831 86.249C80.2281 86.063 79.917 85.8893 79.6583 85.628C79.058 85.1471 78.6537 84.6188 78.2934 84.0221L78.284 84.0226L78.2826 83.9943L78.2731 83.9948L78.2717 83.9665L78.2623 83.967L78.2609 83.9387L78.2515 83.9391L78.2501 83.9108L78.2407 83.9113L78.2393 83.883L78.2298 83.8835L78.2284 83.8552L78.219 83.8557L78.2176 83.8274C78.1799 83.8292 78.1945 83.7434 78.1568 83.7453C78.1559 83.7264 78.1451 83.6986 78.1441 83.6797C78.1069 83.691 78.1314 83.6142 78.1036 83.625L78.1018 83.5873C78.0235 83.5344 78.0241 83.3548 77.9548 83.2921L77.9534 83.2638L77.944 83.2642L77.9421 83.2265L77.9327 83.227L77.9309 83.1893L77.9214 83.1897L77.9196 83.152L77.9101 83.1525L77.9083 83.1147L77.8988 83.1152L77.897 83.0775L77.8875 83.0779L77.8857 83.0402L77.8762 83.0407L77.8744 83.003L77.865 83.0034L77.8631 82.9657L77.8537 82.9662L77.8518 82.9285L77.8424 82.9289L77.8405 82.8912L77.8311 82.8917C77.8297 82.8634 77.8184 82.8261 77.817 82.7978L77.8076 82.7983C77.8057 82.7606 77.7944 82.7233 77.7925 82.6856L77.7831 82.6861L77.7803 82.6295L77.7709 82.63L77.7681 82.5734L77.7587 82.5738L77.7559 82.5173L77.7464 82.5177L77.7436 82.4611L77.7342 82.4616C77.7046 82.2456 77.6185 82.0325 77.6073 81.8061L77.5979 81.8066L77.5914 81.6746L77.5819 81.675L77.5731 81.4959L77.5636 81.4963L77.2479 75.1026C77.2197 74.9149 77.2477 74.715 77.4339 74.6585L77.4335 74.6491L77.4712 74.6473L77.4707 74.6378L77.5367 74.6346L77.5363 74.6251L78.7245 74.5665C78.9881 74.544 79.1955 74.5337 79.318 74.7168C79.4978 76.8254 79.5281 78.9698 79.6607 81.0808L79.6701 81.0804L79.6831 81.3444L79.6926 81.3439L79.6991 81.476L79.7085 81.4755L79.7132 81.5698L79.7226 81.5693C79.7372 81.6726 79.7612 81.7754 79.7757 81.8787L79.7851 81.8782L79.7879 81.9348L79.7974 81.9343L79.8001 81.9909L79.8096 81.9904L79.8124 82.047L79.8218 82.0466L79.8246 82.1031L79.834 82.1027L79.8368 82.1593L79.8463 82.1588L79.8481 82.1965L79.8575 82.196L79.8594 82.2338L79.8688 82.2333L79.8707 82.271L79.8801 82.2705L79.882 82.3083L79.8914 82.3078L79.8933 82.3455L79.9027 82.3451L79.9046 82.3828L79.914 82.3823C79.9154 82.4106 79.9262 82.4384 79.9276 82.4667L79.9371 82.4663L79.9385 82.4945L79.9479 82.4941L79.9498 82.5318L79.9592 82.5313L79.9606 82.5596L79.97 82.5592L79.9719 82.5969C80.0091 82.5856 79.9846 82.6624 80.0124 82.6516L80.0143 82.6893L80.0237 82.6889L80.0251 82.7172C80.0623 82.7059 80.0378 82.7827 80.0656 82.7719L80.067 82.8002L80.0764 82.7997L80.0778 82.828L80.0872 82.8275L80.0886 82.8558L80.0981 82.8553L80.0995 82.8836L80.1089 82.8832L80.1103 82.9115L80.1197 82.911L80.1211 82.9393L80.1306 82.9388L80.132 82.9671L80.1414 82.9666C80.1856 83.0968 80.3138 83.2039 80.367 83.3242C80.6483 83.6601 81.0483 84.1035 81.457 84.3386C81.5456 84.4098 81.6526 84.4707 81.7492 84.5132L81.7497 84.5226C81.7968 84.5203 81.8378 84.5845 81.8849 84.5821L81.8854 84.5916L81.9137 84.5902L81.9142 84.5996C81.9326 84.5892 81.9524 84.6072 81.9722 84.6251C82.0301 84.6506 82.107 84.6752 82.156 84.7105L82.1937 84.7087L82.1942 84.7181L82.2225 84.7167C82.2243 84.7544 82.3083 84.7314 82.3101 84.7691L82.3479 84.7672L82.3483 84.7767L82.3766 84.7753L82.3771 84.7847L82.4148 84.7828L82.4153 84.7923L82.4436 84.7909C82.6269 84.8669 82.8758 84.9302 83.0847 84.9483L83.0852 84.9577L83.1417 84.9549L83.1422 84.9644L83.2082 84.9611L83.2087 84.9705L83.2936 84.9663L83.294 84.9758L83.3789 84.9716L83.3794 84.981L83.4737 84.9763L83.4741 84.9858L83.5967 84.9797L83.5972 84.9891C83.9098 85.0021 84.296 84.9735 84.6058 84.9299L84.6053 84.9205L84.6996 84.9158L84.6991 84.9064L84.784 84.9022L84.7835 84.8928L84.8684 84.8886L84.868 84.8791L84.934 84.8759L84.9335 84.8664L84.9901 84.8636L84.9896 84.8542L85.0556 84.8509L85.0552 84.8415C85.0929 84.8397 85.1301 84.8284 85.1679 84.8265L85.1674 84.8171C85.1957 84.8157 85.233 84.8044 85.2612 84.803L85.2608 84.7936L85.2985 84.7917L85.298 84.7823L85.3357 84.7804L85.3353 84.771L85.373 84.7691L85.3725 84.7597L85.4103 84.7578L85.4098 84.7484L85.4475 84.7465L85.4471 84.7371L85.4848 84.7352L85.4843 84.7258L85.522 84.7239L85.5216 84.7145L85.5499 84.7131L85.5494 84.7037C85.5777 84.7023 85.6055 84.6915 85.6338 84.6901C85.6225 84.6528 85.6993 84.6774 85.6885 84.6495L85.7262 84.6477L85.7258 84.6382L85.7541 84.6368L85.7536 84.6274L85.7819 84.626L85.7814 84.6166L85.8097 84.6152L85.8092 84.6058L85.847 84.6039C85.8451 84.5662 85.9309 84.5808 85.929 84.5431L85.9573 84.5417L85.9569 84.5323L85.9852 84.5309L85.9847 84.5215C86.1516 84.4565 86.2866 84.3175 86.4337 84.2346C86.8253 83.9317 87.2726 83.418 87.5355 82.9985C87.5331 82.9514 87.5973 82.9104 87.5949 82.8632L87.6044 82.8628C87.6195 82.7864 87.6917 82.7167 87.7068 82.6403L87.7163 82.6398L87.7149 82.6115L87.7243 82.6111L87.7229 82.5828L87.7323 82.5823L87.7309 82.554L87.7404 82.5536L87.739 82.5253L87.7484 82.5248L87.747 82.4965L87.7564 82.496L87.755 82.4678L87.7645 82.4673L87.7631 82.439L87.7725 82.4385L87.7711 82.4102C87.8093 82.4178 87.7773 82.3438 87.806 82.3518L87.8046 82.3235L87.8141 82.323L87.8122 82.2853C87.8504 82.2929 87.8184 82.2188 87.8471 82.2269L87.8453 82.1892L87.8547 82.1887L87.8533 82.1604L87.8627 82.1599C87.8613 82.1316 87.8694 82.1029 87.868 82.0746L87.8774 82.0741L87.876 82.0458C87.935 81.9011 87.9903 81.681 88.0003 81.5009L88.0098 81.5004L88.007 81.4438L88.0164 81.4433L88.0131 81.3773L88.0226 81.3769L88.0184 81.292L88.0278 81.2915L88.0236 81.2067L88.033 81.2062L88.0275 81.093L88.0369 81.0926L88.0308 80.97L88.0403 80.9695C87.976 78.9024 87.8354 76.8202 87.7423 74.745C87.7123 74.5196 87.6875 74.2089 87.9209 74.1501L87.9204 74.1407C87.9487 74.1393 87.986 74.128 88.0143 74.1266C88.0633 74.162 88.0628 74.1525 88.0628 74.1525ZM76.2405 86.2883C76.1285 84.4032 76.091 82.4955 75.9319 80.6127L75.9224 80.6132C75.8939 80.227 75.7621 79.8553 75.6779 79.4908L75.6685 79.4913C75.6671 79.463 75.6558 79.4257 75.6544 79.3975L75.645 79.3979C75.6332 79.3512 75.6215 79.3045 75.6102 79.2673L75.6007 79.2678L75.5989 79.23L75.5895 79.2305L75.5876 79.1928L75.5782 79.1932C75.5768 79.165 75.5659 79.1371 75.5645 79.1088L75.5551 79.1093L75.5537 79.081L75.5443 79.0815C75.533 79.0442 75.5212 78.9975 75.5099 78.9603L75.5005 78.9608L75.4991 78.9325L75.4897 78.9329L75.4878 78.8952L75.4784 78.8957C75.4774 78.8768 75.4666 78.849 75.4657 78.8301L75.4563 78.8306L75.4549 78.8023L75.4454 78.8028L75.4436 78.765C75.4063 78.7763 75.4309 78.6995 75.4031 78.7103L75.4012 78.6726C75.3639 78.6839 75.3885 78.6071 75.3607 78.6179L75.3588 78.5802L75.3494 78.5806L75.348 78.5523C75.3107 78.5636 75.3353 78.4868 75.3075 78.4976L75.3061 78.4693L75.2966 78.4698L75.2952 78.4415L75.2858 78.442L75.2844 78.4137L75.275 78.4141L75.2736 78.3858L75.2642 78.3863L75.2628 78.358L75.2533 78.3585L75.2519 78.3302L75.2425 78.3307L75.2411 78.3024L75.2317 78.3028L75.2303 78.2746L75.2209 78.275C75.2294 78.2557 75.2096 78.2378 75.1898 78.2198C75.1884 78.1915 75.1785 78.1826 75.1596 78.1835C75.1672 78.1453 75.1196 78.1382 75.1271 78.1L75.1177 78.1005C75.0334 77.925 74.884 77.7717 74.7908 77.6062C74.3258 76.9958 73.5562 76.3437 72.9322 75.9585C72.9039 75.9599 72.8643 75.9241 72.8445 75.9061C72.7003 75.8566 72.5622 75.7405 72.4085 75.6913L72.408 75.6819L72.3798 75.6833L72.3793 75.6739L72.351 75.6753L72.3505 75.6659L72.3222 75.6672L72.3218 75.6578L72.2935 75.6592L72.293 75.6498L72.2647 75.6512L72.2643 75.6418L72.236 75.6432L72.2355 75.6337L72.2072 75.6351C72.1959 75.5979 72.1115 75.6115 72.0908 75.5747L72.0625 75.5761L72.062 75.5667L72.0243 75.5685C72.0319 75.5303 71.9578 75.5624 71.9659 75.5336L71.9376 75.535L71.9371 75.5256L71.8994 75.5274C71.907 75.4892 71.8329 75.5213 71.8409 75.4925L71.8032 75.4944L71.8028 75.4849L71.7745 75.4863L71.774 75.4769L71.7363 75.4788L71.7358 75.4693L71.7075 75.4707L71.7071 75.4613C71.6788 75.4627 71.65 75.4547 71.6217 75.4561L71.6213 75.4466L71.593 75.448L71.5925 75.4386C71.5642 75.44 71.5354 75.432 71.5072 75.4334L71.5067 75.4239L71.4784 75.4253L71.4779 75.4159C71.4497 75.4173 71.4209 75.4093 71.3926 75.4107L71.3921 75.4012L71.3544 75.4031L71.3539 75.3937L71.3162 75.3955L71.3158 75.3861L71.278 75.388L71.2776 75.3785L71.221 75.3813L71.2205 75.3719L71.1828 75.3737L71.1823 75.3643L71.1446 75.3662L71.1442 75.3568C71.0965 75.3497 71.0395 75.343 70.9919 75.3359L70.9914 75.3265C70.9344 75.3198 70.8773 75.3132 70.8297 75.3061L70.8292 75.2967C70.6689 75.3046 70.4851 75.2191 70.3158 75.237L70.3153 75.2275L70.221 75.2322L70.2206 75.2227L70.1263 75.2274L70.1258 75.218L69.9938 75.2245L69.9933 75.2151C69.7194 75.2191 69.4728 75.203 69.1809 75.2268C69.1365 75.2857 68.9343 75.2106 68.8994 75.2691L68.7391 75.277L68.7395 75.2864L68.6075 75.293L68.608 75.3024L68.5137 75.307L68.5141 75.3165L68.4198 75.3211L68.4203 75.3306C68.194 75.3417 67.9813 75.4373 67.7568 75.4862L67.7573 75.4956C67.7106 75.5074 67.6545 75.5196 67.6078 75.5314L67.6083 75.5408C67.5616 75.5526 67.5149 75.5643 67.4776 75.5756L67.4781 75.5851L67.4404 75.5869L67.4408 75.5964L67.4031 75.5982L67.4036 75.6076L67.3659 75.6095L67.3663 75.6189C67.338 75.6203 67.3102 75.6312 67.2819 75.6326L67.2824 75.642L67.2541 75.6434L67.2546 75.6528C67.2173 75.6641 67.1706 75.6759 67.1334 75.6872L67.1338 75.6966L67.1055 75.698L67.106 75.7074L67.0683 75.7093L67.0687 75.7187C67.0499 75.7196 67.0221 75.7305 67.0032 75.7314L67.0037 75.7408L66.9754 75.7422L66.9758 75.7517L66.9381 75.7535L66.9386 75.763L66.9103 75.7644L66.9108 75.7738L66.873 75.7756C66.8843 75.8129 66.8075 75.7883 66.8183 75.8162L66.7806 75.818C66.7825 75.8558 66.6967 75.8411 66.6985 75.8788L66.6702 75.8802L66.6707 75.8896L66.6424 75.891L66.6429 75.9005L66.6051 75.9023C66.607 75.94 66.5212 75.9254 66.5231 75.9631L66.4948 75.9645L66.4952 75.9739L66.467 75.9753L66.4674 75.9847L66.4391 75.9861L66.4396 75.9956L66.4113 75.997L66.4118 76.0064C66.3924 75.9979 66.3745 76.0177 66.3566 76.0375C66.3283 76.0389 66.3193 76.0488 66.3203 76.0676C66.2453 76.0808 66.2108 76.1487 66.1453 76.1614C66.0283 76.2806 65.8613 76.3455 65.7537 76.4643C65.1962 76.8511 64.5889 77.5711 64.2288 78.1278C64.1873 78.2433 64.0882 78.3427 64.0556 78.4483L64.0462 78.4487C64.0225 78.5444 63.9329 78.6434 63.9092 78.7391L63.8998 78.7396L63.9012 78.7679C63.8644 78.7886 63.8592 78.8739 63.8224 78.8946L63.8238 78.9229C63.7861 78.9248 63.8091 79.0087 63.7714 79.0106L63.7733 79.0483C63.7355 79.0502 63.7586 79.1341 63.7209 79.136L63.7223 79.1643L63.7128 79.1647L63.7142 79.193L63.7048 79.1935L63.7067 79.2312L63.6972 79.2317L63.6986 79.26L63.6892 79.2604L63.6906 79.2887L63.6812 79.2892L63.6826 79.3175L63.6731 79.318L63.675 79.3557L63.6656 79.3561L63.667 79.3844L63.6575 79.3849L63.6594 79.4226L63.65 79.4231C63.6509 79.442 63.6429 79.4707 63.6438 79.4896L63.6344 79.49L63.6358 79.5183L63.6263 79.5188L63.6282 79.5565L63.6188 79.557L63.6202 79.5853L63.6107 79.5857C63.6121 79.614 63.6041 79.6428 63.6055 79.6711L63.5961 79.6715L63.5975 79.6998C63.4492 80.142 63.3616 80.6663 63.3382 81.1495L63.3288 81.15C63.3115 81.5668 63.3339 82.0195 63.3822 82.4236L63.3916 82.4231L63.3982 82.5551L63.4076 82.5547L63.4132 82.6678L63.4226 82.6674L63.4282 82.7805L63.4376 82.7801L63.4418 82.8649L63.4512 82.8645C63.462 83.0814 63.5769 83.3026 63.6064 83.5185L63.6159 83.5181C63.6286 83.5836 63.6507 83.6487 63.6629 83.7048L63.6723 83.7043L63.6742 83.7421L63.6836 83.7416L63.6855 83.7793L63.6949 83.7788L63.6968 83.8166L63.7062 83.8161L63.7081 83.8538L63.7175 83.8534L63.7203 83.9099L63.7297 83.9095L63.7311 83.9378L63.7406 83.9373L63.7424 83.975L63.7518 83.9746C63.7631 84.0118 63.7749 84.0585 63.7862 84.0958L63.7956 84.0953C63.7966 84.1142 63.8074 84.142 63.8083 84.1608L63.8178 84.1604L63.8192 84.1887L63.8286 84.1882C63.83 84.2165 63.8408 84.2443 63.8422 84.2726C63.8795 84.2613 63.8549 84.3381 63.8827 84.3273L63.8846 84.365L63.894 84.3646L63.8954 84.3929L63.9048 84.3924L63.9067 84.4301C63.944 84.4188 63.9194 84.4957 63.9472 84.4848L63.9486 84.5131L63.958 84.5127L63.9599 84.5504C63.9976 84.5485 63.983 84.6343 64.0207 84.6325L64.0221 84.6608L64.0315 84.6603L64.0329 84.6886L64.0423 84.6881L64.0437 84.7164L64.0532 84.7159L64.0546 84.7442L64.064 84.7438C64.0555 84.7631 64.0753 84.781 64.0951 84.799C64.0965 84.8272 64.1064 84.8362 64.1252 84.8353C64.1177 84.8735 64.1653 84.8806 64.1577 84.9188L64.1671 84.9183C64.6226 85.7182 65.4656 86.5179 66.2758 87.0357C66.4304 87.1037 66.5591 87.2202 66.7226 87.2783L66.7231 87.2877C66.7604 87.2764 66.7533 87.3241 66.7905 87.3128C66.8009 87.3312 66.8207 87.3491 66.8485 87.3383L66.849 87.3477L66.8773 87.3463L66.8777 87.3557C66.915 87.3444 66.9079 87.3921 66.9451 87.3808C66.9555 87.3992 66.9753 87.4171 67.0031 87.4063L67.0036 87.4157L67.0319 87.4143L67.0323 87.4237L67.0606 87.4223L67.0611 87.4318L67.0894 87.4304C67.0912 87.4681 67.1752 87.445 67.177 87.4827L67.2148 87.4809C67.2166 87.5186 67.3006 87.4956 67.3024 87.5333L67.3307 87.5319L67.3312 87.5413L67.3689 87.5394C67.3613 87.5776 67.4354 87.5456 67.4274 87.5744L67.4651 87.5725C67.4575 87.6107 67.5316 87.5787 67.5235 87.6074L67.5612 87.6056L67.5617 87.615L67.59 87.6136L67.5905 87.623C67.6093 87.6221 67.6381 87.6301 67.6569 87.6292L67.6574 87.6386C67.6857 87.6372 67.7145 87.6453 67.7427 87.6439L67.7432 87.6533L67.7715 87.6519L67.772 87.6613C67.8102 87.6689 67.8578 87.676 67.896 87.6836L67.8964 87.693L67.9341 87.6911L67.9346 87.7006L67.9723 87.6987L67.9728 87.7081L68.0105 87.7063L68.011 87.7157L68.0487 87.7138L68.0492 87.7233L68.0869 87.7214L68.0874 87.7308C68.1157 87.7294 68.1538 87.737 68.1821 87.7356L68.1826 87.745C68.2109 87.7436 68.2491 87.7512 68.2774 87.7498L68.2778 87.7592C68.6394 87.8076 69.0029 87.8936 69.3712 87.8849L69.3716 87.8943C71.5142 87.8263 73.6907 87.681 75.8413 87.5842C76.0681 87.5825 76.2284 87.5746 76.344 87.4271C76.3494 87.1527 76.2308 86.6669 76.2405 86.2883ZM74.0706 85.6109L69.412 85.8409C69.0325 85.8124 68.6143 85.7669 68.2768 85.6323L68.2485 85.6337L68.248 85.6243L68.2103 85.6261L68.2098 85.6167C68.191 85.6176 68.1622 85.6096 68.1434 85.6105L68.1429 85.6011L68.1146 85.6025L68.1141 85.5931L68.0764 85.5949C68.084 85.5567 68.0099 85.5888 68.018 85.56L67.9802 85.5619C67.9784 85.5241 67.8944 85.5472 67.8926 85.5095L67.8643 85.5109L67.8638 85.5014L67.8355 85.5028L67.8351 85.4934L67.8068 85.4948L67.8063 85.4854C67.7879 85.4957 67.7681 85.4778 67.7483 85.4599C67.72 85.4613 67.7101 85.4523 67.7092 85.4335C67.672 85.4447 67.6602 85.3981 67.6229 85.4094L67.6225 85.3999C67.498 85.3683 67.3981 85.2597 67.2831 85.2276C66.9909 85.053 66.6836 84.7657 66.3967 84.5057C66.3053 84.3778 66.1955 84.2604 66.105 84.1514C66.0824 84.0769 66.0051 84.0429 65.9825 83.9684L65.9731 83.9688C65.8167 83.6741 65.5642 83.3462 65.4895 82.9812L65.48 82.9817L65.4782 82.944L65.4688 82.9444L65.4669 82.9067L65.4575 82.9072L65.4547 82.8506L65.4452 82.8511L65.4424 82.7945L65.433 82.7949L65.4302 82.7384L65.4208 82.7388C65.4189 82.7011 65.4072 82.6544 65.4053 82.6167L65.3959 82.6172L65.3917 82.5323L65.3822 82.5328L65.3781 82.4479L65.3686 82.4484L65.3644 82.3635L65.355 82.364C65.3019 82.0546 65.2796 81.602 65.292 81.2799L65.3014 81.2795C65.2983 81.0244 65.3621 80.7849 65.3971 80.5374L65.4066 80.5369L65.4047 80.4992L65.4141 80.4987L65.4123 80.461L65.4217 80.4605L65.4198 80.4228L65.4293 80.4224L65.4274 80.3846L65.4368 80.3842L65.435 80.3464L65.4444 80.346L65.4426 80.3083L65.452 80.3078C65.4506 80.2795 65.4586 80.2507 65.4572 80.2225L65.4667 80.222L65.4653 80.1937L65.4747 80.1932L65.4728 80.1555L65.4823 80.155L65.4809 80.1268L65.4903 80.1263L65.4884 80.0886C65.5266 80.0961 65.4946 80.0221 65.5233 80.0301L65.522 80.0018L65.5314 80.0014L65.5295 79.9636C65.5672 79.9618 65.5442 79.8778 65.5819 79.876L65.5805 79.8477C65.6079 79.8274 65.6324 79.7506 65.6405 79.7218C65.6589 79.7115 65.6768 79.6917 65.666 79.6639L65.6754 79.6634C65.6641 79.6261 65.7117 79.6332 65.7004 79.596L65.7099 79.5955C65.7245 79.5097 65.8066 79.4489 65.8217 79.3726C66.0851 78.9625 66.523 78.4493 66.9235 78.1365C67.0527 78.0734 67.1692 77.9447 67.3173 77.8807L67.3168 77.8713L67.3451 77.8699L67.3447 77.8605L67.373 77.8591L67.3725 77.8496L67.4008 77.8482L67.4003 77.8388L67.4286 77.8374L67.4282 77.828L67.4564 77.8266L67.456 77.8171L67.4843 77.8157L67.4838 77.8063L67.5121 77.8049L67.5116 77.7955L67.5399 77.7941C67.5286 77.7568 67.6055 77.7814 67.5946 77.7536L67.6229 77.7522L67.6225 77.7427L67.6602 77.7409C67.6489 77.7036 67.7257 77.7282 67.7149 77.7004L67.7526 77.6985L67.7522 77.6891L67.7804 77.6877L67.78 77.6782L67.8177 77.6764L67.8172 77.6669L67.8455 77.6656L67.8451 77.6561C67.8734 77.6547 67.9012 77.6439 67.9295 77.6425L67.929 77.6331L67.9667 77.6312L67.9663 77.6218L68.004 77.6199L68.0035 77.6105L68.0412 77.6086L68.0408 77.5992L68.0785 77.5973L68.078 77.5879L68.1157 77.586L68.1153 77.5766C68.153 77.5747 68.1903 77.5635 68.228 77.5616L68.2275 77.5522L68.2652 77.5503L68.2648 77.5409C68.3025 77.539 68.3492 77.5272 68.3869 77.5254L68.3864 77.5159L68.443 77.5132L68.4425 77.5037L68.5274 77.4995L68.527 77.4901L68.593 77.4868L68.5925 77.4774L68.6774 77.4732L68.6769 77.4638L68.7901 77.4582L68.7896 77.4488L68.9122 77.4427L68.9117 77.4333C69.0734 77.4537 69.3894 77.3435 69.5436 77.4021L69.7322 77.3928L69.7326 77.4022L69.8552 77.3961L69.8557 77.4056C70.1777 77.418 70.5403 77.4852 70.8198 77.5943L70.8481 77.5929L70.8486 77.6023L70.8863 77.6005L70.8867 77.6099L70.915 77.6085L70.9155 77.6179L70.9532 77.6161C70.9457 77.6543 71.0197 77.6222 71.0117 77.651L71.0494 77.6491C71.0512 77.6869 71.1352 77.6638 71.1371 77.7015L71.1653 77.7001L71.1658 77.7096L71.1941 77.7082L71.1946 77.7176L71.2229 77.7162C71.3779 77.7936 71.5618 77.8791 71.698 77.9574C72.1863 78.2736 72.7777 78.7643 73.0664 79.2511L73.0759 79.2506C73.0782 79.2978 73.1461 79.3323 73.1484 79.3794C73.1677 79.3879 73.1875 79.4058 73.1795 79.4346L73.1889 79.4341C73.2101 79.4804 73.2417 79.545 73.2812 79.5808L73.2831 79.6185C73.3204 79.6073 73.2958 79.6841 73.3236 79.6733L73.325 79.7016L73.3344 79.7011L73.3358 79.7294C73.3736 79.7275 73.3589 79.8133 73.3966 79.8115L73.3985 79.8492L73.4079 79.8487L73.4093 79.877C73.4917 80.0147 73.5779 80.2279 73.615 80.4057L73.6245 80.4052L73.6272 80.4618L73.6367 80.4613L73.6395 80.5179L73.6489 80.5175L73.6522 80.5835L73.6616 80.583C73.6681 80.715 73.7411 80.8532 73.7382 80.9857L73.7476 80.9852L73.7542 81.1173L73.7636 81.1168C73.9358 82.4979 73.9848 84.0648 74.0706 85.6109ZM61.8943 82.9224C62.0189 82.765 62.0232 82.6608 62.0007 82.3973L61.9392 81.1525L61.9298 81.1529C61.9284 81.1246 61.9171 81.0874 61.9157 81.0591L61.9063 81.0595L61.9049 81.0313L61.8955 81.0317C61.8857 80.8337 61.7915 80.6493 61.7728 80.4611L61.7633 80.4616C61.7511 80.4055 61.7389 80.3494 61.7271 80.3027L61.7177 80.3031C61.7059 80.2565 61.6937 80.2003 61.682 80.1537L61.6725 80.1541L61.6707 80.1164L61.6612 80.1169L61.6594 80.0791L61.6499 80.0796L61.6481 80.0419L61.6386 80.0424L61.6358 79.9858L61.6264 79.9862L61.6246 79.9485L61.6151 79.949L61.6133 79.9113L61.6038 79.9117L61.602 79.874L61.5925 79.8745L61.5907 79.8368L61.5812 79.8372L61.5798 79.8089L61.5704 79.8094C61.5591 79.7721 61.5474 79.7255 61.5361 79.6882L61.5266 79.6887L61.5252 79.6604L61.5158 79.6608L61.514 79.6231L61.5045 79.6236L61.5031 79.5953L61.4937 79.5958L61.4918 79.558L61.4824 79.5585L61.481 79.5302L61.4716 79.5307L61.4697 79.493L61.4603 79.4934L61.4589 79.4651L61.4494 79.4656L61.4476 79.4279L61.4382 79.4283L61.4368 79.4L61.4273 79.4005L61.4259 79.3722L61.4165 79.3727L61.4151 79.3444L61.4057 79.3449L61.4038 79.3071C61.3661 79.309 61.3808 79.2232 61.343 79.2251L61.3416 79.1968L61.3322 79.1972L61.3308 79.1689L61.3214 79.1694L61.3195 79.1317C61.2818 79.1336 61.2965 79.0477 61.2588 79.0496L61.2574 79.0213C61.2182 78.9949 61.1943 78.8921 61.1556 78.8751L61.1542 78.8468L61.1448 78.8473C61.101 78.7265 60.9926 78.6374 60.9493 78.5261L60.9399 78.5265C60.9074 78.443 60.8197 78.3907 60.7962 78.2973C60.6256 78.0977 60.4433 77.8515 60.2166 77.6642C59.8557 77.2471 59.3589 76.9503 58.9574 76.6676L58.9291 76.669C58.8598 76.6062 58.7528 76.5453 58.676 76.5208L58.6755 76.5113C58.618 76.4953 58.5497 76.4514 58.5106 76.425L58.4823 76.4264L58.4818 76.4169L58.4535 76.4183L58.453 76.4089L58.4248 76.4103L58.4243 76.4009L58.396 76.4023L58.3955 76.3928L58.3672 76.3942C58.3748 76.356 58.3008 76.3881 58.3088 76.3593L58.2805 76.3607L58.28 76.3513L58.2518 76.3527L58.2513 76.3432L58.223 76.3446C58.2211 76.3069 58.1372 76.33 58.1353 76.2922C58.1165 76.2932 58.0877 76.2851 58.0689 76.2861C58.0764 76.2479 58.0024 76.2799 58.0104 76.2511L57.9727 76.253L57.9722 76.2436L57.9439 76.245L57.9435 76.2355C57.9246 76.2365 57.8958 76.2284 57.877 76.2294L57.8765 76.2199L57.8388 76.2218C57.8464 76.1836 57.7723 76.2156 57.7804 76.1869L57.7426 76.1887L57.7422 76.1793L57.7045 76.1812L57.704 76.1717L57.6757 76.1731L57.6752 76.1637C57.6469 76.1651 57.6182 76.1571 57.5899 76.1585L57.5894 76.149L57.5611 76.1504C57.5013 76.0872 57.323 76.1149 57.2726 76.0512L57.216 76.054L57.2156 76.0446L57.1779 76.0465L57.1774 76.037L57.1397 76.0389L57.1392 76.0295C57.0072 76.036 56.871 75.9576 56.7389 75.9642L56.7385 75.9547L56.6819 75.9575L56.6814 75.9481L56.6154 75.9514L56.615 75.9419L56.5301 75.9461L56.5296 75.9367L56.4636 75.9399L56.4631 75.9305L56.3783 75.9347L56.3778 75.9253C56.1609 75.936 55.9313 75.8812 55.7149 75.9013L55.7144 75.8919C55.365 75.8997 55.0166 75.9263 54.6785 75.9714L54.6789 75.9808C54.5182 75.9793 54.3611 76.0532 54.2008 76.0611L54.2013 76.0706C54.1541 76.0729 54.1074 76.0847 54.0697 76.0865L54.0702 76.096L54.0041 76.0992L54.0046 76.1087C53.9485 76.1209 53.883 76.1336 53.8268 76.1458L53.8273 76.1552L53.7707 76.158L53.7712 76.1674L53.7146 76.1702L53.7151 76.1797L53.6773 76.1815L53.6778 76.191C53.6401 76.1928 53.6028 76.2041 53.5651 76.206L53.5656 76.2154L53.5279 76.2173L53.5283 76.2267L53.4906 76.2286L53.4911 76.238L53.4345 76.2408L53.435 76.2502L53.3972 76.2521L53.3977 76.2615L53.36 76.2634L53.3605 76.2728L53.3227 76.2747L53.3232 76.2841C53.2949 76.2855 53.2671 76.2963 53.2388 76.2977L53.2393 76.3072L53.211 76.3085L53.2114 76.318C53.1831 76.3194 53.1553 76.3302 53.127 76.3316L53.1275 76.341L53.0992 76.3424L53.0997 76.3519C53.0714 76.3533 53.0435 76.3641 53.0152 76.3655L53.0157 76.3749L52.9874 76.3763L52.9879 76.3857L52.9502 76.3876L52.9506 76.397L52.9223 76.3984L52.9228 76.4079L52.8851 76.4097L52.8856 76.4192L52.8573 76.4205L52.8577 76.43L52.82 76.4318C52.8313 76.4691 52.7545 76.4445 52.7653 76.4724L52.7276 76.4742C52.7389 76.5115 52.662 76.4869 52.6729 76.5147L52.6446 76.5161L52.645 76.5256L52.6073 76.5274L52.6078 76.5369L52.5795 76.5383C52.5908 76.5755 52.5139 76.5509 52.5248 76.5788L52.4965 76.5802L52.4969 76.5896L52.4686 76.591L52.4691 76.6004L52.4408 76.6018L52.4413 76.6113L52.413 76.6127L52.4135 76.6221L52.3852 76.6235L52.3856 76.6329L52.3573 76.6343L52.3578 76.6437L52.3295 76.6451L52.33 76.6546C52.1088 76.7695 51.9177 76.9207 51.7455 77.071C51.179 77.4677 50.6072 78.1387 50.2192 78.7062C50.2206 78.7345 50.1848 78.7741 50.1668 78.7939C50.0993 78.9579 49.9653 79.1158 49.9081 79.2982L49.8987 79.2987C49.7212 79.7234 49.4898 80.2075 49.4103 80.703L49.4009 80.7034C49.4023 80.7317 49.3947 80.7699 49.3961 80.7982L49.3867 80.7987L49.3886 80.8364L49.3791 80.8369L49.3819 80.8934L49.3725 80.8939C49.3743 80.9316 49.3668 80.9698 49.3686 81.0075L49.3592 81.008L49.3625 81.074L49.353 81.0745L49.3558 81.1311L49.3464 81.1315L49.3497 81.1975L49.3402 81.198L49.3435 81.264L49.3341 81.2645L49.3373 81.3305L49.3279 81.331C49.3307 81.3875 49.3241 81.4446 49.3264 81.4917L49.317 81.4922C49.3202 81.5582 49.314 81.6247 49.3178 81.7001L49.3083 81.7006L49.3139 81.8138L49.3045 81.8142L49.3124 81.9745L49.303 81.975L49.3165 82.2485L49.3071 82.249L49.3299 82.711C49.3916 82.812 49.3542 83.0123 49.3791 83.134L49.3885 83.1335L49.3946 83.2561L49.404 83.2557L49.4096 83.3688L49.4191 83.3684C49.4185 83.548 49.5216 83.7225 49.5305 83.9017L49.5399 83.9012C49.5521 83.9574 49.5644 84.0135 49.5761 84.0602L49.5855 84.0597C49.5874 84.0974 49.5987 84.1347 49.6006 84.1724L49.61 84.1719C49.6114 84.2002 49.6227 84.2375 49.6241 84.2658L49.6335 84.2653L49.6354 84.303L49.6448 84.3026L49.6467 84.3403L49.6561 84.3398L49.6589 84.3964L49.6683 84.3959L49.6702 84.4336L49.6796 84.4332L49.6815 84.4709L49.6909 84.4704L49.6928 84.5082L49.7022 84.5077L49.7041 84.5454L49.7135 84.5449C49.7149 84.5732 49.7257 84.6011 49.7271 84.6294L49.7365 84.6289L49.7379 84.6572L49.7474 84.6567C49.7488 84.685 49.7596 84.7128 49.761 84.7411L49.7704 84.7407L49.7718 84.7689L49.7813 84.7685L49.7831 84.8062L49.7925 84.8057C49.7935 84.8246 49.8043 84.8524 49.8052 84.8713L49.8147 84.8708L49.8161 84.8991L49.8255 84.8986L49.8274 84.9364L49.8368 84.9359L49.8382 84.9642L49.8476 84.9637L49.8495 85.0014C49.8867 84.9901 49.8622 85.067 49.89 85.0562L49.8919 85.0939C49.9296 85.092 49.9149 85.1778 49.9526 85.176L49.954 85.2043L49.9635 85.2038L49.9649 85.2321L49.9743 85.2316L49.9762 85.2693C50.0139 85.2675 49.9992 85.3533 50.0369 85.3514L50.0383 85.3797L50.0477 85.3792L50.0491 85.4075C50.0784 85.425 50.1104 85.499 50.1212 85.5269C50.1405 85.5354 50.1603 85.5533 50.1523 85.582L50.1617 85.5816C50.6261 86.3716 51.4786 87.1709 52.2978 87.6787C52.4519 87.7373 52.5904 87.8628 52.7635 87.9204L52.7639 87.9298C52.8323 87.9737 52.9657 87.9955 53.0345 88.0488L53.0628 88.0474L53.0632 88.0569L53.0915 88.0555L53.092 88.0649L53.1203 88.0635L53.1208 88.0729L53.149 88.0715C53.1603 88.1088 53.2447 88.0952 53.2655 88.132L53.2938 88.1306L53.2942 88.14L53.332 88.1381C53.3244 88.1763 53.3984 88.1443 53.3904 88.173L53.4281 88.1712C53.4206 88.2094 53.4946 88.1774 53.4866 88.2061L53.5243 88.2042L53.5248 88.2137L53.553 88.2123L53.5535 88.2217L53.5912 88.2198L53.5917 88.2293L53.62 88.2279C54.0631 88.3951 54.5977 88.501 55.0904 88.5239L55.0909 88.5334L55.204 88.5278L55.2045 88.5372L55.3271 88.5312L55.3276 88.5406L55.4785 88.5331L55.4789 88.5426L55.743 88.5295L55.7434 88.539L56.1961 88.5166L56.1956 88.5072C56.3371 88.5002 56.4686 88.4842 56.6007 88.4777L56.6002 88.4683C56.9392 88.4421 57.2646 88.3315 57.5919 88.2586L57.5914 88.2492C57.6381 88.2374 57.6942 88.2252 57.7409 88.2134L57.7404 88.204C57.7871 88.1922 57.8338 88.1805 57.8711 88.1692L57.8706 88.1598L57.9083 88.1579L57.9079 88.1485L57.9456 88.1466L57.9451 88.1372L57.9828 88.1353L57.9824 88.1259L58.0201 88.124L58.0196 88.1146C58.0569 88.1033 58.1036 88.0915 58.1408 88.0802L58.1404 88.0708L58.1687 88.0694L58.1682 88.06C58.1965 88.0586 58.2243 88.0478 58.2526 88.0464L58.2521 88.0369L58.2804 88.0355L58.2799 88.0261C58.3082 88.0247 58.3361 88.0139 58.3644 88.0125L58.3639 88.0031L58.3922 88.0017L58.3917 87.9922L58.4294 87.9904C58.4182 87.9531 58.495 87.9777 58.4842 87.9499L58.5219 87.948L58.5214 87.9386L58.5497 87.9372L58.5492 87.9277L58.587 87.9259C58.5757 87.8886 58.6525 87.9132 58.6417 87.8854L58.67 87.884L58.6695 87.8745C58.7072 87.8727 58.753 87.842 58.7799 87.8124L58.8082 87.811L58.8077 87.8015L58.836 87.8001L58.8355 87.7907C59.1128 87.6636 59.3478 87.444 59.577 87.3003C59.6214 87.2414 59.7138 87.199 59.7582 87.1401C59.9591 86.9979 60.1483 86.8089 60.3177 86.602C60.4196 86.5592 60.4692 86.4149 60.5225 86.3461L60.5211 86.3178L60.5305 86.3174C60.6114 85.8501 60.1113 85.6763 59.8517 85.3961C59.6745 85.2536 59.5317 85.0432 59.3479 84.9578C59.3555 84.9196 59.2814 84.9516 59.2895 84.9228L59.2517 84.9247L59.2513 84.9153L59.1853 84.9185L59.1848 84.9091L59.1188 84.9124L59.1192 84.9218L59.0532 84.925C58.7231 85.1304 58.4484 85.5032 58.1465 85.7072C58.0626 85.7302 58.0102 85.8179 57.9168 85.8414L57.9173 85.8509L57.889 85.8523L57.8895 85.8617C57.8343 85.8928 57.7602 85.9248 57.7149 85.9648L57.6772 85.9667L57.6777 85.9761L57.6494 85.9775C57.6513 86.0152 57.5655 86.0006 57.5673 86.0383L57.5296 86.0402C57.5409 86.0774 57.464 86.0529 57.4749 86.0807L57.4372 86.0825L57.4376 86.092L57.4093 86.0934L57.4098 86.1028C57.3815 86.1042 57.3537 86.115 57.3254 86.1164L57.3259 86.1258L57.2976 86.1272C57.0391 86.2534 56.7033 86.3457 56.403 86.3889L56.4034 86.3983L56.2903 86.4039L56.2907 86.4133C56.0276 86.4452 55.6787 86.4624 55.4137 86.4566L55.4132 86.4472L55.2907 86.4532L55.2902 86.4438L55.177 86.4494L55.1766 86.44L55.0917 86.4442L55.0912 86.4347C54.8258 86.4195 54.5297 86.3585 54.2983 86.2659L54.27 86.2673L54.2695 86.2579L54.2318 86.2597L54.2313 86.2503C54.2125 86.2512 54.1837 86.2432 54.1648 86.2441L54.1644 86.2347L54.1361 86.2361L54.1356 86.2267L54.0979 86.2285C54.1055 86.1904 54.0314 86.2224 54.0395 86.1936L54.0017 86.1955C53.9999 86.1578 53.9159 86.1808 53.9141 86.1431L53.8858 86.1445L53.8853 86.1351L53.857 86.1365L53.8566 86.127L53.8283 86.1284L53.8278 86.119L53.7995 86.1204L53.799 86.111C53.6166 86.0538 53.4592 85.9292 53.3046 85.8612C52.7475 85.4917 52.1915 84.952 51.8891 84.3808L51.8797 84.3813L51.8783 84.353L51.8688 84.3534L51.8675 84.3251L51.858 84.3256L51.8566 84.2973L51.8472 84.2978L51.8458 84.2695L51.8364 84.2699L51.835 84.2417L51.8255 84.2421L51.8241 84.2138L51.8147 84.2143L51.8133 84.186L51.8039 84.1865C51.8029 84.1676 51.7921 84.1398 51.7912 84.1209C51.7539 84.1322 51.7785 84.0554 51.7507 84.0662L51.7488 84.0285L51.7394 84.029L51.738 84.0007L51.7286 84.0011C51.7276 83.9823 51.7168 83.9544 51.7159 83.9356L51.7064 83.936L51.7046 83.8983L51.6951 83.8988L51.6937 83.8705L51.6843 83.871C51.6589 83.7399 51.5784 83.6399 51.5521 83.4899C54.897 83.268 58.462 83.2905 61.8943 82.9224ZM51.3786 81.1257L51.3767 81.088L51.3861 81.0875C51.3848 81.0592 51.3928 81.0305 51.3914 81.0022L51.4008 81.0017C51.4084 80.9635 51.4155 80.9159 51.4231 80.8777L51.4325 80.8772L51.4311 80.849L51.4405 80.8485C51.4391 80.8202 51.4471 80.7914 51.4457 80.7632C51.4839 80.7707 51.4519 80.6967 51.4807 80.7047L51.4788 80.667C51.5165 80.6651 51.4935 80.5812 51.5312 80.5793L51.5298 80.551L51.5392 80.5506L51.5378 80.5223L51.5473 80.5218L51.5459 80.4935L51.5553 80.4931L51.5539 80.4648L51.5633 80.4643L51.5619 80.436L51.5714 80.4355L51.57 80.4072L51.5794 80.4068C51.5945 80.3304 51.6667 80.2607 51.6819 80.1843L51.6913 80.1838C51.9222 79.6903 52.4157 79.1555 52.8516 78.7936C53.0082 78.7103 53.1431 78.5712 53.319 78.4964L53.3185 78.487L53.3468 78.4856L53.3464 78.4761L53.3747 78.4747L53.3742 78.4653L53.4025 78.4639L53.402 78.4545L53.4303 78.4531L53.4298 78.4436L53.4581 78.4422L53.4577 78.4328L53.486 78.4314C53.4841 78.3937 53.5699 78.4084 53.568 78.3706L53.6058 78.3688C54.2317 78.0259 55.0658 77.8807 55.815 77.9288L55.8155 77.9382L55.9098 77.9336L55.9102 77.943L55.9951 77.9388L55.9956 77.9483L56.0805 77.9441L56.0809 77.9535L56.1469 77.9502L56.1474 77.9597L56.204 77.9569L56.2044 77.9663L56.2705 77.963L56.2709 77.9725L56.3275 77.9697L56.328 77.9791L56.3846 77.9763L56.385 77.9857C56.4326 77.9928 56.4897 77.9995 56.5373 78.0066L56.5378 78.016L56.5755 78.0142L56.576 78.0236L56.6137 78.0217L56.6141 78.0311L56.6519 78.0293L56.6523 78.0387L56.69 78.0369L56.6905 78.0463L56.7282 78.0444L56.7287 78.0539C56.7669 78.0614 56.8145 78.0685 56.8527 78.0761L56.8532 78.0855L56.8814 78.0841L56.8819 78.0936L56.9196 78.0917C56.9121 78.1299 56.9861 78.0979 56.9781 78.1266L57.0158 78.1248L57.0163 78.1342L57.0446 78.1328C57.037 78.171 57.111 78.139 57.103 78.1677L57.1313 78.1663L57.1318 78.1757L57.1601 78.1743L57.1605 78.1838L57.1888 78.1824L57.1893 78.1918L57.2176 78.1904L57.218 78.1998L57.2463 78.1984L57.2468 78.2079L57.2751 78.2065L57.2755 78.2159L57.3038 78.2145L57.3043 78.2239L57.3326 78.2225L57.3331 78.232C58.0769 78.5545 58.7894 79.1999 59.1836 79.9084L59.193 79.9079C59.2241 79.9631 59.2561 80.0371 59.2962 80.0824L59.2981 80.1201L59.3075 80.1197L59.3089 80.148C59.3466 80.1461 59.3319 80.2319 59.3697 80.23L59.3715 80.2678L59.381 80.2673L59.3824 80.2956L59.3918 80.2951C59.3932 80.3234 59.404 80.3512 59.4054 80.3795L59.4148 80.3791L59.4162 80.4073L59.4257 80.4069C59.4271 80.4352 59.4379 80.463 59.4393 80.4913L59.4487 80.4908C59.4501 80.5191 59.4609 80.5469 59.4623 80.5752L59.4718 80.5748L59.4736 80.6125L59.4831 80.612L59.4849 80.6497L59.4944 80.6493L59.4962 80.687L59.5056 80.6865L59.5084 80.7431L59.5179 80.7426C59.5193 80.7709 59.5306 80.8082 59.532 80.8365L59.5414 80.836L59.5419 80.8455L51.1866 81.2581C51.3492 81.2973 51.3338 81.1752 51.3786 81.1257Z" fill="#FE001C"/>
+<path d="M75.6282 64.3946C75.6471 64.6271 75.4681 64.8288 75.234 64.8479L67.3332 65.4929C67.1007 65.5119 66.8963 65.3415 66.8773 65.109L66.7793 63.9086C66.7605 63.6773 66.9343 63.4739 67.1669 63.4549L75.0676 62.8099C75.3018 62.7908 75.5113 62.9629 75.5302 63.1942L75.6282 64.3946Z" fill="#FAB200"/>
+<path d="M84.9866 43.866L85.5686 50.9957C86.1753 50.4158 87.1929 50.1557 88.801 49.9205L88.5349 46.7075L91.1166 46.4968C92.4692 46.3256 95.4557 45.6798 95.2331 43.0295L84.9866 43.866Z" fill="#71B857"/>
+<path d="M93.3035 49.4707L93.9874 49.4149C93.9874 49.4149 94.0251 49.897 94.0405 50.0853C94.1613 51.5656 92.9021 52.4239 90.304 52.636L89.0276 52.7402L89.2278 55.1921C89.2982 56.0551 89.2522 58.064 87.2755 58.2673L86.1694 58.3576L85.8762 54.7661C85.8511 50.5957 91.3694 49.6735 93.3035 49.4707Z" fill="#71B857"/>
+<path d="M77.7604 44.4594L70.5723 45.0438L71.7552 59.5339C74.2357 59.0248 75.0564 57.7816 75.0485 56.0483L74.3801 47.8612L77.5398 47.6032C77.5789 47.6026 77.6232 47.6014 77.6678 47.6002C77.7445 47.5982 77.8218 47.5961 77.8742 47.5967C79.3875 47.6501 80.3956 48.2193 80.735 51.1821C80.7556 51.2975 80.7628 51.4285 80.7693 51.5476C80.7721 51.6001 80.7749 51.6505 80.7786 51.6959C81.0944 56.5149 77.487 58.293 75.4658 58.9994L75.4554 59.004C75.4315 59.0161 75.4148 59.0297 75.4168 59.0544L75.4274 59.184C75.4295 59.2103 75.4521 59.2285 75.4738 59.2295L75.4809 59.2298L75.7229 59.21C78.7329 58.9643 84.7234 57.7516 84.1932 51.2574L84.1836 51.1387C83.6886 45.5133 81.0952 44.1871 77.7604 44.4594Z" fill="#00B1AF"/>
+<path d="M64.5543 48.6772L62.8542 48.8021C62.7458 48.811 62.6399 48.8151 62.5312 48.8162C60.4253 48.8402 59.1009 47.3701 58.5461 46.5877C58.4206 46.4284 58.3001 46.2641 58.1846 46.0897C58.1846 46.0897 58.1714 46.0553 58.1888 46.0539L63.0482 45.6572C64.6742 45.5244 65.3596 45.5679 66.102 45.7862C66.277 45.8347 66.4601 45.8972 66.6547 45.9674C67.7375 46.3641 68.515 47.1699 68.8883 48.2545C68.9428 48.4037 68.9829 48.5647 69.0193 48.7261C69.0686 48.9385 69.105 49.161 69.1239 49.3927C69.2679 51.1149 68.4749 52.1683 67.3231 52.9546C67.3216 52.9576 67.3028 52.9705 67.3028 52.9705C67.2868 52.978 67.2868 52.978 67.2779 52.9864C67.2651 52.994 67.2538 53.002 67.2433 53.0095C67.2365 53.0143 67.2301 53.0189 67.2236 53.0231C67.2199 53.0234 67.2033 53.0378 67.2033 53.0378C67.068 53.1189 66.9329 53.1732 66.8064 53.2149C66.7865 53.2207 66.7675 53.2274 66.7497 53.2337C66.7341 53.2392 66.7194 53.2444 66.7058 53.2484L66.4289 49.8557C66.299 48.8136 65.34 48.6167 64.8011 48.6607C64.7841 48.6621 64.7665 48.6637 64.7484 48.6654C64.6895 48.6708 64.6251 48.6767 64.5543 48.6772Z" fill="#009BC4"/>
+<path d="M61.2656 52.9109C60.4493 53.0089 60.4307 53.7569 60.4331 53.9031L60.6117 56.0909L63.6868 55.8399C63.9765 56.1929 64.2647 56.5423 64.5326 56.8671L64.8372 57.2365C65.2234 57.6979 65.5935 58.1329 65.746 58.2986C65.7564 58.3101 65.7686 58.3245 65.783 58.3413C65.9773 58.5701 66.563 59.2596 68.4146 59.5493C69.0919 59.6544 69.8278 59.6421 70.2394 59.6352C70.3139 59.6339 70.3783 59.6328 70.4292 59.6327L70.6122 59.6267L70.59 59.5935C70.59 59.5935 70.2244 59.1724 69.7512 58.5L69.6481 58.3533C68.9965 57.4266 66.7863 54.2832 66.3612 53.6691C65.9782 53.1153 65.4227 52.9001 64.8632 52.7876L64.8579 52.788C64.4575 52.7131 64.0242 52.7073 63.7009 52.7174C63.6866 52.7179 63.6726 52.7182 63.6586 52.7185C63.6342 52.719 63.6099 52.7195 63.585 52.7215L61.2656 52.9109Z" fill="#009BC4"/>
+<path d="M57.556 53.214C58.3386 53.186 58.5012 53.8617 58.5286 54.0401L58.8184 57.5891C58.8026 57.6128 58.7866 57.637 58.7705 57.6614C58.7015 57.7659 58.6296 57.8748 58.5539 57.9736C58.4148 58.1517 58.1921 58.4271 58.1075 58.5204C56.5608 60.2286 54.6393 60.9615 52.8035 61.1114C51.2946 61.2346 49.1799 60.9327 47.2745 59.4016C44.041 56.7921 43.6377 52.2237 46.4358 49.1491C46.9545 48.5832 47.1559 48.3711 48.0079 47.7968C49.1835 47.0016 50.5606 46.647 51.689 46.5549C52.6797 46.474 53.7816 46.5973 54.6209 46.8627C54.8163 46.923 55.0372 46.9959 55.3181 47.127C56.0702 47.479 57.0719 48.1222 57.6361 49.2222L57.6365 49.2274L48.7743 49.9509L49.2086 55.2698C49.3532 56.2124 49.6232 56.9479 50.2555 57.4287C50.7663 57.8188 51.5161 58.0405 52.6283 58.061C52.9847 58.0698 53.382 58.0558 53.8215 58.0199L55.7472 57.8582C55.7286 57.8536 55.6519 57.8142 55.358 57.5079C54.992 57.1224 54.8597 56.4221 54.8166 55.8944L54.815 55.8946L54.6157 53.4532L57.556 53.214Z" fill="#0053A2"/>
+<path d="M147.733 137.116L144.085 137.116L142.35 123.051L147.734 123.051L147.733 137.116Z" fill="#FFB8B8"/>
+<path d="M141.479 136.074H148.514V140.502H137.049C137.049 139.921 137.163 139.345 137.386 138.808C137.609 138.27 137.935 137.782 138.346 137.371C138.758 136.96 139.246 136.634 139.783 136.411C140.321 136.189 140.897 136.074 141.479 136.074Z" fill="#61616F"/>
+<path d="M167.397 137.116L163.748 137.116L162.014 123.051L167.398 123.051L167.397 137.116Z" fill="#FFB8B8"/>
+<path d="M161.143 136.074H168.178V140.502H156.713C156.713 139.921 156.827 139.345 157.05 138.808C157.273 138.27 157.599 137.782 158.01 137.371C158.422 136.96 158.91 136.634 159.448 136.411C159.985 136.189 160.561 136.074 161.143 136.074Z" fill="#61616E"/>
+<path d="M156.713 37.1299C161.041 37.1299 164.55 33.6225 164.55 29.2959C164.55 24.9693 161.041 21.4619 156.713 21.4619C152.384 21.4619 148.875 24.9693 148.875 29.2959C148.875 33.6225 152.384 37.1299 156.713 37.1299Z" fill="#FFB8B8"/>
+<path d="M115.888 62.7917C116.171 62.459 116.525 62.1925 116.923 62.011C117.32 61.8295 117.753 61.7375 118.191 61.7414C118.628 61.7453 119.059 61.8451 119.454 62.0336C119.849 62.2221 120.197 62.4949 120.475 62.8327L127.016 60.8456L129.195 64.5258L119.919 67.2021C119.32 67.6311 118.585 67.8257 117.853 67.7491C117.121 67.6724 116.442 67.3298 115.945 66.7861C115.448 66.2425 115.168 65.5356 115.157 64.7994C115.147 64.0632 115.407 63.3489 115.888 62.7917Z" fill="#FFB8B8"/>
+<path d="M167.61 85.6938C167.424 85.2983 167.326 84.8668 167.324 84.4295C167.322 83.9923 167.417 83.56 167.6 83.1631C167.784 82.7661 168.052 82.4143 168.386 82.1322C168.721 81.8501 169.113 81.6448 169.535 81.5306L170.414 74.7527L174.665 74.2822L173.289 83.8365C173.434 84.5583 173.309 85.3081 172.938 85.9439C172.567 86.5798 171.975 87.0574 171.275 87.2863C170.575 87.5152 169.815 87.4796 169.14 87.1861C168.464 86.8926 167.92 86.3616 167.61 85.6938L167.61 85.6938Z" fill="#FFB8B8"/>
+<path d="M163.262 44.0924C163.679 43.5575 164.229 43.142 164.858 42.8877C165.487 42.6335 166.172 42.5495 166.843 42.6443C167.515 42.7391 168.15 43.0093 168.684 43.4277C169.217 43.846 169.631 44.3977 169.884 45.0271L176.308 61.0518C176.964 62.6894 177.174 64.4719 176.914 66.217L174.822 80.3018C174.795 80.4835 174.729 80.6573 174.628 80.8112C174.528 80.9651 174.396 81.0955 174.24 81.1935C174.085 81.2915 173.91 81.3548 173.728 81.3791C173.545 81.4033 173.36 81.388 173.184 81.334L170.428 80.4878C170.142 80.4002 169.896 80.2153 169.733 79.9653C169.57 79.7153 169.5 79.416 169.535 79.1196C170.508 70.8275 169.222 62.4266 165.813 54.8047L162.784 48.0337C162.498 47.3952 162.392 46.6911 162.476 45.9968C162.56 45.3025 162.832 44.6442 163.262 44.0924Z" fill="#F1C017"/>
+<path d="M158.62 37.129C159.8 37.1544 160.972 36.9301 162.058 36.4707C163.145 36.0114 164.122 35.3273 164.926 34.4636C165.729 33.5999 166.34 32.576 166.72 31.4593C167.099 30.3425 167.237 29.1582 167.126 27.9842C167.015 26.8101 166.656 25.6729 166.074 24.6472C165.492 23.6215 164.699 22.7306 163.747 22.0331C162.796 21.3355 161.708 20.8471 160.554 20.5999C159.4 20.3527 158.207 20.3523 157.054 20.5987C155.33 19.5527 153.326 18.8488 151.318 19.0278C149.309 19.2068 147.323 20.3987 146.572 22.2691C145.821 24.1396 146.628 26.6051 148.495 27.3653C149.692 27.8526 151.044 27.6163 152.322 27.4197C153.6 27.2232 154.994 27.095 156.106 27.7539C157.218 28.4129 157.717 30.1798 156.722 31.0036C156.194 31.4576 155.817 32.0617 155.641 32.7352C155.465 33.4088 155.499 34.1199 155.737 34.7738C156.238 36.0676 157.604 37.107 158.62 37.129Z" fill="#61616F"/>
+<path d="M168.345 80.0762L169.735 132.813C169.74 132.989 169.708 133.164 169.642 133.327C169.576 133.49 169.476 133.637 169.35 133.76C169.225 133.883 169.075 133.978 168.91 134.04C168.745 134.103 168.57 134.13 168.394 134.121L163.814 133.887C163.522 133.873 163.244 133.758 163.026 133.562C162.808 133.367 162.665 133.102 162.619 132.814L157.171 98.5606C157.148 98.414 157.074 98.2801 156.963 98.182C156.851 98.0839 156.709 98.0277 156.561 98.0231C156.412 98.0185 156.267 98.0658 156.149 98.1567C156.032 98.2477 155.95 98.3767 155.918 98.5216L148.544 131.501C148.505 131.677 148.428 131.843 148.32 131.988C148.211 132.132 148.074 132.252 147.915 132.34C147.757 132.427 147.582 132.48 147.402 132.494C147.222 132.509 147.041 132.486 146.871 132.425L142.325 132.148C142.062 132.054 141.837 131.877 141.685 131.644C141.532 131.41 141.46 131.133 141.48 130.855L145.448 79.5771L168.345 80.0762Z" fill="#61616F"/>
+<path d="M170.576 55.0278C171.343 47.0361 165.464 39.8076 157.452 39.239C154 38.994 148.641 38.9064 146.874 43.429C141.552 57.0531 150.869 56.722 147.659 68.5258C144.449 80.3297 141.614 81.0062 146.018 81.8585C150.422 82.7109 170.228 87.7424 169.415 79.4344C168.915 74.3277 169.811 62.9995 170.576 55.0278Z" fill="#F1C017"/>
+<path d="M151.885 40.5461C152.548 40.6883 153.162 41.0029 153.665 41.4581C154.168 41.9133 154.542 42.493 154.749 43.1388C154.956 43.7845 154.99 44.4734 154.846 45.136C154.701 45.7985 154.385 46.4112 153.928 46.9123L143.268 58.608C141.445 60.608 139.123 62.0875 136.54 62.8951L124.319 66.7152C124.144 66.77 123.959 66.7863 123.777 66.763C123.594 66.7397 123.419 66.6772 123.263 66.58C123.107 66.4827 122.974 66.353 122.873 66.1996C122.772 66.0462 122.705 65.8727 122.677 65.6911L122.237 62.8416C122.192 62.5465 122.251 62.2448 122.405 61.9891C122.559 61.7334 122.798 61.5399 123.08 61.4421L123.96 61.1372C131.274 58.6021 137.767 54.1383 142.752 48.2176L148.128 41.832C148.579 41.297 149.166 40.8947 149.828 40.6681C150.49 40.4416 151.201 40.3994 151.885 40.5461Z" fill="#F1C017"/>
+<path d="M190.681 141.258H108.35C108.266 141.258 108.185 141.224 108.125 141.165C108.065 141.105 108.031 141.024 108.031 140.939C108.031 140.854 108.065 140.773 108.125 140.714C108.185 140.654 108.266 140.62 108.35 140.62H190.681C190.765 140.62 190.847 140.654 190.906 140.714C190.966 140.773 191 140.854 191 140.939C191 141.024 190.966 141.105 190.906 141.165C190.847 141.224 190.765 141.258 190.681 141.258Z" fill="#CCCCCC"/>
+<defs>
+<linearGradient id="paint0_linear_11182_68748" x1="59" y1="27.1205" x2="38.4887" y2="134.992" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#E0E0E0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/egl.svg b/src/assets/icons/visu/partnerSteps/egl.svg
new file mode 100644
index 000000000..d0de8bada
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/egl.svg
@@ -0,0 +1,32 @@
+<svg width="220" height="220" viewBox="0 0 220 220" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5293 131.207H115.611V199.241C115.611 201.174 114.044 202.741 112.111 202.741H6.0293C4.0963 202.741 2.5293 201.174 2.5293 199.241V131.207Z" fill="url(#paint0_linear_11182_69405)" stroke="#52616C"/>
+<path d="M2.0293 123.962C2.0293 121.753 3.82016 119.962 6.0293 119.962H112.111C114.321 119.962 116.111 121.753 116.111 123.962V130.707H2.0293V123.962Z" fill="#52616C"/>
+<ellipse cx="8.90131" cy="126.678" rx="2.74897" ry="2.68643" fill="#FF5F5F"/>
+<ellipse cx="17.1484" cy="126.678" rx="2.74897" ry="2.68643" fill="#FFB850"/>
+<ellipse cx="25.3954" cy="126.678" rx="2.74896" ry="2.68643" fill="#3CE800"/>
+<path d="M44.2788 179.917V181.115H39.0259V184.723H43.2786V185.875H39.0259V189.582H44.2788V190.78H37.5371V179.917H44.2788Z" fill="white"/>
+<path d="M51.4717 184.465C51.431 184.521 51.3902 184.564 51.3495 184.594C51.3088 184.624 51.2503 184.64 51.1739 184.64C51.0976 184.64 51.0136 184.609 50.922 184.549C50.8354 184.483 50.7235 184.412 50.586 184.336C50.4486 184.261 50.2806 184.192 50.0821 184.132C49.8887 184.066 49.6495 184.033 49.3644 184.033C48.9878 184.033 48.6544 184.101 48.3643 184.238C48.0741 184.369 47.8298 184.561 47.6313 184.814C47.4379 185.067 47.2903 185.372 47.1885 185.731C47.0918 186.09 47.0434 186.492 47.0434 186.937C47.0434 187.402 47.0969 187.816 47.2038 188.18C47.3106 188.539 47.4608 188.842 47.6542 189.09C47.8476 189.332 48.0818 189.519 48.3566 189.651C48.6366 189.777 48.9496 189.84 49.2957 189.84C49.6266 189.84 49.8989 189.802 50.1127 189.726C50.3264 189.645 50.5046 189.557 50.6471 189.461C50.7896 189.365 50.9067 189.279 50.9983 189.203C51.0899 189.122 51.1816 189.082 51.2732 189.082C51.3902 189.082 51.4768 189.125 51.5328 189.211L51.9145 189.704C51.5786 190.113 51.1586 190.414 50.6547 190.606C50.1508 190.793 49.6189 190.886 49.059 190.886C48.5755 190.886 48.125 190.798 47.7077 190.621C47.2954 190.444 46.9365 190.189 46.6311 189.855C46.3257 189.517 46.084 189.102 45.9058 188.612C45.7328 188.122 45.6462 187.563 45.6462 186.937C45.6462 186.366 45.7251 185.837 45.8829 185.352C46.0458 184.867 46.2799 184.45 46.5853 184.101C46.8958 183.748 47.2776 183.472 47.7306 183.275C48.1836 183.078 48.7027 182.979 49.2881 182.979C49.8276 182.979 50.3061 183.068 50.7235 183.245C51.1408 183.417 51.5099 183.662 51.8305 183.98L51.4717 184.465Z" fill="white"/>
+<path d="M56.4542 182.979C57.0192 182.979 57.5282 183.073 57.9812 183.26C58.4393 183.447 58.8261 183.712 59.1417 184.056C59.4623 184.4 59.7067 184.817 59.8746 185.307C60.0477 185.792 60.1342 186.335 60.1342 186.937C60.1342 187.543 60.0477 188.089 59.8746 188.574C59.7067 189.059 59.4623 189.474 59.1417 189.817C58.8261 190.161 58.4393 190.426 57.9812 190.613C57.5282 190.795 57.0192 190.886 56.4542 190.886C55.8892 190.886 55.3777 190.795 54.9196 190.613C54.4666 190.426 54.0797 190.161 53.7591 189.817C53.4384 189.474 53.1915 189.059 53.0185 188.574C52.8454 188.089 52.7589 187.543 52.7589 186.937C52.7589 186.335 52.8454 185.792 53.0185 185.307C53.1915 184.817 53.4384 184.4 53.7591 184.056C54.0797 183.712 54.4666 183.447 54.9196 183.26C55.3777 183.073 55.8892 182.979 56.4542 182.979ZM56.4542 189.832C57.2177 189.832 57.7878 189.58 58.1644 189.074C58.5411 188.564 58.7294 187.854 58.7294 186.944C58.7294 186.029 58.5411 185.317 58.1644 184.806C57.7878 184.296 57.2177 184.041 56.4542 184.041C56.0673 184.041 55.7314 184.106 55.4464 184.238C55.1613 184.369 54.9221 184.559 54.7287 184.806C54.5404 185.054 54.3978 185.36 54.3011 185.724C54.2095 186.083 54.1637 186.489 54.1637 186.944C54.1637 187.399 54.2095 187.806 54.3011 188.165C54.3978 188.524 54.5404 188.827 54.7287 189.074C54.9221 189.317 55.1613 189.504 55.4464 189.635C55.7314 189.767 56.0673 189.832 56.4542 189.832Z" fill="white"/>
+<path d="M63.3205 179.614V190.78H61.9615V179.614H63.3205Z" fill="white"/>
+<path d="M67.9833 193.047C67.9375 193.148 67.8789 193.229 67.8077 193.289C67.7415 193.35 67.6372 193.38 67.4946 193.38H66.4868L67.8993 190.333L64.7079 183.101H65.8837C66.0007 183.101 66.0924 183.131 66.1585 183.192C66.2247 183.247 66.2731 183.311 66.3036 183.381L68.3727 188.218C68.4185 188.329 68.4566 188.44 68.4872 188.551C68.5228 188.662 68.5534 188.776 68.5788 188.892C68.6144 188.776 68.6501 188.662 68.6857 188.551C68.7213 188.44 68.762 188.326 68.8078 188.21L70.8158 183.381C70.8464 183.3 70.8973 183.235 70.9685 183.184C71.0449 183.129 71.1263 183.101 71.2128 183.101H72.297L67.9833 193.047Z" fill="white"/>
+<path d="M76.466 182.979C77.031 182.979 77.54 183.073 77.993 183.26C78.4511 183.447 78.838 183.712 79.1535 184.056C79.4742 184.4 79.7185 184.817 79.8865 185.307C80.0595 185.792 80.1461 186.335 80.1461 186.937C80.1461 187.543 80.0595 188.089 79.8865 188.574C79.7185 189.059 79.4742 189.474 79.1535 189.817C78.838 190.161 78.4511 190.426 77.993 190.613C77.54 190.795 77.031 190.886 76.466 190.886C75.9011 190.886 75.3895 190.795 74.9314 190.613C74.4784 190.426 74.0916 190.161 73.7709 189.817C73.4502 189.474 73.2034 189.059 73.0303 188.574C72.8573 188.089 72.7707 187.543 72.7707 186.937C72.7707 186.335 72.8573 185.792 73.0303 185.307C73.2034 184.817 73.4502 184.4 73.7709 184.056C74.0916 183.712 74.4784 183.447 74.9314 183.26C75.3895 183.073 75.9011 182.979 76.466 182.979ZM76.466 189.832C77.2295 189.832 77.7996 189.58 78.1763 189.074C78.5529 188.564 78.7412 187.854 78.7412 186.944C78.7412 186.029 78.5529 185.317 78.1763 184.806C77.7996 184.296 77.2295 184.041 76.466 184.041C76.0792 184.041 75.7433 184.106 75.4582 184.238C75.1732 184.369 74.934 184.559 74.7405 184.806C74.5522 185.054 74.4097 185.36 74.313 185.724C74.2214 186.083 74.1756 186.489 74.1756 186.944C74.1756 187.399 74.2214 187.806 74.313 188.165C74.4097 188.524 74.5522 188.827 74.7405 189.074C74.934 189.317 75.1732 189.504 75.4582 189.635C75.7433 189.767 76.0792 189.832 76.466 189.832Z" fill="white"/>
+<path d="M59.1015 174.342C74.561 168.216 73.3594 159.506 72.5584 146.515C67.5922 146.293 63.1866 144.743 59.1015 142.16C55.0163 144.743 50.6107 146.293 45.6445 146.515C44.8435 159.506 43.6419 168.216 59.1015 174.342Z" fill="#1B1C22"/>
+<path d="M59.1014 139.79L58.0541 140.452C54.2241 142.874 50.1454 144.301 45.5575 144.505L43.7785 144.584L43.6673 146.389C43.6342 146.925 43.5999 147.458 43.5657 147.988C43.1983 153.691 42.8537 159.041 44.4 163.651C46.1826 168.965 50.3182 173.02 58.3811 176.215L59.1014 176.501V174.342C44.248 168.456 44.7748 160.184 45.5494 148.023C45.581 147.527 45.613 147.024 45.6444 146.515C50.6107 146.293 55.0162 144.743 59.1014 142.16V139.79Z" fill="#FFC600"/>
+<path d="M59.1017 139.79L60.1491 140.452C63.979 142.874 68.0577 144.301 72.6456 144.505L74.4246 144.584L74.5359 146.389C74.5689 146.925 74.6032 147.458 74.6374 147.988C75.0048 153.691 75.3494 159.041 73.8032 163.651C72.0205 168.965 67.8849 173.02 59.822 176.215L59.1017 176.501V174.342C73.9551 168.456 73.4283 160.184 72.6538 148.023C72.6221 147.527 72.5901 147.024 72.5587 146.515C67.5925 146.293 63.1869 144.743 59.1017 142.16V139.79Z" fill="#DB8300"/>
+<path d="M54.2159 152.442H54.9187C55.1994 152.442 55.4686 152.554 55.667 152.754C55.8655 152.953 55.977 153.223 55.977 153.505V164.285H53.1576V153.505C53.1576 153.223 53.2691 152.953 53.4676 152.754C53.666 152.554 53.9352 152.442 54.2159 152.442ZM59.099 157.692H59.8018C60.0824 157.692 60.3516 157.804 60.5501 158.003C60.7486 158.202 60.8601 158.472 60.8601 158.754V164.285H58.0407V158.754C58.0407 158.472 58.1522 158.202 58.3506 158.003C58.5491 157.804 58.8183 157.692 59.099 157.692ZM64.2731 155.661H64.9759C65.2566 155.661 65.5257 155.773 65.7242 155.972C65.9227 156.172 66.0342 156.442 66.0342 156.723V164.285H63.2148V156.723C63.2148 156.442 63.3263 156.172 63.5248 155.972C63.7232 155.773 63.9924 155.661 64.2731 155.661Z" fill="#FFC600"/>
+<path d="M121.39 51.5079C105.493 53.5148 90.8171 61.0772 79.9564 72.8584C69.0957 84.6397 62.7497 99.8812 62.04 115.889" stroke="#A0A0A0" stroke-width="2"/>
+<path d="M131.5 25.5H213.5V75C213.5 76.933 211.933 78.5 210 78.5H135C133.067 78.5 131.5 76.933 131.5 75V25.5Z" fill="white" stroke="#A2B4C1"/>
+<path d="M131 21C131 18.7909 132.791 17 135 17H210C212.209 17 214 18.7909 214 21V25H131V21Z" fill="#A2B4C1"/>
+<circle cx="136" cy="22" r="2" fill="#FF5F5F"/>
+<circle cx="142" cy="22" r="2" fill="#FFB850"/>
+<circle cx="148" cy="22" r="2" fill="#3CE800"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M159.868 60.9967C158.886 60.9643 158.951 61.2556 158.973 60.1875H160.828C160.828 60.6946 160.85 61.2125 160.764 61.7088H160.753C160.753 61.7412 160.742 61.7843 160.742 61.8167H160.731V61.8598H160.721V61.903H160.71V61.9462C160.667 61.9462 160.688 62.0433 160.645 62.0433V62.0756H160.634V62.108C160.472 62.4101 160.116 62.6906 159.825 62.8417C159.804 62.8417 159.771 62.8525 159.75 62.8525V62.8633H159.706V62.8741H159.663V62.8848H159.62V62.8956H159.577V62.9064H159.512V62.9172C159.253 62.9604 158.886 62.9819 158.606 62.928V62.9172H158.541V62.9064H158.476V62.8956H158.433V62.8848H158.368V62.8741H158.336V62.8633H158.293V62.8525H158.261V62.8417H158.217C157.473 62.4856 157.138 61.7951 157.182 60.7809C157.149 59.6804 157.138 58.7417 157.98 58.213C158.056 58.1698 158.174 58.1159 158.25 58.0727H158.282V58.0619H158.325V58.0511H158.358V58.0404C159.07 57.8138 160.041 57.9756 160.548 58.569C160.321 58.7848 160.116 59.033 159.879 59.2272C159.62 58.8927 159.156 58.7309 158.725 58.8496V58.8604H158.692V58.8711H158.649V58.8819H158.617V58.8927C158.444 58.9467 158.347 59.1409 158.261 59.2811V59.3243H158.25V59.389H158.239V59.4646H158.228V59.5725H158.217C158.207 59.8098 158.196 60.0688 158.207 60.3277H158.196C158.217 60.7485 158.196 61.2017 158.271 61.5793H158.282V61.6225C158.368 61.7735 158.487 61.9677 158.671 62.0325V62.0433H158.714V62.054H158.757V62.0648H158.8V62.0756H158.876C159.469 62.2375 159.933 61.7519 159.868 60.9967ZM153.276 57.9648C153.33 59.2164 153.146 60.6083 153.373 61.8167C153.416 61.8059 153.384 61.8922 153.416 61.8814V61.9138H153.427C153.524 62.1727 153.837 62.4533 154.182 62.4964V62.5072H154.258V62.518H154.463V62.5288C154.495 62.5288 154.495 62.518 154.495 62.518H154.7V62.5072H154.797V62.4964H154.862V62.4856H154.905V62.4748H154.948V62.4641H154.991C155.24 62.3454 155.466 62.1296 155.585 61.8814V61.8383H155.596V61.8059H155.606V61.7627C155.811 60.619 155.617 59.2056 155.682 57.9972H156.211V61.5146H156.2V61.644H156.189V61.7412H156.178V61.8059H156.167V61.8706H156.157V61.9138H156.146V61.9569H156.135V62.0001C156.092 61.9893 156.124 62.0756 156.092 62.0648V62.108H156.081V62.1404H156.07C156.07 62.1943 155.995 62.2375 155.995 62.2914H155.984C155.898 62.4748 155.693 62.6259 155.542 62.7446C155.477 62.7554 155.412 62.8309 155.358 62.8417V62.8525H155.315C155.326 62.8956 155.24 62.8633 155.25 62.8956H155.207V62.9064H155.164V62.9172H155.121V62.928H155.078V62.9388H155.013V62.9496H154.937V62.9604H154.862V62.9712H154.732C154.581 63.0467 154.29 62.9496 154.117 62.9604V62.9496C154.074 62.9496 154.031 62.9388 153.988 62.9388V62.928H153.945V62.9172H153.902V62.9064H153.858V62.8956H153.815C153.826 62.8525 153.74 62.8848 153.751 62.8525C153.427 62.7446 153.168 62.4533 152.995 62.1835V62.1512C152.952 62.1512 152.974 62.054 152.931 62.054V62.0109H152.92V61.9785H152.909C152.898 61.9354 152.887 61.8814 152.877 61.8383H152.866C152.715 60.619 152.844 59.2596 152.801 58.008C152.855 57.9325 153.125 57.9648 153.276 57.9648ZM170.41 57.9648C170.701 57.9972 171.089 57.8893 171.316 58.008C171.337 58.0943 171.435 58.159 171.456 58.2561C171.521 58.3317 171.586 58.4288 171.629 58.5259C171.694 58.6014 171.758 58.6985 171.801 58.7956C171.866 58.8711 171.931 58.9683 171.974 59.0654C172.093 59.2164 172.201 59.3783 172.287 59.5509C172.352 59.6264 172.416 59.7235 172.46 59.8206C172.524 59.8962 172.589 59.9933 172.632 60.0904C172.87 60.3817 173.01 60.7054 173.258 61.029V57.9756H174.229V62.9604C173.646 62.9172 173.355 63.1546 173.118 62.5719C172.999 62.4209 172.891 62.2591 172.805 62.0864C172.686 61.9354 172.578 61.7735 172.492 61.6009C172.373 61.4498 172.265 61.288 172.179 61.1154C171.888 60.7377 171.683 60.2954 171.381 59.9285V62.9604H170.41V57.9648ZM179.732 57.9648H180.703V62.0972H182.969V62.9604H179.732V57.9648ZM182.505 57.9648C182.753 58.0188 183.584 57.8138 183.616 58.1051H183.627V58.1375H183.637V58.1698C183.691 58.2022 183.691 58.3425 183.745 58.3748V58.418C183.789 58.418 183.767 58.5151 183.81 58.5151V58.5475H183.821V58.5798H183.832V58.623C183.875 58.623 183.853 58.7201 183.896 58.7201V58.7525C183.94 58.7417 183.907 58.828 183.94 58.8172V58.8604C183.983 58.8604 183.961 58.9575 184.004 58.9575V58.9898H184.015V59.0222H184.026V59.0654C184.08 59.0869 184.069 59.1948 184.123 59.2164V59.2488H184.134V59.2919C184.177 59.2919 184.155 59.389 184.199 59.389V59.4214H184.209V59.4538H184.22V59.4969C184.263 59.4969 184.242 59.594 184.285 59.594V59.6264H184.296V59.6588H184.306V59.7019H184.317C184.328 59.799 184.414 59.853 184.425 59.9717H184.457C184.468 59.8746 184.533 59.8422 184.533 59.7559H184.544V59.7235H184.555V59.6911H184.565V59.6588H184.576V59.6264H184.587V59.594H184.598V59.5509C184.641 59.5509 184.619 59.4538 184.662 59.4538V59.4214C184.716 59.4106 184.695 59.2919 184.738 59.2811V59.2488H184.749C184.749 59.2272 184.76 59.1948 184.76 59.1733C184.803 59.1733 184.781 59.0761 184.824 59.0761V59.033C184.868 59.033 184.846 58.9359 184.889 58.9359V58.9035H184.9V58.8711H184.911V58.828C184.954 58.828 184.932 58.7309 184.975 58.7309V58.6985H184.986C184.986 58.6769 184.997 58.6446 184.997 58.623C185.04 58.623 185.019 58.5259 185.062 58.5259V58.4827C185.105 58.4827 185.083 58.3856 185.126 58.3856V58.3532H185.137V58.3101C185.18 58.3101 185.159 58.213 185.202 58.213V58.1806H185.213V58.1483H185.224V58.1051C185.256 58.1051 185.278 57.9756 185.299 57.9648H186.346C186.259 58.1914 186.119 58.3964 186.033 58.6014H186.022V58.6338H186.011V58.6661C185.968 58.6554 186 58.7417 185.968 58.7309V58.7632C185.925 58.7525 185.957 58.8388 185.925 58.828V58.8604H185.914V58.8927H185.903V58.9251H185.893V58.9575H185.882V58.9898C185.806 59.0977 185.72 59.2811 185.666 59.4106H185.655V59.443C185.612 59.4538 185.623 59.5509 185.58 59.5725V59.6048H185.569V59.6372H185.558V59.6696H185.547V59.7019H185.536V59.7343C185.482 59.7667 185.482 59.8854 185.429 59.9177V59.9501H185.418V59.9825H185.407V60.0148H185.396V60.0472C185.375 60.0688 185.342 60.1227 185.331 60.1551C185.31 60.1659 185.288 60.1875 185.299 60.2198H185.288V60.2522C185.224 60.2954 185.224 60.4248 185.159 60.468V60.5004H185.148V60.5327H185.137V60.5651H185.126V60.5975C185.083 60.5975 185.105 60.6946 185.062 60.6946V60.7269H185.051V60.7593H185.04V60.7917H185.029V60.824C184.986 60.8133 185.019 60.8996 184.986 60.8888V60.9211H184.975V60.9535H184.965V62.9819H184.015V60.9535H184.004C184.004 60.9104 183.972 60.8456 183.94 60.824V60.7917H183.929V60.7593H183.918V60.7269H183.907V60.6946H183.896V60.6622C183.821 60.5867 183.799 60.4248 183.724 60.3493V60.3169H183.713V60.2846H183.702V60.2522H183.691V60.2198H183.681V60.1875H183.67C183.681 60.1659 183.659 60.1443 183.637 60.1227C183.627 60.0904 183.605 60.0256 183.573 60.0148V59.9825H183.562V59.9501H183.551V59.9177H183.54V59.8854C183.454 59.7775 183.411 59.5833 183.325 59.4754V59.443H183.314V59.4106H183.303V59.3783H183.292V59.3459C183.249 59.3135 183.228 59.1948 183.184 59.1733V59.1409H183.174V59.1085H183.163V59.0761H183.152V59.0438H183.141V59.0114H183.13V58.979C183.087 58.9682 183.098 58.8711 183.055 58.8496V58.8172H183.044V58.7848H183.033V58.7525H183.023V58.7201C182.979 58.7309 183.012 58.6446 182.979 58.6554V58.623H182.969V58.5906H182.958V58.5583H182.947V58.5259H182.936V58.4935C182.677 58.364 182.591 58.1483 182.505 57.9648ZM191.233 57.9648C191.514 58.0188 192.096 57.8138 192.183 58.1159C192.248 58.1914 192.312 58.2885 192.355 58.3856C192.42 58.4611 192.485 58.5582 192.528 58.6554C192.593 58.7309 192.658 58.828 192.701 58.9251C192.765 59.0006 192.83 59.0977 192.873 59.1948C192.938 59.2704 193.003 59.3675 193.046 59.4646C193.111 59.5401 193.175 59.6372 193.219 59.7343C193.283 59.8098 193.348 59.9069 193.391 60.004C193.639 60.3277 193.812 60.6838 194.082 61.0398V57.9864H195.053V62.9712C194.287 62.9496 194.19 63.1546 193.844 62.4425C193.726 62.2914 193.618 62.1296 193.531 61.9569C193.467 61.8814 193.402 61.7843 193.359 61.6872C193.24 61.5362 193.132 61.3743 193.046 61.2017C192.733 60.8025 192.539 60.3817 192.204 59.9393V62.9712H191.233V57.9648ZM151.679 59.4646H151.668V59.3567H151.657V59.2811H151.647V59.2056H151.636V59.1409H151.625V59.0977H151.614V59.0546H151.603V59.0114H151.593C151.593 58.979 151.582 58.9467 151.582 58.9143C151.528 58.8604 151.496 58.7525 151.452 58.6769C150.924 57.8354 149.758 57.9756 148.852 57.9756C148.69 57.9756 148.399 57.9433 148.27 57.9864V62.9604C148.992 62.9388 149.802 63.0035 150.503 62.9172V62.9064H150.568V62.8956C150.611 62.8848 150.665 62.874 150.708 62.8633V62.8525H150.74V62.8417H150.783C150.783 62.7985 150.881 62.8201 150.881 62.7769H150.913C151.032 62.7014 151.15 62.6043 151.269 62.5072C151.366 62.3669 151.463 62.2483 151.539 62.0972V62.054H151.55V62.0217H151.56V61.9785H151.571V61.9354H151.582V61.8922H151.593V61.849H151.603C151.603 61.8059 151.614 61.7627 151.614 61.7196H151.625V61.644H151.636V61.5469H151.647V61.4175H151.657C151.711 60.7593 151.722 60.0904 151.679 59.4646ZM151.172 60.6838H151.161C151.172 60.9643 151.14 61.2664 151.118 61.5254H151.107V61.5901H151.096V61.6548H151.086V61.7196H151.075V61.7627H151.064V61.8059C151.021 61.7951 151.053 61.8814 151.021 61.8706C150.945 62.0972 150.73 62.2806 150.503 62.3562V62.3669H150.471V62.3777H150.427V62.3885H150.384V62.3993H150.341V62.4101H150.266V62.4209H150.19V62.4317C149.748 62.464 149.262 62.4425 148.809 62.4425V58.4072C149.575 58.4288 150.643 58.2238 151.032 58.9683V59.0006C151.075 59.0006 151.053 59.0977 151.096 59.0977V59.1409H151.107V59.184H151.118V59.2488H151.129V59.3135H151.14V59.4106H151.15V59.5077H151.161V59.6588H151.172C151.15 60.0256 151.183 60.3493 151.172 60.6838ZM189.572 58.213C189.518 58.213 189.475 58.1375 189.421 58.1375C189.119 57.9432 188.698 57.9217 188.299 57.9325C188.094 57.9756 187.813 58.0188 187.662 58.1375H187.63C187.328 58.3101 187.015 58.6014 186.864 58.9467V58.979H186.853V59.0222H186.842V59.0546H186.831C186.669 59.7343 186.723 60.6622 186.734 61.3959H186.745C186.756 61.493 186.766 61.5901 186.777 61.698H186.788V61.7627H186.799V61.8059H186.81V61.849H186.82V61.8922H186.831V61.9354C186.874 61.9354 186.853 62.0325 186.896 62.0325V62.0648H186.907V62.0972C186.928 62.1188 186.961 62.1727 186.971 62.2051C187.166 62.4533 187.414 62.7122 187.727 62.8201C187.964 62.9604 188.439 63.0359 188.73 62.9712H188.86V62.9604H188.957V62.9496H189.032V62.9388C189.065 62.9388 189.108 62.928 189.14 62.928V62.9172H189.183V62.9064C190.198 62.5935 190.435 61.5901 190.37 60.5867C190.424 59.6588 190.349 58.6985 189.572 58.213ZM188.968 62.0109C188.968 62.054 188.87 62.0325 188.87 62.0756H188.827V62.0864C188.784 62.0864 188.741 62.0972 188.698 62.0972C188.676 62.1404 188.288 62.1188 188.288 62.0864H188.245V62.0756H188.201C188.018 61.9893 187.856 61.8383 187.759 61.6548V61.6117H187.748V61.5469H187.738V61.4822H187.727V61.3851H187.716V61.2556H187.705C187.684 60.673 187.651 59.9177 187.748 59.3675H187.759V59.3243H187.77V59.2811H187.781V59.2488C187.856 59.0977 188.007 58.9575 188.158 58.8711H188.191V58.8604H188.234V58.8496H188.277V58.8388H188.342V58.828H188.471V58.8172C188.806 58.8172 188.978 58.9251 189.173 59.0869C189.291 59.2596 189.399 59.4861 189.378 59.7451H189.388C189.345 60.4464 189.626 61.6117 188.968 62.0109ZM165.241 62.5935H165.231V62.5612H165.22V62.5288H165.209V62.4964H165.198V62.4641H165.187V62.4317H165.177V62.3993C165.09 62.3022 165.036 62.0864 164.939 61.9785V61.9462H164.929C164.875 61.8275 164.799 61.6656 164.724 61.5577V61.5254H164.713V61.493H164.702C164.713 61.4714 164.691 61.4498 164.67 61.4283C164.67 61.3959 164.659 61.3851 164.637 61.3851C164.637 61.3312 164.583 61.3096 164.594 61.2556H164.583V61.2233H164.572V61.1909C164.508 61.0722 164.411 60.9427 164.367 60.7809C164.702 60.6838 164.961 60.4248 165.123 60.1551V60.1227C165.166 60.1227 165.144 60.0256 165.187 60.0256C165.187 59.9933 165.198 59.9609 165.198 59.9285H165.209C165.285 59.6048 165.274 59.238 165.177 58.9143H165.166V58.8819H165.155V58.8388C165.036 58.6122 164.853 58.364 164.626 58.213C164.594 58.2022 164.529 58.1806 164.519 58.1483H164.486V58.1375H164.454C164.454 58.0943 164.357 58.1159 164.357 58.0727H164.314V58.0619H164.27V58.0511H164.227V58.0404H164.184V58.0296C163.386 57.9217 162.501 57.954 161.713 57.9864V62.9604H162.695V60.9751H163.386C163.407 60.9859 163.429 61.1154 163.461 61.1154V61.1477H163.472V61.1801H163.483V61.2125H163.494V61.2448C163.547 61.288 163.558 61.4175 163.623 61.4606V61.493H163.634V61.5254H163.645V61.5577H163.655V61.5901H163.666V61.6225H163.677V61.6656C163.72 61.6656 163.699 61.7627 163.742 61.7627V61.7951H163.752V61.8275H163.763V61.8598H163.774V61.8922H163.785V61.9246C163.839 61.9462 163.828 62.054 163.882 62.0756V62.108H163.893V62.1404H163.904V62.1727H163.914V62.2051H163.925V62.2375H163.936V62.2698H163.947V62.3022H163.957V62.3346C164.011 62.3454 163.99 62.464 164.033 62.4748V62.5072H164.044V62.5396H164.055V62.5719H164.065V62.6043C164.13 62.7014 164.195 62.8417 164.249 62.9819H165.371C165.371 62.8201 165.274 62.7014 165.241 62.5935ZM164.206 59.7451C164.173 59.7883 164.13 59.8746 164.098 59.9285C164.044 59.9501 164.011 60.0364 163.947 60.0364C163.947 60.0796 163.85 60.058 163.85 60.1011H163.806C163.494 60.2198 162.997 60.1119 162.63 60.1443V58.828C163.019 58.8388 163.483 58.7956 163.85 58.8711V58.8819H163.882C163.914 58.9143 163.99 58.9575 164.033 58.979C164.055 59.033 164.141 59.0654 164.141 59.1301C164.184 59.1301 164.162 59.2272 164.206 59.2272V59.2704H164.216V59.3351C164.281 59.389 164.216 59.7127 164.206 59.7451ZM177.908 58.1159H177.865V58.1051H177.833V58.0943H177.79V58.0835H177.746V58.0727C177.714 58.0727 177.671 58.0619 177.639 58.0619V58.0511C177.585 58.0511 177.531 58.0404 177.487 58.0404V58.0296C176.786 57.9648 175.999 58.008 175.286 57.9972V62.9819C175.999 62.9712 176.754 63.0143 177.455 62.9712V62.9604H177.552V62.9496H177.617V62.9388H177.682V62.928C178.146 62.8309 178.545 62.4964 178.696 62.0972H178.707V62.0648C178.75 62.0756 178.717 61.9893 178.75 62.0001V61.9569H178.761V61.9138H178.771V61.8706H178.782C178.782 61.8383 178.793 61.7951 178.793 61.7627H178.804V61.6872H178.815V61.6117H178.825V61.4822H178.836C178.879 60.209 179.117 58.6338 177.908 58.1159ZM176.236 62.0864V58.828C176.98 58.8064 177.574 58.774 177.811 59.3243C177.811 59.3567 177.822 59.389 177.822 59.4214H177.833V59.4969H177.844V59.5725H177.854V59.7127H177.865C177.908 61.2017 178.2 62.3022 176.236 62.0864ZM169.849 62.6798H169.838V62.6475H169.827C169.816 62.6043 169.805 62.5504 169.795 62.5072H169.784V62.4748H169.773C169.773 62.4425 169.762 62.4101 169.762 62.3777H169.751V62.3454H169.741C169.741 62.313 169.73 62.2806 169.73 62.2483H169.719V62.2051H169.708V62.1727H169.697C169.697 62.1404 169.687 62.108 169.687 62.0756H169.676C169.622 61.8059 169.449 61.5362 169.395 61.2664H169.385V61.2233H169.374V61.1909H169.363C169.363 61.1585 169.352 61.1262 169.352 61.0938H169.341C169.287 60.8025 169.104 60.5219 169.039 60.2306H169.029V60.1983H169.018C169.007 60.1551 168.996 60.1011 168.985 60.058H168.975V60.0256H168.964C168.953 59.9825 168.942 59.9285 168.931 59.8854H168.921V59.853H168.91C168.899 59.8098 168.888 59.7559 168.877 59.7127H168.867V59.6804H168.856C168.856 59.648 168.845 59.6156 168.845 59.5833H168.834V59.5509H168.824V59.5077H168.813C168.813 59.4754 168.802 59.443 168.802 59.4106H168.791V59.3783H168.78V59.3351H168.77C168.77 59.3027 168.759 59.2704 168.759 59.238H168.748V59.2056H168.737C168.726 59.1625 168.716 59.1085 168.705 59.0654H168.694V59.033H168.683C168.672 58.9898 168.662 58.9359 168.651 58.8927H168.64V58.8604H168.629C168.23 57.8569 168.586 57.9217 167.54 57.9325C167.529 58.0188 167.464 58.0727 167.475 58.1483H167.464V58.1806H167.453C167.442 58.2238 167.432 58.2777 167.421 58.3209H167.41V58.3532H167.399C167.335 58.6769 167.14 58.9898 167.076 59.3027H167.065V59.3459H167.054V59.3783H167.043C167.043 59.4106 167.032 59.443 167.032 59.4754H167.022V59.5185H167.011V59.5509H167C167 59.5833 166.989 59.6156 166.989 59.648H166.979V59.6804H166.968C166.957 59.7235 166.946 59.7775 166.935 59.8206H166.925V59.853H166.914C166.784 60.3493 166.536 60.8348 166.396 61.3204H166.385V61.3635H166.374V61.3959H166.364V61.439H166.353C166.353 61.4714 166.342 61.5038 166.342 61.5362H166.331V61.5685H166.32C166.245 61.9138 166.051 62.2267 165.975 62.5719H165.964V62.6043H165.954C165.954 62.723 165.867 62.7877 165.856 62.9172H166.871C166.914 62.8201 166.914 62.6583 166.979 62.5935V62.5504H166.989V62.5072H167V62.4641H167.011V62.4209H167.022V62.3885H167.032C167.043 62.2698 167.108 62.1835 167.13 62.0648H168.91C169.244 63.2085 169.082 62.9064 170.205 62.9388C169.913 62.8417 169.859 62.7877 169.849 62.6798ZM167.13 61.2448C167.194 61.0722 167.27 60.9104 167.302 60.7269H167.313V60.6946H167.324C167.324 60.6622 167.335 60.6298 167.335 60.5975H167.345V60.5543H167.356V60.5111H167.367V60.468H167.378V60.4248H167.389V60.3817H167.399V60.3493H167.41V60.3062C167.486 60.2414 167.464 60.0364 167.54 59.9825V59.9501H167.55C167.55 59.9177 167.561 59.8854 167.561 59.853H167.572V59.8098H167.583V59.7667H167.594V59.7235H167.604V59.6804H167.615V59.6372H167.626V59.6048H167.637C167.637 59.5725 167.647 59.5401 167.647 59.5077H167.658V59.4754H167.669C167.669 59.5077 167.68 59.5401 167.68 59.5725H167.691V59.6156H167.701V59.6588H167.712V59.7019H167.723V59.7451H167.734V59.7883H167.745V59.8314H167.755V59.8746H167.766C167.809 60.1443 167.971 60.4033 168.014 60.673H168.025V60.7162H168.036V60.7593H168.047V60.8025H168.057C168.068 60.8456 168.079 60.8996 168.09 60.9427H168.101V60.9751H168.111V61.0183H168.122C168.122 61.1046 168.165 61.1585 168.187 61.234C167.95 61.2448 167.54 61.2448 167.13 61.2448Z" fill="#020304"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M192.69 41.0575C193.305 41.1115 194.104 40.9388 194.643 41.1546C194.816 41.3165 194.772 41.5754 194.772 41.8775V47.4341C194.794 48.6102 194.794 49.8402 194.352 50.9191V50.9515H194.341C194.33 50.9947 194.319 51.0486 194.309 51.0918H194.298V51.1241H194.287V51.1673H194.276C194.276 51.1889 194.265 51.2212 194.265 51.2428H194.255V51.2752H194.244V51.3183C194.201 51.3076 194.233 51.3939 194.201 51.3831V51.4262C194.157 51.4154 194.19 51.5018 194.157 51.491V51.5233H194.147V51.5665H194.136V51.5989C194.093 51.5881 194.125 51.6744 194.093 51.6636V51.696H194.082V51.7283H194.071V51.7607H194.06V51.7931H194.05V51.8254H194.039V51.8578H194.028V51.8902H194.017V51.9226H194.006C193.974 52.0412 193.866 52.1383 193.834 52.2462H193.823C193.801 52.3326 193.715 52.3757 193.694 52.462C193.672 52.4728 193.629 52.5268 193.629 52.5591C193.122 53.3036 192.312 54.0912 191.579 54.5876C191.428 54.6415 191.298 54.7818 191.136 54.8357V54.8465C191.093 54.8357 191.082 54.8897 191.039 54.8789C191.029 54.9005 191.018 54.9112 190.996 54.9112C190.985 54.9328 190.964 54.9544 190.931 54.9436V54.9544H190.899V54.9652H190.867V54.976H190.834C190.845 55.0191 190.759 54.9868 190.77 55.0191H190.737V55.0299H190.705V55.0407H190.672V55.0515H190.64C190.651 55.0947 190.565 55.0623 190.575 55.0947H190.543V55.1055H190.5V55.1162H190.467C190.478 55.1594 190.392 55.127 190.403 55.1594H190.36V55.1702H190.327V55.181H190.284C190.295 55.2241 190.209 55.1918 190.219 55.2241C190.187 55.2241 190.155 55.2349 190.122 55.2349V55.2457H190.09V55.2565C190.057 55.2565 190.025 55.2673 189.993 55.2673V55.2781H189.96V55.2889C189.928 55.2889 189.896 55.2997 189.863 55.2997V55.3105H189.82V55.3212H189.777V55.332H189.734V55.3428H189.691V55.3536H189.647V55.3644H189.583V55.3752H189.54V55.386C189.507 55.386 189.464 55.3968 189.432 55.3968V55.4076H189.367V55.4183C189.324 55.4183 189.281 55.4291 189.237 55.4291V55.4399H189.173V55.4507H189.108V55.4615H189.032V55.4723H188.957V55.4831H188.881V55.4939H188.806V55.5047C188.741 55.5047 188.666 55.5155 188.601 55.5155V55.5262H188.493V55.537H188.364V55.5478H188.223V55.5586H188.04V55.5694H187.738V55.5802H187.252V55.5694C186.842 55.5802 186.465 55.5047 186.109 55.4615V55.4507H186.033V55.4399H185.957V55.4291H185.893V55.4183H185.817V55.4076H185.752V55.3968H185.688V55.386H185.623V55.3752H185.558V55.3644H185.515V55.3536C185.289 55.3105 185.008 55.2133 184.814 55.1162H184.781V55.1055H184.738V55.0947H184.706V55.0839H184.663C184.673 55.0407 184.587 55.0731 184.598 55.0407H184.555C184.566 54.9976 184.479 55.0299 184.49 54.9976H184.458V54.9868H184.415V54.976H184.382C184.393 54.9328 184.307 54.9652 184.317 54.9328H184.285V54.922H184.253V54.9112H184.22V54.9005H184.188V54.8897H184.156V54.8789H184.123V54.8681H184.091V54.8573C184.069 54.8681 184.048 54.8465 184.026 54.8249C183.983 54.8357 183.994 54.7818 183.951 54.7926V54.7818C183.735 54.6955 183.551 54.5336 183.357 54.4365C183.077 54.2099 182.731 53.9941 182.451 53.6812C181.793 53.0986 181.361 52.4728 180.983 51.7715H180.973V51.7391H180.962V51.7068H180.951V51.6744H180.94V51.642H180.93V51.6097H180.919V51.5773H180.908V51.5449C180.865 51.5449 180.886 51.4478 180.843 51.4478C180.843 51.4262 180.832 51.3939 180.832 51.3723C180.789 51.3831 180.822 51.2968 180.789 51.3076V51.2644C180.703 51.1997 180.714 50.9947 180.638 50.9191V50.8868H180.627V50.8436H180.617V50.8004H180.606V50.7573H180.595V50.7141H180.584V50.671H180.573V50.6278H180.563V50.5847H180.552V50.5415H180.541V50.4983H180.53V50.4552H180.52C180.52 50.4228 180.509 50.3797 180.509 50.3473H180.498C180.498 50.3041 180.487 50.261 180.487 50.2178H180.476V50.1531H180.466V50.0883H180.455V50.0236H180.444V49.9589H180.433C180.412 49.7107 180.325 49.4625 180.325 49.2036H180.315V49.0525H180.304V48.8475H180.293V41.5323C180.271 41.3165 180.315 41.0899 180.53 41.036V41.0252H180.573V41.0144H180.649V41.0036H182.008C182.311 40.9928 182.548 40.9928 182.677 41.2086C182.764 43.6254 182.677 46.0746 182.71 48.4915H182.721V48.7936H182.731V48.9447H182.742V49.0525H182.753C182.764 49.1712 182.785 49.2899 182.796 49.4086H182.807V49.4733H182.818V49.5381H182.828V49.6028H182.839V49.6675H182.85V49.7323H182.861V49.7754H182.872V49.8186H182.882V49.8618H182.893V49.9049H182.904V49.9481H182.915V49.9912H182.926C182.926 50.0236 182.936 50.056 182.936 50.0883H182.947V50.1207H182.958V50.1639H182.969V50.1962H182.98V50.2394C183.023 50.2286 182.99 50.3149 183.023 50.3041V50.3473H183.033V50.3797C183.077 50.3689 183.044 50.4552 183.077 50.4444V50.4768H183.087V50.5091H183.098V50.5415H183.109V50.5739H183.12V50.6062H183.131V50.6386H183.141V50.671H183.152C183.195 50.822 183.336 50.9515 183.39 51.0918C183.692 51.491 184.123 52.0197 184.576 52.311C184.674 52.3973 184.792 52.4728 184.9 52.5268V52.5376C184.954 52.5376 184.997 52.6131 185.051 52.6131V52.6239H185.083V52.6347C185.105 52.6239 185.127 52.6454 185.148 52.667C185.213 52.6994 185.299 52.7318 185.353 52.7749H185.396V52.7857H185.429C185.429 52.8289 185.526 52.8073 185.526 52.8504H185.569V52.8612H185.601V52.872H185.645V52.8828H185.677C185.882 52.9799 186.162 53.0662 186.4 53.0986V53.1094H186.465V53.1202H186.54V53.131H186.637V53.1418H186.734V53.1526H186.842V53.1633H186.982V53.1741C187.339 53.2065 187.781 53.1957 188.137 53.1633V53.1526H188.245V53.1418H188.342V53.131H188.439V53.1202H188.515V53.1094H188.579V53.0986H188.655V53.0878C188.698 53.0878 188.741 53.077 188.784 53.077V53.0662C188.817 53.0662 188.86 53.0555 188.892 53.0555V53.0447H188.935V53.0339H188.979V53.0231H189.022V53.0123H189.065V53.0015H189.108V52.9907H189.151V52.9799H189.194V52.9691H189.227V52.9583C189.259 52.9583 189.291 52.9476 189.324 52.9476C189.313 52.9044 189.399 52.9368 189.389 52.9044H189.432V52.8936H189.464V52.8828H189.496V52.872H189.529V52.8612H189.572C189.572 52.8181 189.669 52.8397 189.669 52.7965H189.701V52.7857H189.734V52.7749C189.928 52.7102 190.09 52.5591 190.262 52.4728C190.726 52.1491 191.266 51.5881 191.59 51.1241C191.59 51.0702 191.665 51.027 191.665 50.9731H191.676C191.697 50.8868 191.784 50.8112 191.805 50.7249H191.816V50.6926H191.827V50.6602H191.838V50.6278H191.849V50.5954H191.859V50.5631H191.87V50.5307H191.881V50.4983H191.892V50.466C191.935 50.4768 191.902 50.3904 191.935 50.4012V50.3689H191.946V50.3257C191.989 50.3365 191.956 50.2502 191.989 50.261V50.2178H192V50.1854H192.01C192.01 50.1531 192.021 50.1207 192.021 50.0883H192.032V50.056C192.107 49.8941 192.183 49.646 192.205 49.441H192.215V49.3762H192.226V49.3007H192.237V49.2036H192.248V49.1065H192.259V48.977H192.269V48.8368H192.28C192.323 46.4739 192.28 44.0894 192.291 41.7157C192.269 41.4567 192.259 41.1007 192.528 41.0467V41.036C192.561 41.036 192.604 41.0252 192.636 41.0252C192.69 41.0683 192.69 41.0575 192.69 41.0575ZM178.513 54.2423C178.491 52.0844 178.556 49.9049 178.48 47.747H178.47C178.459 47.3046 178.329 46.8731 178.254 46.4523H178.243C178.243 46.4199 178.232 46.3768 178.232 46.3444H178.221C178.211 46.2904 178.2 46.2365 178.189 46.1933H178.178V46.1502H178.167V46.107H178.157C178.157 46.0746 178.146 46.0423 178.146 46.0099H178.135V45.9775H178.124C178.113 45.9344 178.103 45.8804 178.092 45.8373H178.081V45.8049H178.07V45.7617H178.06C178.06 45.7402 178.049 45.7078 178.049 45.6862H178.038V45.6539H178.027V45.6107C177.984 45.6215 178.016 45.5352 177.984 45.546V45.5028C177.941 45.5136 177.973 45.4273 177.941 45.4381V45.3949H177.93V45.3625C177.887 45.3733 177.919 45.287 177.887 45.2978V45.2654H177.876V45.2331H177.865V45.2007H177.855V45.1683H177.844V45.136H177.833V45.1036H177.822V45.0712H177.811V45.0389H177.801C177.811 45.0173 177.79 44.9957 177.768 44.9741C177.768 44.9417 177.757 44.931 177.736 44.931C177.747 44.8878 177.693 44.877 177.703 44.8339H177.693C177.606 44.6289 177.445 44.4454 177.347 44.2512C176.851 43.5283 176.01 42.7407 175.319 42.266C175.287 42.266 175.243 42.2228 175.222 42.2012C175.06 42.1365 174.909 41.9962 174.736 41.9315V41.9207H174.704V41.9099H174.672V41.8991H174.639V41.8883H174.607V41.8775H174.575V41.8667H174.542V41.856H174.51C174.499 41.8128 174.402 41.8236 174.38 41.7804H174.348V41.7696H174.305C174.316 41.7265 174.229 41.7588 174.24 41.7265H174.208V41.7157H174.165C174.175 41.6725 174.089 41.7049 174.1 41.6725H174.057V41.6617H174.024V41.651H173.981V41.6402H173.949V41.6294C173.916 41.6294 173.884 41.6186 173.852 41.6186V41.6078H173.819V41.597C173.787 41.597 173.755 41.5862 173.722 41.5862V41.5754H173.69V41.5646C173.657 41.5646 173.625 41.5538 173.593 41.5538V41.5431H173.55V41.5323H173.506V41.5215H173.463V41.5107H173.398V41.4999H173.355V41.4891H173.312V41.4783C173.258 41.4675 173.193 41.4567 173.14 41.4459V41.4352C173.075 41.4244 173.01 41.4136 172.956 41.4028V41.392C172.773 41.392 172.568 41.2841 172.373 41.2949V41.2841H172.266V41.2733H172.158V41.2625H172.007V41.2517C171.694 41.241 171.413 41.2086 171.079 41.2194C171.025 41.2841 170.798 41.187 170.755 41.2517H170.572V41.2625H170.421V41.2733H170.313V41.2841H170.205V41.2949C169.946 41.2949 169.698 41.392 169.439 41.4352V41.4459C169.385 41.4567 169.32 41.4675 169.266 41.4783V41.4891C169.212 41.4999 169.158 41.5107 169.115 41.5215V41.5323H169.072V41.5431H169.029V41.5538H168.986V41.5646C168.953 41.5646 168.921 41.5754 168.888 41.5754V41.5862H168.856V41.597C168.813 41.6078 168.759 41.6186 168.716 41.6294V41.6402H168.683V41.651H168.64V41.6617C168.619 41.6617 168.586 41.6725 168.565 41.6725V41.6833H168.532V41.6941H168.489V41.7049H168.457V41.7157H168.414C168.425 41.7588 168.338 41.7265 168.349 41.7588H168.306C168.306 41.802 168.209 41.7804 168.209 41.8236H168.176V41.8344H168.144V41.8452H168.101C168.101 41.8883 168.004 41.8667 168.004 41.9099H167.971V41.9207H167.939V41.9315H167.907V41.9423H167.874V41.9531C167.853 41.9423 167.831 41.9638 167.81 41.9854C167.777 41.9854 167.766 41.9962 167.766 42.0178C167.68 42.0286 167.637 42.1041 167.561 42.1149C167.421 42.2444 167.227 42.3091 167.097 42.4386C166.439 42.8486 165.706 43.6362 165.263 44.2512C165.209 44.3807 165.091 44.4886 165.047 44.6073H165.037C165.004 44.7152 164.896 44.8231 164.864 44.931H164.853V44.9633C164.81 44.9849 164.799 45.082 164.756 45.1036V45.136C164.713 45.136 164.735 45.2331 164.691 45.2331V45.2762C164.648 45.2762 164.67 45.3733 164.627 45.3733V45.4057H164.616V45.4381H164.605V45.4812H164.594V45.5136H164.583V45.546H164.573V45.5783H164.562V45.6215H164.551V45.6539H164.54V45.697H164.53C164.53 45.7186 164.519 45.751 164.519 45.7725H164.508V45.8049H164.497V45.8481H164.486V45.8804H164.476C164.476 45.9128 164.465 45.9452 164.465 45.9775H164.454V46.0099C164.26 46.5062 164.13 47.0996 164.076 47.6499H164.066C164.022 48.1246 164.022 48.6425 164.055 49.1065H164.066V49.2575H164.076V49.387H164.087V49.5165H164.098V49.6136H164.109C164.109 49.8618 164.227 50.1207 164.249 50.3689H164.26C164.271 50.4444 164.292 50.5199 164.303 50.5847H164.314V50.6278H164.325V50.671H164.335V50.7141H164.346V50.7573H164.357V50.822H164.368V50.8544H164.378V50.8976H164.389C164.4 50.9407 164.411 50.9947 164.422 51.0378H164.432C164.432 51.0594 164.443 51.0918 164.443 51.1133H164.454V51.1457H164.465C164.465 51.1781 164.476 51.2105 164.476 51.2428C164.519 51.232 164.486 51.3183 164.519 51.3076V51.3507H164.53V51.3831H164.54V51.4262C164.583 51.4154 164.551 51.5018 164.583 51.491V51.5233H164.594V51.5665C164.637 51.5665 164.616 51.6636 164.659 51.6636V51.696H164.67V51.7283H164.681V51.7607H164.691V51.7931H164.702C164.691 51.8147 164.713 51.8362 164.735 51.8578C164.735 51.8902 164.745 51.901 164.767 51.901C164.756 51.9441 164.81 51.9549 164.799 51.9981H164.81C165.285 52.9368 166.202 53.897 167.097 54.5336C167.27 54.6199 167.41 54.7602 167.594 54.8357V54.8465C167.637 54.8357 167.626 54.8897 167.669 54.8789C167.68 54.9005 167.702 54.922 167.734 54.9112V54.922H167.766V54.9328C167.81 54.922 167.799 54.976 167.842 54.9652C167.853 54.9868 167.874 55.0084 167.907 54.9976V55.0083H167.939V55.0191H167.971V55.0299H168.004C168.004 55.0731 168.101 55.0515 168.101 55.0947H168.144C168.144 55.1378 168.241 55.1162 168.241 55.1594H168.273V55.1702H168.317C168.306 55.2133 168.392 55.181 168.381 55.2134H168.425C168.414 55.2565 168.5 55.2241 168.489 55.2565H168.532V55.2673H168.565V55.2781C168.586 55.2781 168.619 55.2889 168.64 55.2889V55.2997C168.673 55.2997 168.705 55.3105 168.737 55.3105V55.3212H168.77V55.332C168.813 55.3428 168.867 55.3536 168.91 55.3644V55.3752H168.953V55.386H168.996V55.3968H169.04V55.4076H169.083V55.4183H169.126V55.4291C169.158 55.4291 169.201 55.4399 169.234 55.4399V55.4507C169.266 55.4507 169.309 55.4615 169.342 55.4615V55.4723C169.752 55.5478 170.162 55.6665 170.582 55.6773V55.6881C173.032 55.7312 175.524 55.6881 177.984 55.6989C178.243 55.7097 178.426 55.7097 178.567 55.5478C178.588 55.2349 178.48 54.6739 178.513 54.2423ZM176.074 53.3468H170.744C170.313 53.2928 169.838 53.2173 169.46 53.0447H169.428V53.0339H169.385V53.0231C169.363 53.0231 169.331 53.0123 169.309 53.0123V53.0015H169.277V52.9907H169.234C169.245 52.9476 169.158 52.9799 169.169 52.9476H169.126C169.126 52.9044 169.029 52.926 169.029 52.8828H168.996V52.872H168.964V52.8612H168.932V52.8504C168.91 52.8612 168.888 52.8397 168.867 52.8181C168.835 52.8181 168.824 52.8073 168.824 52.7857C168.781 52.7965 168.77 52.7426 168.727 52.7533V52.7426C168.586 52.6994 168.478 52.5699 168.349 52.5268C168.025 52.311 167.691 51.9657 167.378 51.6528C167.281 51.5018 167.162 51.3615 167.065 51.232C167.043 51.1457 166.957 51.1026 166.936 51.0162H166.925C166.763 50.671 166.493 50.2825 166.428 49.8618H166.418V49.8186H166.407V49.7754H166.396V49.7107H166.385V49.646H166.375V49.5812H166.364C166.364 49.5381 166.353 49.4841 166.353 49.441H166.342V49.3439H166.331V49.2468H166.321V49.1497H166.31C166.267 48.7936 166.267 48.2757 166.299 47.9089H166.31C166.321 47.6175 166.407 47.3478 166.461 47.0673H166.472V47.0241H166.482V46.981H166.493V46.9378H166.504V46.8946H166.515V46.8515H166.526V46.8083H166.536C166.536 46.776 166.547 46.7436 166.547 46.7112H166.558V46.6789H166.569V46.6357H166.58V46.6033H166.59V46.5602C166.633 46.571 166.601 46.4847 166.633 46.4954V46.4631H166.644V46.4199C166.687 46.4199 166.666 46.3228 166.709 46.3228V46.2904C166.741 46.2689 166.774 46.1825 166.785 46.1502C166.806 46.1394 166.828 46.1178 166.817 46.0854H166.828C166.817 46.0423 166.871 46.0531 166.86 46.0099H166.871C166.892 45.9128 166.99 45.8481 167.011 45.7617C167.335 45.3086 167.863 44.7475 168.338 44.4131C168.489 44.3483 168.63 44.2081 168.802 44.1433V44.1325H168.835V44.1218H168.867V44.111H168.899V44.1002H168.932V44.0894H168.964V44.0786H168.996V44.0678H169.029V44.057H169.061C169.05 44.0139 169.137 44.0462 169.126 44.0139H169.158V44.0031H169.201C169.191 43.9599 169.277 43.9923 169.266 43.9599H169.309V43.9491H169.342V43.9383H169.385V43.9275H169.417V43.9167C169.45 43.9167 169.482 43.906 169.514 43.906V43.8952H169.557V43.8844H169.601V43.8736H169.644V43.8628H169.687V43.852H169.73V43.8412C169.773 43.8412 169.816 43.8304 169.86 43.8304V43.8196H169.903V43.8089C169.946 43.8089 170 43.7981 170.043 43.7981V43.7873H170.108V43.7765H170.205V43.7657H170.28V43.7549H170.377V43.7441H170.507V43.7333H170.647V43.7225C170.831 43.7549 171.197 43.647 171.37 43.7225H171.586V43.7333H171.726V43.7441C172.093 43.7765 172.503 43.8736 172.816 44.0139H172.848V44.0246H172.891V44.0354H172.924V44.0462H172.967C172.956 44.0894 173.042 44.057 173.032 44.0894H173.075C173.075 44.1325 173.172 44.111 173.172 44.1541H173.204V44.1649H173.237V44.1757H173.269C173.442 44.2728 173.647 44.3807 173.798 44.4778C174.337 44.8662 174.985 45.4596 175.287 46.0315H175.297C175.297 46.0854 175.373 46.1286 175.373 46.1825C175.395 46.1933 175.416 46.2149 175.405 46.2473H175.416C175.438 46.3012 175.47 46.3768 175.513 46.4199V46.4631C175.556 46.4523 175.524 46.5386 175.556 46.5278V46.5602H175.567V46.5925C175.61 46.5925 175.589 46.6896 175.632 46.6896V46.7328H175.643V46.7652C175.729 46.927 175.815 47.1752 175.848 47.3802H175.858V47.4449H175.869V47.5096H175.88V47.5852H175.891C175.891 47.7362 175.966 47.8981 175.956 48.0491H175.966V48.2002H175.977C176.096 49.7862 176.063 51.5773 176.074 53.3468ZM162.328 49.592C162.479 49.4194 162.49 49.3007 162.48 48.9986V47.5744H162.469C162.469 47.542 162.458 47.4989 162.458 47.4665H162.447V47.4341H162.436C162.436 47.2075 162.339 46.9918 162.328 46.776H162.318C162.307 46.7112 162.296 46.6465 162.285 46.5925H162.274C162.264 46.5386 162.253 46.4739 162.242 46.4199H162.231V46.3768H162.221V46.3336H162.21V46.2904H162.199V46.2257H162.188V46.1825H162.177V46.1394H162.167V46.0962H162.156V46.0531H162.145V46.0207H162.134C162.123 45.9775 162.113 45.9236 162.102 45.8804H162.091V45.8481H162.08V45.8049H162.069V45.7725H162.059V45.7294H162.048V45.697H162.037V45.6539H162.026V45.6215H162.016V45.5783H162.005V45.546H161.994V45.5136H161.983V45.4812H161.972V45.4381C161.929 45.4381 161.951 45.341 161.908 45.341V45.3086H161.897V45.2762H161.886V45.2331C161.843 45.2331 161.865 45.136 161.821 45.136V45.1036C161.778 45.0712 161.757 44.9525 161.713 44.931V44.8986H161.703C161.66 44.7583 161.541 44.6504 161.498 44.521H161.487C161.455 44.4239 161.357 44.3591 161.336 44.2512C161.152 44.0138 160.958 43.7225 160.71 43.496C160.322 42.9996 159.771 42.6328 159.329 42.2875H159.297C159.221 42.212 159.102 42.1365 159.016 42.1041V42.0933C158.951 42.0717 158.876 42.0178 158.833 41.9854H158.8V41.9746H158.768V41.9639H158.736V41.9531H158.703V41.9423H158.671C158.682 41.8991 158.595 41.9315 158.606 41.8991H158.574V41.8883H158.541V41.8775H158.509C158.509 41.8344 158.412 41.856 158.412 41.8128C158.39 41.8128 158.358 41.802 158.336 41.802C158.347 41.7589 158.261 41.7912 158.272 41.7588H158.228V41.7481H158.196V41.7373C158.174 41.7373 158.142 41.7265 158.121 41.7265V41.7157H158.077C158.088 41.6725 158.002 41.7049 158.013 41.6725H157.969V41.6617H157.926V41.651H157.894V41.6402C157.862 41.6402 157.829 41.6294 157.797 41.6294V41.6186H157.764C157.7 41.5431 157.495 41.5646 157.441 41.4891H157.376V41.4783H157.333V41.4675H157.29V41.4567C157.139 41.4567 156.988 41.3596 156.837 41.3596V41.3488H156.772V41.3381H156.696V41.3273H156.599V41.3165H156.524V41.3057H156.427V41.2949C156.178 41.2949 155.919 41.2194 155.671 41.2302V41.2194C155.272 41.2086 154.873 41.2194 154.484 41.2517V41.2625C154.301 41.2517 154.118 41.3273 153.934 41.3273V41.3381C153.88 41.3381 153.826 41.3488 153.783 41.3488V41.3596H153.708V41.3704C153.643 41.3812 153.567 41.392 153.503 41.4028V41.4136H153.438V41.4244H153.373V41.4352H153.33V41.4459C153.287 41.4459 153.244 41.4567 153.201 41.4567V41.4675H153.157V41.4783H153.114V41.4891H153.049V41.4999H153.006V41.5107H152.963V41.5215H152.92V41.5323C152.888 41.5323 152.855 41.5431 152.823 41.5431V41.5538H152.791V41.5646C152.758 41.5646 152.726 41.5754 152.693 41.5754V41.5862H152.661V41.597C152.629 41.597 152.596 41.6078 152.564 41.6078V41.6186H152.532V41.6294H152.488V41.6402H152.456V41.651H152.413V41.6617H152.381V41.6725H152.337C152.348 41.7157 152.262 41.6833 152.273 41.7157H152.229C152.24 41.7588 152.154 41.7265 152.165 41.7588H152.132V41.7696H152.089V41.7804H152.057C152.068 41.8236 151.981 41.7912 151.992 41.8236H151.96V41.8344H151.927V41.8452H151.895V41.856H151.863V41.8667H151.83V41.8775H151.798V41.8883H151.766V41.8991C151.507 42.0178 151.28 42.1796 151.075 42.3415C150.406 42.7623 149.716 43.496 149.241 44.1218C149.241 44.1541 149.198 44.1973 149.176 44.2189C149.09 44.4023 148.928 44.5749 148.852 44.7799H148.842C148.615 45.2546 148.324 45.7941 148.205 46.3552H148.194C148.194 46.3875 148.183 46.4307 148.183 46.4631H148.173V46.5062H148.162V46.571H148.151C148.151 46.6141 148.14 46.6573 148.14 46.7004H148.129V46.776H148.119V46.8407H148.108V46.9162H148.097V46.9918H148.086V47.0673H148.076C148.076 47.132 148.065 47.1968 148.065 47.2507H148.054C148.054 47.3262 148.043 47.4018 148.043 47.4881H148.032V47.6175H148.022V47.801H148.011V48.1139H148V48.6425C148.065 48.7612 148.011 48.9878 148.032 49.1281H148.043V49.2683H148.054V49.3978H148.065C148.054 49.6028 148.162 49.8078 148.162 50.0128H148.173C148.183 50.0776 148.194 50.1423 148.205 50.1962H148.216C148.216 50.2394 148.227 50.2826 148.227 50.3257H148.237C148.237 50.3581 148.248 50.4012 148.248 50.4336H148.259V50.4768H148.27V50.5199H148.281V50.5847H148.291V50.6278H148.302V50.671H148.313V50.7141H148.324V50.7573H148.334C148.334 50.7897 148.345 50.822 148.345 50.8544H148.356V50.8868H148.367C148.367 50.9191 148.378 50.9515 148.378 50.9839H148.388V51.0162H148.399V51.0594H148.41C148.41 51.081 148.421 51.1133 148.421 51.1349H148.432V51.1673H148.442V51.2104H148.453V51.2428H148.464V51.286C148.507 51.2752 148.475 51.3615 148.507 51.3507V51.3939C148.55 51.3939 148.529 51.491 148.572 51.491V51.5233H148.583V51.5557H148.593V51.5989C148.637 51.5989 148.615 51.696 148.658 51.696V51.7283H148.669V51.7607C148.701 51.7823 148.734 51.8686 148.744 51.901C148.766 51.9118 148.788 51.9333 148.777 51.9657H148.788C149.273 52.8936 150.201 53.8539 151.107 54.4797C151.28 54.5552 151.431 54.7062 151.625 54.7818V54.7926C151.701 54.8465 151.852 54.8789 151.927 54.9436H151.96V54.9544H151.992V54.9652H152.024V54.976H152.057C152.068 55.0191 152.165 55.0084 152.186 55.0515H152.219V55.0623H152.262C152.251 55.1055 152.337 55.0731 152.327 55.1055H152.37C152.359 55.1486 152.445 55.1162 152.434 55.1486H152.478V55.1594H152.51V55.1702H152.553V55.181H152.586C153.082 55.3968 153.686 55.5478 154.247 55.6018V55.6126H154.377V55.6234H154.517V55.6341H154.689V55.6449H154.992V55.6557H155.509V55.6449C155.671 55.6449 155.822 55.6341 155.973 55.6341V55.6234C156.362 55.6126 156.739 55.5047 157.117 55.4399V55.4291C157.171 55.4184 157.236 55.4076 157.29 55.3968V55.386C157.344 55.3752 157.398 55.3644 157.441 55.3536V55.3428H157.484V55.332H157.527V55.3212H157.57V55.3105H157.613V55.2997C157.657 55.2889 157.711 55.2781 157.754 55.2673V55.2565H157.786V55.2457C157.818 55.2457 157.851 55.2349 157.883 55.2349V55.2241H157.916V55.2134C157.948 55.2134 157.98 55.2026 158.013 55.2026V55.1918H158.045V55.181H158.088C158.077 55.1378 158.164 55.1702 158.153 55.1378H158.196V55.127H158.228V55.1162H158.272C158.261 55.0731 158.347 55.1055 158.336 55.0731H158.369V55.0623C158.412 55.0623 158.466 55.0299 158.498 54.9976H158.531V54.9868H158.563V54.976C158.887 54.8465 159.167 54.6091 159.437 54.4581C159.491 54.3934 159.599 54.3502 159.653 54.2855C159.89 54.1344 160.117 53.9294 160.322 53.7028C160.44 53.6597 160.505 53.4978 160.57 53.4223V53.3899H160.581C160.699 52.8612 160.138 52.6347 159.858 52.3002C159.663 52.1276 159.512 51.8794 159.307 51.7715C159.318 51.7283 159.232 51.7607 159.243 51.7283H159.199V51.7176H159.124V51.7068H159.048V51.7176H158.973C158.584 51.9333 158.25 52.3433 157.894 52.5591C157.797 52.5807 157.732 52.6778 157.624 52.6994V52.7102H157.592V52.721C157.527 52.7533 157.441 52.7857 157.387 52.8289H157.344V52.8397H157.311C157.311 52.8828 157.214 52.8612 157.214 52.9044H157.171C157.182 52.9476 157.096 52.9152 157.106 52.9476H157.063V52.9583H157.031V52.9691C156.998 52.9691 156.966 52.9799 156.934 52.9799V52.9907H156.901C156.599 53.1202 156.211 53.2065 155.866 53.2389V53.2497H155.736V53.2604C155.434 53.282 155.035 53.282 154.733 53.2604V53.2497H154.592V53.2389H154.463V53.2281H154.366V53.2173C154.064 53.1849 153.729 53.0986 153.47 52.9799H153.438V52.9691H153.395V52.9583C153.373 52.9583 153.341 52.9476 153.319 52.9476V52.9368H153.287V52.926H153.244C153.254 52.8828 153.168 52.9152 153.179 52.8828H153.136C153.136 52.8397 153.039 52.8612 153.039 52.8181H153.006V52.8073H152.974V52.7965H152.942V52.7857H152.909V52.7749C152.704 52.6994 152.532 52.5483 152.359 52.462C151.744 52.0089 151.14 51.3615 150.827 50.6926H150.816V50.6602H150.805V50.6278H150.794V50.5954H150.784V50.5631H150.773V50.5307H150.762V50.4983H150.751V50.466H150.741C150.741 50.4444 150.73 50.412 150.73 50.3904C150.687 50.4012 150.719 50.3149 150.687 50.3257V50.2826H150.676V50.2502H150.665C150.665 50.2286 150.654 50.1962 150.654 50.1747H150.643V50.1315H150.633V50.0991H150.622C150.6 49.9481 150.514 49.8294 150.492 49.6568C154.323 49.592 158.39 49.8186 162.328 49.592ZM150.428 46.9486V46.9054H150.438C150.438 46.8731 150.449 46.8407 150.449 46.8083H150.46C150.471 46.7652 150.482 46.7112 150.492 46.6681H150.503V46.6357H150.514C150.514 46.6033 150.525 46.571 150.525 46.5386C150.568 46.5494 150.536 46.4631 150.568 46.4739V46.4307C150.611 46.4307 150.589 46.3336 150.633 46.3336V46.3012H150.643V46.2689H150.654V46.2365H150.665V46.2041H150.676V46.1718H150.687V46.1394H150.697C150.719 46.0531 150.805 45.9775 150.827 45.8912H150.838C151.129 45.341 151.722 44.7583 152.24 44.3699C152.424 44.2836 152.586 44.1325 152.791 44.057V44.0462H152.823V44.0354H152.855V44.0246H152.888V44.0139H152.92V44.0031H152.952V43.9923H152.985C152.985 43.9491 153.082 43.9707 153.082 43.9275H153.125C153.859 43.5715 154.819 43.4528 155.671 43.5499V43.5607H155.779V43.5715H155.876V43.5823H155.973V43.5931H156.049V43.6038H156.114V43.6146H156.189V43.6254H156.254V43.6362H156.319V43.647C156.373 43.6578 156.437 43.6686 156.491 43.6794V43.6902H156.534V43.701H156.578V43.7117H156.621V43.7225H156.664V43.7333H156.707V43.7441C156.75 43.7549 156.804 43.7657 156.847 43.7765V43.7873H156.88V43.7981H156.923C156.912 43.8412 156.998 43.8089 156.988 43.8412H157.031V43.852H157.063C157.052 43.8952 157.139 43.8628 157.128 43.8952H157.16V43.906H157.193V43.9167H157.225V43.9275H157.257V43.9383H157.29V43.9491H157.322V43.9599H157.354V43.9707H157.387V43.9815C158.218 44.3915 158.994 45.1683 159.404 45.9991H159.415C159.448 46.0639 159.48 46.1502 159.523 46.2041V46.2473H159.534V46.2796C159.577 46.2796 159.556 46.3768 159.599 46.3768V46.4199H159.609V46.4523H159.62C159.62 46.4846 159.631 46.517 159.631 46.5494H159.642V46.5818H159.653C159.653 46.6141 159.663 46.6465 159.663 46.6789H159.674C159.674 46.7112 159.685 46.7436 159.685 46.776H159.696V46.8191H159.707V46.8623H159.717V46.9054H159.728V46.9702H159.739C159.739 47.0025 159.75 47.0457 159.75 47.0781H159.761V47.0889H150.201C150.384 47.1428 150.374 47.0025 150.428 46.9486Z" fill="#FE001C"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M188.177 86C192.818 94.2213 195.697 103.387 196.553 112.912C197.9 127.919 194.144 142.942 185.892 155.548C177.643 168.152 165.384 177.603 151.097 182.375C147.902 183.347 139.667 184.868 121.422 184.992L126.071 180.343C126.462 179.953 126.462 179.319 126.071 178.929C125.681 178.538 125.047 178.538 124.657 178.929L118.293 185.293C117.902 185.683 117.902 186.317 118.293 186.707L124.657 193.071C125.047 193.462 125.681 193.462 126.071 193.071C126.462 192.681 126.462 192.047 126.071 191.657L121.406 186.992C139.762 186.869 148.23 185.34 151.693 184.284L151.705 184.28L151.718 184.276C166.437 179.363 179.068 169.627 187.566 156.644C196.064 143.66 199.932 128.189 198.545 112.734C197.698 103.301 194.924 94.2119 190.463 86H188.177Z" fill="#A0A0A0"/>
+<defs>
+<linearGradient id="paint0_linear_11182_69405" x1="57.1095" y1="130.707" x2="57.1095" y2="203.241" gradientUnits="userSpaceOnUse">
+<stop stop-color="#323339"/>
+<stop offset="1" stop-color="#25262B"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/electricity_bill.svg b/src/assets/icons/visu/partnerSteps/electricity_bill.svg
new file mode 100644
index 000000000..70ceab0a6
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/electricity_bill.svg
@@ -0,0 +1,31 @@
+<svg width="217" height="229" viewBox="0 0 217 229" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11182_68982)">
+<path d="M194.592 47.1556L195.68 44.7462L193.068 44.3563L69.6931 25.939L68.1961 25.7155L67.5728 27.0964L45.7985 75.3369L44.6689 75.1682L44.9407 77.2373L44.0877 79.1272L45.2109 79.2949L51.9551 130.644L26.3996 185.776L25.2762 188.2L27.9156 188.594L151.291 207.011L152.772 207.232L153.402 205.872L179.202 150.212L179.447 149.685L179.371 149.11L172.429 96.2574L194.592 47.1556Z" stroke="#C95300" stroke-width="4"/>
+<path d="M54.0131 130.955L177.388 149.373L151.588 205.032L28.2132 186.615L54.0131 130.955Z" fill="white"/>
+<path d="M54.013 130.956L177.388 149.373L170.372 95.9562L46.9969 77.5389L54.013 130.956Z" fill="#F5E3D8"/>
+<path d="M69.3949 27.917L192.77 46.3343L170.372 95.9557L46.9973 77.5384L69.3949 27.917Z" fill="white"/>
+<mask id="mask0_11182_68982" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="45" y="135" width="117" height="51">
+<path d="M63.7506 135.385L161.53 149.982L151.176 175.245L112.204 169.428L104.693 185.535L45.2441 176.661L63.7506 135.385Z" fill="#D87B39"/>
+</mask>
+<g mask="url(#mask0_11182_68982)">
+<rect x="54.46" y="138.759" width="115.525" height="4.70872" transform="rotate(8.49036 54.46 138.759)" fill="#D87B39"/>
+<path d="M47.6582 152.129L156.987 168.449L155.422 172.976L46.963 156.786L47.6582 152.129Z" fill="#D87B39"/>
+<rect x="42.6621" y="166.158" width="115.525" height="4.70866" transform="rotate(8.49036 42.6621 166.158)" fill="#D87B39"/>
+</g>
+<mask id="mask1_11182_68982" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="57" y="83" width="109" height="61">
+<path d="M159.591 98.5123L57.9883 83.3452L63.6334 128.226L165.236 143.393L159.591 98.5123Z" fill="#D87B39"/>
+</mask>
+<g mask="url(#mask1_11182_68982)">
+<rect x="55.207" y="101.973" width="115.525" height="4.70871" transform="rotate(8.49036 55.207 101.973)" fill="#D87B39"/>
+<path d="M52.2646 86.7897L100.634 94.0103L102.582 99.9957L51.4331 92.3602L52.2646 86.7897Z" fill="#D87B39"/>
+<rect x="56.6016" y="116.464" width="115.525" height="4.7087" transform="rotate(8.49036 56.6016 116.464)" fill="#D87B39"/>
+</g>
+<path d="M113.733 74.7956C122.357 76.0829 130.461 70.7525 131.667 62.6742C132.873 54.5958 126.679 47.131 118.055 45.8437C109.432 44.5564 101.328 49.8867 100.122 57.9651C98.9157 66.0435 105.11 73.5083 113.733 74.7956Z" fill="#D87B39" stroke="#D87B39" stroke-width="2"/>
+<path d="M100.296 58.5081L103.589 61.7572L107.251 57.4782L109.839 65.4477L115.986 54.6459L118.071 65.9872L122.975 58.4468L125.391 66.3054L129.249 61.9787L131.116 64.6599" stroke="white"/>
+</g>
+<defs>
+<clipPath id="clip0_11182_68982">
+<rect width="190" height="196" fill="white" transform="translate(28.9375 7) rotate(8.49036)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/enedis.svg b/src/assets/icons/visu/partnerSteps/enedis.svg
new file mode 100644
index 000000000..15d3543a2
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/enedis.svg
@@ -0,0 +1,37 @@
+<svg width="220" height="220" viewBox="0 0 220 220" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5293 131.207H115.611V199.241C115.611 201.174 114.044 202.741 112.111 202.741H6.0293C4.0963 202.741 2.5293 201.174 2.5293 199.241V131.207Z" fill="url(#paint0_linear_11182_69259)" stroke="#52616C"/>
+<path d="M2.0293 123.962C2.0293 121.753 3.82016 119.962 6.0293 119.962H112.111C114.321 119.962 116.111 121.753 116.111 123.962V130.707H2.0293V123.962Z" fill="#52616C"/>
+<ellipse cx="8.90131" cy="126.678" rx="2.74897" ry="2.68643" fill="#FF5F5F"/>
+<ellipse cx="17.1484" cy="126.678" rx="2.74897" ry="2.68643" fill="#FFB850"/>
+<ellipse cx="25.3954" cy="126.678" rx="2.74896" ry="2.68643" fill="#3CE800"/>
+<path d="M44.2788 179.917V181.115H39.0259V184.723H43.2786V185.875H39.0259V189.582H44.2788V190.78H37.5371V179.917H44.2788Z" fill="white"/>
+<path d="M51.4717 184.465C51.431 184.521 51.3902 184.564 51.3495 184.594C51.3088 184.625 51.2503 184.64 51.1739 184.64C51.0976 184.64 51.0136 184.609 50.922 184.549C50.8354 184.483 50.7235 184.412 50.586 184.336C50.4486 184.261 50.2806 184.192 50.0821 184.132C49.8887 184.066 49.6495 184.033 49.3644 184.033C48.9878 184.033 48.6544 184.101 48.3643 184.238C48.0741 184.369 47.8298 184.561 47.6313 184.814C47.4379 185.067 47.2903 185.372 47.1885 185.731C47.0918 186.09 47.0434 186.492 47.0434 186.937C47.0434 187.402 47.0969 187.816 47.2038 188.18C47.3106 188.539 47.4608 188.842 47.6542 189.09C47.8476 189.332 48.0818 189.519 48.3566 189.651C48.6366 189.777 48.9496 189.84 49.2957 189.84C49.6266 189.84 49.8989 189.802 50.1127 189.726C50.3264 189.645 50.5046 189.557 50.6471 189.461C50.7896 189.365 50.9067 189.279 50.9983 189.203C51.0899 189.122 51.1816 189.082 51.2732 189.082C51.3902 189.082 51.4768 189.125 51.5328 189.211L51.9145 189.704C51.5786 190.113 51.1586 190.414 50.6547 190.606C50.1508 190.793 49.6189 190.886 49.059 190.886C48.5755 190.886 48.125 190.798 47.7077 190.621C47.2954 190.444 46.9365 190.189 46.6311 189.855C46.3257 189.517 46.084 189.102 45.9058 188.612C45.7328 188.122 45.6462 187.563 45.6462 186.937C45.6462 186.366 45.7251 185.837 45.8829 185.352C46.0458 184.867 46.2799 184.45 46.5853 184.101C46.8958 183.748 47.2776 183.472 47.7306 183.275C48.1836 183.078 48.7027 182.98 49.2881 182.98C49.8276 182.98 50.3061 183.068 50.7235 183.245C51.1408 183.417 51.5099 183.662 51.8305 183.98L51.4717 184.465Z" fill="white"/>
+<path d="M56.4542 182.98C57.0192 182.98 57.5282 183.073 57.9812 183.26C58.4393 183.447 58.8261 183.712 59.1417 184.056C59.4623 184.4 59.7067 184.817 59.8746 185.307C60.0477 185.792 60.1342 186.335 60.1342 186.937C60.1342 187.543 60.0477 188.089 59.8746 188.574C59.7067 189.059 59.4623 189.474 59.1417 189.817C58.8261 190.161 58.4393 190.426 57.9812 190.613C57.5282 190.795 57.0192 190.886 56.4542 190.886C55.8892 190.886 55.3777 190.795 54.9196 190.613C54.4666 190.426 54.0797 190.161 53.7591 189.817C53.4384 189.474 53.1915 189.059 53.0185 188.574C52.8454 188.089 52.7589 187.543 52.7589 186.937C52.7589 186.335 52.8454 185.792 53.0185 185.307C53.1915 184.817 53.4384 184.4 53.7591 184.056C54.0797 183.712 54.4666 183.447 54.9196 183.26C55.3777 183.073 55.8892 182.98 56.4542 182.98ZM56.4542 189.832C57.2177 189.832 57.7878 189.58 58.1644 189.074C58.5411 188.564 58.7294 187.854 58.7294 186.944C58.7294 186.029 58.5411 185.317 58.1644 184.806C57.7878 184.296 57.2177 184.041 56.4542 184.041C56.0673 184.041 55.7314 184.107 55.4464 184.238C55.1613 184.369 54.9221 184.559 54.7287 184.806C54.5404 185.054 54.3978 185.36 54.3011 185.724C54.2095 186.083 54.1637 186.489 54.1637 186.944C54.1637 187.399 54.2095 187.806 54.3011 188.165C54.3978 188.524 54.5404 188.827 54.7287 189.074C54.9221 189.317 55.1613 189.504 55.4464 189.635C55.7314 189.767 56.0673 189.832 56.4542 189.832Z" fill="white"/>
+<path d="M63.3205 179.614V190.78H61.9615V179.614H63.3205Z" fill="white"/>
+<path d="M67.9833 193.047C67.9375 193.148 67.8789 193.229 67.8077 193.289C67.7415 193.35 67.6372 193.38 67.4946 193.38H66.4868L67.8993 190.333L64.7079 183.101H65.8837C66.0007 183.101 66.0924 183.131 66.1585 183.192C66.2247 183.247 66.2731 183.311 66.3036 183.381L68.3727 188.218C68.4185 188.329 68.4566 188.44 68.4872 188.551C68.5228 188.663 68.5534 188.776 68.5788 188.892C68.6144 188.776 68.6501 188.663 68.6857 188.551C68.7213 188.44 68.762 188.326 68.8078 188.21L70.8158 183.381C70.8464 183.3 70.8973 183.235 70.9685 183.184C71.0449 183.129 71.1263 183.101 71.2128 183.101H72.297L67.9833 193.047Z" fill="white"/>
+<path d="M76.466 182.98C77.031 182.98 77.54 183.073 77.993 183.26C78.4511 183.447 78.838 183.712 79.1535 184.056C79.4742 184.4 79.7185 184.817 79.8865 185.307C80.0595 185.792 80.1461 186.335 80.1461 186.937C80.1461 187.543 80.0595 188.089 79.8865 188.574C79.7185 189.059 79.4742 189.474 79.1535 189.817C78.838 190.161 78.4511 190.426 77.993 190.613C77.54 190.795 77.031 190.886 76.466 190.886C75.9011 190.886 75.3895 190.795 74.9314 190.613C74.4784 190.426 74.0916 190.161 73.7709 189.817C73.4502 189.474 73.2034 189.059 73.0303 188.574C72.8573 188.089 72.7707 187.543 72.7707 186.937C72.7707 186.335 72.8573 185.792 73.0303 185.307C73.2034 184.817 73.4502 184.4 73.7709 184.056C74.0916 183.712 74.4784 183.447 74.9314 183.26C75.3895 183.073 75.9011 182.98 76.466 182.98ZM76.466 189.832C77.2295 189.832 77.7996 189.58 78.1763 189.074C78.5529 188.564 78.7412 187.854 78.7412 186.944C78.7412 186.029 78.5529 185.317 78.1763 184.806C77.7996 184.296 77.2295 184.041 76.466 184.041C76.0792 184.041 75.7433 184.107 75.4582 184.238C75.1732 184.369 74.934 184.559 74.7405 184.806C74.5522 185.054 74.4097 185.36 74.313 185.724C74.2214 186.083 74.1756 186.489 74.1756 186.944C74.1756 187.399 74.2214 187.806 74.313 188.165C74.4097 188.524 74.5522 188.827 74.7405 189.074C74.934 189.317 75.1732 189.504 75.4582 189.635C75.7433 189.767 76.0792 189.832 76.466 189.832Z" fill="white"/>
+<path d="M59.1015 174.342C74.561 168.216 73.3594 159.506 72.5584 146.515C67.5922 146.293 63.1866 144.743 59.1015 142.16C55.0163 144.743 50.6107 146.293 45.6445 146.515C44.8435 159.506 43.6419 168.216 59.1015 174.342Z" fill="#1B1C22"/>
+<path d="M59.1014 139.79L58.0541 140.452C54.2241 142.874 50.1454 144.301 45.5575 144.505L43.7785 144.584L43.6673 146.389C43.6342 146.925 43.5999 147.458 43.5657 147.988C43.1983 153.692 42.8537 159.041 44.4 163.651C46.1826 168.965 50.3182 173.02 58.3811 176.215L59.1014 176.501V174.342C44.248 168.456 44.7748 160.185 45.5494 148.023C45.581 147.527 45.613 147.024 45.6444 146.515C50.6107 146.293 55.0162 144.743 59.1014 142.16V139.79Z" fill="#FFC600"/>
+<path d="M59.1017 139.79L60.1491 140.452C63.979 142.874 68.0577 144.301 72.6456 144.505L74.4246 144.584L74.5359 146.389C74.5689 146.925 74.6032 147.458 74.6374 147.988C75.0048 153.692 75.3494 159.041 73.8032 163.651C72.0205 168.965 67.8849 173.02 59.822 176.215L59.1017 176.501V174.342C73.9551 168.456 73.4283 160.185 72.6538 148.023C72.6221 147.527 72.5901 147.024 72.5587 146.515C67.5925 146.293 63.1869 144.743 59.1017 142.16V139.79Z" fill="#DB8300"/>
+<path d="M54.2159 152.443H54.9187C55.1994 152.443 55.4686 152.554 55.667 152.754C55.8655 152.953 55.977 153.223 55.977 153.505V164.285H53.1576V153.505C53.1576 153.223 53.2691 152.953 53.4676 152.754C53.666 152.554 53.9352 152.443 54.2159 152.443ZM59.099 157.692H59.8018C60.0824 157.692 60.3516 157.804 60.5501 158.003C60.7486 158.202 60.8601 158.473 60.8601 158.754V164.285H58.0407V158.754C58.0407 158.473 58.1522 158.202 58.3506 158.003C58.5491 157.804 58.8183 157.692 59.099 157.692ZM64.2731 155.661H64.9759C65.2566 155.661 65.5257 155.773 65.7242 155.972C65.9227 156.172 66.0342 156.442 66.0342 156.723V164.285H63.2148V156.723C63.2148 156.442 63.3263 156.172 63.5248 155.972C63.7232 155.773 63.9924 155.661 64.2731 155.661Z" fill="#FFC600"/>
+<path d="M121.39 51.5078C105.493 53.5147 90.8171 61.0771 79.9564 72.8584C69.0957 84.6396 62.7497 99.8811 62.04 115.889" stroke="#A0A0A0" stroke-width="2"/>
+<path d="M131.5 25.5H213.5V75C213.5 76.933 211.933 78.5 210 78.5H135C133.067 78.5 131.5 76.933 131.5 75V25.5Z" fill="white" stroke="#A2B4C1"/>
+<path d="M131 21C131 18.7909 132.791 17 135 17H210C212.209 17 214 18.7909 214 21V25H131V21Z" fill="#A2B4C1"/>
+<circle cx="136" cy="22" r="2" fill="#FF5F5F"/>
+<circle cx="142" cy="22" r="2" fill="#FFB850"/>
+<circle cx="148" cy="22" r="2" fill="#3CE800"/>
+<path d="M172.344 62.6227C170.969 62.6227 169.847 61.6269 169.847 60.374V59.967H175.17C177.007 59.967 178.514 58.6071 178.514 56.9473V55.0305C178.514 53.3599 177.018 52.0107 175.17 52.0107H170.529C170.265 52.0107 170.012 52.0107 169.748 52.0642C168.242 52.3855 167.186 53.6277 167.186 55.0305V56.1441C167.186 56.4011 167.373 56.6046 167.615 56.6046H169.418C169.649 56.6046 169.847 56.4011 169.847 56.1441V55.8657V55.4267C169.847 54.8484 170.375 54.3772 171.035 54.3772H174.675C175.324 54.3772 175.863 54.8484 175.863 55.4267V56.5618C175.863 57.14 175.335 57.6112 174.675 57.6112H165.668V59.967H167.186V60.374C167.186 62.9226 169.506 64.9893 172.355 64.9893H180.043V62.6227H172.344Z" fill="#91C21D"/>
+<path d="M160.521 54.3772C161.895 54.3772 163.017 55.3945 163.017 56.6367V64.5717C163.017 64.7966 163.226 64.9893 163.49 64.9893H165.195C165.459 64.9893 165.668 64.8073 165.668 64.5717V56.6367C165.668 54.0881 163.358 52.0107 160.521 52.0107H155.032C154.801 52.0107 154.604 52.2141 154.604 52.4711V64.5288C154.604 64.7858 154.79 64.9893 155.032 64.9893H156.836C157.067 64.9893 157.265 64.7858 157.265 64.5288V54.3772H160.521Z" fill="#0063A6"/>
+<path d="M145.618 54.3779H152.613C152.866 54.3779 153.075 54.1959 153.075 53.971V52.4183C153.075 52.1934 152.877 52.0114 152.613 52.0114H145.563C143.606 52.0114 142 53.4463 142 55.2025V61.8096C142 63.5658 143.595 65.0007 145.563 65.0007H152.613C152.866 65.0007 153.075 64.8187 153.075 64.5938V63.0411C153.075 62.8162 152.866 62.6342 152.613 62.6342H145.618C145.101 62.6342 144.673 62.2379 144.673 61.7668V59.957H148.852C149.105 59.957 149.314 59.775 149.314 59.5501V58.0295C149.314 57.8046 149.105 57.6226 148.852 57.6226H144.673V55.2453C144.673 54.7742 145.101 54.3779 145.618 54.3779Z" fill="#0063A6"/>
+<path d="M208 60.5132C208 60.3954 208 60.2776 207.989 60.1491C207.857 58.7035 206.328 57.6112 204.722 57.6112H200.73H200.631C199.993 57.6112 199.476 57.0544 199.476 56.3798V55.5017C199.476 54.8806 200.037 54.3773 200.741 54.3773H202.314H202.325H206.306C206.515 54.3773 206.691 54.2595 206.757 54.0881C206.779 54.0453 206.779 54.0025 206.779 53.9596V52.4176C206.779 52.1928 206.57 52 206.306 52H200.092C198.288 52 196.804 53.3171 196.804 54.9448V56.7867C196.804 58.5429 198.156 59.9671 199.828 59.9671H204.183C204.821 59.9671 205.338 60.5239 205.338 61.1985V61.4877C205.338 62.1088 204.777 62.6121 204.085 62.6121H197.288C197.079 62.6121 196.903 62.7299 196.837 62.9012C196.815 62.944 196.815 62.9869 196.815 63.0297V64.5717C196.815 64.7966 197.024 64.9893 197.288 64.9893H202.853H204.744C206.548 64.9893 208 63.6722 208 62.0445V60.5132Z" fill="#0063A6"/>
+<path d="M186.257 52.0107H180.472C180.241 52.0107 180.043 52.2141 180.043 52.4711V60.1063C180.043 60.3633 180.23 60.5667 180.472 60.5667H182.276C182.507 60.5667 182.705 60.3633 182.705 60.1063V54.3772H185.96C187.335 54.3772 188.457 55.3945 188.457 56.6367V60.8023C188.457 62.0445 187.335 62.6227 185.96 62.6227L180.043 62.6335V65H185.96C188.798 65 191.107 63.3723 191.107 60.813V56.6153C191.107 54.1631 188.995 52.0107 186.257 52.0107Z" fill="#0063A6"/>
+<path d="M195.286 60.1812V55.8443C195.286 55.5873 195.099 55.3838 194.857 55.3838H193.065C192.834 55.3838 192.636 55.5873 192.636 55.8443V60.1812V64.5181C192.636 64.7751 192.823 64.9786 193.065 64.9786H194.857C195.088 64.9786 195.286 64.7751 195.286 64.5181V60.1812Z" fill="#0063A6"/>
+<path d="M195.286 52.9959V52.4711C195.286 52.2141 195.099 52.0107 194.857 52.0107H193.065C192.834 52.0107 192.636 52.2141 192.636 52.4711V52.9959V53.9168C192.636 54.1738 192.823 54.3772 193.065 54.3772H194.857C195.088 54.3772 195.286 54.1738 195.286 53.9168V52.9959Z" fill="#0063A6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M188.731 87C193.047 94.9617 195.732 103.771 196.553 112.912C197.9 127.919 194.144 142.942 185.892 155.548C177.643 168.152 165.384 177.603 151.097 182.375C147.902 183.347 139.667 184.868 121.422 184.992L126.071 180.343C126.462 179.953 126.462 179.319 126.071 178.929C125.681 178.538 125.047 178.538 124.657 178.929L118.293 185.293C117.902 185.683 117.902 186.317 118.293 186.707L124.657 193.071C125.047 193.462 125.681 193.462 126.071 193.071C126.462 192.681 126.462 192.047 126.071 191.657L121.406 186.992C139.762 186.869 148.23 185.34 151.693 184.284L151.705 184.28L151.718 184.276C166.437 179.363 179.068 169.627 187.566 156.644C196.064 143.66 199.932 128.189 198.545 112.734C197.732 103.683 195.145 94.9472 190.996 87H188.731Z" fill="#A0A0A0"/>
+<defs>
+<linearGradient id="paint0_linear_11182_69259" x1="57.1095" y1="130.707" x2="57.1095" y2="203.241" gradientUnits="userSpaceOnUse">
+<stop stop-color="#323339"/>
+<stop offset="1" stop-color="#25262B"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/france_connect.svg b/src/assets/icons/visu/partnerSteps/france_connect.svg
new file mode 100644
index 000000000..9a5bba672
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/france_connect.svg
@@ -0,0 +1,28 @@
+<svg width="217" height="222" viewBox="0 0 217 222" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.0151 72.4082L22.0224 132.54L79.4766 155.577L129.077 118.285L121.07 58.1526L63.439 35.1399L14.0151 72.4082Z" fill="white"/>
+<path d="M99.9077 91.4759L81.0963 67.0845L65.0127 46.2796L69.1225 77.1428L78.0803 144.413L117.183 114.191L99.9077 91.4759Z" fill="#034EA2"/>
+<path d="M81.1022 67.1272L99.9202 91.5685L110.668 65.263L92.202 57.5462L81.1022 67.1272Z" fill="#0069CC"/>
+<path d="M92.2018 57.546L65.0127 46.2796L81.102 67.127L92.2018 57.546Z" fill="#ED1C24"/>
+<path d="M81.102 67.127L65.0127 46.2796L81.102 67.127Z" fill="#0069CC"/>
+<path d="M117.201 114.331L110.668 65.2636L99.9196 91.5691L117.201 114.331Z" fill="#ED1C24"/>
+<path d="M43.3449 99.0084L55.118 70.5444L65.0127 46.2802L69.1224 77.1434L78.0803 144.414L32.4313 125.477L43.3449 99.0084Z" fill="#0069CC"/>
+<path d="M55.1241 70.5865L43.3577 99.1004L25.9164 76.5487L41.7196 64.2685L55.1241 70.5865Z" fill="#ED1C24"/>
+<path d="M41.7193 64.2683L65.0128 46.2797L55.1238 70.5863L41.7193 64.2683Z" fill="#034EA2"/>
+<path d="M32.4498 125.616L25.916 76.5492L43.3573 99.101L32.4498 125.616Z" fill="#034EA2"/>
+<path d="M83.9036 98.7183C84.6585 98.6178 85.3881 98.3277 86.1682 98.4167C86.7596 98.5309 87.5145 98.4304 87.5397 98.62C87.5025 99.7826 85.8293 100.198 85.2258 101.436C85.0371 101.461 85.0371 101.461 84.8484 101.487C84.4962 101.726 84.7859 102.46 84.4085 102.51C84.0058 102.37 83.6536 102.61 83.1127 102.875C83.7546 103.369 84.5599 103.647 85.2896 103.357C85.4783 103.332 85.6923 103.496 85.7427 103.876C85.7427 103.876 85.9315 103.851 85.9062 103.661C86.0949 103.636 86.0949 103.636 86.1202 103.825C86.1454 104.015 86.1707 104.205 86.1959 104.394C85.8942 105.013 85.1141 104.924 84.5479 104.999C85.7055 105.038 86.8378 104.887 87.7561 104.572C88.4605 104.093 87.5289 102.866 88.0194 102.222C87.8307 102.247 87.9689 101.843 87.5914 101.893C87.7549 101.678 88.0566 101.059 88.2453 101.034C88.4341 101.009 88.975 100.744 88.9497 100.555C88.9245 100.365 88.3331 100.251 88.4713 99.8465C89.1505 99.1772 89.8044 98.3184 89.3007 97.4208C89.0615 97.0668 87.9292 97.2175 87.3378 97.1034C86.5577 97.0143 85.828 97.3044 85.0984 97.5945C84.3435 97.695 83.8279 98.1496 83.0982 98.4396C82.2051 98.9445 81.526 99.6137 80.6581 100.308C81.9034 99.5634 82.8218 99.2482 83.9036 98.7183Z" fill="#034EA2"/>
+<path d="M98.3107 104.879C97.8304 104.179 97.185 103.693 96.5145 103.018C95.8191 102.157 94.9585 101.508 94.6184 100.408C94.0882 99.333 94.3437 98.3446 94.1939 97.2192C93.9191 95.1561 93.0739 93.1689 92.2536 91.3693C91.7483 90.4822 91.4083 89.3822 90.9031 88.495C90.638 87.9577 90.3729 87.4203 89.9176 86.9083C89.7024 86.7461 89.6275 86.1834 89.7927 85.9705C90.3133 85.5194 90.8089 84.8808 91.1393 84.455C91.4198 83.6542 90.9145 82.767 90.294 82.4679C89.2932 82.2194 89.6582 83.507 88.9474 83.9834C88.7573 84.0087 88.7573 84.0087 88.5671 84.034C88.3269 83.6842 88.6823 83.446 88.8475 83.2332C88.8226 83.0456 88.7976 82.858 88.6074 82.8834C88.0369 82.9593 87.4413 82.8478 87.2262 82.6855C85.455 81.0125 83.4283 80.328 81.2365 79.8563C81.832 79.9679 82.4025 79.892 82.9731 79.816C83.9489 79.8769 85.065 79.5374 85.7758 79.061C86.4866 78.5846 86.3617 77.6468 86.452 76.8712C86.6172 76.6584 86.402 76.4961 86.3521 76.121C86.3021 75.7459 85.8718 75.4214 85.6317 75.0716C85.6317 75.0716 85.4165 74.9094 85.1764 74.5596C83.4302 73.0742 76.8852 68.9828 65.9547 71.2018C61.2502 72.21 55.5295 74.308 49.1326 78.5957C48.9424 78.621 48.7772 78.8339 48.3968 78.8846C47.3307 79.5992 45.9341 80.7396 45.1331 81.9915C44.1668 83.4564 43.4157 85.0835 43.2601 86.8221C41.6984 88.1754 40.7821 90.0154 40.056 91.83C39.2146 94.2326 37.9429 96.3108 38.2676 98.7491C38.2926 98.9366 38.3175 99.1242 38.3175 99.1242C38.6076 99.8491 38.6825 100.412 38.9726 101.137C39.5528 102.586 40.133 104.036 40.5229 105.511C40.813 106.236 41.1031 106.961 41.3932 107.686C41.8734 108.386 41.618 109.374 42.2884 110.048C42.5285 110.398 42.6035 110.961 43.199 111.072C43.2239 111.26 43.2489 111.448 43.2739 111.635C43.489 111.797 43.489 111.797 43.6792 111.772C43.7042 111.96 43.7292 112.147 43.7542 112.335C45.0701 113.496 46.5512 114.444 47.5117 115.843C47.9919 116.542 46.2304 116.395 45.4447 116.309C44.0385 115.924 42.9378 114.925 41.6718 114.139L41.5066 114.352C42.202 115.214 44.4438 116.061 43.4027 116.963C42.8821 117.414 42.0215 116.765 41.716 117.378C41.5508 117.591 41.7909 117.941 41.8159 118.128C40.9803 117.667 40.0793 118.169 39.2687 117.895C38.6732 117.783 38.3581 116.871 37.7876 116.947C36.026 116.8 34.2644 116.652 32.3626 116.906C32.1725 116.931 31.9823 116.956 31.9823 116.956C30.2457 116.997 28.5091 117.037 27.0126 117.427L27.2624 119.303C28.7339 118.725 30.2054 118.147 31.7268 117.945C31.917 117.919 32.1071 117.894 32.1071 117.894C32.4875 117.844 33.0331 117.58 33.4384 117.717C32.8679 117.793 32.1072 117.894 31.5616 118.158C30.0651 118.548 28.6186 119.313 27.1721 120.078L27.4219 121.954C28.2076 122.04 29.1585 121.914 29.9441 122C30.92 122.061 31.8959 122.122 32.8967 122.37C34.2779 122.568 35.3038 123.004 36.5198 123.415C37.1403 123.714 37.3804 124.064 38.0009 124.363C38.8115 124.637 39.7624 124.51 40.283 124.059C40.4732 124.034 40.8536 123.983 41.0438 123.958C43.0608 123.116 45.0778 122.275 46.1843 120.41C46.2093 120.597 46.3995 120.572 46.3995 120.572C46.169 121.748 46.3188 122.874 45.708 124.1C45.7329 124.288 45.5677 124.501 45.9731 124.638C46.1632 124.612 46.1632 124.612 46.1632 124.612C45.9731 124.638 45.9731 124.637 45.998 124.825C46.023 125.013 46.3784 124.774 46.5936 124.937C45.8578 125.225 45.3122 125.489 45.0068 126.102C45.0318 126.29 45.222 126.265 45.4121 126.239C45.2469 126.452 44.6764 126.528 44.7014 126.716L44.9165 126.878C44.7264 126.903 44.7264 126.903 44.7513 127.091C44.7763 127.278 44.7763 127.278 44.8013 127.466C44.4209 127.517 44.2807 127.917 44.0905 127.942C44.711 128.241 45.0414 127.816 45.612 127.74C44.1654 128.505 43.1492 129.595 41.6778 130.172C41.4876 130.198 41.7277 130.548 41.5375 130.573C41.9429 130.71 42.2733 130.284 42.6536 130.233C41.9678 130.897 41.2571 131.374 40.5463 131.85L45.4603 133.868C47.2122 132.49 48.749 130.949 50.0457 129.058L50.2608 129.22C50.0553 130.584 49.4194 131.623 48.4032 132.713C47.6925 133.189 47.2218 134.015 46.6763 134.279L50.3493 135.699C51.035 135.035 51.5556 134.584 52.4566 134.082C52.6468 134.057 52.8619 134.219 53.2423 134.168C54.2335 132.891 55.3899 131.401 57.3417 131.522C57.3666 131.71 57.3666 131.71 57.5568 131.685C57.5568 131.685 57.747 131.659 57.722 131.472C57.747 131.659 57.747 131.659 57.5568 131.685C57.0362 132.136 56.7058 132.562 56.1852 133.013C56.02 133.226 56.2102 133.2 56.4004 133.175C57.1112 132.698 57.4416 132.273 57.9622 131.822C57.797 132.035 57.8219 132.222 57.8469 132.41C56.3101 133.95 55.1537 135.441 54.0222 137.118L73.4629 145.028C73.9336 144.202 74.5444 142.975 75.1803 141.936C77.9541 136.604 82.0247 129.381 83.3463 127.678C83.8669 127.227 84.4374 127.151 85.1732 126.862C87.4553 126.558 90.0026 126.792 92.3097 126.675C92.4999 126.65 92.9052 126.787 93.0954 126.761C93.8811 126.848 94.807 126.534 95.7329 126.219C96.6339 125.718 97.7 125.003 97.9305 123.827C98.186 122.839 98.2264 121.688 97.5309 120.826C96.4302 119.827 98.0669 119.037 98.5375 118.211C98.818 117.41 98.0073 117.136 97.9324 116.573C97.7172 116.411 97.1467 116.487 96.9066 116.137C97.8075 115.635 99.2041 114.495 98.2935 113.471C97.8132 112.771 96.9276 111.935 97.5885 111.083C98.4644 110.394 99.9859 110.192 100.241 109.203C101.133 107.176 99.2462 106.091 98.3107 104.879ZM91.516 98.912C91.3508 99.1249 91.9463 99.2365 91.9963 99.6116C91.8311 99.8245 91.4757 100.063 91.2855 100.088C91.1203 100.301 90.7899 100.727 90.6247 100.94C90.8149 100.914 90.6746 101.315 91.055 101.264C90.5843 102.09 91.7101 103.276 90.7842 103.591C89.8832 104.092 88.7421 104.244 87.5511 104.021C88.0967 103.758 88.9073 104.031 89.2128 103.418C89.1878 103.231 89.1628 103.043 89.1378 102.855C89.1129 102.668 88.9227 102.693 88.9227 102.693C88.7575 102.906 88.7575 102.906 88.7575 102.906C88.7325 102.719 88.3022 102.394 88.3022 102.394C87.5665 102.683 86.7558 102.409 86.1103 101.922C86.4657 101.684 86.8211 101.446 87.4166 101.558C87.797 101.507 87.5069 100.782 87.8623 100.544C88.0524 100.519 88.0524 100.519 88.2426 100.493C88.8535 99.2665 90.5152 98.6635 90.5805 97.7004C90.5555 97.5128 89.7948 97.6141 89.1992 97.5025C88.4136 97.4163 87.6778 97.7051 86.9171 97.8064C85.826 98.3335 84.8751 98.4601 83.9991 99.1494C84.6849 98.4854 85.5609 97.7962 86.4618 97.2944C87.1976 97.0056 87.7181 96.5545 88.4789 96.4532C89.2146 96.1643 90.1405 95.8501 90.736 95.9617C91.5217 96.048 92.4726 95.9214 92.7128 96.2711C92.6724 97.4218 92.2018 98.248 91.516 98.912Z" fill="white"/>
+<path opacity="0.45" fill-rule="evenodd" clip-rule="evenodd" d="M109.607 112.227L203.252 125.923C207.884 126.601 211.089 130.904 210.412 135.536L202.644 188.648C201.966 193.28 197.663 196.485 193.031 195.808L99.3855 182.111C94.754 181.434 91.5485 177.13 92.2259 172.499L99.9941 119.386C100.672 114.755 104.975 111.549 109.607 112.227ZM109.198 115.022C106.11 114.57 103.241 116.707 102.79 119.795L95.0213 172.907C94.5697 175.995 96.7067 178.864 99.7944 179.316L193.44 193.013C196.528 193.464 199.397 191.327 199.848 188.239L207.617 135.127C208.068 132.039 205.931 129.17 202.844 128.719L109.198 115.022Z" fill="#AEAEAE"/>
+<path d="M103.029 118.162C103.348 115.976 105.379 114.463 107.565 114.783L204.477 128.957C206.663 129.277 208.175 131.308 207.856 133.494L207.208 137.922L102.381 122.59L103.029 118.162Z" fill="#034EA2"/>
+<path d="M102.381 122.59L207.208 137.922L200.871 181.25L96.0436 165.918L102.381 122.59Z" fill="url(#paint0_linear_11182_69190)"/>
+<path d="M96.043 165.919L200.87 181.251L199.609 189.872C199.289 192.058 197.258 193.571 195.072 193.251L98.161 179.077C95.9751 178.757 94.4623 176.726 94.782 174.54L96.043 165.919Z" fill="white"/>
+<rect x="102.381" y="122.59" width="31.0765" height="43.7896" transform="rotate(8.32109 102.381 122.59)" fill="#E0E0E0"/>
+<path d="M123.397 144.835C122.493 151.01 117.577 156.22 112.559 155.486C107.542 154.752 104.323 148.353 105.227 142.177C106.13 136.002 110.813 132.389 115.83 133.123C120.848 133.857 124.3 138.659 123.397 144.835Z" fill="#6B7F95"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M108.066 152.901C109.28 154.285 110.81 155.229 112.559 155.485C114.341 155.746 116.109 155.257 117.69 154.242L112.968 152.69L108.066 152.901ZM104.671 153.047L97.8831 153.339L96.0433 165.919L126.793 170.416L128.632 157.837L120.931 155.307C118.595 157.404 115.508 158.772 112.15 158.281C108.847 157.797 106.311 155.666 104.671 153.047Z" fill="#6B7F95"/>
+<defs>
+<linearGradient id="paint0_linear_11182_69190" x1="154.794" y1="130.256" x2="148.457" y2="173.584" gradientUnits="userSpaceOnUse">
+<stop stop-color="#A2E8C2"/>
+<stop offset="0.489583" stop-color="#C1E8ED"/>
+<stop offset="1" stop-color="#8CC8DB"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/gas_bill.svg b/src/assets/icons/visu/partnerSteps/gas_bill.svg
new file mode 100644
index 000000000..be3a8c5b4
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/gas_bill.svg
@@ -0,0 +1,38 @@
+<svg width="217" height="229" viewBox="0 0 217 229" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11182_69056)">
+<path d="M194.592 47.1556L195.68 44.7462L193.068 44.3563L69.6931 25.939L68.1961 25.7155L67.5728 27.0965L45.7985 75.3369L44.6689 75.1683L44.9407 77.2374L44.0877 79.1272L45.2109 79.2949L51.9551 130.644L26.3996 185.776L25.2762 188.2L27.9156 188.594L151.291 207.011L152.772 207.232L153.402 205.872L179.202 150.212L179.447 149.685L179.371 149.11L172.429 96.2575L194.592 47.1556Z" stroke="#1B7E6D" stroke-width="4"/>
+<path d="M54.0131 130.955L177.388 149.373L151.588 205.032L28.2132 186.615L54.0131 130.955Z" fill="white"/>
+<path d="M54.013 130.956L177.388 149.373L170.372 95.9562L46.9969 77.5389L54.013 130.956Z" fill="#C9F5EE"/>
+<path d="M69.3949 27.917L192.77 46.3343L170.372 95.9557L46.9973 77.5384L69.3949 27.917Z" fill="white"/>
+<mask id="mask0_11182_69056" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="45" y="135" width="117" height="51">
+<path d="M63.7506 135.385L161.53 149.981L151.176 175.245L112.204 169.428L104.693 185.535L45.2441 176.661L63.7506 135.385Z" fill="#D87B39"/>
+</mask>
+<g mask="url(#mask0_11182_69056)">
+<rect x="54.46" y="138.759" width="115.525" height="4.70872" transform="rotate(8.49036 54.46 138.759)" fill="#45D1B8"/>
+<path d="M47.6582 152.129L156.987 168.449L155.422 172.976L46.963 156.786L47.6582 152.129Z" fill="#45D1B8"/>
+<rect x="42.6621" y="166.158" width="115.525" height="4.70866" transform="rotate(8.49036 42.6621 166.158)" fill="#45D1B8"/>
+</g>
+<mask id="mask1_11182_69056" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="57" y="83" width="109" height="61">
+<path d="M159.591 98.5123L57.9883 83.3452L63.6334 128.226L165.236 143.393L159.591 98.5123Z" fill="#D87B39"/>
+</mask>
+<g mask="url(#mask1_11182_69056)">
+<rect x="55.207" y="101.973" width="115.525" height="4.70871" transform="rotate(8.49036 55.207 101.973)" fill="#45D1B8"/>
+<path d="M52.2646 86.7897L100.634 94.0103L102.582 99.9957L51.4331 92.3602L52.2646 86.7897Z" fill="#45D1B8"/>
+<rect x="56.6016" y="116.464" width="115.525" height="4.7087" transform="rotate(8.49036 56.6016 116.464)" fill="#45D1B8"/>
+</g>
+<g clip-path="url(#clip1_11182_69056)">
+<circle cx="116" cy="59.9999" r="16.8636" fill="#45D1B8" stroke="#45D1B8"/>
+<path d="M110.273 65.409C112.356 65.409 114.045 63.7199 114.045 61.6363C114.045 59.5527 112.356 57.8636 110.273 57.8636C108.189 57.8636 106.5 59.5527 106.5 61.6363C106.5 63.7199 108.189 65.409 110.273 65.409Z" fill="white" stroke="#45D1B8"/>
+<path d="M118.455 70.3181C119.635 70.3181 120.591 69.3617 120.591 68.1818C120.591 67.0019 119.635 66.0454 118.455 66.0454C117.275 66.0454 116.318 67.0019 116.318 68.1818C116.318 69.3617 117.275 70.3181 118.455 70.3181Z" fill="white" stroke="#45D1B8"/>
+<circle cx="117.636" cy="55.909" r="6.22727" fill="white" stroke="#45D1B8"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_11182_69056">
+<rect width="190" height="196" fill="white" transform="translate(28.9375 7) rotate(8.49036)"/>
+</clipPath>
+<clipPath id="clip1_11182_69056">
+<rect width="36" height="36" fill="white" transform="translate(98 41.9999)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/grdf.svg b/src/assets/icons/visu/partnerSteps/grdf.svg
new file mode 100644
index 000000000..564e21d8a
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/grdf.svg
@@ -0,0 +1,37 @@
+<svg width="220" height="220" viewBox="0 0 220 220" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5293 131.207H115.611V199.241C115.611 201.174 114.044 202.741 112.111 202.741H6.0293C4.0963 202.741 2.5293 201.174 2.5293 199.241V131.207Z" fill="url(#paint0_linear_11182_69332)" stroke="#52616C"/>
+<path d="M2.0293 123.962C2.0293 121.753 3.82016 119.962 6.0293 119.962H112.111C114.321 119.962 116.111 121.753 116.111 123.962V130.707H2.0293V123.962Z" fill="#52616C"/>
+<ellipse cx="8.90131" cy="126.678" rx="2.74897" ry="2.68643" fill="#FF5F5F"/>
+<ellipse cx="17.1484" cy="126.678" rx="2.74897" ry="2.68643" fill="#FFB850"/>
+<ellipse cx="25.3954" cy="126.678" rx="2.74896" ry="2.68643" fill="#3CE800"/>
+<path d="M44.2788 179.917V181.115H39.0259V184.723H43.2786V185.875H39.0259V189.582H44.2788V190.78H37.5371V179.917H44.2788Z" fill="white"/>
+<path d="M51.4717 184.465C51.431 184.521 51.3902 184.564 51.3495 184.594C51.3088 184.624 51.2503 184.64 51.1739 184.64C51.0976 184.64 51.0136 184.609 50.922 184.549C50.8354 184.483 50.7235 184.412 50.586 184.336C50.4486 184.261 50.2806 184.192 50.0821 184.132C49.8887 184.066 49.6495 184.033 49.3644 184.033C48.9878 184.033 48.6544 184.101 48.3643 184.238C48.0741 184.369 47.8298 184.561 47.6313 184.814C47.4379 185.067 47.2903 185.372 47.1885 185.731C47.0918 186.09 47.0434 186.492 47.0434 186.937C47.0434 187.402 47.0969 187.816 47.2038 188.18C47.3106 188.539 47.4608 188.842 47.6542 189.09C47.8476 189.332 48.0818 189.519 48.3566 189.651C48.6366 189.777 48.9496 189.84 49.2957 189.84C49.6266 189.84 49.8989 189.802 50.1127 189.726C50.3264 189.645 50.5046 189.557 50.6471 189.461C50.7896 189.365 50.9067 189.279 50.9983 189.203C51.0899 189.122 51.1816 189.082 51.2732 189.082C51.3902 189.082 51.4768 189.125 51.5328 189.211L51.9145 189.704C51.5786 190.113 51.1586 190.414 50.6547 190.606C50.1508 190.793 49.6189 190.886 49.059 190.886C48.5755 190.886 48.125 190.798 47.7077 190.621C47.2954 190.444 46.9365 190.189 46.6311 189.855C46.3257 189.517 46.084 189.102 45.9058 188.612C45.7328 188.122 45.6462 187.563 45.6462 186.937C45.6462 186.366 45.7251 185.837 45.8829 185.352C46.0458 184.867 46.2799 184.45 46.5853 184.101C46.8958 183.748 47.2776 183.472 47.7306 183.275C48.1836 183.078 48.7027 182.979 49.2881 182.979C49.8276 182.979 50.3061 183.068 50.7235 183.245C51.1408 183.417 51.5099 183.662 51.8305 183.98L51.4717 184.465Z" fill="white"/>
+<path d="M56.4542 182.979C57.0192 182.979 57.5282 183.073 57.9812 183.26C58.4393 183.447 58.8261 183.712 59.1417 184.056C59.4623 184.4 59.7067 184.817 59.8746 185.307C60.0477 185.792 60.1342 186.335 60.1342 186.937C60.1342 187.543 60.0477 188.089 59.8746 188.574C59.7067 189.059 59.4623 189.474 59.1417 189.817C58.8261 190.161 58.4393 190.426 57.9812 190.613C57.5282 190.795 57.0192 190.886 56.4542 190.886C55.8892 190.886 55.3777 190.795 54.9196 190.613C54.4666 190.426 54.0797 190.161 53.7591 189.817C53.4384 189.474 53.1915 189.059 53.0185 188.574C52.8454 188.089 52.7589 187.543 52.7589 186.937C52.7589 186.335 52.8454 185.792 53.0185 185.307C53.1915 184.817 53.4384 184.4 53.7591 184.056C54.0797 183.712 54.4666 183.447 54.9196 183.26C55.3777 183.073 55.8892 182.979 56.4542 182.979ZM56.4542 189.832C57.2177 189.832 57.7878 189.58 58.1644 189.074C58.5411 188.564 58.7294 187.854 58.7294 186.944C58.7294 186.029 58.5411 185.317 58.1644 184.806C57.7878 184.296 57.2177 184.041 56.4542 184.041C56.0673 184.041 55.7314 184.106 55.4464 184.238C55.1613 184.369 54.9221 184.559 54.7287 184.806C54.5404 185.054 54.3978 185.36 54.3011 185.724C54.2095 186.083 54.1637 186.489 54.1637 186.944C54.1637 187.399 54.2095 187.806 54.3011 188.165C54.3978 188.524 54.5404 188.827 54.7287 189.074C54.9221 189.317 55.1613 189.504 55.4464 189.635C55.7314 189.767 56.0673 189.832 56.4542 189.832Z" fill="white"/>
+<path d="M63.3205 179.614V190.78H61.9615V179.614H63.3205Z" fill="white"/>
+<path d="M67.9833 193.047C67.9375 193.148 67.8789 193.229 67.8077 193.289C67.7415 193.35 67.6372 193.38 67.4946 193.38H66.4868L67.8993 190.333L64.7079 183.101H65.8837C66.0007 183.101 66.0924 183.131 66.1585 183.192C66.2247 183.247 66.2731 183.311 66.3036 183.381L68.3727 188.218C68.4185 188.329 68.4566 188.44 68.4872 188.551C68.5228 188.662 68.5534 188.776 68.5788 188.892C68.6144 188.776 68.6501 188.662 68.6857 188.551C68.7213 188.44 68.762 188.326 68.8078 188.21L70.8158 183.381C70.8464 183.3 70.8973 183.235 70.9685 183.184C71.0449 183.129 71.1263 183.101 71.2128 183.101H72.297L67.9833 193.047Z" fill="white"/>
+<path d="M76.466 182.979C77.031 182.979 77.54 183.073 77.993 183.26C78.4511 183.447 78.838 183.712 79.1535 184.056C79.4742 184.4 79.7185 184.817 79.8865 185.307C80.0595 185.792 80.1461 186.335 80.1461 186.937C80.1461 187.543 80.0595 188.089 79.8865 188.574C79.7185 189.059 79.4742 189.474 79.1535 189.817C78.838 190.161 78.4511 190.426 77.993 190.613C77.54 190.795 77.031 190.886 76.466 190.886C75.9011 190.886 75.3895 190.795 74.9314 190.613C74.4784 190.426 74.0916 190.161 73.7709 189.817C73.4502 189.474 73.2034 189.059 73.0303 188.574C72.8573 188.089 72.7707 187.543 72.7707 186.937C72.7707 186.335 72.8573 185.792 73.0303 185.307C73.2034 184.817 73.4502 184.4 73.7709 184.056C74.0916 183.712 74.4784 183.447 74.9314 183.26C75.3895 183.073 75.9011 182.979 76.466 182.979ZM76.466 189.832C77.2295 189.832 77.7996 189.58 78.1763 189.074C78.5529 188.564 78.7412 187.854 78.7412 186.944C78.7412 186.029 78.5529 185.317 78.1763 184.806C77.7996 184.296 77.2295 184.041 76.466 184.041C76.0792 184.041 75.7433 184.106 75.4582 184.238C75.1732 184.369 74.934 184.559 74.7405 184.806C74.5522 185.054 74.4097 185.36 74.313 185.724C74.2214 186.083 74.1756 186.489 74.1756 186.944C74.1756 187.399 74.2214 187.806 74.313 188.165C74.4097 188.524 74.5522 188.827 74.7405 189.074C74.934 189.317 75.1732 189.504 75.4582 189.635C75.7433 189.767 76.0792 189.832 76.466 189.832Z" fill="white"/>
+<path d="M59.1015 174.342C74.561 168.216 73.3594 159.506 72.5584 146.515C67.5922 146.293 63.1866 144.743 59.1015 142.16C55.0163 144.743 50.6107 146.293 45.6445 146.515C44.8435 159.506 43.6419 168.216 59.1015 174.342Z" fill="#1B1C22"/>
+<path d="M59.1014 139.79L58.0541 140.452C54.2241 142.874 50.1454 144.301 45.5575 144.505L43.7785 144.584L43.6673 146.389C43.6342 146.925 43.5999 147.458 43.5657 147.988C43.1983 153.691 42.8537 159.041 44.4 163.651C46.1826 168.965 50.3182 173.02 58.3811 176.215L59.1014 176.501V174.342C44.248 168.456 44.7748 160.184 45.5494 148.023C45.581 147.527 45.613 147.024 45.6444 146.515C50.6107 146.293 55.0162 144.743 59.1014 142.16V139.79Z" fill="#FFC600"/>
+<path d="M59.1017 139.79L60.1491 140.452C63.979 142.874 68.0577 144.301 72.6456 144.505L74.4246 144.584L74.5359 146.389C74.5689 146.925 74.6032 147.458 74.6374 147.988C75.0048 153.691 75.3494 159.041 73.8032 163.651C72.0205 168.965 67.8849 173.02 59.822 176.215L59.1017 176.501V174.342C73.9551 168.456 73.4283 160.184 72.6538 148.023C72.6221 147.527 72.5901 147.024 72.5587 146.515C67.5925 146.293 63.1869 144.743 59.1017 142.16V139.79Z" fill="#DB8300"/>
+<path d="M54.2159 152.442H54.9187C55.1994 152.442 55.4686 152.554 55.667 152.754C55.8655 152.953 55.977 153.223 55.977 153.505V164.285H53.1576V153.505C53.1576 153.223 53.2691 152.953 53.4676 152.754C53.666 152.554 53.9352 152.442 54.2159 152.442ZM59.099 157.692H59.8018C60.0824 157.692 60.3516 157.804 60.5501 158.003C60.7486 158.202 60.8601 158.472 60.8601 158.754V164.285H58.0407V158.754C58.0407 158.472 58.1522 158.202 58.3506 158.003C58.5491 157.804 58.8183 157.692 59.099 157.692ZM64.2731 155.661H64.9759C65.2566 155.661 65.5257 155.773 65.7242 155.972C65.9227 156.172 66.0342 156.442 66.0342 156.723V164.285H63.2148V156.723C63.2148 156.442 63.3263 156.172 63.5248 155.972C63.7232 155.773 63.9924 155.661 64.2731 155.661Z" fill="#FFC600"/>
+<path d="M121.39 51.5078C105.493 53.5147 90.8171 61.0771 79.9564 72.8584C69.0957 84.6396 62.7497 99.8811 62.04 115.889" stroke="#A0A0A0" stroke-width="2"/>
+<path d="M131.5 25.5H213.5V75C213.5 76.933 211.933 78.5 210 78.5H135C133.067 78.5 131.5 76.933 131.5 75V25.5Z" fill="white" stroke="#A2B4C1"/>
+<path d="M131 21C131 18.7909 132.791 17 135 17H210C212.209 17 214 18.7909 214 21V25H131V21Z" fill="#A2B4C1"/>
+<circle cx="136" cy="22" r="2" fill="#FF5F5F"/>
+<circle cx="142" cy="22" r="2" fill="#FFB850"/>
+<circle cx="148" cy="22" r="2" fill="#3CE800"/>
+<path d="M180.92 68.1802C180.92 68.466 180.682 68.6946 180.394 68.6946H170.678C170.392 68.6946 170.159 68.466 170.159 68.1802V66.704C170.159 66.4196 170.392 66.1885 170.678 66.1885H180.394C180.682 66.1885 180.92 66.4196 180.92 66.704V68.1802Z" fill="#FAB200"/>
+<path d="M194.4 44.0361V52.8037C195.199 52.1557 196.468 51.9396 198.456 51.8126L198.451 47.8611H201.626C203.295 47.7869 207.008 47.2958 207 44.0361H194.4Z" fill="#71B857"/>
+<path d="M204.001 51.7122H204.842C204.842 51.7122 204.84 52.3049 204.84 52.5365C204.84 54.3568 203.216 55.2797 200.021 55.2797H198.451V58.2948C198.451 59.3562 198.195 61.8055 195.76 61.8568H194.399V57.4402C194.785 52.3432 201.618 51.767 204.001 51.7122Z" fill="#71B857"/>
+<path d="M185.513 44.0401L176.674 44.0371V61.8561C179.755 61.4816 180.881 60.0447 181.045 57.9265V47.8586H184.93C184.978 47.8617 185.032 47.8647 185.087 47.8677C185.181 47.8728 185.275 47.878 185.339 47.884C187.183 48.1001 188.357 48.896 188.476 52.5492C188.49 52.6922 188.486 52.853 188.482 52.999C188.48 53.0635 188.478 53.1253 188.478 53.1812C188.384 59.0994 183.799 60.9118 181.26 61.5732L181.247 61.5777C181.216 61.5902 181.195 61.6051 181.195 61.6355V61.7949C181.195 61.8272 181.22 61.8516 181.247 61.8551L181.255 61.8561H181.553C185.254 61.8561 192.693 60.9721 192.693 52.986V52.84C192.65 45.9187 189.614 44.0401 185.513 44.0401Z" fill="#00B1AF"/>
+<path d="M168.96 47.8756L166.871 47.8586C166.738 47.8586 166.608 47.8531 166.475 47.8437C163.9 47.6629 162.429 45.735 161.829 44.7239C161.692 44.5167 161.561 44.3041 161.437 44.0795C161.437 44.0795 161.425 44.0361 161.446 44.0361H167.422C169.421 44.0361 170.254 44.1577 171.139 44.4983C171.348 44.575 171.566 44.6696 171.796 44.7747C173.08 45.3674 173.949 46.4292 174.297 47.7914C174.349 47.9791 174.382 48.1799 174.41 48.3806C174.449 48.645 174.471 48.9204 174.471 49.2053C174.475 51.3235 173.402 52.5313 171.916 53.3769C171.914 53.3804 171.89 53.3944 171.89 53.3944C171.869 53.4018 171.869 53.4018 171.858 53.4113C171.841 53.4192 171.827 53.4279 171.813 53.436C171.804 53.4412 171.796 53.4462 171.788 53.4507C171.783 53.4507 171.761 53.4666 171.761 53.4666C171.588 53.5523 171.418 53.605 171.259 53.6434C171.234 53.6484 171.21 53.6548 171.188 53.6607C171.168 53.6659 171.15 53.6708 171.133 53.6743V49.5022C171.078 48.2162 169.926 47.88 169.264 47.88C169.243 47.88 169.221 47.8803 169.199 47.8805C169.126 47.8812 169.047 47.882 168.96 47.8756Z" fill="#009BC4"/>
+<path d="M164.521 52.7194C163.514 52.7578 163.417 53.6697 163.405 53.8485V56.5389H167.186C167.505 56.9991 167.822 57.4546 168.117 57.8781L168.452 58.3598C168.878 58.9619 169.287 59.5302 169.457 59.7478C169.468 59.7629 169.482 59.7817 169.498 59.8037C169.712 60.1026 170.359 61.0032 172.592 61.5418C173.409 61.7378 174.309 61.7961 174.812 61.8287C174.904 61.8346 174.982 61.8397 175.045 61.8446L175.269 61.8555L175.245 61.8127C175.245 61.8127 174.84 61.2619 174.329 60.3933L174.218 60.2038C173.514 59.0067 171.128 54.9464 170.67 54.1538C170.257 53.4391 169.6 53.1208 168.928 52.9276H168.921C168.44 52.7961 167.911 52.7458 167.515 52.7259C167.497 52.7252 167.48 52.7241 167.463 52.7231C167.433 52.7212 167.404 52.7194 167.373 52.7194H164.521Z" fill="#009BC4"/>
+<path d="M159.958 52.7197C160.917 52.7636 161.048 53.6053 161.064 53.8259V58.1903C161.042 58.2177 161.021 58.2456 160.998 58.2738C160.904 58.3946 160.805 58.5204 160.703 58.6335C160.515 58.8372 160.215 59.1515 160.103 59.2571C158.043 61.1895 155.623 61.8932 153.365 61.8932C151.51 61.8932 148.956 61.3135 146.782 59.2531C143.092 55.7429 143.055 50.122 146.779 46.6451C147.469 46.0056 147.737 45.7666 148.835 45.15C150.35 44.2958 152.068 44 153.455 44C154.674 44 156.008 44.2605 157.006 44.6684C157.239 44.7615 157.502 44.8726 157.832 45.0608C158.715 45.5658 159.875 46.4514 160.454 47.8514V47.8578H149.556V54.3987C149.639 55.5646 149.895 56.4899 150.62 57.1404C151.205 57.6678 152.099 58.0135 153.455 58.1494C153.89 58.1957 154.377 58.2181 154.917 58.2181L157.286 58.2127C157.263 58.2052 157.174 58.1494 156.845 57.746C156.436 57.2385 156.345 56.3699 156.345 55.721H156.343V52.7188L159.958 52.7197Z" fill="#0053A2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M188.731 87C193.047 94.9617 195.732 103.771 196.553 112.912C197.9 127.919 194.144 142.942 185.892 155.548C177.643 168.152 165.384 177.603 151.097 182.375C147.902 183.347 139.667 184.868 121.422 184.992L126.071 180.343C126.462 179.953 126.462 179.319 126.071 178.929C125.681 178.538 125.047 178.538 124.657 178.929L118.293 185.293C117.902 185.683 117.902 186.317 118.293 186.707L124.657 193.071C125.047 193.462 125.681 193.462 126.071 193.071C126.462 192.681 126.462 192.047 126.071 191.657L121.406 186.992C139.762 186.869 148.23 185.34 151.693 184.284L151.705 184.28L151.718 184.276C166.437 179.363 179.068 169.627 187.566 156.644C196.064 143.66 199.932 128.189 198.545 112.734C197.732 103.683 195.145 94.9472 190.996 87H188.731Z" fill="#A0A0A0"/>
+<defs>
+<linearGradient id="paint0_linear_11182_69332" x1="57.1095" y1="130.707" x2="57.1095" y2="203.241" gradientUnits="userSpaceOnUse">
+<stop stop-color="#323339"/>
+<stop offset="1" stop-color="#25262B"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/icons/visu/partnerSteps/water_bill.svg b/src/assets/icons/visu/partnerSteps/water_bill.svg
new file mode 100644
index 000000000..aee720326
--- /dev/null
+++ b/src/assets/icons/visu/partnerSteps/water_bill.svg
@@ -0,0 +1,36 @@
+<svg width="217" height="229" viewBox="0 0 217 229" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11182_69128)">
+<path d="M194.592 47.1556L195.68 44.7462L193.068 44.3563L69.6931 25.939L68.1961 25.7155L67.5728 27.0965L45.7985 75.3369L44.6689 75.1683L44.9407 77.2374L44.0877 79.1272L45.2109 79.2949L51.9551 130.644L26.3996 185.776L25.2762 188.2L27.9156 188.594L151.291 207.011L152.772 207.232L153.402 205.872L179.202 150.212L179.447 149.685L179.371 149.11L172.429 96.2575L194.592 47.1556Z" stroke="#1761A4" stroke-width="4"/>
+<path d="M54.0131 130.955L177.388 149.373L151.588 205.032L28.2132 186.615L54.0131 130.955Z" fill="white"/>
+<path d="M54.013 130.956L177.388 149.373L170.372 95.9562L46.9969 77.5389L54.013 130.956Z" fill="#D7E6F4"/>
+<path d="M69.3949 27.9171L192.77 46.3344L170.372 95.9557L46.9973 77.5384L69.3949 27.9171Z" fill="white"/>
+<mask id="mask0_11182_69128" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="45" y="135" width="117" height="51">
+<path d="M63.7506 135.385L161.53 149.982L151.176 175.245L112.204 169.428L104.693 185.535L45.2441 176.661L63.7506 135.385Z" fill="#D87B39"/>
+</mask>
+<g mask="url(#mask0_11182_69128)">
+<rect x="54.46" y="138.759" width="115.525" height="4.70872" transform="rotate(8.49036 54.46 138.759)" fill="#3A98EC"/>
+<path d="M47.6582 152.129L156.987 168.449L155.422 172.976L46.963 156.786L47.6582 152.129Z" fill="#3A98EC"/>
+<rect x="42.6621" y="166.158" width="115.525" height="4.70866" transform="rotate(8.49036 42.6621 166.158)" fill="#3A98EC"/>
+</g>
+<mask id="mask1_11182_69128" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="57" y="83" width="109" height="61">
+<path d="M159.591 98.5124L57.9883 83.3452L63.6334 128.226L165.236 143.393L159.591 98.5124Z" fill="#D87B39"/>
+</mask>
+<g mask="url(#mask1_11182_69128)">
+<rect x="55.207" y="101.973" width="115.525" height="4.70871" transform="rotate(8.49036 55.207 101.973)" fill="#3A98EC"/>
+<path d="M52.2646 86.7898L100.634 94.0103L102.582 99.9958L51.4331 92.3603L52.2646 86.7898Z" fill="#3A98EC"/>
+<rect x="56.6016" y="116.464" width="115.525" height="4.7087" transform="rotate(8.49036 56.6016 116.464)" fill="#3A98EC"/>
+</g>
+<g clip-path="url(#clip1_11182_69128)">
+<circle cx="116" cy="60" r="14.8636" transform="rotate(9.46591 116 60)" fill="white" stroke="#3A98EC" stroke-width="3"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M99.6956 61.4298C101.505 58.8886 105.163 55.4505 109.632 56.1957C112.861 56.7341 114.147 58.9765 115.432 61.2189C116.718 63.4613 118.003 65.7037 121.232 66.242C124.536 66.793 126.941 64.7802 129.058 63.0076C130.206 62.0465 131.27 61.156 132.347 60.7831C132.316 61.4151 132.248 62.0521 132.142 62.6915C130.655 71.6058 122.224 77.6274 113.31 76.1411C105.789 74.8872 100.327 68.6899 99.6956 61.4298Z" fill="#3A98EC"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_11182_69128">
+<rect width="190" height="196" fill="white" transform="translate(28.9375 7) rotate(8.49036)"/>
+</clipPath>
+<clipPath id="clip1_11182_69128">
+<rect width="36" height="36" fill="white" transform="translate(101.206 39.2848) rotate(9.46591)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/ActivateHalfHourLoad/ActivateHalfHourLoad.tsx b/src/components/ActivateHalfHourLoad/ActivateHalfHourLoad.tsx
index 4fd9355a9..432a7cf63 100644
--- a/src/components/ActivateHalfHourLoad/ActivateHalfHourLoad.tsx
+++ b/src/components/ActivateHalfHourLoad/ActivateHalfHourLoad.tsx
@@ -10,7 +10,7 @@ import { UserExplorationID } from 'enum/userExploration.enum'
import { FluidConfig } from 'models'
interface ActivateHalfHourLoadProps {
- consentActive: boolean
+ consentActive?: boolean
}
const ActivateHalfHourLoad: React.FC<ActivateHalfHourLoadProps> = ({
diff --git a/src/components/Analysis/ElecHalfHourChart.spec.tsx b/src/components/Analysis/ElecHalfHourChart.spec.tsx
new file mode 100644
index 000000000..702caef22
--- /dev/null
+++ b/src/components/Analysis/ElecHalfHourChart.spec.tsx
@@ -0,0 +1,68 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import ElecHalfHourChart from './ElecHalfHourChart'
+import * as reactRedux from 'react-redux'
+import { DateTime } from 'luxon'
+import { dataLoadArray } from '../../../tests/__mocks__/datachartData.mock'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+const mockcompareStepDate = jest.fn()
+jest.mock('services/dateChart.service', () => {
+ return jest.fn(() => {
+ return {
+ compareStepDate: mockcompareStepDate,
+ }
+ })
+})
+const mockStore = configureStore([])
+const mockUseSelector = jest.spyOn(reactRedux, 'useSelector')
+
+describe('ElecHalfHourChart component', () => {
+ it('should be rendered correctly', () => {
+ const store = mockStore({
+ ecolyo: {
+ global: globalStateData,
+ },
+ })
+ mockUseSelector.mockReturnValue(
+ DateTime.fromISO('2021-07-01T00:00:00.000Z', {
+ zone: 'utc',
+ })
+ )
+ const wrapper = mount(
+ <Provider store={store}>
+ <ElecHalfHourChart dataLoad={dataLoadArray} isWeekend={true} />
+ </Provider>
+ ).getElement()
+ expect(wrapper).toMatchSnapshot()
+ })
+ it('should render week data', () => {
+ const store = mockStore({
+ ecolyo: {
+ global: globalStateData,
+ },
+ })
+ mockUseSelector.mockReturnValue(
+ DateTime.fromISO('2021-07-01T00:00:00.000Z', {
+ zone: 'utc',
+ })
+ )
+ const wrapper = mount(
+ <Provider store={store}>
+ <ElecHalfHourChart dataLoad={dataLoadArray} isWeekend={false} />
+ </Provider>
+ )
+ expect(wrapper.find('.week')).toBeTruthy()
+ })
+})
diff --git a/src/components/Analysis/ElecHalfHourChart.tsx b/src/components/Analysis/ElecHalfHourChart.tsx
new file mode 100644
index 000000000..3d2c1990f
--- /dev/null
+++ b/src/components/Analysis/ElecHalfHourChart.tsx
@@ -0,0 +1,120 @@
+import React, { useEffect, useRef, useState } from 'react'
+import Bar from 'components/Charts/Bar'
+import AxisBottom from 'components/Charts/AxisBottom'
+import AxisRight from 'components/Charts/AxisRight'
+import { FluidType } from 'enum/fluid.enum'
+import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
+import { DateTime } from 'luxon'
+import { TimeStep } from 'enum/timeStep.enum'
+import { Dataload } from 'models'
+import './elecHalfHourMonthlyAnalysis.scss'
+
+interface ElecHalfHourChartProps {
+ dataLoad: Dataload[]
+ isWeekend: boolean
+}
+
+const ElecHalfHourChart = ({ dataLoad, isWeekend }: ElecHalfHourChartProps) => {
+ const [width, setWidth] = useState<number>(0)
+ const [height, setHeight] = useState<number>(0)
+ const chartContainer = useRef<HTMLDivElement>(null)
+ const marginLeft = 10
+ const marginRight = 10
+ const marginTop = 20
+ const marginBottom = 50
+ const getContentWidth = () => {
+ return width - marginLeft - marginRight
+ }
+
+ const getContentHeight = () => {
+ return height - marginTop - marginBottom
+ }
+ const getMaxLoad = () => {
+ const maxLoad = dataLoad
+ ? Math.max(...dataLoad.map((d: Dataload) => d.value))
+ : 0
+ return maxLoad
+ }
+
+ const xScale: ScaleBand<string> = scaleBand()
+ .domain(
+ dataLoad.map((d: Dataload) =>
+ d.date.toLocaleString(DateTime.DATETIME_SHORT)
+ )
+ )
+ .range([0, getContentWidth()])
+ .padding(0.2)
+
+ const yScale: ScaleLinear<number, number> = scaleLinear()
+ .domain([0, getMaxLoad()])
+ .range([getContentHeight(), 0])
+
+ useEffect(() => {
+ function handleResize() {
+ const maxWidth = 940
+ const maxHeight = 200
+ const _width = chartContainer.current
+ ? chartContainer.current.offsetWidth > maxWidth
+ ? maxWidth
+ : chartContainer.current.offsetWidth
+ : 400
+ setWidth(_width)
+ const _height = chartContainer.current
+ ? chartContainer.current.offsetHeight > maxHeight
+ ? maxHeight
+ : chartContainer.current.offsetHeight
+ : 200
+ setHeight(_height)
+ }
+ handleResize()
+ window.addEventListener('resize', handleResize)
+ return () => window.removeEventListener('resize', handleResize)
+ }, [])
+
+ return (
+ <div className="graph-elec-half-hour" ref={chartContainer}>
+ <svg width={width} height={height}>
+ <AxisRight
+ fluidType={FluidType.ELECTRICITY}
+ yScale={yScale}
+ width={width}
+ marginRight={marginRight}
+ marginTop={marginTop}
+ isAnalysis={true}
+ />
+ <g transform={`translate(${10},${10})`}>
+ {dataLoad.map((value, index) => {
+ return (
+ <Bar
+ key={index}
+ index={index}
+ dataload={value}
+ compareDataload={null}
+ fluidType={FluidType.ELECTRICITY}
+ timeStep={TimeStep.HALF_AN_HOUR}
+ showCompare={false}
+ xScale={xScale}
+ yScale={yScale}
+ height={getContentHeight()}
+ isSwitching={false}
+ isDuel={false}
+ weekdays={isWeekend ? 'weekend' : 'week'}
+ />
+ )
+ })}
+ </g>
+ <AxisBottom
+ data={dataLoad}
+ timeStep={TimeStep.HALF_AN_HOUR}
+ xScale={xScale}
+ height={height}
+ marginLeft={marginLeft}
+ marginBottom={marginBottom}
+ isDuel={false}
+ />
+ </svg>
+ </div>
+ )
+}
+
+export default ElecHalfHourChart
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
new file mode 100644
index 000000000..ebff1dd6d
--- /dev/null
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
@@ -0,0 +1,80 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
+import { Provider } from 'react-redux'
+import configureStore from 'redux-mock-store'
+import * as reactRedux from 'react-redux'
+import { DateTime } from 'luxon'
+import ElecHalfHourMonthlyAnalysis from './ElecHalfHourMonthlyAnalysis'
+import { IconButton } from '@material-ui/core'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+const mockcompareStepDate = jest.fn()
+jest.mock('services/dateChart.service', () => {
+ return jest.fn(() => {
+ return {
+ compareStepDate: mockcompareStepDate,
+ }
+ })
+})
+const mockStore = configureStore([])
+const mockUseSelector = jest.spyOn(reactRedux, 'useSelector')
+
+describe('ElecHalfHourMonthlyAnalysis component', () => {
+ it('should be rendered correctly', () => {
+ const store = mockStore({
+ ecolyo: {
+ global: globalStateData,
+ },
+ })
+ mockUseSelector.mockReturnValue(
+ DateTime.fromISO('2021-07-01T00:00:00.000Z', {
+ zone: 'utc',
+ })
+ )
+ const wrapper = mount(
+ <Provider store={store}>
+ <ElecHalfHourMonthlyAnalysis
+ analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', {
+ zone: 'utc',
+ })}
+ />
+ </Provider>
+ ).getElement()
+ expect(wrapper).toMatchSnapshot()
+ })
+ it('should change from weekend to week', async () => {
+ const store = mockStore({
+ ecolyo: {
+ global: globalStateData,
+ },
+ })
+ mockUseSelector.mockReturnValue(
+ DateTime.fromISO('2021-07-01T00:00:00.000Z', {
+ zone: 'utc',
+ })
+ )
+ const wrapper = mount(
+ <Provider store={store}>
+ <ElecHalfHourMonthlyAnalysis
+ analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', {
+ zone: 'utc',
+ })}
+ />
+ </Provider>
+ )
+ wrapper
+ .find(IconButton)
+ .first()
+ .simulate('click')
+ expect(wrapper.find('.weekend')).toBeTruthy()
+ })
+})
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx
new file mode 100644
index 000000000..1320e16c0
--- /dev/null
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx
@@ -0,0 +1,223 @@
+import React, { useEffect, useState } from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import LeftArrowIcon from 'assets/icons/ico/left-arrow.svg'
+import RigthArrowIcon from 'assets/icons/ico/right-arrow.svg'
+import MinIcon from 'assets/icons/ico/minimum.svg'
+import MaxPowerIcon from 'assets/icons/ico/maxPower.svg'
+import IconButton from '@material-ui/core/IconButton'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { FluidType } from 'enum/fluid.enum'
+import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import { UserExplorationID } from 'enum/userExploration.enum'
+import { getNavPicto } from 'utils/picto'
+import { DateTime } from 'luxon'
+import { useClient } from 'cozy-client'
+import EnedisMonthlyAnalysisDataService from 'services/enedisMonthlyAnalysisData.service'
+import ConsumptionService from 'services/consumption.service'
+import {
+ AggregatedEnedisMonthlyDataloads,
+ EnedisMonthlyAnalysisData,
+} from 'models/enedisMonthlyAnalysis'
+import ElecHalfHourChart from './ElecHalfHourChart'
+import './elecHalfHourMonthlyAnalysis.scss'
+import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
+import { TimeStep } from 'enum/timeStep.enum'
+import { Button } from '@material-ui/core'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import useExploration from 'components/Hooks/useExploration'
+import { FluidConfig } from 'models'
+import ConfigService from 'services/fluidConfig.service'
+
+interface ElecHalfHourMonthlyAnalysisProps {
+ analysisDate: DateTime
+}
+
+const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> = ({
+ analysisDate,
+}: ElecHalfHourMonthlyAnalysisProps) => {
+ const { t } = useI18n()
+ const client = useClient()
+ const fluidConfig: Array<FluidConfig> = new ConfigService().getFluidConfig()
+ const [, setValidExploration] = useExploration()
+ const [isWeekend, setisWeekend] = useState(true)
+ const [isHalfHourActivated, setisHalfHourActivated] = useState(true)
+ const [isLoading, setisLoading] = useState(true)
+ const [monthDataloads, setMonthDataloads] = useState<
+ AggregatedEnedisMonthlyDataloads
+ >()
+ const [enedisAnalysisValues, setenedisAnalysisValues] = useState<
+ EnedisMonthlyAnalysisData
+ >()
+ const handleChangeWeek = () => {
+ setisWeekend(prev => !prev)
+ }
+
+ useEffect(() => {
+ let subscribed = true
+ async function getEnedisAnalysisData() {
+ const cs = new ConsumptionService(client)
+ const activateHalfHourLoad = await cs.checkDoctypeEntries(
+ FluidType.ELECTRICITY,
+ TimeStep.HALF_AN_HOUR
+ )
+ if (activateHalfHourLoad) {
+ const emas = new EnedisMonthlyAnalysisDataService(client)
+ const data = await emas.getEnedisMonthlyAnalysisByDate(
+ analysisDate.year,
+ analysisDate.month - 1
+ )
+ if (data && data.length) {
+ const aggregatedData = emas.aggregateValuesToDataLoad(data[0])
+ setenedisAnalysisValues(data[0])
+ setMonthDataloads(aggregatedData)
+ }
+ } else {
+ setisHalfHourActivated(false)
+ }
+ setisLoading(false)
+ }
+ if (subscribed) {
+ getEnedisAnalysisData()
+ }
+ return () => {
+ subscribed = false
+ }
+ }, [analysisDate, client])
+
+ return (
+ <div className="special-elec-container">
+ <Icon
+ className="elec-icon"
+ icon={getNavPicto(FluidType.ELECTRICITY, true, true)}
+ size={42}
+ />
+ <div className="text-18-normal title">{t('special_elec.title')}</div>
+ {isHalfHourActivated ? (
+ <>
+ <div className="navigator">
+ <IconButton
+ aria-label={t('consumption.accessibility.button_previous_value')}
+ onClick={handleChangeWeek}
+ className="arrow-prev"
+ >
+ <Icon icon={LeftArrowIcon} size={24} />
+ </IconButton>
+ <div className="average text-18-normal">
+ <div className="text-1">{t('special_elec.average')}</div>
+ <div className="text-2 text-18-bold">
+ {t('special_elec.weektype')}{' '}
+ <span className={isWeekend ? 'weekend' : 'week'}>
+ {isWeekend
+ ? t('special_elec.weekend')
+ : t('special_elec.week')}
+ </span>
+ </div>
+ </div>
+ <IconButton
+ aria-label={t('consumption.accessibility.button_previous_value')}
+ onClick={handleChangeWeek}
+ className="arrow-next"
+ >
+ <Icon icon={RigthArrowIcon} size={24} />
+ </IconButton>
+ </div>
+ {!isLoading ? (
+ <>
+ {monthDataloads ? (
+ <ElecHalfHourChart
+ dataLoad={
+ isWeekend ? monthDataloads.weekend : monthDataloads.week
+ }
+ isWeekend={isWeekend}
+ />
+ ) : (
+ <p className={`text-20-bold no_data`}>
+ {t('analysis.no_data')}
+ </p>
+ )}
+ {enedisAnalysisValues && (
+ <div className="min-max">
+ <div className="container">
+ <Icon icon={MinIcon} size={40} className="minIcon" />
+ <div className="text">
+ <div className="min text-18-normal">
+ {t('special_elec.min')}
+ </div>
+ <div className="value text-18-bold">
+ {enedisAnalysisValues.minLoad !== 0 &&
+ enedisAnalysisValues.minLoad !== null ? (
+ <>
+ {enedisAnalysisValues.minLoad} <span> kWh</span>
+ </>
+ ) : (
+ <span>----</span>
+ )}
+ </div>
+ </div>
+ </div>
+ <div className="container">
+ <Icon icon={MaxPowerIcon} size={40} className="minIcon" />
+ <div className="text">
+ <div className="min text-18-normal">
+ {t('special_elec.maxPower')}
+ </div>
+ <div className="value text-18-bold">
+ {enedisAnalysisValues.maxPower !== 0 &&
+ enedisAnalysisValues.maxPower !== null ? (
+ <>
+ {enedisAnalysisValues.maxPower.toFixed(2)}
+ <span> kVA</span>
+ </>
+ ) : (
+ <span>----</span>
+ )}
+ </div>
+ </div>
+ </div>
+ </div>
+ )}
+ </>
+ ) : (
+ <div className="loader-container">
+ <StyledSpinner size="5em" fluidType={FluidType.ELECTRICITY} />
+ </div>
+ )}
+ </>
+ ) : (
+ <>
+ <div className="activation-text text-18-normal">
+ {t(`timestep.activate.enedis.no_consent_active.text_analysis`)}
+ </div>
+ <Button
+ aria-label={t(
+ `timestep.activate.enedis.no_consent_active.accessibility.button_activate`
+ )}
+ onClick={() => {
+ setValidExploration(UserExplorationID.EXPLORATION004)
+ window.open(fluidConfig[0].konnectorConfig.activation, '_blank')
+ }}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ <div className="oauthform-button-content">
+ <div className="oauthform-button-content-icon">
+ <StyledIcon icon={iconEnedisLogo} size={48} />
+ </div>
+ <div className="oauthform-button-text text-18-bold">
+ <div>
+ {t(
+ `timestep.activate.enedis.no_consent_active.accessibility.button_activate`
+ )}
+ </div>
+ </div>
+ </div>
+ </Button>
+ </>
+ )}
+ </div>
+ )
+}
+
+export default ElecHalfHourMonthlyAnalysis
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index 56640f42e..3576b5bbb 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -23,6 +23,7 @@ import { DateTime } from 'luxon'
import MaxConsumptionCard from './MaxConsumptionCard'
import AnalysisIcon from 'assets/icons/visu/analysis/analysis.svg'
import TotalAnalysisChart from './TotalAnalysisChart'
+import ElecHalfHourMonthlyAnalysis from './ElecHalfHourMonthlyAnalysis'
interface MonthlyAnalysisProps {
analysisDate: DateTime
@@ -180,6 +181,13 @@ const MonthlyAnalysis: React.FC<MonthlyAnalysisProps> = ({
/>
</div>
</div>
+ {fluidTypes.includes(FluidType.ELECTRICITY) && (
+ <div className="analysis-content">
+ <div className="card">
+ <ElecHalfHourMonthlyAnalysis analysisDate={analysisDate} />
+ </div>
+ </div>
+ )}
</>
) : (
<AnalysisErrorModal />
diff --git a/src/components/Analysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap b/src/components/Analysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap
new file mode 100644
index 000000000..4b4a2fe85
--- /dev/null
+++ b/src/components/Analysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap
@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ElecHalfHourChart component should be rendered correctly 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <ElecHalfHourChart
+ dataLoad={
+ Array [
+ Object {
+ "date": "2021-09-23T00:00:00.000Z",
+ "value": 12,
+ "valueDetail": null,
+ },
+ Object {
+ "date": "2021-09-23T00:00:00.000Z",
+ "value": 12,
+ "valueDetail": null,
+ },
+ Object {
+ "date": "2021-09-23T00:00:00.000Z",
+ "value": 12,
+ "valueDetail": null,
+ },
+ Object {
+ "date": "2021-09-23T00:00:00.000Z",
+ "value": 12,
+ "valueDetail": null,
+ },
+ ]
+ }
+ isWeekend={true}
+ />
+</Provider>
+`;
diff --git a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
new file mode 100644
index 000000000..c0386f058
--- /dev/null
+++ b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <ElecHalfHourMonthlyAnalysis
+ analysisDate={"2021-07-01T00:00:00.000Z"}
+ />
+</Provider>
+`;
diff --git a/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss b/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss
new file mode 100644
index 000000000..ec2f61057
--- /dev/null
+++ b/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss
@@ -0,0 +1,58 @@
+@import '../../styles/base/color';
+
+.special-elec-container {
+ color: white;
+ .elec-icon {
+ margin: auto;
+ display: block;
+ }
+ .title {
+ text-align: center;
+ margin-top: 1rem;
+ color: $grey-bright;
+ }
+ .navigator {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ text-align: center;
+ margin: 1rem 0;
+ .text-1 {
+ color: $grey-bright;
+ }
+ .week {
+ color: $elec-compare-color;
+ }
+ .weekend {
+ color: $multi-compare-color;
+ }
+ }
+ .minIcon {
+ margin-right: 0.7rem;
+ }
+ .activation-text {
+ margin: 1rem 0 0.7rem 0;
+ }
+ .oauthform-button-content {
+ display: flex;
+ padding: 0.5rem;
+ }
+ .oauthform-button-text {
+ text-align: left;
+ margin-left: 1rem;
+ }
+ .container {
+ margin-bottom: 1rem;
+ }
+ .loader-container {
+ text-align: center;
+ }
+ .no_data {
+ text-align: center;
+ color: white;
+ }
+}
+.graph-elec-half-hour {
+ height: 13rem;
+}
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 8fbbb027f..171fcd7bc 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -11,15 +11,13 @@ import Navbar from 'components/Navbar/Navbar'
import SplashRoot from 'components/Splash/SplashRoot'
import SplashScreen from 'components/Splash/SplashScreen'
import SplashScreenError from 'components/Splash/SplashScreenError'
-import TutorialWelcome from './Tutorial/TutorialWelcome'
+import WelcomeModal from 'components/Onboarding/WelcomeModal'
export const history = createBrowserHistory()
export const App = () => {
- const { tutorial } = useSelector((state: AppStore) => state.ecolyo.profile)
- const { isLastTermAccepted } = useSelector(
- (state: AppStore) => state.ecolyo.global
- )
+ const { onboarding } = useSelector((state: AppStore) => state.ecolyo.profile)
+ const { termsStatus } = useSelector((state: AppStore) => state.ecolyo.global)
return (
<HashRouter {...history}>
@@ -28,15 +26,15 @@ export const App = () => {
splashComponent={SplashScreen}
splashErrorComponent={SplashScreenError}
>
- {isLastTermAccepted && (
+ {termsStatus.accepted && (
<>
- <TutorialWelcome open={!tutorial.isWelcomeSeen} />
+ <WelcomeModal open={!onboarding.isWelcomeSeen} />
<Navbar />
</>
)}
<Main>
<Content className="app-content">
- <Routes isLastTermAccepted={isLastTermAccepted} />
+ <Routes termsStatus={termsStatus} />
</Content>
</Main>
</SplashRoot>
diff --git a/src/components/Challenge/ChallengeCardUnlocked.tsx b/src/components/Challenge/ChallengeCardUnlocked.tsx
index a12a13aff..d5ad1daa2 100644
--- a/src/components/Challenge/ChallengeCardUnlocked.tsx
+++ b/src/components/Challenge/ChallengeCardUnlocked.tsx
@@ -14,6 +14,7 @@ import defaultIcon from 'assets/icons/visu/challenge/challengeLocked.svg'
import { importIconbyId } from 'utils/utils'
import UsageEventService from 'services/usageEvent.service'
import { UsageEventType } from 'enum/usageEvent.enum'
+import { FluidState } from 'enum/fluid.enum'
interface ChallengeCardUnlockedProps {
userChallenge: UserChallenge
@@ -35,8 +36,11 @@ const ChallengeCardUnlocked: React.FC<ChallengeCardUnlockedProps> = ({
setopenNoFluidModal(prev => !prev)
}, [])
- fluidStatus.forEach(elem => {
- if (elem.status === 200) {
+ fluidStatus.forEach(fluid => {
+ if (
+ fluid.status !== FluidState.NOT_CONNECTED &&
+ fluid.status !== FluidState.KONNECTOR_NOT_FOUND
+ ) {
statusRequirementOk = true
}
})
diff --git a/src/components/Challenge/challengeCardOnGoing.scss b/src/components/Challenge/challengeCardOnGoing.scss
index e616648b2..73bc4b49d 100644
--- a/src/components/Challenge/challengeCardOnGoing.scss
+++ b/src/components/Challenge/challengeCardOnGoing.scss
@@ -20,7 +20,7 @@
right: 0;
margin: auto;
top: -1rem;
- background: rgba(27, 28, 34, 1);
+ background: $dark-light-2;
width: fit-content;
padding: 0 1rem;
max-width: 235px;
diff --git a/src/components/Charts/AxisRight.tsx b/src/components/Charts/AxisRight.tsx
index 7afffbba9..259eb53e5 100644
--- a/src/components/Charts/AxisRight.tsx
+++ b/src/components/Charts/AxisRight.tsx
@@ -11,6 +11,7 @@ interface AxisRightProps {
width: number
marginRight: number
marginTop: number
+ isAnalysis?: boolean
}
const AxisRight = ({
@@ -19,6 +20,7 @@ const AxisRight = ({
width,
marginRight,
marginTop,
+ isAnalysis,
}: AxisRightProps) => {
const { t } = useI18n()
const fluidStyle =
@@ -31,7 +33,7 @@ const AxisRight = ({
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
select(yAxisRef.current!).call(
axisRight(yScale)
- .ticks(4)
+ .ticks(isAnalysis ? 0 : 4)
.tickSize(-width)
.tickSizeOuter(0)
.tickFormat(d =>
diff --git a/src/components/Charts/Bar.tsx b/src/components/Charts/Bar.tsx
index f8db21834..0e259ed6e 100644
--- a/src/components/Charts/Bar.tsx
+++ b/src/components/Charts/Bar.tsx
@@ -27,6 +27,7 @@ interface BarProps {
isSwitching: boolean
isDuel?: boolean
isMultiMissingFluid?: boolean
+ weekdays?: 'week' | 'weekend'
}
const Bar = ({
@@ -42,6 +43,7 @@ const Bar = ({
isSwitching,
isDuel,
isMultiMissingFluid,
+ weekdays,
}: BarProps) => {
const dispatch = useDispatch()
const { selectedDate } = useSelector((state: AppStore) => state.ecolyo.chart)
@@ -90,18 +92,18 @@ const Bar = ({
)
const barClass = clicked
- ? `bar-${fluidStyle} selected bounce-${
+ ? `bar-${fluidStyle} ${weekdays} selected bounce-${
browser && browser.name !== 'edge' ? '2' : '3'
} delay`
: isSelectedDate
? animationEnded
- ? `bar-${fluidStyle} selected`
- : `bar-${fluidStyle} selected bounce-${
+ ? `bar-${fluidStyle} ${weekdays} selected`
+ : `bar-${fluidStyle} ${weekdays} selected bounce-${
browser && browser.name !== 'edge' ? '1' : '3'
} delay--${index % 13}`
: animationEnded
- ? `bar-${fluidStyle} `
- : `bar-${fluidStyle} bounce-${
+ ? `bar-${fluidStyle} ${weekdays}`
+ : `bar-${fluidStyle} ${weekdays} bounce-${
browser && browser.name !== 'edge' ? '1' : '3'
} delay--${index % 13}`
diff --git a/src/components/Connection/Connection.spec.tsx b/src/components/Connection/Connection.spec.tsx
new file mode 100644
index 000000000..bc417a77f
--- /dev/null
+++ b/src/components/Connection/Connection.spec.tsx
@@ -0,0 +1,48 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import Connection from 'components/Connection/Connection'
+import { fluidStatusConnectedData } from '../../../tests/__mocks__/fluidStatusData.mock'
+
+jest.mock('components/Connection/ConnectionLogin', () => {
+ return jest.fn(() => {
+ return <div id="ConnectionLogin" />
+ })
+})
+
+jest.mock('components/Connection/ConnectionOAuth', () => {
+ return jest.fn(() => {
+ return <div id="ConnectionOAuth" />
+ })
+})
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+
+const mockDispatch = jest.fn()
+jest.mock('react-redux', () => ({
+ useDispatch: () => mockDispatch,
+}))
+
+describe('Connection component test', () => {
+ it('should call ConnectionOAuth', () => {
+ const wrapper = mount(
+ <Connection fluidStatus={fluidStatusConnectedData[2]} />
+ )
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+
+ it('should call ConnectionLogin', () => {
+ const wrapper = mount(
+ <Connection fluidStatus={fluidStatusConnectedData[0]} />
+ )
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+})
diff --git a/src/components/Connection/Connection.tsx b/src/components/Connection/Connection.tsx
new file mode 100644
index 000000000..0fae75cc5
--- /dev/null
+++ b/src/components/Connection/Connection.tsx
@@ -0,0 +1,36 @@
+import React, { useCallback } from 'react'
+import { useDispatch } from 'react-redux'
+import { updatedFluidConnection } from 'store/global/global.actions'
+import { FluidStatus, FluidConnection } from 'models'
+
+import ConnectionLogin from 'components/Connection/ConnectionLogin'
+import ConnectionOauth from 'components/Connection/ConnectionOAuth'
+import './connection.scss'
+interface ConnectionProps {
+ fluidStatus: FluidStatus
+}
+
+const Connection: React.FC<ConnectionProps> = ({
+ fluidStatus,
+}: ConnectionProps) => {
+ const dispatch = useDispatch()
+
+ const handleSuccess = useCallback(async () => {
+ const updatedConnection: FluidConnection = {
+ ...fluidStatus.connection,
+ shouldLaunchKonnector: true,
+ }
+ dispatch(updatedFluidConnection(fluidStatus.fluidType, updatedConnection))
+ }, [dispatch, fluidStatus.fluidType, fluidStatus.connection])
+ return (
+ <div className="konnector-form">
+ {!fluidStatus.connection.konnectorConfig.oauth ? (
+ <ConnectionLogin fluidStatus={fluidStatus} onSuccess={handleSuccess} />
+ ) : (
+ <ConnectionOauth fluidStatus={fluidStatus} onSuccess={handleSuccess} />
+ )}
+ </div>
+ )
+}
+
+export default Connection
diff --git a/src/components/Connection/ConnectionForm.spec.tsx b/src/components/Connection/ConnectionForm.spec.tsx
deleted file mode 100644
index 56a041315..000000000
--- a/src/components/Connection/ConnectionForm.spec.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react'
-import { mount } from 'enzyme'
-import ConnectionForm from './ConnectionForm'
-import { fluidStatusConnectedData } from '../../../tests/__mocks__/fluidStatusData.mock'
-
-jest.mock('./OAuthForm.tsx', () => {
- return jest.fn(() => {
- return <></>
- })
-})
-
-jest.mock('cozy-ui/transpiled/react/I18n', () => {
- return {
- useI18n: jest.fn(() => {
- return {
- t: (str: string) => str,
- }
- }),
- }
-})
-
-const mockDispatch = jest.fn()
-jest.mock('react-redux', () => ({
- useDispatch: () => mockDispatch,
-}))
-
-describe('ConnectionForm component test', () => {
- it('should call ConnectionOAuthForm', () => {
- const wrapper = mount(
- <ConnectionForm fluidStatus={fluidStatusConnectedData[2]} />
- )
- expect(wrapper.getElement()).toMatchSnapshot()
- })
-
- it('should call ConnectionLoginForm', () => {
- const wrapper = mount(
- <ConnectionForm fluidStatus={fluidStatusConnectedData[0]} />
- )
- expect(wrapper.getElement()).toMatchSnapshot()
- })
-})
diff --git a/src/components/Connection/ConnectionForm.tsx b/src/components/Connection/ConnectionForm.tsx
deleted file mode 100644
index f66e04b31..000000000
--- a/src/components/Connection/ConnectionForm.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
-import { updatedFluidConnection } from 'store/global/global.actions'
-import { FluidStatus, FluidConnection } from 'models'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-
-import ConnectionFormLogin from 'components/Connection/ConnectionFormLogin'
-import ConnectionFormOauth from 'components/Connection/ConnectionFormOAuth'
-import { FluidType } from 'enum/fluid.enum'
-import './connectionForm.scss'
-interface ConnectionFormProps {
- fluidStatus: FluidStatus
-}
-
-const ConnectionForm: React.FC<ConnectionFormProps> = ({
- fluidStatus,
-}: ConnectionFormProps) => {
- const dispatch = useDispatch()
- const { t } = useI18n()
-
- const handleSuccess = useCallback(async () => {
- const updatedConnection: FluidConnection = {
- ...fluidStatus.connection,
- shouldLaunchKonnector: true,
- }
- dispatch(updatedFluidConnection(fluidStatus.fluidType, updatedConnection))
- }, [dispatch, fluidStatus.fluidType, fluidStatus.connection])
- return (
- <div className="konnector-form">
- <p
- className={`form-title ${FluidType[
- fluidStatus.fluidType
- ].toLowerCase()}`}
- >
- {t(
- `konnector_form.not_connected_${FluidType[
- fluidStatus.fluidType
- ].toLowerCase()}`
- )}
- </p>
- {!fluidStatus.connection.konnectorConfig.oauth ? (
- <ConnectionFormLogin
- fluidStatus={fluidStatus}
- onSuccess={handleSuccess}
- />
- ) : (
- <ConnectionFormOauth
- fluidStatus={fluidStatus}
- onSuccess={handleSuccess}
- />
- )}
- </div>
- )
-}
-
-export default ConnectionForm
diff --git a/src/components/Connection/ConnectionFormOAuth.tsx b/src/components/Connection/ConnectionFormOAuth.tsx
deleted file mode 100644
index 1c882b407..000000000
--- a/src/components/Connection/ConnectionFormOAuth.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import React, { useCallback, useState } from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useClient } from 'cozy-client'
-import { useDispatch } from 'react-redux'
-import './connectionFormOAuth.scss'
-
-import { Konnector, Trigger, FluidStatus, FluidConnection } from 'models'
-import OAuthForm from 'components/Connection/OAuthForm'
-import Button from '@material-ui/core/Button'
-import AccountService from 'services/account.service'
-import TriggerService from 'services/triggers.service'
-import { updatedFluidConnection } from 'store/global/global.actions'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import UsageEventService from 'services/usageEvent.service'
-
-import ConnectionInfoCreationEnedisAccountModal from './ConnectionInfoCreationEnedisAccountModal'
-
-interface ConnectionFormOAuthProps {
- fluidStatus: FluidStatus
- onSuccess: Function
-}
-
-const ConnectionFormOAuth: React.FC<ConnectionFormOAuthProps> = ({
- fluidStatus,
- onSuccess,
-}: ConnectionFormOAuthProps) => {
- const { t } = useI18n()
- const client = useClient()
- const dispatch = useDispatch()
-
- const [
- openConnectionInfoCreationEnedisAccountModal,
- setOpenConnectionInfoCreationEnedisAccountModal,
- ] = useState<boolean>(false)
-
- const konnectorSlug: string = fluidStatus.connection.konnectorConfig.slug
- const siteLink: string = fluidStatus.connection.konnectorConfig.siteLink
- const konnector: Konnector | null = fluidStatus.connection.konnector
-
- const handleSuccess = useCallback(
- async (accountId: string) => {
- if (konnector) {
- const accountService = new AccountService(client)
- const account = await accountService.getAccount(accountId)
- if (!account) {
- const updatedConnection: FluidConnection = {
- ...fluidStatus.connection,
- account: null,
- trigger: null,
- }
- dispatch(
- updatedFluidConnection(fluidStatus.fluidType, updatedConnection)
- )
- await UsageEventService.addEvent(client, {
- type: UsageEventType.KONNECTOR_CONNECT_EVENT,
- target: konnectorSlug,
- result: 'error',
- })
- } else {
- const triggersServices = new TriggerService(client)
- const trigger: Trigger = await triggersServices.createTrigger(
- account,
- konnector
- )
- const updatedConnection: FluidConnection = {
- ...fluidStatus.connection,
- account: account,
- trigger: trigger,
- }
- await UsageEventService.addEvent(client, {
- type: UsageEventType.KONNECTOR_CONNECT_EVENT,
- target: konnectorSlug,
- result: 'success',
- })
- dispatch(
- updatedFluidConnection(fluidStatus.fluidType, updatedConnection)
- )
- onSuccess()
- }
- }
- },
- [
- client,
- konnector,
- dispatch,
- fluidStatus.fluidType,
- fluidStatus.connection,
- onSuccess,
- konnectorSlug,
- ]
- )
-
- const toggleInfoCreationEnedisAccount = useCallback(() => {
- setOpenConnectionInfoCreationEnedisAccountModal(prev => !prev)
- }, [])
-
- const handleSubmit = () => {
- toggleInfoCreationEnedisAccount()
- window.open(siteLink, '_blank')
- }
-
- return (
- <div className="koauthform">
- <p className="koauthform-info-provider text-16-normal">
- {t('auth.' + `${konnectorSlug}` + '.connect.info')}
- </p>
- <p className="koauthform-info-provider text-16-italic info2">
- {t('auth.' + `${konnectorSlug}` + '.connect.info2')}
- </p>
- <div className="koauthform-button">
- <OAuthForm konnector={konnector} onSuccess={handleSuccess} />
- </div>
- <div className="koauthform-text text-16-bold">
- <div className="text-16-bold">
- {t('auth.' + konnectorSlug + '.no_account.title')}
- </div>
- <div className="text-16-normal">
- {t('auth.' + konnectorSlug + '.no_account.text')}
- </div>
- </div>
- <div>
- {konnectorSlug === 'enedisgrandlyon' && (
- <div className="koauthform-button">
- <Button
- aria-label={t('auth.accessibility.button_create_account')}
- onClick={toggleInfoCreationEnedisAccount}
- classes={{
- root: 'btn-secondary-negative',
- label: 'text-16-normal',
- }}
- >
- {t('auth.' + konnectorSlug + '.create_account')}
- </Button>
- </div>
- )}
- </div>
- <ConnectionInfoCreationEnedisAccountModal
- open={openConnectionInfoCreationEnedisAccountModal}
- handleCloseClick={toggleInfoCreationEnedisAccount}
- handleSubmit={handleSubmit}
- />
- </div>
- )
-}
-
-export default ConnectionFormOAuth
diff --git a/src/components/Connection/ConnectionInfoCreationEnedisAccountModal.spec.tsx b/src/components/Connection/ConnectionInfoCreationEnedisAccountModal.spec.tsx
deleted file mode 100644
index 80ae0879d..000000000
--- a/src/components/Connection/ConnectionInfoCreationEnedisAccountModal.spec.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react'
-import { mount } from 'enzyme'
-import ConnectionInfoCreationEnedisAccountModal from './ConnectionInfoCreationEnedisAccountModal'
-import { Button } from '@material-ui/core'
-
-jest.mock('cozy-ui/transpiled/react/I18n', () => {
- return {
- useI18n: jest.fn(() => {
- return {
- t: (str: string) => str,
- }
- }),
- }
-})
-
-const mockHandleCloseClick = jest.fn()
-const mockHandleSubmit = jest.fn()
-
-describe('ConnectionInfoCreationEnedisAccountModal component', () => {
- it('should be rendered correctly open connection info modal', () => {
- const wrapper = mount(
- <ConnectionInfoCreationEnedisAccountModal
- open={true}
- handleCloseClick={mockHandleCloseClick}
- handleSubmit={mockHandleSubmit}
- />
- )
-
- wrapper
- .find(Button)
- .first()
- .simulate('click')
- expect(mockHandleSubmit).toHaveBeenCalled()
- })
-})
diff --git a/src/components/Connection/ConnectionInfoCreationEnedisAccountModal.tsx b/src/components/Connection/ConnectionInfoCreationEnedisAccountModal.tsx
deleted file mode 100644
index c6f08e7c5..000000000
--- a/src/components/Connection/ConnectionInfoCreationEnedisAccountModal.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React from 'react'
-import './connectionInfoCreationEnedisAccountModal.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import Button from '@material-ui/core/Button'
-import Dialog from '@material-ui/core/Dialog'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import IconButton from '@material-ui/core/IconButton'
-import CloseIcon from 'assets/icons/ico/close.svg'
-
-interface ConnectionInfoCreationEnedisAccountModalProps {
- open: boolean
- handleCloseClick: () => void
- handleSubmit: () => void
-}
-
-const ConnectionInfoCreationEnedisAccountModal: React.FC<ConnectionInfoCreationEnedisAccountModalProps> = ({
- open,
- handleCloseClick,
- handleSubmit,
-}: ConnectionInfoCreationEnedisAccountModalProps) => {
- const { t } = useI18n()
-
- return (
- <Dialog
- open={open}
- disableBackdropClick
- disableEscapeKeyDown
- onClose={handleCloseClick}
- aria-labelledby={'accessibility-title'}
- classes={{
- root: 'modal-root',
- paper: 'modal-paper',
- }}
- >
- <div id={'accessibility-title'}>
- {t('auth.enedisgrandlyon.infoModal.accessibility.window_title')}
- </div>
- <IconButton
- aria-label={t(
- 'auth.enedisgrandlyon.infoModal.accessibility.button_close'
- )}
- className="modal-paper-close-button"
- onClick={handleCloseClick}
- >
- <Icon icon={CloseIcon} size={16} />
- </IconButton>
- <div className="enedisInfoModal">
- <p className="text-16-normal">
- {t('auth.enedisgrandlyon.infoModal.text1')}
- <br />
- {t('auth.enedisgrandlyon.infoModal.text2')}
- </p>
- <p className="text-16-normal">
- {t('auth.enedisgrandlyon.infoModal.text3')}
- </p>
- <p className="text-16-normal">
- {t('auth.enedisgrandlyon.infoModal.text4')}
- </p>
- <p className="text-16-normal">
- {t('auth.enedisgrandlyon.infoModal.text5')}
- </p>
- <p className="text-16-normal">
- {t('auth.enedisgrandlyon.infoModal.text6')}
- <br />
- {t('auth.enedisgrandlyon.infoModal.text7')}
- </p>
- <Button
- aria-label={t(
- 'auth.enedisgrandlyon.infoModal.accessibility.buttonText'
- )}
- onClick={handleSubmit}
- classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
- }}
- >
- {t('auth.enedisgrandlyon.infoModal.buttonText')}
- </Button>
- </div>
- </Dialog>
- )
-}
-
-export default ConnectionInfoCreationEnedisAccountModal
diff --git a/src/components/Connection/ConnectionLogin.tsx b/src/components/Connection/ConnectionLogin.tsx
new file mode 100644
index 000000000..4ece0f1ea
--- /dev/null
+++ b/src/components/Connection/ConnectionLogin.tsx
@@ -0,0 +1,67 @@
+import React, { useState, useCallback } from 'react'
+import './connectionLogin.scss'
+
+import { FluidStatus } from 'models'
+import PartnerConnectionStepsModal from 'components/PartnerConnectionStepsModal/PartnerConnectionStepsModal'
+import ConnectionLoginWithPartnerAccount from './ConnectionLoginWithPartnerAccount'
+import ConnectionLoginNoPartnerAccount from './ConnectionLoginNoPartnerAccount'
+
+interface ConnectionLoginProps {
+ fluidStatus: FluidStatus
+ onSuccess: () => Promise<void>
+}
+
+const ConnectionLogin: React.FC<ConnectionLoginProps> = ({
+ fluidStatus,
+ onSuccess,
+}: ConnectionLoginProps) => {
+ const konnectorSlug: string = fluidStatus.connection.konnectorConfig.slug
+ const siteLink: string = fluidStatus.connection.konnectorConfig.siteLink
+
+ const [
+ openPartenerConnectionModal,
+ setOpenPartenerConnectionModal,
+ ] = useState<boolean>(false)
+ const [
+ hasSeenPartnerConnectionModal,
+ setHasSeenPartnerConnectionModal,
+ ] = useState<boolean>(false)
+
+ const togglePartnerConnectionModal = useCallback(() => {
+ setOpenPartenerConnectionModal(prev => !prev)
+ }, [])
+
+ const handleEndSteps = useCallback(() => {
+ togglePartnerConnectionModal()
+ window.open(siteLink, '_blank')
+ setHasSeenPartnerConnectionModal(true)
+ }, [siteLink, togglePartnerConnectionModal])
+
+ return (
+ <>
+ {hasSeenPartnerConnectionModal ? (
+ <ConnectionLoginWithPartnerAccount
+ konnectorSlug={konnectorSlug}
+ fluidStatus={fluidStatus}
+ handleSuccess={onSuccess}
+ togglePartnerConnectionModal={togglePartnerConnectionModal}
+ />
+ ) : (
+ <ConnectionLoginNoPartnerAccount
+ konnectorSlug={konnectorSlug}
+ fluidStatus={fluidStatus}
+ handleSuccess={onSuccess}
+ togglePartnerConnectionModal={togglePartnerConnectionModal}
+ />
+ )}
+ <PartnerConnectionStepsModal
+ fluidType={fluidStatus.fluidType}
+ open={openPartenerConnectionModal}
+ handleCloseClick={togglePartnerConnectionModal}
+ handleEndSteps={handleEndSteps}
+ />
+ </>
+ )
+}
+
+export default ConnectionLogin
diff --git a/src/components/Connection/ConnectionLoginNoPartnerAccount.tsx b/src/components/Connection/ConnectionLoginNoPartnerAccount.tsx
new file mode 100644
index 000000000..29b8738da
--- /dev/null
+++ b/src/components/Connection/ConnectionLoginNoPartnerAccount.tsx
@@ -0,0 +1,62 @@
+import React from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import './connectionLogin.scss'
+import { FluidStatus } from 'models'
+import Button from '@material-ui/core/Button'
+import FormLogin from 'components/Connection/FormLogin'
+
+interface ConnectionLoginNoPartnerAccountProps {
+ konnectorSlug: string
+ fluidStatus: FluidStatus
+ handleSuccess: () => Promise<void>
+ togglePartnerConnectionModal: () => void
+}
+
+const ConnectionLoginNoPartnerAccount = ({
+ konnectorSlug,
+ fluidStatus,
+ handleSuccess,
+ togglePartnerConnectionModal,
+}: ConnectionLoginNoPartnerAccountProps) => {
+ const { t } = useI18n()
+
+ return (
+ <div className="kloginform">
+ <p className={`kloginform-title ${konnectorSlug} text-20-bold`}>
+ {t('auth.' + `${konnectorSlug}` + '.no_account.title')}
+ </p>
+
+ <div className="kloginform-subtitle text-18-bold">
+ {t('auth.' + konnectorSlug + '.no_account.subtitle1')}
+ </div>
+ <div className="kloginform-button">
+ <Button
+ aria-label={t('auth.accessibility.button_create_account')}
+ onClick={togglePartnerConnectionModal}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('auth.' + konnectorSlug + '.no_account.button_create_account')}
+ </Button>
+ </div>
+
+ <div className="kloginform-subtitle text-18-bold">
+ {t('auth.' + `${konnectorSlug}` + '.no_account.subtitle2')}
+ </div>
+ <div className="kloginform-infotext text-16-normal">
+ {t('auth.' + `${konnectorSlug}` + '.no_account.subtitle2_info')}
+ </div>
+ <div className="kloginform-connect-button">
+ <FormLogin
+ fluidStatus={fluidStatus}
+ highlightedStyle={false}
+ handleSuccess={handleSuccess}
+ />
+ </div>
+ </div>
+ )
+}
+
+export default ConnectionLoginNoPartnerAccount
diff --git a/src/components/Connection/ConnectionLoginWithPartnerAccount.tsx b/src/components/Connection/ConnectionLoginWithPartnerAccount.tsx
new file mode 100644
index 000000000..242e84c8b
--- /dev/null
+++ b/src/components/Connection/ConnectionLoginWithPartnerAccount.tsx
@@ -0,0 +1,87 @@
+import React, { useCallback } from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import './connectionLogin.scss'
+import Button from '@material-ui/core/Button'
+import { FluidStatus } from 'models'
+import FormLogin from 'components/Connection/FormLogin'
+
+interface ConnectionLoginWithPartnerAccountProps {
+ konnectorSlug: string
+ fluidStatus: FluidStatus
+ handleSuccess: () => Promise<void>
+ togglePartnerConnectionModal: () => void
+}
+
+const ConnectionLoginWithPartnerAccount = ({
+ konnectorSlug,
+ fluidStatus,
+ handleSuccess,
+ togglePartnerConnectionModal,
+}: ConnectionLoginWithPartnerAccountProps) => {
+ const { t } = useI18n()
+
+ const goToGuide = useCallback(() => {
+ window.open(
+ 'https://www.notion.so/Besoin-d-aide-d3afe29ba5aa42bb9d49eecfcb506c72',
+ '_blank'
+ )
+ }, [])
+
+ return (
+ <div className="kloginform">
+ <p className={`kloginform-title ${konnectorSlug} text-20-bold`}>
+ {t('auth.' + `${konnectorSlug}` + '.with_account.title')}
+ </p>
+
+ <div className="kloginform-subtitle text-18-bold">
+ {t('auth.' + konnectorSlug + '.with_account.subtitle1')}
+ </div>
+ <div className="kloginform-connect-button">
+ <FormLogin
+ fluidStatus={fluidStatus}
+ highlightedStyle={true}
+ handleSuccess={handleSuccess}
+ />
+ </div>
+ {konnectorSlug === 'grdfgrandlyon' && (
+ <div className="kloginform-infotext text-16-normal">
+ {t('auth.' + konnectorSlug + '.with_account.subtitle1_info')}
+ </div>
+ )}
+
+ <div className="kloginform-subtitle text-18-bold">
+ {t('auth.' + konnectorSlug + '.with_account.subtitle2')}
+ </div>
+ <div className="kloginform-button">
+ <Button
+ aria-label={t('auth.accessibility.button_create_account')}
+ onClick={togglePartnerConnectionModal}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('auth.' + konnectorSlug + '.with_account.button_create_account')}
+ </Button>
+ </div>
+
+ <div className="kloginform-infotext text-16-normal">
+ {t('auth.' + `${konnectorSlug}` + '.with_account.subtitle2_info')}
+ </div>
+ <div className="kloginform-button">
+ <Button
+ aria-label={t('auth.accessibility.button_goto_guide')}
+ onClick={goToGuide}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('auth.' + konnectorSlug + '.with_account.button_goto_guide')}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+export default ConnectionLoginWithPartnerAccount
diff --git a/src/components/Connection/ConnectionNotFound.spec.tsx b/src/components/Connection/ConnectionNotFound.spec.tsx
index 359fa90e0..73dd07fae 100644
--- a/src/components/Connection/ConnectionNotFound.spec.tsx
+++ b/src/components/Connection/ConnectionNotFound.spec.tsx
@@ -1,6 +1,6 @@
import React from 'react'
import { shallow, mount } from 'enzyme'
-import ConnectionNotFound from './ConnectionNotFound'
+import ConnectionNotFound from 'components/Connection/ConnectionNotFound'
import Button from '@material-ui/core/Button'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
diff --git a/src/components/Connection/ConnectionOAuth.tsx b/src/components/Connection/ConnectionOAuth.tsx
new file mode 100644
index 000000000..28ae7b355
--- /dev/null
+++ b/src/components/Connection/ConnectionOAuth.tsx
@@ -0,0 +1,125 @@
+import React, { useCallback, useState } from 'react'
+import { useClient } from 'cozy-client'
+import { useDispatch } from 'react-redux'
+import './connectionOAuth.scss'
+import { Konnector, Trigger, FluidStatus, FluidConnection } from 'models'
+import AccountService from 'services/account.service'
+import TriggerService from 'services/triggers.service'
+import { updatedFluidConnection } from 'store/global/global.actions'
+import { UsageEventType } from 'enum/usageEvent.enum'
+import UsageEventService from 'services/usageEvent.service'
+import PartnerConnectionStepsModal from 'components/PartnerConnectionStepsModal/PartnerConnectionStepsModal'
+import ConnectionOAuthNoPartnerAccount from 'components/Connection/ConnectionOAuthNoPartnerAccount'
+import ConnectionOAuthWithPartnerAccount from 'components/Connection/ConnectionOAuthWithPartnerAccount'
+
+interface ConnectionOAuthProps {
+ fluidStatus: FluidStatus
+ onSuccess: Function
+}
+
+const ConnectionOAuth: React.FC<ConnectionOAuthProps> = ({
+ fluidStatus,
+ onSuccess,
+}: ConnectionOAuthProps) => {
+ const client = useClient()
+ const dispatch = useDispatch()
+
+ const [
+ openPartenerConnectionModal,
+ setOpenPartenerConnectionModal,
+ ] = useState<boolean>(false)
+ const [
+ hasSeenPartnerConnectionModal,
+ setHasSeenPartnerConnectionModal,
+ ] = useState<boolean>(false)
+
+ const konnectorSlug: string = fluidStatus.connection.konnectorConfig.slug
+ const siteLink: string = fluidStatus.connection.konnectorConfig.siteLink
+ const konnector: Konnector | null = fluidStatus.connection.konnector
+
+ const handleSuccess = useCallback(
+ async (accountId: string) => {
+ if (konnector) {
+ const accountService = new AccountService(client)
+ const account = await accountService.getAccount(accountId)
+ if (!account) {
+ const updatedConnection: FluidConnection = {
+ ...fluidStatus.connection,
+ account: null,
+ trigger: null,
+ }
+ dispatch(
+ updatedFluidConnection(fluidStatus.fluidType, updatedConnection)
+ )
+ await UsageEventService.addEvent(client, {
+ type: UsageEventType.KONNECTOR_CONNECT_EVENT,
+ target: konnectorSlug,
+ result: 'error',
+ })
+ } else {
+ const triggersServices = new TriggerService(client)
+ const trigger: Trigger = await triggersServices.createTrigger(
+ account,
+ konnector
+ )
+ const updatedConnection: FluidConnection = {
+ ...fluidStatus.connection,
+ account: account,
+ trigger: trigger,
+ }
+ dispatch(
+ updatedFluidConnection(fluidStatus.fluidType, updatedConnection)
+ )
+ onSuccess()
+ }
+ }
+ },
+ [
+ client,
+ konnector,
+ dispatch,
+ fluidStatus.fluidType,
+ fluidStatus.connection,
+ onSuccess,
+ konnectorSlug,
+ ]
+ )
+
+ const togglePartnerConnectionModal = useCallback(() => {
+ setOpenPartenerConnectionModal(prev => !prev)
+ }, [])
+
+ const handleEndSteps = useCallback(() => {
+ togglePartnerConnectionModal()
+ window.open(siteLink, '_blank')
+ setHasSeenPartnerConnectionModal(true)
+ }, [siteLink, togglePartnerConnectionModal])
+
+ return (
+ <>
+ {hasSeenPartnerConnectionModal ? (
+ <ConnectionOAuthWithPartnerAccount
+ konnectorSlug={konnectorSlug}
+ konnector={konnector}
+ handleSuccess={handleSuccess}
+ togglePartnerConnectionModal={togglePartnerConnectionModal}
+ />
+ ) : (
+ <ConnectionOAuthNoPartnerAccount
+ konnectorSlug={konnectorSlug}
+ konnector={konnector}
+ handleSuccess={handleSuccess}
+ togglePartnerConnectionModal={togglePartnerConnectionModal}
+ />
+ )}
+ <PartnerConnectionStepsModal
+ fluidType={fluidStatus.fluidType}
+ open={openPartenerConnectionModal}
+ handleCloseClick={togglePartnerConnectionModal}
+ handleEndSteps={handleEndSteps}
+ />
+ </>
+ )
+}
+
+export default ConnectionOAuth
diff --git a/src/components/Connection/ConnectionOAuthNoPartnerAccount.tsx b/src/components/Connection/ConnectionOAuthNoPartnerAccount.tsx
new file mode 100644
index 000000000..d58a27ef4
--- /dev/null
+++ b/src/components/Connection/ConnectionOAuthNoPartnerAccount.tsx
@@ -0,0 +1,66 @@
+import React from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import './connectionOAuth.scss'
+import { Konnector } from 'models'
+import OAuthForm from 'components/Connection/FormOAuth'
+import Button from '@material-ui/core/Button'
+
+interface ConnectionOAuthNoPartnerAccountProps {
+ konnectorSlug: string
+ konnector: Konnector | null
+ handleSuccess: (accountId: string) => Promise<void>
+ togglePartnerConnectionModal: () => void
+}
+
+const ConnectionOAuthNoPartnerAccount = ({
+ konnectorSlug,
+ konnector,
+ handleSuccess,
+ togglePartnerConnectionModal,
+}: ConnectionOAuthNoPartnerAccountProps) => {
+ const { t } = useI18n()
+
+ return (
+ <div className="koauthform">
+ <p className={`koauthform-title ${konnectorSlug} text-20-bold`}>
+ {t('auth.' + `${konnectorSlug}` + '.no_account.title')}
+ </p>
+
+ <div className="koauthform-subtitle text-18-bold">
+ {t('auth.' + konnectorSlug + '.no_account.subtitle1')}
+ </div>
+ <div className="koauthform-button">
+ <Button
+ aria-label={t('auth.accessibility.button_create_account')}
+ onClick={togglePartnerConnectionModal}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('auth.' + konnectorSlug + '.no_account.button_create_account')}
+ </Button>
+ </div>
+
+ <div className="koauthform-subtitle text-18-bold">
+ {t('auth.' + `${konnectorSlug}` + '.no_account.subtitle2')}
+ </div>
+ <div className="koauthform-infotext text-16-normal">
+ {t('auth.' + `${konnectorSlug}` + '.no_account.subtitle2_info')}
+ </div>
+ <div className="koauthform-connect-button">
+ <OAuthForm
+ konnector={konnector}
+ onSuccess={handleSuccess}
+ highlightedStyle={false}
+ />
+ </div>
+
+ <div className="koauthform-infotext text-16-italic">
+ {t('auth.' + `${konnectorSlug}` + '.no_account.info')}
+ </div>
+ </div>
+ )
+}
+
+export default ConnectionOAuthNoPartnerAccount
diff --git a/src/components/Connection/ConnectionOAuthWithPartnerAccount.tsx b/src/components/Connection/ConnectionOAuthWithPartnerAccount.tsx
new file mode 100644
index 000000000..659b3c27b
--- /dev/null
+++ b/src/components/Connection/ConnectionOAuthWithPartnerAccount.tsx
@@ -0,0 +1,87 @@
+import React, { useCallback } from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import './connectionOAuth.scss'
+import { Konnector } from 'models'
+import OAuthForm from 'components/Connection/FormOAuth'
+import Button from '@material-ui/core/Button'
+
+interface ConnectionOAuthWithPartnerAccountProps {
+ konnectorSlug: string
+ konnector: Konnector | null
+ handleSuccess: (accountId: string) => Promise<void>
+ togglePartnerConnectionModal: () => void
+}
+
+const ConnectionOAuthWithPartnerAccount = ({
+ konnectorSlug,
+ konnector,
+ handleSuccess,
+ togglePartnerConnectionModal,
+}: ConnectionOAuthWithPartnerAccountProps) => {
+ const { t } = useI18n()
+
+ const goToGuide = useCallback(() => {
+ window.open(
+ 'https://www.notion.so/Besoin-d-aide-d3afe29ba5aa42bb9d49eecfcb506c72',
+ '_blank'
+ )
+ }, [])
+
+ return (
+ <div className="koauthform">
+ <p className={`koauthform-title ${konnectorSlug} text-20-bold`}>
+ {t('auth.' + `${konnectorSlug}` + '.with_account.title')}
+ </p>
+
+ <div className="koauthform-subtitle text-18-bold">
+ {t('auth.' + konnectorSlug + '.with_account.subtitle1')}
+ </div>
+ <div className="koauthform-connect-button">
+ <OAuthForm
+ konnector={konnector}
+ onSuccess={handleSuccess}
+ highlightedStyle={true}
+ />
+ </div>
+ {konnectorSlug === 'grdfgrandlyon' && (
+ <div className="koauthform-infotext text-16-normal">
+ {t('auth.' + konnectorSlug + '.with_account.subtitle1_info')}
+ </div>
+ )}
+
+ <div className="koauthform-subtitle text-18-bold">
+ {t('auth.' + konnectorSlug + '.with_account.subtitle2')}
+ </div>
+ <div className="koauthform-button">
+ <Button
+ aria-label={t('auth.accessibility.button_create_account')}
+ onClick={togglePartnerConnectionModal}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('auth.' + konnectorSlug + '.with_account.button_create_account')}
+ </Button>
+ </div>
+
+ <div className="koauthform-infotext text-16-normal">
+ {t('auth.' + `${konnectorSlug}` + '.with_account.subtitle2_info')}
+ </div>
+ <div className="koauthform-button">
+ <Button
+ aria-label={t('auth.accessibility.button_goto_guide')}
+ onClick={goToGuide}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('auth.' + konnectorSlug + '.with_account.button_goto_guide')}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+export default ConnectionOAuthWithPartnerAccount
diff --git a/src/components/Connection/ConnectionResult.tsx b/src/components/Connection/ConnectionResult.tsx
index 3e93db6b5..dfccf4c75 100644
--- a/src/components/Connection/ConnectionResult.tsx
+++ b/src/components/Connection/ConnectionResult.tsx
@@ -1,245 +1,243 @@
-import React, { useState, useEffect, useCallback } from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useClient } from 'cozy-client'
-import { useDispatch } from 'react-redux'
-import { updatedFluidConnection } from 'store/global/global.actions'
-
-import { Account, FluidConnection, FluidStatus } from 'models'
-import AccountService from 'services/account.service'
-import { getKonnectorUpdateError } from 'utils/utils'
-
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import warningWhite from 'assets/icons/ico/warning-white.svg'
-import Button from '@material-ui/core/Button'
-import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
-
-import './connectionResult.scss'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import UsageEventService from 'services/usageEvent.service'
-import DateChartService from 'services/dateChart.service'
-import { FluidType } from 'enum/fluid.enum'
-import { DateTime } from 'luxon'
-
-interface ConnectionResultProps {
- fluidStatus: FluidStatus
- handleAccountDeletion: Function
- fluidType: FluidType
-}
-
-const ConnectionResult: React.FC<ConnectionResultProps> = ({
- fluidStatus,
- handleAccountDeletion,
- fluidType,
-}: ConnectionResultProps) => {
- const { t } = useI18n()
- const client = useClient()
- const dispatch = useDispatch()
- const account: Account | null = fluidStatus.connection.account
-
- const [updating, setUpdating] = useState<boolean>(false)
- const [lastExecutionDate, setLastExecutionDate] = useState<string | DateTime>(
- '-'
- )
- const [konnectorError, setKonnectorError] = useState<string>('')
- const [status, setStatus] = useState<string>('')
- const [outDatedDataDays, setOutDatedDataDays] = useState<number | null>(null)
-
- const updateKonnector = async () => {
- setUpdating(true)
- setStatus('')
- setLastExecutionDate('-')
- setKonnectorError('')
- const updatedConnection: FluidConnection = {
- ...fluidStatus.connection,
- shouldLaunchKonnector: true,
- isUpdating: true,
- }
- await UsageEventService.addEvent(client, {
- type: UsageEventType.KONNECTOR_REFRESH_EVENT,
- target: updatedConnection.konnector
- ? updatedConnection.konnector.slug
- : '',
- result:
- updatedConnection.triggerState &&
- updatedConnection.triggerState.status === 'done'
- ? 'success'
- : 'error',
- })
- dispatch(updatedFluidConnection(fluidStatus.fluidType, updatedConnection))
- setUpdating(false)
- }
-
- const deleteAccount = async () => {
- setUpdating(true)
- try {
- if (account) {
- const accountService = new AccountService(client)
- await accountService.deleteAccount(account)
- await handleAccountDeletion()
- }
- } catch (error) {
- setUpdating(false)
- }
- }
- const isOutdated = useCallback(() => {
- const dateChartService = new DateChartService()
-
- return dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidType)
- }, [fluidStatus, fluidType])
-
- const hasUpdatedToday = useCallback(() => {
- const todayDate = DateTime.local()
- .setZone('utc', {
- keepLocalTime: true,
- })
- .minus({ days: 1 })
- .toLocaleString()
- if (lastExecutionDate === '-') {
- return false
- } else if (lastExecutionDate > todayDate) {
- return false
- } else {
- return true
- }
- }, [lastExecutionDate])
-
- useEffect(() => {
- if (
- fluidStatus.connection.triggerState &&
- fluidStatus.connection.triggerState.last_success
- ) {
- const result = DateTime.fromISO(
- fluidStatus.connection.triggerState.last_success
- )
- setLastExecutionDate(result)
- } else {
- setLastExecutionDate('-')
- }
- if (
- fluidStatus.connection.triggerState &&
- fluidStatus.connection.triggerState.status === 'errored' &&
- fluidStatus.connection.triggerState.last_error
- ) {
- setStatus('errored')
- setKonnectorError(
- getKonnectorUpdateError(fluidStatus.connection.triggerState.last_error)
- )
- }
-
- if (isOutdated()) {
- setOutDatedDataDays(isOutdated())
- }
- }, [fluidStatus.connection.triggerState, isOutdated])
-
- return (
- <div className="connection-update-result">
- <div
- className={
- status === 'errored' && !hasUpdatedToday()
- ? 'connection-update-errored'
- : ''
- }
- >
- {outDatedDataDays ? (
- <div className="connection-caption text-16-normal">
- <div className="text-16-normal">
- {hasUpdatedToday() === true ? (
- <>
- <div className="connection-caption">
- {t('konnector_form.label_updated_at')}
- </div>
- <div className="text-16-bold">
- {lastExecutionDate.toLocaleString()}
- </div>
- <div>
- {fluidStatus &&
- fluidStatus.connection &&
- fluidStatus.connection.konnector &&
- t('konnector_form.issue') +
- ' ' +
- fluidStatus.connection.konnector.name +
- '.'}
- </div>
- </>
- ) : (
- <div className="connection-caption-errored connection-update-errored warning-white text-16-normal">
- <StyledIcon
- icon={warningWhite}
- size={36}
- className="warning-icon"
- role="img"
- title="Attention"
- ariaHidden={false}
- />
- <div className="text-16-normal">
- {t('konnector_form.resolve')}
- </div>
- </div>
- )}
- </div>
- </div>
- ) : status === 'errored' ? (
- <div className="connection-caption-errored warning-white text-16-normal">
- <StyledIcon
- icon={warningWhite}
- size={36}
- className="warning-icon"
- role="img"
- title="Attention"
- ariaHidden={false}
- />
-
- <div className="text-16-normal">
- {t(`konnector_form.${konnectorError}`)}
- <div className="connection-caption">
- {t('konnector_form.label_updated_at')}
- </div>
- <div className="text-16-bold">
- {lastExecutionDate.toLocaleString()}
- </div>
- </div>
- </div>
- ) : (
- <div>
- <div className="connection-caption text-16-normal">
- {t('konnector_form.label_updated_at')}
- </div>
- <div className="text-16-bold">
- {lastExecutionDate.toLocaleString()}
- </div>
- </div>
- )}
- </div>
- <div className="inline-buttons">
- <Button
- aria-label={t('konnector_form.accessibility.button_delete')}
- onClick={deleteAccount}
- disabled={updating}
- classes={{
- root: 'btn-secondary-positive',
- label: 'text-16-normal',
- }}
- >
- {t('konnector_form.button_delete')}
- </Button>
- <Button
- aria-label={t('konnector_form.accessibility.button_update')}
- onClick={updateKonnector}
- disabled={updating}
- classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
- }}
- >
- {updating ? (
- <StyledBlackSpinner size="2em" />
- ) : (
- <div>{t('konnector_form.button_update')}</div>
- )}
- </Button>
- </div>
- </div>
- )
-}
-
-export default ConnectionResult
+import React, { useState, useEffect, useCallback } from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { useClient } from 'cozy-client'
+import { useDispatch } from 'react-redux'
+import { updatedFluidConnection } from 'store/global/global.actions'
+
+import { Account, FluidConnection, FluidStatus } from 'models'
+import AccountService from 'services/account.service'
+import { getKonnectorUpdateError } from 'utils/utils'
+
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import warningWhite from 'assets/icons/ico/warning-white.svg'
+import Button from '@material-ui/core/Button'
+import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
+
+import './connectionResult.scss'
+import UsageEventService from 'services/usageEvent.service'
+import DateChartService from 'services/dateChart.service'
+import { FluidState, FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
+
+interface ConnectionResultProps {
+ fluidStatus: FluidStatus
+ handleAccountDeletion: Function
+ fluidType: FluidType
+}
+
+const ConnectionResult: React.FC<ConnectionResultProps> = ({
+ fluidStatus,
+ handleAccountDeletion,
+ fluidType,
+}: ConnectionResultProps) => {
+ const { t } = useI18n()
+ const client = useClient()
+ const dispatch = useDispatch()
+ const account: Account | null = fluidStatus.connection.account
+
+ const [updating, setUpdating] = useState<boolean>(false)
+ const [lastExecutionDate, setLastExecutionDate] = useState<string | DateTime>(
+ '-'
+ )
+ const [konnectorError, setKonnectorError] = useState<string>('')
+ const [status, setStatus] = useState<string>('')
+ const [outDatedDataDays, setOutDatedDataDays] = useState<number | null>(null)
+
+ const updateKonnector = async () => {
+ setUpdating(true)
+ setStatus('')
+ setLastExecutionDate('-')
+ setKonnectorError('')
+ const updatedConnection: FluidConnection = {
+ ...fluidStatus.connection,
+ shouldLaunchKonnector: true,
+ isUpdating: true,
+ }
+ dispatch(updatedFluidConnection(fluidStatus.fluidType, updatedConnection))
+ setUpdating(false)
+ }
+
+ const deleteAccount = async () => {
+ setUpdating(true)
+ try {
+ if (account) {
+ const accountService = new AccountService(client)
+ await accountService.deleteAccount(account)
+ await handleAccountDeletion()
+ }
+ } catch (error) {
+ setUpdating(false)
+ }
+ }
+ const isOutdated = useCallback(() => {
+ const dateChartService = new DateChartService()
+
+ return dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidType)
+ }, [fluidStatus, fluidType])
+
+ const hasUpdatedToday = useCallback(() => {
+ const todayDate = DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .minus({ days: 1 })
+ .toLocaleString()
+ if (lastExecutionDate === '-') {
+ return false
+ } else if (lastExecutionDate > todayDate) {
+ return false
+ } else {
+ return true
+ }
+ }, [lastExecutionDate])
+
+ useEffect(() => {
+ if (
+ fluidStatus.connection.triggerState &&
+ fluidStatus.connection.triggerState.last_success
+ ) {
+ const result = DateTime.fromISO(
+ fluidStatus.connection.triggerState.last_success
+ )
+ setLastExecutionDate(result)
+ } else {
+ setLastExecutionDate('-')
+ }
+ if (
+ fluidStatus.connection.triggerState &&
+ fluidStatus.connection.triggerState.status === 'errored' &&
+ fluidStatus.connection.triggerState.last_error
+ ) {
+ setStatus('errored')
+ setKonnectorError(
+ getKonnectorUpdateError(fluidStatus.connection.triggerState.last_error)
+ )
+ }
+
+ if (isOutdated()) {
+ setOutDatedDataDays(isOutdated())
+ }
+ }, [fluidStatus.connection.triggerState, isOutdated])
+
+ return (
+ <div className="connection-update-result">
+ <div
+ className={
+ status === 'errored' &&
+ !hasUpdatedToday() &&
+ fluidStatus.status !== FluidState.PARTNER_ISSUE
+ ? 'connection-update-errored'
+ : ''
+ }
+ >
+ {outDatedDataDays || fluidStatus.status === FluidState.PARTNER_ISSUE ? (
+ <div className="connection-caption text-16-normal">
+ <div className="text-16-normal">
+ {fluidStatus.status === FluidState.PARTNER_ISSUE ? (
+ <div className="connection-caption">
+ {t('konnector_form.wait_end_issue')}
+ </div>
+ ) : (
+ <>
+ {hasUpdatedToday() === true ? (
+ <>
+ <div className="connection-caption">
+ {t('konnector_form.label_updated_at')}
+ </div>
+ <div className="text-16-bold">
+ {lastExecutionDate.toLocaleString()}
+ </div>
+ <div>
+ {fluidStatus &&
+ fluidStatus.connection &&
+ fluidStatus.connection.konnector &&
+ t('konnector_form.issue') +
+ ' ' +
+ fluidStatus.connection.konnector.name +
+ '.'}
+ </div>
+ </>
+ ) : (
+ <div className="connection-caption-errored connection-update-errored warning-white text-16-normal">
+ <StyledIcon
+ icon={warningWhite}
+ size={36}
+ className="warning-icon"
+ role="img"
+ title="Attention"
+ ariaHidden={false}
+ />
+ <div className="text-16-normal">
+ {t('konnector_form.resolve')}
+ </div>
+ </div>
+ )}
+ </>
+ )}
+ </div>
+ </div>
+ ) : status === 'errored' ? (
+ <div className="connection-caption-errored warning-white text-16-normal">
+ <StyledIcon
+ icon={warningWhite}
+ size={36}
+ className="warning-icon"
+ role="img"
+ title="Attention"
+ ariaHidden={false}
+ />
+
+ <div className="text-16-normal">
+ {t(`konnector_form.${konnectorError}`)}
+ <div className="connection-caption">
+ {t('konnector_form.label_updated_at')}
+ </div>
+ <div className="text-16-bold">
+ {lastExecutionDate.toLocaleString()}
+ </div>
+ </div>
+ </div>
+ ) : (
+ <div>
+ <div className="connection-caption text-16-normal">
+ {t('konnector_form.label_updated_at')}
+ </div>
+ <div className="text-16-bold">
+ {lastExecutionDate.toLocaleString()}
+ </div>
+ </div>
+ )}
+ </div>
+ <div className="inline-buttons">
+ <Button
+ aria-label={t('konnector_form.accessibility.button_delete')}
+ onClick={deleteAccount}
+ disabled={updating}
+ classes={{
+ root: 'btn-secondary-positive',
+ label: 'text-16-normal',
+ }}
+ >
+ {t('konnector_form.button_delete')}
+ </Button>
+ <Button
+ aria-label={t('konnector_form.accessibility.button_update')}
+ onClick={updateKonnector}
+ disabled={updating}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ {updating ? (
+ <StyledBlackSpinner size="2em" />
+ ) : (
+ <div>{t('konnector_form.button_update')}</div>
+ )}
+ </Button>
+ </div>
+ </div>
+ )
+}
+
+export default ConnectionResult
diff --git a/src/components/Connection/ConnectionFormLogin.tsx b/src/components/Connection/FormLogin.tsx
similarity index 72%
rename from src/components/Connection/ConnectionFormLogin.tsx
rename to src/components/Connection/FormLogin.tsx
index 6d4f84779..9bfd1ddb1 100644
--- a/src/components/Connection/ConnectionFormLogin.tsx
+++ b/src/components/Connection/FormLogin.tsx
@@ -3,42 +3,40 @@ import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { useClient } from 'cozy-client'
import { useDispatch } from 'react-redux'
-import { Account, FluidStatus, FluidConnection } from 'models'
+import { Account, FluidStatus, FluidConnection, UsageEvent } from 'models'
import AccountService from 'services/account.service'
import ConnectionService from 'services/connection.service'
+import UsageEventService from 'services/usageEvent.service'
+import './formLogin.scss'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import Button from '@material-ui/core/Button'
import TrailingIcon from 'assets/icons/ico/trailing-icon.svg'
-
-import iconGRDFLogo from 'assets/icons/visu/grdf-logo.svg'
-import iconEGLLogo from 'assets/icons/visu/egl-logo.svg'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import './auth.scss'
-import './connectionFormLogin.scss'
import { FluidType } from 'enum/fluid.enum'
-import { updatedFluidConnection } from 'store/global/global.actions'
+import { getPartnerPicto } from 'utils/picto'
import { UsageEventType } from 'enum/usageEvent.enum'
-import UsageEventService from 'services/usageEvent.service'
+import { updatedFluidConnection } from 'store/global/global.actions'
-interface ConnectionFormLoginProps {
+interface FormLoginProps {
fluidStatus: FluidStatus
- onSuccess: Function
+ highlightedStyle?: boolean
+ handleSuccess: () => Promise<void>
}
-const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
+const FormLogin: React.FC<FormLoginProps> = ({
fluidStatus,
- onSuccess,
-}: ConnectionFormLoginProps) => {
+ highlightedStyle = true,
+ handleSuccess,
+}: FormLoginProps) => {
const { t } = useI18n()
const client = useClient()
const dispatch = useDispatch()
+
const konnectorSlug: string = fluidStatus.connection.konnectorConfig.slug
const lastKnownCredentials: string | undefined =
fluidStatus.connection.konnectorConfig.lastKnownCredentials
-
const fluidName: string = FluidType[fluidStatus.fluidType]
- const siteLink: string = fluidStatus.connection.konnectorConfig.siteLink
const account: Account | null = fluidStatus.connection.account
const [login, setLogin] = useState<string>('')
@@ -46,17 +44,7 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
const [error, setError] = useState<string>('')
const [loading, setLoading] = useState<boolean>(false)
- const getIcon = (fluidType: FluidType): string | null => {
- switch (fluidType) {
- case FluidType.GAS:
- return iconGRDFLogo
- case FluidType.WATER:
- return iconEGLLogo
- default:
- return ''
- }
- }
- const icon = getIcon(fluidStatus.fluidType)
+ const icon = getPartnerPicto(konnectorSlug, highlightedStyle)
const changeLogin = (value: string) => {
if ((/[0-9]/.test(value) && value.length <= 7) || value === '') {
@@ -81,6 +69,16 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
}
}
+ const sendUsageEventError = async (
+ konnectorSlug: string
+ ): Promise<UsageEvent> => {
+ return UsageEventService.addEvent(client, {
+ type: UsageEventType.KONNECTOR_CONNECT_EVENT,
+ target: konnectorSlug,
+ result: 'error',
+ })
+ }
+
const connect = async () => {
const connectionService = new ConnectionService(client)
try {
@@ -90,6 +88,7 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
} = await connectionService.connectNewUser(konnectorSlug, login, password)
if (!_trigger) {
setError(t('konnector_form.error_account_creation'))
+ sendUsageEventError(konnectorSlug)
return null
}
const updatedConnection: FluidConnection = {
@@ -98,20 +97,12 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
trigger: _trigger,
}
setLoading(false)
- await UsageEventService.addEvent(client, {
- type: UsageEventType.KONNECTOR_CONNECT_EVENT,
- target: konnectorSlug,
- result: 'success',
- })
+ // await sendUsageEventSuccess(konnectorSlug)
dispatch(updatedFluidConnection(fluidStatus.fluidType, updatedConnection))
- onSuccess()
+ handleSuccess()
} catch (err) {
setLoading(false)
- UsageEventService.addEvent(client, {
- type: UsageEventType.KONNECTOR_CONNECT_EVENT,
- target: konnectorSlug,
- result: 'error',
- })
+ sendUsageEventError(konnectorSlug)
console.log(err)
}
}
@@ -131,7 +122,7 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
account: updatedAccount,
}
dispatch(updatedFluidConnection(fluidStatus.fluidType, updatedConnection))
- onSuccess()
+ handleSuccess()
}
}
@@ -173,10 +164,6 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
className="form"
onSubmit={(e: React.FormEvent<HTMLFormElement>) => handleSubmit(e)}
>
- <p className="form-info-provider text-16-normal">
- {t('auth.' + `${konnectorSlug}` + '.connect.info')}
- </p>
-
<div className="form-group">
<input
id={'idFieldLogin' + fluidName}
@@ -186,8 +173,8 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
? 'form-control form-input'
: 'form-control form-input --error'
}
- aria-label={t('auth.' + konnectorSlug + '.connect.placeholder')}
- placeholder={t('auth.' + konnectorSlug + '.connect.placeholder')}
+ aria-label={t('auth.' + konnectorSlug + '.connect.login')}
+ placeholder={t('auth.' + konnectorSlug + '.connect.login')}
name="login"
onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
changeLogin(e.target.value)
@@ -205,8 +192,8 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
? 'form-control form-input'
: 'form-control form-input --error'
}
- aria-label={t('auth.password_label')}
- placeholder={t('auth.password_label')}
+ aria-label={t('auth.' + konnectorSlug + '.connect.password')}
+ placeholder={t('auth.' + konnectorSlug + '.connect.password')}
name="password"
onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
changePassword(e.target.value)
@@ -231,13 +218,15 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
aria-label={t('auth.accessibility.button_connect')}
disabled={loading}
classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
+ root: `${
+ highlightedStyle ? 'btn-highlight' : 'btn-secondary-negative'
+ }`,
+ label: 'text-18-bold',
}}
>
<div className="authform-button-content">
<div className="authform-button-content-icon">
- {icon && <StyledIcon icon={icon} size={48} />}
+ {icon && <StyledIcon icon={icon} size={80} />}
</div>
<div className="authform-button-text text-18-bold">
<div>{t('auth.' + konnectorSlug + '.connect.label1')}</div>
@@ -246,29 +235,9 @@ const ConnectionFormLogin: React.FC<ConnectionFormLoginProps> = ({
</div>
</Button>
</div>
- <div className="kloginauthform-text text-16-bold">
- <div className="text-16-bold">
- {t('auth.' + konnectorSlug + '.no_account.title')}
- </div>
- <div className="text-16-normal">
- {t('auth.' + konnectorSlug + '.no_account.text')}
- </div>
- </div>
-
- <Button
- disabled={loading}
- aria-label={t('auth.accessibility.button_create_account')}
- onClick={() => window.open(siteLink, '_blank')}
- classes={{
- root: 'btn-secondary-negative',
- label: 'text-16-normal',
- }}
- >
- {t('auth.' + konnectorSlug + '.create_account')}
- </Button>
</div>
</form>
)
}
-export default ConnectionFormLogin
+export default FormLogin
diff --git a/src/components/Connection/OAuthForm.tsx b/src/components/Connection/FormOAuth.tsx
similarity index 57%
rename from src/components/Connection/OAuthForm.tsx
rename to src/components/Connection/FormOAuth.tsx
index b4595c252..85843b5a6 100644
--- a/src/components/Connection/OAuthForm.tsx
+++ b/src/components/Connection/FormOAuth.tsx
@@ -1,43 +1,33 @@
import React, { useCallback, useState } from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { useClient } from 'cozy-client'
-
-import { FluidType } from 'enum/fluid.enum'
+import './auth.scss'
import { Konnector } from 'models'
-import ConfigService from 'services/fluidConfig.service'
import { OAuthWindow } from 'cozy-harvest-lib/dist/components/OAuthWindow'
-
-import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
-import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
-import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
import Button from '@material-ui/core/Button'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
-import ModalGRDF from './ModalGRDF'
-import './auth.scss'
-interface OAuthFormProps {
+import { getPartnerPicto } from 'utils/picto'
+
+interface FormOAuthProps {
konnector: Konnector | null
onSuccess: Function
+ highlightedStyle?: boolean
}
-const OAuthForm: React.FC<OAuthFormProps> = ({
+const FormOAuth: React.FC<FormOAuthProps> = ({
konnector,
onSuccess,
-}: OAuthFormProps) => {
+ highlightedStyle = true,
+}: FormOAuthProps) => {
const IDLE = 'idle'
const WAITING = 'waiting'
const { t } = useI18n()
const client = useClient()
const [status, setStatus] = useState<string>(IDLE)
- const [openGRDFModal, setOpenGRDFModal] = useState<boolean>(false)
-
- const toggleGRDFModal = useCallback(() => {
- setOpenGRDFModal(prev => !prev)
- }, [])
const endOAuth = () => {
- setOpenGRDFModal(false)
setStatus(IDLE)
}
const startOAuth = () => {
@@ -57,30 +47,26 @@ const OAuthForm: React.FC<OAuthFormProps> = ({
endOAuth()
}, [])
- const fluidconfig = new ConfigService().getFluidConfig()
- const icon = konnector
- ? konnector.slug === fluidconfig[FluidType.ELECTRICITY].konnectorConfig.slug
- ? iconEnedisLogo
- : konnector.slug === fluidconfig[FluidType.GAS].konnectorConfig.slug
- ? iconGrdfLogo
- : konnector.slug === fluidconfig[FluidType.WATER].konnectorConfig.slug
- ? iconEglLogo
- : ''
- : ''
+ const icon = getPartnerPicto(
+ konnector ? konnector.slug : '',
+ highlightedStyle
+ )
const isWaiting = status === WAITING
- return !konnector ? null : (
+
+ if (!konnector) {
+ return null
+ }
+ return (
<>
<Button
aria-label={t('auth.accessibility.button_connect')}
- onClick={
- konnector.slug === fluidconfig[FluidType.GAS].konnectorConfig.slug
- ? toggleGRDFModal
- : handleSubmit
- }
+ onClick={handleSubmit}
disabled={isWaiting}
classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
+ root: `${
+ highlightedStyle ? 'btn-highlight' : 'btn-secondary-negative'
+ }`,
+ label: 'text-18-bold',
}}
>
<div className="authform-button-content">
@@ -88,7 +74,7 @@ const OAuthForm: React.FC<OAuthFormProps> = ({
{isWaiting ? (
<StyledBlackSpinner size={48} />
) : (
- <StyledIcon icon={icon} size={48} />
+ <StyledIcon icon={icon} size={80} />
)}
</div>
<div className="authform-button-text text-18-bold">
@@ -107,14 +93,8 @@ const OAuthForm: React.FC<OAuthFormProps> = ({
t={t}
/>
)}
- <ModalGRDF
- open={openGRDFModal}
- handleSubmit={handleSubmit}
- handleCloseClick={toggleGRDFModal}
- isWaiting={isWaiting}
- />
</>
)
}
-export default OAuthForm
+export default FormOAuth
diff --git a/src/components/Connection/ModalGRDF.tsx b/src/components/Connection/ModalGRDF.tsx
deleted file mode 100644
index 3fbdafa04..000000000
--- a/src/components/Connection/ModalGRDF.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import IconButton from '@material-ui/core/IconButton'
-import Button from '@material-ui/core/Button'
-import Dialog from '@material-ui/core/Dialog'
-import switchMobile from 'assets/icons/ico/switchGRDFMobile.svg'
-import switchDesktop from 'assets/icons/ico/switchGRDFDesktop.svg'
-import CloseIcon from 'assets/icons/ico/close.svg'
-import { ScreenType } from 'enum/screen.enum'
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
-import { useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import './modalGRDF.scss'
-
-interface ModalGRDFProps {
- open: boolean
- isWaiting?: boolean
- handleSubmit: () => void
- handleCloseClick: () => void
-}
-
-const ModalGRDF: React.FC<ModalGRDFProps> = ({
- open,
- handleSubmit,
- handleCloseClick,
- isWaiting,
-}: ModalGRDFProps) => {
- const { t } = useI18n()
- const { screenType } = useSelector((state: AppStore) => state.ecolyo.global)
-
- return (
- <Dialog
- open={open}
- disableBackdropClick
- disableEscapeKeyDown
- onClose={handleCloseClick}
- aria-labelledby={'accessibility-title'}
- classes={{
- root: 'modal-root',
- paper: 'modal-paper',
- }}
- >
- <div id={'accessibility-title'}>
- {t('auth.grdfgrandlyon.authModal.accessibility.window_title')}
- </div>
- <IconButton
- aria-label={t(
- 'auth.grdfgrandlyon.authModal.accessibility.button_close'
- )}
- className="modal-paper-close-button"
- onClick={handleCloseClick}
- >
- <Icon icon={CloseIcon} size={16} />
- </IconButton>
- {screenType === ScreenType.MOBILE ? (
- <StyledIcon icon={switchMobile} size={200} />
- ) : (
- <StyledIcon icon={switchDesktop} size={300} />
- )}
- <div className="grdfAuthModal">
- <p className="text-16-normal">
- {t('auth.grdfgrandlyon.authModal.text1')}
- <span className="text-16-bold yellowText">
- {t('auth.grdfgrandlyon.authModal.text2')}
- </span>
- </p>
- <p className="text-16-normal">
- {t('auth.grdfgrandlyon.authModal.listItem1')}
- <br />
- {t('auth.grdfgrandlyon.authModal.listItem2')}
- </p>
- <p className="text-16-normal">
- {t('auth.grdfgrandlyon.authModal.endText1')}
- <span className="text-16-bold yellowText">
- {t('auth.grdfgrandlyon.authModal.duration')}
- </span>
- {t('auth.grdfgrandlyon.authModal.endText2')}
- </p>
- <Button
- aria-label={t(
- 'auth.grdfgrandlyon.authModal.accessibility.button_validate'
- )}
- onClick={handleSubmit}
- disabled={isWaiting}
- classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
- }}
- >
- {t('auth.grdfgrandlyon.authModal.buttonText')}
- {isWaiting && <StyledBlackSpinner size={30} />}
- </Button>
- </div>
- </Dialog>
- )
-}
-
-export default ModalGRDF
diff --git a/src/components/Connection/__snapshots__/Connection.spec.tsx.snap b/src/components/Connection/__snapshots__/Connection.spec.tsx.snap
new file mode 100644
index 000000000..c252168a3
--- /dev/null
+++ b/src/components/Connection/__snapshots__/Connection.spec.tsx.snap
@@ -0,0 +1,123 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Connection component test should call ConnectionLogin 1`] = `
+<Connection
+ fluidStatus={
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": false,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 0,
+ "lastDataDate": "2020-09-01T00:00:00.000Z",
+ "status": 200,
+ }
+ }
+>
+ <div
+ className="konnector-form"
+ >
+ <mockConstructor
+ fluidStatus={
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": false,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 0,
+ "lastDataDate": "2020-09-01T00:00:00.000Z",
+ "status": 200,
+ }
+ }
+ onSuccess={[Function]}
+ >
+ <div
+ id="ConnectionLogin"
+ />
+ </mockConstructor>
+ </div>
+</Connection>
+`;
+
+exports[`Connection component test should call ConnectionOAuth 1`] = `
+<Connection
+ fluidStatus={
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": true,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 2,
+ "lastDataDate": "2020-09-01T00:00:00.000Z",
+ "status": 200,
+ }
+ }
+>
+ <div
+ className="konnector-form"
+ >
+ <mockConstructor
+ fluidStatus={
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": true,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 2,
+ "lastDataDate": "2020-09-01T00:00:00.000Z",
+ "status": 200,
+ }
+ }
+ onSuccess={[Function]}
+ >
+ <div
+ id="ConnectionOAuth"
+ />
+ </mockConstructor>
+ </div>
+</Connection>
+`;
diff --git a/src/components/Connection/__snapshots__/ConnectionForm.spec.tsx.snap b/src/components/Connection/__snapshots__/ConnectionForm.spec.tsx.snap
deleted file mode 100644
index ca77a53af..000000000
--- a/src/components/Connection/__snapshots__/ConnectionForm.spec.tsx.snap
+++ /dev/null
@@ -1,55 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ConnectionForm component test should call ConnectionLoginForm 1`] = `
-<ConnectionForm
- fluidStatus={
- Object {
- "connection": Object {
- "account": null,
- "isUpdating": false,
- "konnector": null,
- "konnectorConfig": Object {
- "activation": "",
- "name": "",
- "oauth": false,
- "siteLink": "",
- "slug": "",
- },
- "shouldLaunchKonnector": false,
- "trigger": null,
- "triggerState": null,
- },
- "fluidType": 0,
- "lastDataDate": "2020-09-01T00:00:00.000Z",
- "status": 200,
- }
- }
-/>
-`;
-
-exports[`ConnectionForm component test should call ConnectionOAuthForm 1`] = `
-<ConnectionForm
- fluidStatus={
- Object {
- "connection": Object {
- "account": null,
- "isUpdating": false,
- "konnector": null,
- "konnectorConfig": Object {
- "activation": "",
- "name": "",
- "oauth": true,
- "siteLink": "",
- "slug": "",
- },
- "shouldLaunchKonnector": false,
- "trigger": null,
- "triggerState": null,
- },
- "fluidType": 2,
- "lastDataDate": "2020-09-01T00:00:00.000Z",
- "status": 200,
- }
- }
-/>
-`;
diff --git a/src/components/Connection/auth.scss b/src/components/Connection/auth.scss
index c9f2c45ea..11caa2a60 100644
--- a/src/components/Connection/auth.scss
+++ b/src/components/Connection/auth.scss
@@ -10,13 +10,13 @@
justify-content: left;
}
.authform-button-content-icon {
- margin: 0 1.375rem;
+ margin: 0 0.5rem 0 0;
}
.authform-button-text {
display: flex;
flex-direction: column;
align-items: flex-start;
text-align: left;
- max-width: 10.625rem;
+ max-width: 13.5rem;
}
}
diff --git a/src/components/Connection/connection.scss b/src/components/Connection/connection.scss
new file mode 100644
index 000000000..51d095986
--- /dev/null
+++ b/src/components/Connection/connection.scss
@@ -0,0 +1,11 @@
+@import 'src/styles/base/color';
+@import 'src/styles/base/breakpoint';
+
+.konnector-form {
+ margin: 0;
+ @media only screen and (min-width : #{$width-large-phone}) {
+ padding-top: 1rem;
+ margin: 1rem 1.5rem 2rem 1.5rem;
+ padding-bottom: 1rem;
+ }
+}
diff --git a/src/components/Connection/connectionForm.scss b/src/components/Connection/connectionForm.scss
deleted file mode 100644
index 2c6f2e9dd..000000000
--- a/src/components/Connection/connectionForm.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@import 'src/styles/base/color';
-@import 'src/styles/base/breakpoint';
-
-.konnector-form {
- margin: 1rem 1.5rem 2rem 1.5rem;
- @media only screen and (min-width : #{$width-large-phone}) {
- padding-top: 1rem;
- margin: 4rem 1.5rem 2rem 1.5rem;
- padding-bottom: 1rem;
- }
- .form-title {
- font-size: 20px;
- font-weight: bold;
- text-align: center;
- &.electricity {
- color: $elec-color;
- }
- &.gas {
- color: $gas-color;
- }
- &.water {
- color: $water-color;
- }
- }
-}
diff --git a/src/components/Connection/connectionFormOAuth.scss b/src/components/Connection/connectionFormOAuth.scss
deleted file mode 100644
index 053697893..000000000
--- a/src/components/Connection/connectionFormOAuth.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@import 'src/styles/base/color';
-@import 'src/styles/base/breakpoint';
-
-.koauthform {
- margin: 0 1.3rem 1rem;
- @media #{$large-phone} {
- margin: 0 0 0.25rem;
- }
- .koauthform-info-provider {
- padding: 0;
- margin: 0;
- color: $grey-bright;
- text-align: center;
- }
- .info2 {
- margin-top: 0.5rem;
- }
- button.btn-secondary-positive {
- span:first-child {
- color: $grey-bright;
- }
- }
- .koauthform-text {
- text-align: center;
- color: $grey-bright;
- padding-top: 0.5rem;
- }
- .koauthform-button {
- margin-bottom: 1rem;
- button.btn-highlight {
- padding: 0.5rem;
- }
- }
-}
diff --git a/src/components/Connection/connectionInfoCreationEnedisAccountModal.scss b/src/components/Connection/connectionInfoCreationEnedisAccountModal.scss
deleted file mode 100644
index f98ab8bc8..000000000
--- a/src/components/Connection/connectionInfoCreationEnedisAccountModal.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@import 'src/styles/base/color';
-
-.enedisInfoModal {
- padding: 0 0.5rem;
-
- p {
- color: white
- }
-
- button.btn-highlight {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-evenly;
- margin: 1.5rem 0 1rem;
- padding: 1rem 2rem;
- transition: all 300ms ease;
- }
-}
-
-#accessibility-title {
- display: none;
-}
\ No newline at end of file
diff --git a/src/components/Connection/connectionLogin.scss b/src/components/Connection/connectionLogin.scss
new file mode 100644
index 000000000..9460217f5
--- /dev/null
+++ b/src/components/Connection/connectionLogin.scss
@@ -0,0 +1,70 @@
+@import 'src/styles/base/color';
+
+.kloginform {
+ .kloginform-title {
+ text-align: center;
+ margin-bottom: 0;
+ padding: 0 1rem;
+ &.enedisgrandlyon {
+ color: $elec-color;
+ }
+ &.grdfgrandlyon {
+ color: $gas-color;
+ }
+ &.eglgrandlyon {
+ color: $water-color;
+ }
+ }
+ .kloginform-subtitle {
+ text-align: center;
+ color: $white;
+ margin: 2.5rem 0 0.5rem;
+ }
+ .kloginform-infotext {
+ text-align: center;
+ color: $grey-bright;
+ }
+
+ button.btn-secondary-positive {
+ span:first-child {
+ color: $grey-bright;
+ }
+ }
+
+ .kloginform-button {
+ margin: 0 0.5rem;
+ text-align: center;
+ button.btn-highlight {
+ padding: 0.5rem;
+ margin-top: 0.5rem;
+ margin-bottom: 0rem;
+ height: 2.5rem;
+ max-width: 22.5rem;
+ }
+ button.btn-secondary-negative {
+ padding: 0.5rem;
+ margin-top: 0.5rem;
+ margin-bottom: 1.5rem;
+ height: 2.5rem;
+ max-width: 22.5rem;
+ }
+ }
+ .kloginform-connect-button {
+ margin: 0 0.5rem;
+ text-align: center;
+ button.btn-highlight {
+ padding: 0.5rem;
+ margin-top: 0.5rem;
+ margin-bottom: 1rem;
+ height: 5rem;
+ max-width: 22.5rem;
+ }
+ button.btn-secondary-negative {
+ padding: 0.5rem;
+ margin-top: 1rem;
+ margin-bottom: 2.5rem;
+ height: 5rem;
+ max-width: 22.5rem;
+ }
+ }
+}
diff --git a/src/components/Connection/connectionOAuth.scss b/src/components/Connection/connectionOAuth.scss
new file mode 100644
index 000000000..b28c2d5ef
--- /dev/null
+++ b/src/components/Connection/connectionOAuth.scss
@@ -0,0 +1,71 @@
+@import 'src/styles/base/color';
+@import 'src/styles/base/breakpoint';
+
+.koauthform {
+ .koauthform-title {
+ text-align: center;
+ margin-bottom: 0;
+ padding: 0 1rem;
+ &.enedisgrandlyon {
+ color: $elec-color;
+ }
+ &.grdfgrandlyon {
+ color: $gas-color;
+ }
+ &.eglgrandlyon {
+ color: $water-color;
+ }
+ }
+ .koauthform-subtitle {
+ text-align: center;
+ color: $white;
+ margin: 2.5rem 0 0.5rem;
+ }
+ .koauthform-infotext {
+ text-align: center;
+ color: $grey-bright;
+ }
+
+ button.btn-secondary-positive {
+ span:first-child {
+ color: $grey-bright;
+ }
+ }
+
+ .koauthform-button {
+ margin: 0 0.5rem;
+ text-align: center;
+ button.btn-highlight {
+ padding: 0.5rem;
+ margin-top: 0.5rem;
+ margin-bottom: 0rem;
+ height: 2.5rem;
+ max-width: 22.5rem;
+ }
+ button.btn-secondary-negative {
+ padding: 0.5rem;
+ margin-top: 0.5rem;
+ margin-bottom: 1.5rem;
+ height: 2.5rem;
+ max-width: 22.5rem;
+ }
+ }
+ .koauthform-connect-button {
+ margin: 0 0.5rem;
+ text-align: center;
+ button.btn-highlight {
+ padding: 0.5rem;
+ margin-top: 0.5rem;
+ margin-bottom: 1rem;
+ height: 5rem;
+ max-width: 22.5rem;
+ }
+ button.btn-secondary-negative {
+ padding: 0.5rem;
+ margin-top: 1rem;
+ margin-bottom: 2.5rem;
+ height: 5rem;
+ max-width: 22.5rem;
+ }
+ }
+}
diff --git a/src/components/Connection/connectionFormLogin.scss b/src/components/Connection/formLogin.scss
similarity index 90%
rename from src/components/Connection/connectionFormLogin.scss
rename to src/components/Connection/formLogin.scss
index 4477632d8..469d0606f 100644
--- a/src/components/Connection/connectionFormLogin.scss
+++ b/src/components/Connection/formLogin.scss
@@ -1,85 +1,87 @@
-@import 'src/styles/base/color';
-@import 'src/styles/base/breakpoint';
-
-// KonnectorLoginForm
-.kloginauthform {
- button.btn-secondary-positive {
- span:first-child {
- color: $grey-bright;
- }
- }
- .kloginauthform-text {
- color: $grey-bright;
- padding-top: 1rem;
- }
- .kloginauthform-button {
- margin-bottom: 1rem;
- button.btn-highlight {
- padding: 0.5rem;
- }
- }
-}
-
-.form {
- margin: 0 1.3rem 1rem;
- @media #{$large-phone} {
- margin: 0 0 0.25rem;
- }
- .form-info-provider {
- padding: 0;
- margin: 0;
- color: $grey-bright;
- text-align: center;
- }
- label {
- font-style: normal;
- font-weight: normal;
- font-size: 1rem;
- color: $grey-bright;
- margin-top: 0rem;
- }
- .form-input {
- background: rgba(0, 0, 0, 0.3);
- border: 1px solid #7b7b7b;
- border-radius: 4px;
- color: $grey-bright;
- padding: 0 5%;
- outline-offset: -1px;
- &.--error {
- border: 1px solid $red-primary;
- }
- }
- .form-input:focus {
- outline: none;
- border: 1px solid $gold-shadow;
- }
- .form-group {
- display: flex;
- flex-direction: column;
- margin: 1.5rem 0 0 0;
- .form-trailing-icon {
- float: right;
- position: relative;
- margin-top: -48px;
- margin-right: 15px;
- }
- }
- .form-control {
- height: 3rem;
- @media #{$large-phone} {
- max-width: 100vw;
- }
- }
- .form-message {
- color: $red-primary;
- min-height: 1.25rem;
- margin-top: 0.75rem;
- }
- button.btn-highlight {
- margin-top: 0.75rem;
- }
- ::placeholder {
- color: $grey-bright;
- opacity: 0.6;
- }
-}
+@import 'src/styles/base/color';
+@import 'src/styles/base/breakpoint';
+
+.kloginauthform {
+ button.btn-secondary-positive {
+ span:first-child {
+ color: $grey-bright;
+ }
+ }
+ .kloginauthform-text {
+ color: $grey-bright;
+ padding-top: 1rem;
+ }
+ .kloginauthform-button {
+ margin-bottom: 1rem;
+ button.btn-highlight {
+ padding: 0.5rem;
+ }
+ button.btn-secondary-negative {
+ padding: 0.5rem;
+ }
+ }
+}
+
+.form {
+ margin: 0 1.3rem 1rem;
+ @media #{$large-phone} {
+ margin: 0 0 0.25rem;
+ }
+ .form-info-provider {
+ padding: 0;
+ margin: 0;
+ color: $grey-bright;
+ text-align: center;
+ }
+ label {
+ font-style: normal;
+ font-weight: normal;
+ font-size: 1rem;
+ color: $grey-bright;
+ margin-top: 0rem;
+ }
+ .form-input {
+ background: rgba(0, 0, 0, 0.3);
+ border: 1px solid #7b7b7b;
+ border-radius: 4px;
+ color: $grey-bright;
+ padding: 0 5%;
+ outline-offset: -1px;
+ &.--error {
+ border: 1px solid $red-primary;
+ }
+ }
+ .form-input:focus {
+ outline: none;
+ border: 1px solid $gold-shadow;
+ }
+ .form-group {
+ display: flex;
+ flex-direction: column;
+ margin: 0.75rem 0 0 0;
+ .form-trailing-icon {
+ float: right;
+ position: relative;
+ margin-top: -48px;
+ margin-right: 15px;
+ }
+ }
+ .form-control {
+ height: 3rem;
+ @media #{$large-phone} {
+ max-width: 100vw;
+ }
+ }
+ .form-message {
+ color: $red-primary;
+ min-height: 1.25rem;
+ margin-top: 0.25rem;
+ }
+ button.btn-highlight {
+ margin-top: 0.75rem;
+ }
+ ::placeholder {
+ color: $grey-bright;
+ opacity: 0.6;
+ }
+}
diff --git a/src/components/ConsumptionVisualizer/DataloadComparisonLeft.tsx b/src/components/ConsumptionVisualizer/DataloadComparisonLeft.tsx
index 69fb32a16..e0edf457c 100644
--- a/src/components/ConsumptionVisualizer/DataloadComparisonLeft.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadComparisonLeft.tsx
@@ -51,7 +51,11 @@ const DataloadComparisonLeft: React.FC<DataloadComparisonLeftProps> = ({
].toLowerCase()}-compare text-16-normal`}
>
{`${formatNumberValues(
- converterService.LoadToEuro(compareDataload.value, fluidType)
+ converterService.LoadToEuro(
+ compareDataload.value,
+ fluidType,
+ compareDataload.price ? compareDataload.price : null
+ )
)} €`}
</div>
)}
diff --git a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
index e036c5701..15dfb718f 100644
--- a/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
@@ -123,7 +123,11 @@ const DataloadConsumptionVisualizer = ({
].toLowerCase()} text-16-normal`}
>
{`${formatNumberValues(
- converterService.LoadToEuro(dataload.value, fluidType)
+ converterService.LoadToEuro(
+ dataload.value,
+ fluidType,
+ dataload.price ? dataload.price : null
+ )
)} €`}
</div>
) : (
@@ -212,7 +216,8 @@ const DataloadConsumptionVisualizer = ({
<div>{`${formatNumberValues(
converterService.LoadToEuro(
dataload.value,
- fluidType
+ fluidType,
+ dataload.price ? dataload.price : null
)
)} €`}</div>
</div>
diff --git a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
index 8ae100b80..667bc7de6 100644
--- a/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
+++ b/src/components/ConsumptionVisualizer/DataloadNoValue.tsx
@@ -62,8 +62,8 @@ const DataloadNoValue: React.FC<DataloadNoValueProps> = ({
const getDataState = useCallback(() => {
if (fluidType !== FluidType.MULTIFLUID) {
- //J+3 for elec and J+5 for the other ==> dataDelayPffset + 3
- const delay = fluidConfig[fluidType].dataDelayOffset + 3
+ //J+3 for elec and J+5 for the other
+ const delay = fluidConfig[fluidType].dataDelayOffset + 1
const today = DateTime.local().setZone('utc', {
keepLocalTime: true,
})
diff --git a/src/components/Feedback/FeedbackModal.spec.tsx b/src/components/Feedback/FeedbackModal.spec.tsx
index dbd6912f0..f57ee8d62 100644
--- a/src/components/Feedback/FeedbackModal.spec.tsx
+++ b/src/components/Feedback/FeedbackModal.spec.tsx
@@ -12,15 +12,6 @@ import {
} from '../../../tests/__mocks__/store'
import { act } from 'react-dom/test-utils'
-const mockSendMail = jest.fn()
-jest.mock('services/mail.service', () => {
- return jest.fn(() => {
- return {
- SendMail: mockSendMail,
- }
- })
-})
-
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
useI18n: jest.fn(() => {
@@ -31,6 +22,23 @@ jest.mock('cozy-ui/transpiled/react/I18n', () => {
}
})
+jest.mock('services/environment.service', () => {
+ return jest.fn(() => {
+ return {
+ isProduction: () => true,
+ }
+ })
+})
+
+const mockSendMail = jest.fn()
+jest.mock('services/mail.service', () => {
+ return jest.fn(() => {
+ return {
+ SendMail: mockSendMail,
+ }
+ })
+})
+
const handleFeedbackModalClose = jest.fn()
const mockUseSelector = jest.spyOn(reactRedux, 'useSelector')
@@ -90,7 +98,7 @@ describe('FeedbackModal functionnalities', () => {
email: 'ecolyo@grandlyon.com',
},
],
- subject: '[Ecolyo - alpha] - Feedbacks - feedback.type_bug',
+ subject: '[Ecolyo] - Feedbacks - feedback.type_bug',
attachments: [],
parts: [
{
diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx
index f3e7f2733..d2db8f2d0 100644
--- a/src/components/Feedback/FeedbackModal.tsx
+++ b/src/components/Feedback/FeedbackModal.tsx
@@ -22,7 +22,7 @@ import MailService from 'services/mail.service'
import './feedbackModal.scss'
import useExploration from 'components/Hooks/useExploration'
import { UserExplorationID } from 'enum/userExploration.enum'
-import EnvironementService from 'services/environement.service'
+import EnvironmentService from 'services/environment.service'
const FEEDBACK_EMAIL = 'ecolyo@grandlyon.com'
const browser = detect()
@@ -86,7 +86,7 @@ const FeedbackModal: React.FC<FeedbackModalProps> = ({
'\n' +
envInfo
- const subjectEnv = new EnvironementService().isProduction()
+ const subjectEnv = new EnvironmentService().isProduction()
? '[Ecolyo]'
: '[Ecolyo - alpha]'
diff --git a/src/components/Home/ConsumptionView.spec.tsx b/src/components/Home/ConsumptionView.spec.tsx
index ab185281d..4466cc773 100644
--- a/src/components/Home/ConsumptionView.spec.tsx
+++ b/src/components/Home/ConsumptionView.spec.tsx
@@ -25,8 +25,8 @@ jest.mock('components/FluidChart/FluidChart', () => () => (
jest.mock('components/Home/ConsumptionDetails', () => () => (
<div id="consumptiondetails"></div>
))
-jest.mock('components/Connection/ConnectionForm', () => () => (
- <div id="connectionForm"></div>
+jest.mock('components/Connection/Connection', () => () => (
+ <div id="connection"></div>
))
jest.mock('components/Konnector/KonnectorViewerCard', () => () => (
<div id="konnectorViewerCard"></div>
diff --git a/src/components/Home/ConsumptionView.tsx b/src/components/Home/ConsumptionView.tsx
index 0d47ffec9..f207ac8b6 100644
--- a/src/components/Home/ConsumptionView.tsx
+++ b/src/components/Home/ConsumptionView.tsx
@@ -19,7 +19,11 @@ import KonnectorViewerList from 'components/Konnector/KonnectorViewerList'
import classNames from 'classnames'
import { isKonnectorActive } from 'utils/utils'
import ReleaseNotesModal from './releaseNotesModal'
-import { showReleaseNotes } from 'store/global/global.actions'
+import { setPartnersIssue, showReleaseNotes } from 'store/global/global.actions'
+import PartnersIssueModal from 'components/PartnersIssue/PartnersIssueModal'
+import ProfileService from 'services/profile.service'
+import { useClient } from 'cozy-client'
+import { DateTime } from 'luxon'
interface ConsumptionViewProps {
fluidType: FluidType
@@ -27,11 +31,12 @@ interface ConsumptionViewProps {
const ConsumptionView: React.FC<ConsumptionViewProps> = ({
fluidType,
}: ConsumptionViewProps) => {
+ const client = useClient()
const dispatch = useDispatch()
const { currentTimeStep, loading } = useSelector(
(state: AppStore) => state.ecolyo.chart
)
- const { fluidStatus, releaseNotes } = useSelector(
+ const { fluidStatus, releaseNotes, openPartnersIssueModal } = useSelector(
(state: AppStore) => state.ecolyo.global
)
@@ -48,7 +53,13 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({
/* eslint-disable @typescript-eslint/no-non-null-assertion */
- const lastDataDate =
+ const updatekey =
+ fluidType !== FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate
+ ? `${fluidStatus[fluidType].lastDataDate!.toLocaleString()} + ${
+ fluidStatus[fluidType].status
+ }`
+ : ''
+ const lastDataDateKey =
fluidType !== FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate
? fluidStatus[fluidType].lastDataDate!.toLocaleString()
: ''
@@ -62,6 +73,20 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({
dispatch(showReleaseNotes(false, releaseNotes.notes))
}, [dispatch, releaseNotes.notes])
+ const handleCloseModal = useCallback(async () => {
+ const profileService = new ProfileService(client)
+ const updatedProfile = await profileService.updateProfile({
+ partnersIssueDate: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('day'),
+ })
+ if (updatedProfile) {
+ dispatch(setPartnersIssue(false))
+ }
+ }, [client, dispatch])
+
useEffect(() => {
setIsFluidKonnected(isKonnectorActive(fluidStatus, fluidType))
if (
@@ -75,6 +100,7 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({
useEffect(() => {
dispatch(setLoading(true))
}, [dispatch])
+
return (
<>
<CozyBar titleKey={'navigation.consumption'} />
@@ -82,7 +108,7 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({
<DateNavigator />
</Header>
<Content height={headerHeight}>
- <FluidButtons activeFluid={fluidType} key={lastDataDate} />
+ <FluidButtons activeFluid={fluidType} key={updatekey} />
{openReleaseNoteModal && (
<ReleaseNotesModal
@@ -105,7 +131,7 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({
<FluidChart
fluidType={fluidType}
setActive={setActive}
- key={lastDataDate}
+ key={lastDataDateKey}
/>
<ConsumptionDetails fluidType={fluidType} />
</div>
@@ -122,23 +148,29 @@ const ConsumptionView: React.FC<ConsumptionViewProps> = ({
</div>
)}
</>
- ) : !isMulti ? (
- <div className="konnector-section">
- <KonnectorViewerCard
- fluidStatus={fluidStatus[fluidType]}
- fluidType={fluidType}
- isParam={false}
- isDisconnected={true}
- setActive={setActive}
- active={active}
- />
- </div>
) : (
<div className="konnector-section">
- <KonnectorViewerList />
+ {!isMulti ? (
+ <KonnectorViewerCard
+ fluidStatus={fluidStatus[fluidType]}
+ fluidType={fluidType}
+ isParam={false}
+ isDisconnected={true}
+ setActive={setActive}
+ active={active}
+ />
+ ) : (
+ <KonnectorViewerList />
+ )}
</div>
)}
</Content>
+
+ <PartnersIssueModal
+ open={openPartnersIssueModal}
+ fluidStatus={fluidStatus}
+ handleCloseClick={handleCloseModal}
+ />
</>
)
}
diff --git a/src/components/Home/FluidButton.tsx b/src/components/Home/FluidButton.tsx
index 7be422f8b..e8c80f310 100644
--- a/src/components/Home/FluidButton.tsx
+++ b/src/components/Home/FluidButton.tsx
@@ -12,6 +12,7 @@ import { useSelector } from 'react-redux'
import { AppStore } from 'store'
import { isKonnectorActive } from 'utils/utils'
import ErrorNotif from 'assets/icons/ico/notif_error.svg'
+import PartnerIssueNotif from 'assets/icons/ico/notif_maintenance.svg'
import DateChartService from 'services/dateChart.service'
interface FluidButtonProps {
@@ -68,6 +69,14 @@ const FluidButton: React.FC<FluidButtonProps> = ({
)
}, [history, fluidType, client])
+ const serviceIsDown = () => {
+ return (
+ fluidType !== FluidType.MULTIFLUID &&
+ fluidStatus[fluidType] &&
+ fluidStatus[fluidType].status === FluidState.PARTNER_ISSUE
+ )
+ }
+
useEffect(() => {
//Show errors only on konnected konnectors that are in error, outdated, with no data (specific case), and not in multifluid
if (
@@ -92,8 +101,16 @@ const FluidButton: React.FC<FluidButtonProps> = ({
icon={iconType}
size={fluidType === FluidType.MULTIFLUID ? 36 : 32}
/>
- {showError && (
- <StyledIcon icon={ErrorNotif} size={22} className="notif-error" />
+ {serviceIsDown() ? (
+ <StyledIcon
+ icon={PartnerIssueNotif}
+ size={22}
+ className="notif-error"
+ />
+ ) : (
+ showError && (
+ <StyledIcon icon={ErrorNotif} size={22} className="notif-error" />
+ )
)}
<div
className={`fluid-title ${FluidType[
diff --git a/src/components/Home/FluidButtons.tsx b/src/components/Home/FluidButtons.tsx
index e0a15ed79..2eb74c577 100644
--- a/src/components/Home/FluidButtons.tsx
+++ b/src/components/Home/FluidButtons.tsx
@@ -21,9 +21,11 @@ const FluidButtons: React.FC<FluidButtonsProps> = ({
<div className="fluid-buttons">
<div className="content">
{orderedFluids.map((fluid, key) => (
- <React.Fragment key={key}>
- <FluidButton isActive={activeFluid === fluid} fluidType={fluid} />
- </React.Fragment>
+ <FluidButton
+ key={key}
+ isActive={activeFluid === fluid}
+ fluidType={fluid}
+ />
))}
</div>
</div>
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index 6b7bad4ac..0aaa25927 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useMemo } from 'react'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { useClient } from 'cozy-client'
import { useDispatch, useSelector } from 'react-redux'
@@ -15,6 +15,7 @@ import {
Trigger,
FluidStatus,
FluidConnection,
+ UsageEvent,
} from 'models'
import { getAddPicto, getParamPicto } from 'utils/picto'
import { setChallengeConsumption } from 'store/challenge/challenge.actions'
@@ -34,8 +35,9 @@ import ExpansionPanel from '@material-ui/core/ExpansionPanel'
import ExpansionPanelSummary from '@material-ui/core/ExpansionPanelSummary'
import ExpansionPanelDetails from '@material-ui/core/ExpansionPanelDetails'
import ErrorNotif from 'assets/icons/ico/notif_error.svg'
+import PartnersIssueNotif from 'assets/icons/ico/notif_maintenance.svg'
import ConnectionNotFound from 'components/Connection/ConnectionNotFound'
-import ConnectionForm from 'components/Connection/ConnectionForm'
+import Connection from 'components/Connection/Connection'
import ConnectionResult from 'components/Connection/ConnectionResult'
import KonnectorModal from 'components/Konnector/KonnectorModal'
@@ -50,6 +52,10 @@ import { DateTime } from 'luxon'
import { setSelectedDate } from 'store/chart/chart.actions'
import DateChartService from 'services/dateChart.service'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import UsageEventService from 'services/usageEvent.service'
+import { UsageEventType } from 'enum/usageEvent.enum'
+import PartnersInfoService from 'services/partnersInfo.service'
+import { PartnersInfo } from 'models/partnersInfo.model'
interface KonnectorViewerCardProps {
fluidStatus: FluidStatus
@@ -90,13 +96,16 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
const [updatedFluidStatus, setUpdatedFluidStatus] = useState<FluidStatus[]>(
[]
)
- const [isOutdatedData, setisOutdatedData] = useState<number | null>(null)
+ const [isOutdatedData, setIsOutdatedData] = useState<number | null>(null)
const { currentChallenge } = useSelector(
(state: AppStore) => state.ecolyo.challenge
)
+ const fluidService = useMemo(() => new FluidService(client), [client])
+ const partnersInfoService = useMemo(() => new PartnersInfoService(client), [
+ client,
+ ])
/* eslint-disable @typescript-eslint/no-non-null-assertion */
-
const lastDataDate =
fluidType !== FluidType.MULTIFLUID && statusArray[fluidType].lastDataDate
? statusArray[fluidType].lastDataDate!.toLocaleString()
@@ -114,22 +123,21 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
const updateGlobalFluidStatus = useCallback(async (): Promise<
FluidStatus[]
> => {
- const fluidService = new FluidService(client)
const _updatedFluidStatus: FluidStatus[] = await fluidService.getFluidStatus()
setUpdatedFluidStatus(_updatedFluidStatus)
const refDate: DateTime = DateTime.fromISO('0001-01-01')
- let lastDataDate: DateTime | null = DateTime.fromISO('0001-01-01')
+ let _lastDataDate: DateTime | null = DateTime.fromISO('0001-01-01')
for (const fluid of _updatedFluidStatus) {
- if (fluid.lastDataDate && fluid.lastDataDate > lastDataDate) {
- lastDataDate = fluid.lastDataDate
+ if (fluid.lastDataDate && fluid.lastDataDate > _lastDataDate) {
+ _lastDataDate = fluid.lastDataDate
}
}
- if (lastDataDate > refDate) {
- dispatch(setSelectedDate(lastDataDate))
+ if (_lastDataDate > refDate) {
+ dispatch(setSelectedDate(_lastDataDate))
}
return _updatedFluidStatus
- }, [client, dispatch])
+ }, [dispatch, fluidService])
const refreshChallengeState = useCallback(async () => {
if (
@@ -157,10 +165,21 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
await refreshChallengeState()
const _updatedFluidStatus = await updateGlobalFluidStatus()
if (_updatedFluidStatus.length > 0) {
- dispatch(setFluidStatus(_updatedFluidStatus))
+ const partnersInfo: PartnersInfo = await partnersInfoService.getPartnersInfo()
+ const updatedFluidStatus: FluidStatus[] = await fluidService.getFluidStatus(
+ partnersInfo
+ )
+ dispatch(setFluidStatus(updatedFluidStatus))
}
setActive(false)
- }, [refreshChallengeState, updateGlobalFluidStatus, setActive, dispatch])
+ }, [
+ refreshChallengeState,
+ updateGlobalFluidStatus,
+ setActive,
+ partnersInfoService,
+ fluidService,
+ dispatch,
+ ])
const handleConnectionEnd = useCallback(async () => {
if (
@@ -178,7 +197,11 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
await handleAccountDeletion()
} else {
if (updatedFluidStatus.length > 0) {
- dispatch(setFluidStatus(updatedFluidStatus))
+ const partnersInfo: PartnersInfo = await partnersInfoService.getPartnersInfo()
+ const _updatedFluidStatus: FluidStatus[] = await fluidService.getFluidStatus(
+ partnersInfo
+ )
+ dispatch(setFluidStatus(_updatedFluidStatus))
}
}
setActive(false)
@@ -190,13 +213,41 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
account,
client,
dispatch,
+ fluidService,
fluidStatus,
handleAccountDeletion,
konnectorErrorDescription,
+ partnersInfoService,
setActive,
- updatedFluidStatus,
+ updatedFluidStatus.length,
])
+ const sendUsageEventSuccess = async (
+ konnectorSlug: string,
+ isConnexion: boolean
+ ): Promise<UsageEvent> => {
+ return UsageEventService.addEvent(client, {
+ type: isConnexion
+ ? UsageEventType.KONNECTOR_CONNECT_EVENT
+ : UsageEventType.KONNECTOR_REFRESH_EVENT,
+ target: konnectorSlug,
+ result: 'success',
+ })
+ }
+
+ const sendUsageEventError = async (
+ konnectorSlug: string,
+ isConnexion: boolean
+ ): Promise<UsageEvent> => {
+ return UsageEventService.addEvent(client, {
+ type: isConnexion
+ ? UsageEventType.KONNECTOR_CONNECT_EVENT
+ : UsageEventType.KONNECTOR_REFRESH_EVENT,
+ target: konnectorSlug,
+ result: 'error',
+ })
+ }
+
const getConnectionCard = useCallback(() => {
if (fluidState === FluidState.KONNECTOR_NOT_FOUND && !isUpdating) {
return <ConnectionNotFound konnectorSlug={fluidSlug} />
@@ -214,7 +265,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
/>
)
} else {
- return <ConnectionForm fluidStatus={fluidStatus} />
+ return <Connection fluidStatus={fluidStatus} />
}
}, [
fluidState,
@@ -257,14 +308,23 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
const connectionFlow = new ConnectionFlow(client, trigger, konnector)
await connectionFlow.launch()
connectionFlow.jobWatcher.on(ERROR_EVENT, () => {
+ if (subscribed) {
+ sendUsageEventError(fluidSlug, fluidStatus.lastDataDate === null)
+ }
setKonnectorErrorDescription(connectionFlow.jobWatcher.on()._error)
callbackResponse(ERROR_EVENT)
})
// When LOGIN SUCESS EVENT is triggered, the status retrieve from the trigger is still running
connectionFlow.jobWatcher.on(LOGIN_SUCCESS_EVENT, () => {
+ if (subscribed) {
+ sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null)
+ }
callbackResponse(LOGIN_SUCCESS_EVENT)
})
connectionFlow.jobWatcher.on(SUCCESS_EVENT, () => {
+ if (subscribed) {
+ sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null)
+ }
callbackResponse(SUCCESS_EVENT)
})
@@ -276,8 +336,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
}
getData()
const dateChartService = new DateChartService()
-
- setisOutdatedData(
+ setIsOutdatedData(
dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidType)
)
return () => {
@@ -303,9 +362,10 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
onChange={toggleAccordion}
classes={{
root: `expansion-panel-root ${
- fluidStatus.status === FluidState.ERROR ||
- fluidStatus.status === FluidState.ERROR_LOGIN_FAILED ||
- isOutdatedData
+ fluidStatus.status !== FluidState.PARTNER_ISSUE &&
+ (fluidStatus.status === FluidState.ERROR ||
+ fluidStatus.status === FluidState.ERROR_LOGIN_FAILED ||
+ isOutdatedData)
? 'red-border'
: ''
}`,
@@ -330,7 +390,13 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
) : (
<Icon icon={iconAddType} size={49} />
)}
- {fluidStatus.status === FluidState.ERROR || isOutdatedData ? (
+ {fluidStatus.status === FluidState.PARTNER_ISSUE ? (
+ <StyledIcon
+ icon={PartnersIssueNotif}
+ size={24}
+ className="konnector-state-picto"
+ />
+ ) : fluidStatus.status === FluidState.ERROR || isOutdatedData ? (
<StyledIcon
icon={ErrorNotif}
size={24}
@@ -342,13 +408,18 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
className={classNames('konnector-title', {
[`${FluidType[
fluidStatus.fluidType
- ].toLowerCase()}-connected text-18-bold`]:
- fluidStatus.status !== FluidState.NOT_CONNECTED,
+ ].toLowerCase()}-connected text-16-bold`]:
+ fluidStatus.status !== FluidState.NOT_CONNECTED &&
+ fluidStatus.status !== FluidState.PARTNER_ISSUE,
})}
>
- {fluidStatus.connection.account &&
- fluidStatus.status !== FluidState.ERROR_LOGIN_FAILED &&
- !isOutdatedData ? (
+ {fluidStatus.status === FluidState.PARTNER_ISSUE ? (
+ <span className="text-16-bold">
+ {t(`konnector_options.partner_issue`)}
+ </span>
+ ) : fluidStatus.connection.account &&
+ fluidStatus.status !== FluidState.ERROR_LOGIN_FAILED &&
+ !isOutdatedData ? (
t('FLUID.' + FluidType[fluidStatus.fluidType] + '.LABEL')
) : fluidStatus.status !== FluidState.ERROR_LOGIN_FAILED ? (
<span className="text-16-bold outdated">
diff --git a/src/components/Onboarding/WelcomeModal.spec.tsx b/src/components/Onboarding/WelcomeModal.spec.tsx
new file mode 100644
index 000000000..9be659c49
--- /dev/null
+++ b/src/components/Onboarding/WelcomeModal.spec.tsx
@@ -0,0 +1,147 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import WelcomeModal from './WelcomeModal'
+import { profileData } from '../../../tests/__mocks__/profile.mock'
+import configureStore from 'redux-mock-store'
+import { Provider } from 'react-redux'
+import * as profileActions from 'store/profile/profile.actions'
+import { Button, IconButton } from '@material-ui/core'
+import mockClient from '../../../tests/__mocks__/client'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+jest.mock('cozy-client', () => {
+ return {
+ useClient: jest.fn(() => mockClient),
+ }
+})
+jest.mock('components/Hooks/userInstanceSettings', () => {
+ return jest.fn(() => ({
+ data: {
+ // eslint-disable-next-line @typescript-eslint/camelcase
+ public_name: 'mocked_public_name',
+ },
+ }))
+})
+jest.mock('services/environment.service', () => {
+ return jest.fn(() => {
+ return {
+ getPublicURL: () => 'https://ecolyo-agent-rec.grandlyon.com',
+ }
+ })
+})
+const mockSendMail = jest.fn()
+jest.mock('services/mail.service', () => {
+ return jest.fn(() => {
+ return {
+ SendMail: mockSendMail,
+ }
+ })
+})
+jest.mock('notifications/welcome.hbs', () => {
+ return jest.fn(() => {
+ return {
+ welcomeTemplate: jest.fn(),
+ }
+ })
+})
+jest.mock('mjml-browser', () => {
+ return jest.fn(() => {
+ return {
+ mjml2html: jest.fn(),
+ }
+ })
+})
+
+const mockStore = configureStore([])
+const updateProfileSpy = jest.spyOn(profileActions, 'updateProfile')
+
+describe('WelcomeModal component', () => {
+ beforeEach(() => {
+ updateProfileSpy.mockClear()
+ })
+
+ it('should be rendered correctly', () => {
+ const store = mockStore({
+ ecolyo: {
+ profile: profileData,
+ },
+ })
+ const component = mount(
+ <Provider store={store}>
+ <WelcomeModal open={true} />
+ </Provider>
+ )
+ expect(toJson(component)).toMatchSnapshot()
+ })
+
+ it('should not be rendered', () => {
+ const store = mockStore({
+ ecolyo: {
+ profile: profileData,
+ },
+ })
+ const component = mount(
+ <Provider store={store}>
+ <WelcomeModal open={false} />
+ </Provider>
+ )
+ expect(toJson(component)).toMatchSnapshot()
+ })
+
+ it('should send mail and update profile when user click on the ok button', async () => {
+ const store = mockStore({
+ ecolyo: {
+ profile: profileData,
+ },
+ })
+ const component = mount(
+ <Provider store={store}>
+ <WelcomeModal open={true} />
+ </Provider>
+ )
+ component
+ .find(Button)
+ .first()
+ .simulate('click')
+ expect(mockSendMail).toBeCalled()
+ expect(updateProfileSpy).toHaveBeenCalledWith({
+ isFirstConnection: false,
+ onboarding: {
+ isWelcomeSeen: true,
+ },
+ })
+ })
+
+ it('should send mail and update profile when modal is closed by user', async () => {
+ const store = mockStore({
+ ecolyo: {
+ profile: profileData,
+ },
+ })
+ const component = mount(
+ <Provider store={store}>
+ <WelcomeModal open={true} />
+ </Provider>
+ )
+ component
+ .find(IconButton)
+ .first()
+ .simulate('click')
+ expect(mockSendMail).toBeCalled()
+ expect(updateProfileSpy).toHaveBeenCalledWith({
+ isFirstConnection: false,
+ onboarding: {
+ isWelcomeSeen: true,
+ },
+ })
+ })
+})
diff --git a/src/components/Onboarding/WelcomeModal.tsx b/src/components/Onboarding/WelcomeModal.tsx
new file mode 100644
index 000000000..8db78b491
--- /dev/null
+++ b/src/components/Onboarding/WelcomeModal.tsx
@@ -0,0 +1,117 @@
+import React, { useCallback } from 'react'
+import './welcomeModal.scss'
+import { useDispatch } from 'react-redux'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { useClient } from 'cozy-client'
+import { Button, Dialog, IconButton } from '@material-ui/core'
+import userInstanceSettings from 'components/Hooks/userInstanceSettings'
+import EnvironmentService from 'services/environment.service'
+import MailService from 'services/mail.service'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import CloseIcon from 'assets/icons/ico/close.svg'
+import PartnersConsentIcon from 'assets/icons/visu/onboarding/partners_consent.svg'
+import { updateProfile } from 'store/profile/profile.actions'
+const welcomeTemplate = require('notifications/welcome.hbs')
+const mjml2html = require('mjml-browser')
+
+interface WelcomeModalProps {
+ open: boolean
+}
+
+const WelcomeModal = ({ open }: WelcomeModalProps) => {
+ const { t } = useI18n()
+ const client = useClient()
+ const dispatch = useDispatch()
+ const { data: instanceSettings } = userInstanceSettings()
+
+ const setWelcomeModalViewed = useCallback(async () => {
+ const mailService = new MailService()
+ let username = ''
+
+ if (instanceSettings.public_name !== '') {
+ username = instanceSettings.public_name
+ }
+ const environmentService = new EnvironmentService()
+ const baseUrl = environmentService.getPublicURL()
+ const template = welcomeTemplate({
+ title: 'Bienvenue sur Ecolyo !',
+ username: username,
+ baseUrl: baseUrl,
+ clientUrl: client.options.uri,
+ cloudImageUrl: baseUrl + '/assets/godCloud.png',
+ ecolyoPhoneImageUrl: baseUrl + '/assets/ecolyoPhone.png',
+ androidImageUrl: baseUrl + '/assets/android.png',
+ menuImageUrl: baseUrl + '/assets/menu.png',
+ appleImageUrl: baseUrl + '/assets/apple.png',
+ shareImageUrl: baseUrl + '/assets/share.png',
+ })
+ const mailData = {
+ mode: 'noreply',
+ subject: '[Ecolyo] - Bienvenue',
+ parts: [
+ {
+ type: 'text/html',
+ body: mjml2html(template).html,
+ },
+ ],
+ }
+
+ mailService.SendMail(client, mailData)
+
+ dispatch(
+ updateProfile({
+ isFirstConnection: false,
+ onboarding: {
+ isWelcomeSeen: true,
+ },
+ })
+ )
+ }, [client, dispatch, instanceSettings])
+
+ return (
+ <Dialog
+ open={open}
+ onClose={setWelcomeModalViewed}
+ aria-labelledby={'accessibility-title'}
+ classes={{
+ root: 'modal-root',
+ paper: 'modal-paper',
+ }}
+ >
+ <div id={'accessibility-title'}>
+ {t('onboarding.welcomeModal.accessibility.window_title')}
+ </div>
+ <IconButton
+ aria-label={t('onboarding.welcomeModal.accessibility.button_valid')}
+ className="modal-paper-close-button"
+ onClick={setWelcomeModalViewed}
+ >
+ <Icon icon={CloseIcon} size={16} />
+ </IconButton>
+ <div className="info">
+ <h1 className="info-header text-24-bold">
+ {t('onboarding.welcomeModal.title')}
+ </h1>
+ <div className="info-content text-16-normal">
+ <p>{t('onboarding.welcomeModal.part1')}</p>
+ <p>{t('onboarding.welcomeModal.part2')}</p>
+ </div>
+ <div className="info-footer">
+ <Icon icon={PartnersConsentIcon} size={191} />
+ <Button
+ aria-label={t('onboarding.welcomeModal.accessibility.button_valid')}
+ onClick={setWelcomeModalViewed}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('onboarding.welcomeModal.button_valid')}
+ </Button>
+ </div>
+ </div>
+ </Dialog>
+ )
+}
+
+export default WelcomeModal
diff --git a/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap b/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
new file mode 100644
index 000000000..aa3ec9957
--- /dev/null
+++ b/src/components/Onboarding/__snapshots__/WelcomeModal.spec.tsx.snap
@@ -0,0 +1,1416 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`WelcomeModal component should be rendered correctly 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <WelcomeModal
+ open={true}
+ >
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[Function]}
+ open={true}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[Function]}
+ open={true}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[Function]}
+ open={true}
+ >
+ <ForwardRef(Portal)
+ disablePortal={false}
+ >
+ <Portal
+ containerInfo={
+ <body
+ style="padding-right: 0px; overflow: hidden;"
+ >
+ <div
+ class="MuiDialog-root modal-root"
+ role="presentation"
+ style="position: fixed; z-index: 1300; right: 0px; bottom: 0px; top: 0px; left: 0px;"
+ >
+ <div
+ aria-hidden="true"
+ class="MuiBackdrop-root"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ />
+ <div
+ data-test="sentinelStart"
+ tabindex="0"
+ />
+ <div
+ class="MuiDialog-container MuiDialog-scrollPaper"
+ role="none presentation"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ tabindex="-1"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ class="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ onboarding.welcomeModal.accessibility.window_title
+ </div>
+ <button
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ class="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="16"
+ width="16"
+ >
+ <use
+ xlink:href="#function () {
+ return fn.apply(this, arguments);
+ }"
+ />
+ </svg>
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ <div
+ class="info"
+ >
+ <h1
+ class="info-header text-24-bold"
+ >
+ onboarding.welcomeModal.title
+ </h1>
+ <div
+ class="info-content text-16-normal"
+ >
+ <p>
+ onboarding.welcomeModal.part1
+ </p>
+ <p>
+ onboarding.welcomeModal.part2
+ </p>
+ </div>
+ <div
+ class="info-footer"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="191"
+ width="191"
+ >
+ <use
+ xlink:href="#function () {
+ return fn.apply(this, arguments);
+ }"
+ />
+ </svg>
+ <button
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ class="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ onboarding.welcomeModal.button_valid
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div
+ data-test="sentinelEnd"
+ tabindex="0"
+ />
+ </div>
+ </body>
+ }
+ >
+ <div
+ className="MuiDialog-root modal-root"
+ onKeyDown={[Function]}
+ role="presentation"
+ style={
+ Object {
+ "bottom": 0,
+ "left": 0,
+ "position": "fixed",
+ "right": 0,
+ "top": 0,
+ "zIndex": 1300,
+ }
+ }
+ >
+ <WithStyles(ForwardRef(Backdrop))
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Backdrop)
+ classes={
+ Object {
+ "invisible": "MuiBackdrop-invisible",
+ "root": "MuiBackdrop-root",
+ }
+ }
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Fade)
+ in={true}
+ onClick={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onClick={[Function]}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ aria-hidden={true}
+ className="MuiBackdrop-root"
+ onClick={[Function]}
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ />
+ </Transition>
+ </ForwardRef(Fade)>
+ </ForwardRef(Backdrop)>
+ </WithStyles(ForwardRef(Backdrop))>
+ <TrapFocus
+ disableAutoFocus={false}
+ disableEnforceFocus={false}
+ disableRestoreFocus={false}
+ getDoc={[Function]}
+ isEnabled={[Function]}
+ open={true}
+ >
+ <div
+ data-test="sentinelStart"
+ tabIndex={0}
+ />
+ <ForwardRef(Fade)
+ appear={true}
+ in={true}
+ onEnter={[Function]}
+ onExited={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ className="MuiDialog-container MuiDialog-scrollPaper"
+ onClick={[Function]}
+ onMouseDown={[Function]}
+ role="none presentation"
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ tabIndex="-1"
+ >
+ <WithStyles(ForwardRef(Paper))
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ elevation={24}
+ role="dialog"
+ >
+ <ForwardRef(Paper)
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ classes={
+ Object {
+ "elevation0": "MuiPaper-elevation0",
+ "elevation1": "MuiPaper-elevation1",
+ "elevation10": "MuiPaper-elevation10",
+ "elevation11": "MuiPaper-elevation11",
+ "elevation12": "MuiPaper-elevation12",
+ "elevation13": "MuiPaper-elevation13",
+ "elevation14": "MuiPaper-elevation14",
+ "elevation15": "MuiPaper-elevation15",
+ "elevation16": "MuiPaper-elevation16",
+ "elevation17": "MuiPaper-elevation17",
+ "elevation18": "MuiPaper-elevation18",
+ "elevation19": "MuiPaper-elevation19",
+ "elevation2": "MuiPaper-elevation2",
+ "elevation20": "MuiPaper-elevation20",
+ "elevation21": "MuiPaper-elevation21",
+ "elevation22": "MuiPaper-elevation22",
+ "elevation23": "MuiPaper-elevation23",
+ "elevation24": "MuiPaper-elevation24",
+ "elevation3": "MuiPaper-elevation3",
+ "elevation4": "MuiPaper-elevation4",
+ "elevation5": "MuiPaper-elevation5",
+ "elevation6": "MuiPaper-elevation6",
+ "elevation7": "MuiPaper-elevation7",
+ "elevation8": "MuiPaper-elevation8",
+ "elevation9": "MuiPaper-elevation9",
+ "outlined": "MuiPaper-outlined",
+ "root": "MuiPaper-root",
+ "rounded": "MuiPaper-rounded",
+ }
+ }
+ elevation={24}
+ role="dialog"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ className="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ onboarding.welcomeModal.accessibility.window_title
+ </div>
+ <WithStyles(ForwardRef(IconButton))
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ className="modal-paper-close-button"
+ onClick={[Function]}
+ >
+ <ForwardRef(IconButton)
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ className="modal-paper-close-button"
+ classes={
+ Object {
+ "colorInherit": "MuiIconButton-colorInherit",
+ "colorPrimary": "MuiIconButton-colorPrimary",
+ "colorSecondary": "MuiIconButton-colorSecondary",
+ "disabled": "Mui-disabled",
+ "edgeEnd": "MuiIconButton-edgeEnd",
+ "edgeStart": "MuiIconButton-edgeStart",
+ "label": "MuiIconButton-label",
+ "root": "MuiIconButton-root",
+ "sizeSmall": "MuiIconButton-sizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ focusRipple={true}
+ onClick={[Function]}
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ disabled={false}
+ focusRipple={true}
+ onClick={[Function]}
+ >
+ <button
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ className="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiIconButton-label"
+ >
+ <Icon
+ icon={[MockFunction]}
+ size={16}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <use
+ xlinkHref="#function () {
+ return fn.apply(this, arguments);
+ }"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
+ center={true}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(IconButton)>
+ </WithStyles(ForwardRef(IconButton))>
+ <div
+ className="info"
+ >
+ <h1
+ className="info-header text-24-bold"
+ >
+ onboarding.welcomeModal.title
+ </h1>
+ <div
+ className="info-content text-16-normal"
+ >
+ <p>
+ onboarding.welcomeModal.part1
+ </p>
+ <p>
+ onboarding.welcomeModal.part2
+ </p>
+ </div>
+ <div
+ className="info-footer"
+ >
+ <Icon
+ icon={[MockFunction]}
+ size={191}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={191}
+ style={Object {}}
+ width={191}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={191}
+ style={Object {}}
+ width={191}
+ >
+ <use
+ xlinkHref="#function () {
+ return fn.apply(this, arguments);
+ }"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ <WithStyles(ForwardRef(Button))
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-highlight",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-highlight",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ className="MuiButton-root btn-highlight MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="onboarding.welcomeModal.accessibility.button_valid"
+ className="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ onboarding.welcomeModal.button_valid
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+ </div>
+ </ForwardRef(Paper)>
+ </WithStyles(ForwardRef(Paper))>
+ </div>
+ </Transition>
+ </ForwardRef(Fade)>
+ <div
+ data-test="sentinelEnd"
+ tabIndex={0}
+ />
+ </TrapFocus>
+ </div>
+ </Portal>
+ </ForwardRef(Portal)>
+ </ForwardRef(Modal)>
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+ </WelcomeModal>
+</Provider>
+`;
+
+exports[`WelcomeModal component should not be rendered 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <WelcomeModal
+ open={false}
+ >
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[Function]}
+ open={false}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[Function]}
+ open={false}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[Function]}
+ open={false}
+ />
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+ </WelcomeModal>
+</Provider>
+`;
diff --git a/src/components/Connection/modalGRDF.scss b/src/components/Onboarding/welcomeModal.scss
similarity index 81%
rename from src/components/Connection/modalGRDF.scss
rename to src/components/Onboarding/welcomeModal.scss
index d22775509..3bbf75622 100644
--- a/src/components/Connection/modalGRDF.scss
+++ b/src/components/Onboarding/welcomeModal.scss
@@ -1,24 +1,28 @@
-@import 'src/styles/base/color';
-
-.grdfAuthModal {
- padding: 0 0.5rem;
- p {
- color: white;
- }
- .yellowText {
- color: $gold-shadow;
- }
- button.btn-highlight {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-evenly;
- margin: 1.5rem 0 1rem;
- padding: 1rem 2rem;
- transition: all 300ms ease;
- }
-}
-
-#accessibility-title {
- display: none;
-}
\ No newline at end of file
+@import 'src/styles/base/color';
+
+.info {
+ padding: 0.5rem 0.5rem 0;
+ text-align: center;
+
+ h1 {
+ color: $gold-shadow;
+ }
+
+ p {
+ color: white;
+ }
+
+ button.btn-highlight {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+ margin: 1.5rem 0 1rem;
+ padding: 1rem 2rem;
+ transition: all 300ms ease;
+ }
+}
+
+#accessibility-title {
+ display: none;
+}
diff --git a/src/components/Options/ReportOptions.spec.tsx b/src/components/Options/ReportOptions.spec.tsx
index 3ca58f678..fc6cac748 100644
--- a/src/components/Options/ReportOptions.spec.tsx
+++ b/src/components/Options/ReportOptions.spec.tsx
@@ -9,6 +9,7 @@ import {
import * as profileActions from 'store/profile/profile.actions'
import { Button } from '@material-ui/core'
import StyledSwitch from 'components/CommonKit/Switch/StyledSwitch'
+import { FluidState, FluidType } from 'enum/fluid.enum'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
@@ -83,6 +84,10 @@ describe('ReportOptions component', () => {
})
it('should be rendered with sendConsumptionAlert to false', () => {
+ mockInitialEcolyoState.profile.sendAnalysisNotification = false
+ mockInitialEcolyoState.global.fluidStatus[FluidType.WATER].status =
+ FluidState.DONE
+ store = createMockStore(mockInitialEcolyoState)
const wrapper = mount(
<Provider store={store}>
<ReportOptions />
diff --git a/src/components/Options/ReportOptions.tsx b/src/components/Options/ReportOptions.tsx
index 9e8c687e3..8edbc8c24 100644
--- a/src/components/Options/ReportOptions.tsx
+++ b/src/components/Options/ReportOptions.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
import './reportOptions.scss'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { useSelector, useDispatch } from 'react-redux'
@@ -25,9 +25,12 @@ const ReportOptions: React.FC = () => {
dispatch(updateProfile({ sendAnalysisNotification: value }))
}
- const updateProfileAlert = async (value: boolean) => {
- dispatch(updateProfile({ sendConsumptionAlert: value }))
- }
+ const updateProfileAlert = useCallback(
+ async (value: boolean) => {
+ dispatch(updateProfile({ sendConsumptionAlert: value }))
+ },
+ [dispatch]
+ )
const setWaterLimit = (e: React.ChangeEvent<HTMLInputElement>) => {
if (e.target.value !== null && parseInt(e.target.value) > 0) {
@@ -83,7 +86,12 @@ const ReportOptions: React.FC = () => {
return () => {
subscribed = false
}
- }, [client])
+ }, [
+ client,
+ profile.sendConsumptionAlert,
+ profile.waterDailyConsumptionLimit,
+ updateProfileAlert,
+ ])
return (
<div className="report-option-root">
<div className="report-option-content">
@@ -113,27 +121,31 @@ const ReportOptions: React.FC = () => {
</div>
</div>
{/* Consumption Alert activation */}
- {fluidStatus[FluidType.WATER].status !== FluidState.NOT_CONNECTED && (
- <>
- <div className="head text-16-normal-uppercase">
- {t('profile.report.title_alert')}
- </div>
- <div className="switch-container-alert">
- <StyledSwitch
- checked={profile.sendConsumptionAlert}
- onChange={handleAlertChange}
- inputProps={{
- 'aria-label': t(
- 'profile.accessibility.button_toggle_consumption_alert'
- ),
- }}
- />
- <span className="switch-label text-16-normal">
- {t('profile.report.switch_label_alert')}
- </span>
- </div>
- </>
- )}
+ {fluidStatus[FluidType.WATER].status !== FluidState.NOT_CONNECTED &&
+ fluidStatus[FluidType.WATER].status !==
+ FluidState.KONNECTOR_NOT_FOUND &&
+ fluidStatus[FluidType.WATER].status !==
+ FluidState.ERROR_LOGIN_FAILED && (
+ <>
+ <div className="head text-16-normal-uppercase">
+ {t('profile.report.title_alert')}
+ </div>
+ <div className="switch-container-alert">
+ <StyledSwitch
+ checked={profile.sendConsumptionAlert}
+ onChange={handleAlertChange}
+ inputProps={{
+ 'aria-label': t(
+ 'profile.accessibility.button_toggle_consumption_alert'
+ ),
+ }}
+ />
+ <span className="switch-label text-16-normal">
+ {t('profile.report.switch_label_alert')}
+ </span>
+ </div>
+ </>
+ )}
{profile.sendConsumptionAlert && (
<div className="alert-inputs-display">
<div className="alert-input-row">
diff --git a/src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.spec.tsx b/src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.spec.tsx
new file mode 100644
index 000000000..07dc5f128
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.spec.tsx
@@ -0,0 +1,112 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import PartnerConnectionStepsModal from 'components/PartnerConnectionStepsModal/PartnerConnectionStepsModal'
+import { FluidType } from 'enum/fluid.enum'
+import { electricitySteps } from '../../../tests/__mocks__/stepsData.mock'
+import { Button, IconButton } from '@material-ui/core'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: () => {
+ return {
+ t: (str: string) => str,
+ }
+ },
+ }
+})
+const mockGetPartnerSteps = jest.fn()
+jest.mock('utils/steps', () => {
+ return {
+ getPartnerSteps: () => mockGetPartnerSteps,
+ }
+})
+const mockHandleCloseClick = jest.fn()
+const mockHandleEndSteps = jest.fn()
+
+describe('PartnerConnectionStepsModal component', () => {
+ beforeEach(() => {
+ mockGetPartnerSteps.mockClear()
+ })
+
+ it('should be rendered correctly', () => {
+ mockGetPartnerSteps.mockReturnValue(electricitySteps)
+ const component = mount(
+ <PartnerConnectionStepsModal
+ fluidType={FluidType.ELECTRICITY}
+ open={true}
+ handleCloseClick={mockHandleCloseClick}
+ handleEndSteps={mockHandleEndSteps}
+ />
+ )
+ expect(toJson(component)).toMatchSnapshot()
+ })
+
+ it('should close when user click on the button', async () => {
+ mockGetPartnerSteps.mockReturnValue(electricitySteps)
+ const component = mount(
+ <PartnerConnectionStepsModal
+ fluidType={FluidType.ELECTRICITY}
+ open={true}
+ handleCloseClick={mockHandleCloseClick}
+ handleEndSteps={mockHandleEndSteps}
+ />
+ )
+ component
+ .find(IconButton)
+ .first()
+ .simulate('click')
+ expect(mockHandleCloseClick).toBeCalled()
+ })
+
+ it('should go to next step when user click on next button', () => {
+ mockGetPartnerSteps.mockReturnValue(electricitySteps)
+ const component = mount(
+ <PartnerConnectionStepsModal
+ fluidType={FluidType.ELECTRICITY}
+ open={true}
+ handleCloseClick={mockHandleCloseClick}
+ handleEndSteps={mockHandleEndSteps}
+ />
+ )
+ component
+ .find(Button)
+ .last()
+ .simulate('click')
+ const step: string = component
+ .find('.partners-connection-step-progress')
+ .first()
+ .text()
+ expect(step).toEqual('2 / 3')
+ })
+
+ it('should handle the end of modal when user click on last button', () => {
+ mockGetPartnerSteps.mockReturnValue(electricitySteps)
+ const component = mount(
+ <PartnerConnectionStepsModal
+ fluidType={FluidType.ELECTRICITY}
+ open={true}
+ handleCloseClick={mockHandleCloseClick}
+ handleEndSteps={mockHandleEndSteps}
+ />
+ )
+ component
+ .find(Button)
+ .last()
+ .simulate('click')
+ component
+ .find(Button)
+ .last()
+ .simulate('click')
+ const step: string = component
+ .find('.partners-connection-step-progress')
+ .first()
+ .text()
+ expect(step).toEqual('3 / 3')
+ component
+ .find(Button)
+ .last()
+ .simulate('click')
+ expect(mockHandleEndSteps).toBeCalled()
+ })
+})
diff --git a/src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.tsx b/src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.tsx
new file mode 100644
index 000000000..70988ddd0
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/PartnerConnectionStepsModal.tsx
@@ -0,0 +1,115 @@
+import React, { useCallback, useEffect, useState } from 'react'
+import './partnerConnectionStepModal.scss'
+import { Step } from 'models/step.model'
+import { Button, Dialog, IconButton } from '@material-ui/core'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import CloseIcon from 'assets/icons/ico/close.svg'
+import StepDetail from './StepDetail'
+import { FluidType } from 'enum/fluid.enum'
+import classNames from 'classnames'
+import { getPartnerSteps } from 'utils/steps'
+
+interface PartnerConnectionStepsModalProps {
+ fluidType: FluidType
+ open: boolean
+ handleCloseClick: () => void
+ handleEndSteps: () => void
+}
+
+const PartnerConnectionStepsModal = ({
+ fluidType,
+ open,
+ handleCloseClick,
+ handleEndSteps,
+}: PartnerConnectionStepsModalProps) => {
+ const { t } = useI18n()
+
+ const [steps, setSteps] = useState<Step[]>([])
+ const [stepIndex, setStepIndex] = useState<number>(0)
+
+ const goPrevStep = useCallback(() => {
+ setStepIndex(prev => prev - 1)
+ }, [])
+
+ const goNextStep = useCallback(() => {
+ setStepIndex(prev => prev + 1)
+ }, [])
+
+ useEffect(() => {
+ if (open) {
+ const newSteps: Step[] = getPartnerSteps(fluidType)
+ setSteps(newSteps)
+ setStepIndex(0)
+ }
+ }, [open, fluidType])
+
+ return (
+ <Dialog
+ open={open && steps.length > 0}
+ onClose={handleCloseClick}
+ aria-labelledby={'accessibility-title'}
+ classes={{
+ root: 'modal-root',
+ paper: 'modal-paper',
+ }}
+ >
+ <div id={'accessibility-title'}>
+ {t('partner_connection_steps.accessibility.window_title')}
+ </div>
+ <IconButton
+ aria-label={t('partner_connection_steps.accessibility.button_close')}
+ className="modal-paper-close-button"
+ onClick={handleCloseClick}
+ >
+ <Icon icon={CloseIcon} size={16} />
+ </IconButton>
+ <div className="partners-connection-step-content">
+ <div className="partners-connection-step-progress">{`${stepIndex +
+ 1} / ${steps.length}`}</div>
+ <StepDetail step={steps[stepIndex]} />
+ </div>
+ <div className="partners-connection-step-navigation">
+ <Button
+ aria-label={t(
+ 'partner_connection_steps.accessibility.button_previous'
+ )}
+ onClick={goPrevStep}
+ className={classNames('navigation-button', {
+ ['disabled']: stepIndex === 0,
+ })}
+ disabled={stepIndex === 0}
+ classes={{
+ root: 'btn-profile-back',
+ label: 'text-16-bold',
+ }}
+ >
+ {`< ${t('partner_connection_steps.button_previous')}`}
+ </Button>
+ <Button
+ aria-label={
+ stepIndex === steps.length - 1
+ ? t('partner_connection_steps.accessibility.button_validate')
+ : t('partner_connection_steps.accessibility.button_next')
+ }
+ onClick={stepIndex === steps.length - 1 ? handleEndSteps : goNextStep}
+ className={'navigation-button'}
+ classes={{
+ root: 'btn-profile-next rounded',
+ label: 'text-16-bold',
+ }}
+ >
+ {stepIndex === steps.length - 1
+ ? t(
+ `partner_connection_steps.${FluidType[
+ fluidType
+ ].toLowerCase()}.button_validate`
+ )
+ : `${t('partner_connection_steps.button_next')} >`}
+ </Button>
+ </div>
+ </Dialog>
+ )
+}
+
+export default PartnerConnectionStepsModal
diff --git a/src/components/PartnerConnectionStepsModal/StepDetail.spec.tsx b/src/components/PartnerConnectionStepsModal/StepDetail.spec.tsx
new file mode 100644
index 000000000..bb74c7776
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/StepDetail.spec.tsx
@@ -0,0 +1,30 @@
+import React from 'react'
+import { shallow } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import StepDetail from 'components/PartnerConnectionStepsModal/StepDetail'
+import { electricitySteps } from '../../../tests/__mocks__/stepsData.mock'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: () => {
+ return {
+ t: (str: string) => str,
+ }
+ },
+ }
+})
+
+describe('StepDetail component', () => {
+ it('should be rendered correctly', () => {
+ const step = electricitySteps[0]
+ const component = shallow(<StepDetail step={step} />)
+ expect(toJson(component)).toMatchSnapshot()
+ })
+
+ it('should not display info2 if empty', () => {
+ const step = electricitySteps[0]
+ step.info2 = ''
+ const component = shallow(<StepDetail step={step} />)
+ expect(toJson(component)).toMatchSnapshot()
+ })
+})
diff --git a/src/components/PartnerConnectionStepsModal/StepDetail.tsx b/src/components/PartnerConnectionStepsModal/StepDetail.tsx
new file mode 100644
index 000000000..3289e6224
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/StepDetail.tsx
@@ -0,0 +1,29 @@
+import React from 'react'
+import './stepDetail.scss'
+import { Step } from 'models/step.model'
+import { decoreText } from 'utils/decoreText'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+
+interface StepDetailProps {
+ step: Step
+}
+
+const StepDetail = ({ step }: StepDetailProps) => {
+ const { t } = useI18n()
+ const info1: string = t(step.info1)
+ const info2: string = t(step.info2)
+ return (
+ <div className="step-detail-info">
+ <Icon className="info-icon" icon={step.icon} size={222} />
+ <div className="info-content text-18-normal">
+ <div className="info-content-text">{decoreText(info1)}</div>
+ {info2.length > 0 && (
+ <div className="info-content-text">{decoreText(info2)}</div>
+ )}
+ </div>
+ </div>
+ )
+}
+
+export default StepDetail
diff --git a/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap b/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap
new file mode 100644
index 000000000..24aae2ac9
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/__snapshots__/PartnerConnectionStepsModal.spec.tsx.snap
@@ -0,0 +1,1164 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PartnerConnectionStepsModal component should be rendered correctly 1`] = `
+<PartnerConnectionStepsModal
+ fluidType={0}
+ handleCloseClick={[MockFunction]}
+ handleEndSteps={[MockFunction]}
+ open={true}
+>
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Portal)
+ disablePortal={false}
+ >
+ <Portal
+ containerInfo={
+ <body
+ style="padding-right: 0px; overflow: hidden;"
+ >
+ <div
+ class="MuiDialog-root modal-root"
+ role="presentation"
+ style="position: fixed; z-index: 1300; right: 0px; bottom: 0px; top: 0px; left: 0px;"
+ >
+ <div
+ aria-hidden="true"
+ class="MuiBackdrop-root"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ />
+ <div
+ data-test="sentinelStart"
+ tabindex="0"
+ />
+ <div
+ class="MuiDialog-container MuiDialog-scrollPaper"
+ role="none presentation"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ tabindex="-1"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ class="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ partner_connection_steps.accessibility.window_title
+ </div>
+ <button
+ aria-label="partner_connection_steps.accessibility.button_close"
+ class="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="16"
+ width="16"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ <div
+ class="partners-connection-step-content"
+ >
+ <div
+ class="partners-connection-step-progress"
+ >
+ 1 / 3
+ </div>
+ <div
+ class="step-detail-info"
+ >
+ <svg
+ class="info-icon styles__icon___23x3R"
+ height="222"
+ width="222"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ <div
+ class="info-content text-18-normal"
+ >
+ <div
+ class="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info1
+ </div>
+ <div
+ class="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info2
+ </div>
+ </div>
+ </div>
+ </div>
+ <div
+ class="partners-connection-step-navigation"
+ >
+ <button
+ aria-label="partner_connection_steps.accessibility.button_previous"
+ class="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text navigation-button disabled Mui-disabled Mui-disabled"
+ disabled=""
+ tabindex="-1"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ < partner_connection_steps.button_previous
+ </span>
+ </button>
+ <button
+ aria-label="partner_connection_steps.accessibility.button_next"
+ class="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text navigation-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ partner_connection_steps.button_next >
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ </div>
+ </div>
+ </div>
+ <div
+ data-test="sentinelEnd"
+ tabindex="0"
+ />
+ </div>
+ </body>
+ }
+ >
+ <div
+ className="MuiDialog-root modal-root"
+ onKeyDown={[Function]}
+ role="presentation"
+ style={
+ Object {
+ "bottom": 0,
+ "left": 0,
+ "position": "fixed",
+ "right": 0,
+ "top": 0,
+ "zIndex": 1300,
+ }
+ }
+ >
+ <WithStyles(ForwardRef(Backdrop))
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Backdrop)
+ classes={
+ Object {
+ "invisible": "MuiBackdrop-invisible",
+ "root": "MuiBackdrop-root",
+ }
+ }
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Fade)
+ in={true}
+ onClick={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onClick={[Function]}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ aria-hidden={true}
+ className="MuiBackdrop-root"
+ onClick={[Function]}
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ />
+ </Transition>
+ </ForwardRef(Fade)>
+ </ForwardRef(Backdrop)>
+ </WithStyles(ForwardRef(Backdrop))>
+ <TrapFocus
+ disableAutoFocus={false}
+ disableEnforceFocus={false}
+ disableRestoreFocus={false}
+ getDoc={[Function]}
+ isEnabled={[Function]}
+ open={true}
+ >
+ <div
+ data-test="sentinelStart"
+ tabIndex={0}
+ />
+ <ForwardRef(Fade)
+ appear={true}
+ in={true}
+ onEnter={[Function]}
+ onExited={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ className="MuiDialog-container MuiDialog-scrollPaper"
+ onClick={[Function]}
+ onMouseDown={[Function]}
+ role="none presentation"
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ tabIndex="-1"
+ >
+ <WithStyles(ForwardRef(Paper))
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ elevation={24}
+ role="dialog"
+ >
+ <ForwardRef(Paper)
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ classes={
+ Object {
+ "elevation0": "MuiPaper-elevation0",
+ "elevation1": "MuiPaper-elevation1",
+ "elevation10": "MuiPaper-elevation10",
+ "elevation11": "MuiPaper-elevation11",
+ "elevation12": "MuiPaper-elevation12",
+ "elevation13": "MuiPaper-elevation13",
+ "elevation14": "MuiPaper-elevation14",
+ "elevation15": "MuiPaper-elevation15",
+ "elevation16": "MuiPaper-elevation16",
+ "elevation17": "MuiPaper-elevation17",
+ "elevation18": "MuiPaper-elevation18",
+ "elevation19": "MuiPaper-elevation19",
+ "elevation2": "MuiPaper-elevation2",
+ "elevation20": "MuiPaper-elevation20",
+ "elevation21": "MuiPaper-elevation21",
+ "elevation22": "MuiPaper-elevation22",
+ "elevation23": "MuiPaper-elevation23",
+ "elevation24": "MuiPaper-elevation24",
+ "elevation3": "MuiPaper-elevation3",
+ "elevation4": "MuiPaper-elevation4",
+ "elevation5": "MuiPaper-elevation5",
+ "elevation6": "MuiPaper-elevation6",
+ "elevation7": "MuiPaper-elevation7",
+ "elevation8": "MuiPaper-elevation8",
+ "elevation9": "MuiPaper-elevation9",
+ "outlined": "MuiPaper-outlined",
+ "root": "MuiPaper-root",
+ "rounded": "MuiPaper-rounded",
+ }
+ }
+ elevation={24}
+ role="dialog"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ className="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ partner_connection_steps.accessibility.window_title
+ </div>
+ <WithStyles(ForwardRef(IconButton))
+ aria-label="partner_connection_steps.accessibility.button_close"
+ className="modal-paper-close-button"
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(IconButton)
+ aria-label="partner_connection_steps.accessibility.button_close"
+ className="modal-paper-close-button"
+ classes={
+ Object {
+ "colorInherit": "MuiIconButton-colorInherit",
+ "colorPrimary": "MuiIconButton-colorPrimary",
+ "colorSecondary": "MuiIconButton-colorSecondary",
+ "disabled": "Mui-disabled",
+ "edgeEnd": "MuiIconButton-edgeEnd",
+ "edgeStart": "MuiIconButton-edgeStart",
+ "label": "MuiIconButton-label",
+ "root": "MuiIconButton-root",
+ "sizeSmall": "MuiIconButton-sizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="partner_connection_steps.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="partner_connection_steps.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <button
+ aria-label="partner_connection_steps.accessibility.button_close"
+ className="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiIconButton-label"
+ >
+ <Icon
+ icon="test-file-stub"
+ size={16}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
+ center={true}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(IconButton)>
+ </WithStyles(ForwardRef(IconButton))>
+ <div
+ className="partners-connection-step-content"
+ >
+ <div
+ className="partners-connection-step-progress"
+ >
+ 1 / 3
+ </div>
+ <StepDetail
+ step={
+ Object {
+ "icon": "test-file-stub",
+ "info1": "partner_connection_steps.electricity.step1.info1",
+ "info2": "partner_connection_steps.electricity.step1.info2",
+ }
+ }
+ >
+ <div
+ className="step-detail-info"
+ >
+ <Icon
+ className="info-icon"
+ icon="test-file-stub"
+ size={222}
+ spin={false}
+ >
+ <Component
+ className="info-icon styles__icon___23x3R"
+ height={222}
+ style={Object {}}
+ width={222}
+ >
+ <svg
+ className="info-icon styles__icon___23x3R"
+ height={222}
+ style={Object {}}
+ width={222}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ <div
+ className="info-content text-18-normal"
+ >
+ <div
+ className="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info1
+ </div>
+ <div
+ className="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info2
+ </div>
+ </div>
+ </div>
+ </StepDetail>
+ </div>
+ <div
+ className="partners-connection-step-navigation"
+ >
+ <WithStyles(ForwardRef(Button))
+ aria-label="partner_connection_steps.accessibility.button_previous"
+ className="navigation-button disabled"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-profile-back",
+ }
+ }
+ disabled={true}
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="partner_connection_steps.accessibility.button_previous"
+ className="navigation-button disabled"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-back",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ disabled={true}
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="partner_connection_steps.accessibility.button_previous"
+ className="MuiButton-root btn-profile-back MuiButton-text navigation-button disabled Mui-disabled"
+ component="button"
+ disabled={true}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="partner_connection_steps.accessibility.button_previous"
+ className="MuiButton-root btn-profile-back MuiButton-text navigation-button disabled Mui-disabled"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={true}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="partner_connection_steps.accessibility.button_previous"
+ className="MuiButtonBase-root MuiButton-root btn-profile-back MuiButton-text navigation-button disabled Mui-disabled Mui-disabled"
+ disabled={true}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={-1}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ < partner_connection_steps.button_previous
+ </span>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ <WithStyles(ForwardRef(Button))
+ aria-label="partner_connection_steps.accessibility.button_next"
+ className="navigation-button"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-profile-next rounded",
+ }
+ }
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="partner_connection_steps.accessibility.button_next"
+ className="navigation-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="partner_connection_steps.accessibility.button_next"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text navigation-button"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="partner_connection_steps.accessibility.button_next"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text navigation-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="partner_connection_steps.accessibility.button_next"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text navigation-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ partner_connection_steps.button_next >
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+ </ForwardRef(Paper)>
+ </WithStyles(ForwardRef(Paper))>
+ </div>
+ </Transition>
+ </ForwardRef(Fade)>
+ <div
+ data-test="sentinelEnd"
+ tabIndex={0}
+ />
+ </TrapFocus>
+ </div>
+ </Portal>
+ </ForwardRef(Portal)>
+ </ForwardRef(Modal)>
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+</PartnerConnectionStepsModal>
+`;
diff --git a/src/components/PartnerConnectionStepsModal/__snapshots__/StepDetail.spec.tsx.snap b/src/components/PartnerConnectionStepsModal/__snapshots__/StepDetail.spec.tsx.snap
new file mode 100644
index 000000000..c79888522
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/__snapshots__/StepDetail.spec.tsx.snap
@@ -0,0 +1,50 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`StepDetail component should be rendered correctly 1`] = `
+<div
+ className="step-detail-info"
+>
+ <Icon
+ className="info-icon"
+ icon="test-file-stub"
+ size={222}
+ spin={false}
+ />
+ <div
+ className="info-content text-18-normal"
+ >
+ <div
+ className="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info1
+ </div>
+ <div
+ className="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info2
+ </div>
+ </div>
+</div>
+`;
+
+exports[`StepDetail component should not display info2 if empty 1`] = `
+<div
+ className="step-detail-info"
+>
+ <Icon
+ className="info-icon"
+ icon="test-file-stub"
+ size={222}
+ spin={false}
+ />
+ <div
+ className="info-content text-18-normal"
+ >
+ <div
+ className="info-content-text"
+ >
+ partner_connection_steps.electricity.step1.info1
+ </div>
+ </div>
+</div>
+`;
diff --git a/src/components/PartnerConnectionStepsModal/partnerConnectionStepModal.scss b/src/components/PartnerConnectionStepsModal/partnerConnectionStepModal.scss
new file mode 100644
index 000000000..695f3c1b4
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/partnerConnectionStepModal.scss
@@ -0,0 +1,44 @@
+.partners-connection-step-content {
+ padding: 0.5rem 0.5rem 0;
+ text-align: center;
+
+ .footer {
+ button.btn-highlight {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+ margin: 1.5rem 0 1rem;
+ padding: 1rem 2rem;
+ transition: all 300ms ease;
+ }
+ }
+}
+
+.partners-connection-step-navigation {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-evenly;
+ transition: all 300ms ease;
+ .rounded {
+ border-radius: 22px;
+ margin-left: 1rem;
+ margin-right: 1rem;
+ }
+
+ .disabled {
+ opacity: 0;
+ }
+
+ button.navigation-button {
+ max-width: 10rem;
+ min-height: 2.5rem;
+ margin: 0.375rem 0.5rem;
+ padding: 0rem 1rem;
+ }
+}
+
+#accessibility-title {
+ display: none;
+}
diff --git a/src/components/PartnerConnectionStepsModal/stepDetail.scss b/src/components/PartnerConnectionStepsModal/stepDetail.scss
new file mode 100644
index 000000000..7ba6f5d9d
--- /dev/null
+++ b/src/components/PartnerConnectionStepsModal/stepDetail.scss
@@ -0,0 +1,29 @@
+@import 'src/styles/base/color';
+
+.step-detail-info {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+
+ .info-icon {
+ margin-top: 1rem;
+ }
+
+ .info-content {
+ min-height: 7.75rem;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-bottom: 1rem;
+
+ .info-content-text {
+ margin: 0.25rem 0;
+ color: white;
+ span {
+ color: $gold-shadow;
+ font-weight: 700;
+ }
+ }
+ }
+}
diff --git a/src/components/PartnersIssue/PartnersIssueModal.spec.tsx b/src/components/PartnersIssue/PartnersIssueModal.spec.tsx
new file mode 100644
index 000000000..ec3e9bd98
--- /dev/null
+++ b/src/components/PartnersIssue/PartnersIssueModal.spec.tsx
@@ -0,0 +1,54 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import { Provider } from 'react-redux'
+import toJson from 'enzyme-to-json'
+import configureStore from 'redux-mock-store'
+import { mockInitialEcolyoState } from '../../../tests/__mocks__/store'
+import PartnersIssueModal from './PartnersIssueModal'
+import { Button } from '@material-ui/core'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+
+const mockStore = configureStore([])
+const mockHandleClose = jest.fn()
+describe('PartnersIssueModal component', () => {
+ it('should render correctly', () => {
+ const store = mockStore({
+ ecolyo: mockInitialEcolyoState,
+ })
+ const wrapper = mount(
+ <Provider store={store}>
+ <PartnersIssueModal
+ open={true}
+ handleCloseClick={mockHandleClose}
+ fluidStatus={mockInitialEcolyoState.global.fluidStatus}
+ />
+ </Provider>
+ )
+ expect(toJson(wrapper)).toMatchSnapshot()
+ })
+ it('should close modal correctly', () => {
+ const store = mockStore({
+ ecolyo: mockInitialEcolyoState,
+ })
+ const wrapper = mount(
+ <Provider store={store}>
+ <PartnersIssueModal
+ open={true}
+ handleCloseClick={mockHandleClose}
+ fluidStatus={mockInitialEcolyoState.global.fluidStatus}
+ />
+ </Provider>
+ )
+ wrapper.find(Button).simulate('click')
+ expect(mockHandleClose).toHaveBeenCalled()
+ })
+})
diff --git a/src/components/PartnersIssue/PartnersIssueModal.tsx b/src/components/PartnersIssue/PartnersIssueModal.tsx
new file mode 100644
index 000000000..68a048023
--- /dev/null
+++ b/src/components/PartnersIssue/PartnersIssueModal.tsx
@@ -0,0 +1,92 @@
+import React, { useEffect, useState } from 'react'
+import './partnersIssueModal.scss'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import Button from '@material-ui/core/Button'
+import Dialog from '@material-ui/core/Dialog'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { FluidState } from 'enum/fluid.enum'
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import OrangeWarn from 'assets/icons/ico/warn-orange.svg'
+import { FluidStatus } from 'models'
+import IconButton from '@material-ui/core/IconButton'
+import CloseIcon from 'assets/icons/ico/close.svg'
+
+interface PartnersIssueModalProps {
+ open: boolean
+ fluidStatus: FluidStatus[]
+ handleCloseClick: () => void
+}
+
+const PartnersIssueModal: React.FC<PartnersIssueModalProps> = ({
+ open,
+ fluidStatus,
+ handleCloseClick,
+}: PartnersIssueModalProps) => {
+ const { t } = useI18n()
+ const [fluids, setFluids] = useState<FluidStatus[]>([])
+
+ useEffect(() => {
+ const issuedFluids = fluidStatus.filter(fluid => {
+ return fluid.status === FluidState.PARTNER_ISSUE
+ })
+ setFluids(issuedFluids)
+ }, [fluidStatus])
+ return (
+ <Dialog
+ open={open}
+ disableBackdropClick
+ disableEscapeKeyDown
+ onClose={handleCloseClick}
+ aria-labelledby={'accessibility-title'}
+ classes={{
+ root: 'modal-root',
+ paper: 'modal-paper',
+ }}
+ >
+ <div id={'accessibility-title'}>
+ {t('feedback.accessibility.window_title')}
+ </div>
+ <IconButton
+ aria-label={t('feedback.accessibility.button_close')}
+ className="modal-paper-close-button"
+ onClick={handleCloseClick}
+ >
+ <Icon icon={CloseIcon} size={16} />
+ </IconButton>
+ <div className="partnersIssueModal">
+ <StyledIcon icon={OrangeWarn} size={40} className={'warn-icon'} />
+
+ <div className="partners-issue-title text-20-bold">
+ {t('consumption.partners_issue_modal.title')}
+ </div>
+ <div className="partners-issue-content text-16-normal">
+ {t('consumption.partners_issue_modal.text_1')}
+ </div>
+ <ul>
+ {fluids.map((fluid: FluidStatus, key) => {
+ return (
+ <li key={key} className="text-16-bold">
+ {fluid.connection.konnectorConfig.name}
+ </li>
+ )
+ })}
+ </ul>
+ <div className="partners-issue-content text-16-normal">
+ {t('consumption.partners_issue_modal.text_2')}
+ </div>
+
+ <Button
+ onClick={handleCloseClick}
+ classes={{
+ root: 'btn-highlight',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('consumption.partners_issue_modal.button_validate')}
+ </Button>
+ </div>
+ </Dialog>
+ )
+}
+
+export default PartnersIssueModal
diff --git a/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap b/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap
new file mode 100644
index 000000000..834700542
--- /dev/null
+++ b/src/components/PartnersIssue/__snapshots__/PartnersIssueModal.spec.tsx.snap
@@ -0,0 +1,1093 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PartnersIssueModal component should render correctly 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <PartnersIssueModal
+ fluidStatus={
+ Array [
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": false,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 0,
+ "lastDataDate": null,
+ "status": 0,
+ },
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": false,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 1,
+ "lastDataDate": null,
+ "status": 0,
+ },
+ Object {
+ "connection": Object {
+ "account": null,
+ "isUpdating": false,
+ "konnector": null,
+ "konnectorConfig": Object {
+ "activation": "",
+ "name": "",
+ "oauth": false,
+ "siteLink": "",
+ "slug": "",
+ },
+ "shouldLaunchKonnector": false,
+ "trigger": null,
+ "triggerState": null,
+ },
+ "fluidType": 2,
+ "lastDataDate": null,
+ "status": 0,
+ },
+ ]
+ }
+ handleCloseClick={[MockFunction]}
+ open={true}
+ >
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ disableBackdropClick={true}
+ disableEscapeKeyDown={true}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ disableBackdropClick={true}
+ disableEscapeKeyDown={true}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={true}
+ disableEscapeKeyDown={true}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Portal)
+ disablePortal={false}
+ >
+ <Portal
+ containerInfo={
+ <body
+ style="padding-right: 0px; overflow: hidden;"
+ >
+ <div
+ class="MuiDialog-root modal-root"
+ role="presentation"
+ style="position: fixed; z-index: 1300; right: 0px; bottom: 0px; top: 0px; left: 0px;"
+ >
+ <div
+ aria-hidden="true"
+ class="MuiBackdrop-root"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ />
+ <div
+ data-test="sentinelStart"
+ tabindex="0"
+ />
+ <div
+ class="MuiDialog-container MuiDialog-scrollPaper"
+ role="none presentation"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ tabindex="-1"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ class="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ feedback.accessibility.window_title
+ </div>
+ <button
+ aria-label="feedback.accessibility.button_close"
+ class="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="16"
+ width="16"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ <div
+ class="partnersIssueModal"
+ >
+ <svg
+ aria-hidden="true"
+ class="warn-icon styles__icon___23x3R"
+ height="40"
+ width="40"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ <div
+ class="partners-issue-title text-20-bold"
+ >
+ consumption.partners_issue_modal.title
+ </div>
+ <div
+ class="partners-issue-content text-16-normal"
+ >
+ consumption.partners_issue_modal.text_1
+ </div>
+ <ul />
+ <div
+ class="partners-issue-content text-16-normal"
+ >
+ consumption.partners_issue_modal.text_2
+ </div>
+ <button
+ class="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ consumption.partners_issue_modal.button_validate
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ </div>
+ </div>
+ </div>
+ <div
+ data-test="sentinelEnd"
+ tabindex="0"
+ />
+ </div>
+ </body>
+ }
+ >
+ <div
+ className="MuiDialog-root modal-root"
+ onKeyDown={[Function]}
+ role="presentation"
+ style={
+ Object {
+ "bottom": 0,
+ "left": 0,
+ "position": "fixed",
+ "right": 0,
+ "top": 0,
+ "zIndex": 1300,
+ }
+ }
+ >
+ <WithStyles(ForwardRef(Backdrop))
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Backdrop)
+ classes={
+ Object {
+ "invisible": "MuiBackdrop-invisible",
+ "root": "MuiBackdrop-root",
+ }
+ }
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Fade)
+ in={true}
+ onClick={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onClick={[Function]}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ aria-hidden={true}
+ className="MuiBackdrop-root"
+ onClick={[Function]}
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ />
+ </Transition>
+ </ForwardRef(Fade)>
+ </ForwardRef(Backdrop)>
+ </WithStyles(ForwardRef(Backdrop))>
+ <TrapFocus
+ disableAutoFocus={false}
+ disableEnforceFocus={false}
+ disableRestoreFocus={false}
+ getDoc={[Function]}
+ isEnabled={[Function]}
+ open={true}
+ >
+ <div
+ data-test="sentinelStart"
+ tabIndex={0}
+ />
+ <ForwardRef(Fade)
+ appear={true}
+ in={true}
+ onEnter={[Function]}
+ onExited={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ className="MuiDialog-container MuiDialog-scrollPaper"
+ onClick={[Function]}
+ onMouseDown={[Function]}
+ role="none presentation"
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ tabIndex="-1"
+ >
+ <WithStyles(ForwardRef(Paper))
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ elevation={24}
+ role="dialog"
+ >
+ <ForwardRef(Paper)
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ classes={
+ Object {
+ "elevation0": "MuiPaper-elevation0",
+ "elevation1": "MuiPaper-elevation1",
+ "elevation10": "MuiPaper-elevation10",
+ "elevation11": "MuiPaper-elevation11",
+ "elevation12": "MuiPaper-elevation12",
+ "elevation13": "MuiPaper-elevation13",
+ "elevation14": "MuiPaper-elevation14",
+ "elevation15": "MuiPaper-elevation15",
+ "elevation16": "MuiPaper-elevation16",
+ "elevation17": "MuiPaper-elevation17",
+ "elevation18": "MuiPaper-elevation18",
+ "elevation19": "MuiPaper-elevation19",
+ "elevation2": "MuiPaper-elevation2",
+ "elevation20": "MuiPaper-elevation20",
+ "elevation21": "MuiPaper-elevation21",
+ "elevation22": "MuiPaper-elevation22",
+ "elevation23": "MuiPaper-elevation23",
+ "elevation24": "MuiPaper-elevation24",
+ "elevation3": "MuiPaper-elevation3",
+ "elevation4": "MuiPaper-elevation4",
+ "elevation5": "MuiPaper-elevation5",
+ "elevation6": "MuiPaper-elevation6",
+ "elevation7": "MuiPaper-elevation7",
+ "elevation8": "MuiPaper-elevation8",
+ "elevation9": "MuiPaper-elevation9",
+ "outlined": "MuiPaper-outlined",
+ "root": "MuiPaper-root",
+ "rounded": "MuiPaper-rounded",
+ }
+ }
+ elevation={24}
+ role="dialog"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ className="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ feedback.accessibility.window_title
+ </div>
+ <WithStyles(ForwardRef(IconButton))
+ aria-label="feedback.accessibility.button_close"
+ className="modal-paper-close-button"
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(IconButton)
+ aria-label="feedback.accessibility.button_close"
+ className="modal-paper-close-button"
+ classes={
+ Object {
+ "colorInherit": "MuiIconButton-colorInherit",
+ "colorPrimary": "MuiIconButton-colorPrimary",
+ "colorSecondary": "MuiIconButton-colorSecondary",
+ "disabled": "Mui-disabled",
+ "edgeEnd": "MuiIconButton-edgeEnd",
+ "edgeStart": "MuiIconButton-edgeStart",
+ "label": "MuiIconButton-label",
+ "root": "MuiIconButton-root",
+ "sizeSmall": "MuiIconButton-sizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="feedback.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="feedback.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <button
+ aria-label="feedback.accessibility.button_close"
+ className="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiIconButton-label"
+ >
+ <Icon
+ icon="test-file-stub"
+ size={16}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
+ center={true}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(IconButton)>
+ </WithStyles(ForwardRef(IconButton))>
+ <div
+ className="partnersIssueModal"
+ >
+ <StyledIcon
+ className="warn-icon"
+ icon="test-file-stub"
+ size={40}
+ >
+ <Icon
+ aria-hidden={true}
+ className="warn-icon"
+ icon="test-file-stub"
+ size={40}
+ spin={false}
+ >
+ <Component
+ aria-hidden={true}
+ className="warn-icon styles__icon___23x3R"
+ height={40}
+ style={Object {}}
+ width={40}
+ >
+ <svg
+ aria-hidden={true}
+ className="warn-icon styles__icon___23x3R"
+ height={40}
+ style={Object {}}
+ width={40}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </StyledIcon>
+ <div
+ className="partners-issue-title text-20-bold"
+ >
+ consumption.partners_issue_modal.title
+ </div>
+ <div
+ className="partners-issue-content text-16-normal"
+ >
+ consumption.partners_issue_modal.text_1
+ </div>
+ <ul />
+ <div
+ className="partners-issue-content text-16-normal"
+ >
+ consumption.partners_issue_modal.text_2
+ </div>
+ <WithStyles(ForwardRef(Button))
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-highlight",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(Button)
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-highlight",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ className="MuiButton-root btn-highlight MuiButton-text"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ className="MuiButton-root btn-highlight MuiButton-text"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <button
+ className="MuiButtonBase-root MuiButton-root btn-highlight MuiButton-text"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ consumption.partners_issue_modal.button_validate
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </div>
+ </ForwardRef(Paper)>
+ </WithStyles(ForwardRef(Paper))>
+ </div>
+ </Transition>
+ </ForwardRef(Fade)>
+ <div
+ data-test="sentinelEnd"
+ tabIndex={0}
+ />
+ </TrapFocus>
+ </div>
+ </Portal>
+ </ForwardRef(Portal)>
+ </ForwardRef(Modal)>
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+ </PartnersIssueModal>
+</Provider>
+`;
diff --git a/src/components/PartnersIssue/partnersIssueModal.scss b/src/components/PartnersIssue/partnersIssueModal.scss
new file mode 100644
index 000000000..ffb8ff0be
--- /dev/null
+++ b/src/components/PartnersIssue/partnersIssueModal.scss
@@ -0,0 +1,34 @@
+@import '../../styles/base/typo-variables';
+@import '../../styles/base/color';
+
+.partnersIssueModal {
+ padding: 1rem;
+ max-width: 20rem;
+ .warn-icon {
+ margin: 1rem auto;
+ display: block;
+ }
+ .partners-issue-title {
+ color: #ec9d41;
+ margin: 1rem auto;
+ text-align: center;
+ }
+ .partners-issue-content {
+ color: $grey-bright;
+ }
+
+ button.btn-highlight {
+ padding: 0.65rem;
+ }
+}
+.partners-issue-portal {
+ .modal-overlay {
+ .modal-box {
+ max-width: 21rem;
+ }
+ }
+}
+
+#accessibility-title {
+ display: none;
+}
diff --git a/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx b/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
index 1fe0f2f00..151d62d29 100644
--- a/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
+++ b/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
@@ -7,8 +7,6 @@ import { FluidType } from 'enum/fluid.enum'
import { PerformanceIndicator } from 'models'
import { getPicto } from 'utils/picto'
import { formatNumberValues, getPreviousMonthName } from 'utils/utils'
-
-import StyledCard from 'components/CommonKit/Card/StyledCard'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
interface FluidPerformanceIndicatorProps {
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index 15879a680..ccfaa9b9a 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -8,6 +8,7 @@ import ExplorationView from 'components/Exploration/ExplorationView'
import ActionView from 'components/Action/ActionView'
import UnSubscribe from 'components/Options/UnSubscribe'
import TermsView from 'components/Terms/TermsView'
+import { TermsStatus } from 'models'
const ConsumptionView = lazy(() => import('components/Home/ConsumptionView'))
@@ -26,15 +27,15 @@ const ProfileTypeView = lazy(() =>
)
interface RouteProps {
- isLastTermAccepted: boolean
+ termsStatus: TermsStatus
}
-const Routes: React.FC<RouteProps> = ({ isLastTermAccepted }: RouteProps) => {
+const Routes: React.FC<RouteProps> = ({ termsStatus }: RouteProps) => {
return (
<Suspense fallback={<div></div>}>
<Switch>
- {isLastTermAccepted && <Redirect from="/terms" to="/consumption" />}
+ {termsStatus.accepted && <Redirect from="/terms" to="/consumption" />}
<Route path="/terms" component={TermsView} />
- {!isLastTermAccepted && (
+ {!termsStatus.accepted && (
<>
<Redirect from="*" to="/terms" />
<Redirect from="/" to="/terms" />
diff --git a/src/components/Splash/SplashRoot.tsx b/src/components/Splash/SplashRoot.tsx
index 97463335e..dffc345f1 100644
--- a/src/components/Splash/SplashRoot.tsx
+++ b/src/components/Splash/SplashRoot.tsx
@@ -8,6 +8,8 @@ import React, {
import { useClient } from 'cozy-client'
import classNames from 'classnames'
import { useDispatch } from 'react-redux'
+import { FluidState, FluidType } from 'enum/fluid.enum'
+
import {
toggleAnalysisNotification,
toggleChallengeExplorationNotification,
@@ -17,6 +19,7 @@ import {
GlobalActionTypes,
updateTermValidation,
showReleaseNotes,
+ setPartnersIssue,
} from 'store/global/global.actions'
import {
ProfileActionTypes,
@@ -46,12 +49,15 @@ import {
import { DateTime } from 'luxon'
import { UserActionState } from 'enum/userAction.enum'
import ActionService from 'services/action.service'
-import { UserChallenge } from 'models'
+import { FluidStatus, TermsStatus, UserChallenge } from 'models'
import UsageEventService from 'services/usageEvent.service'
import { UsageEventType } from 'enum/usageEvent.enum'
import { MigrationService } from 'migrations/migration.service'
import { migrations } from 'migrations/migration.data'
import { ReleaseNotes } from 'models/releaseNotes.model'
+import PartnersInfoService from 'services/partnersInfo.service'
+import FluidService from 'services/fluid.service'
+import { PartnersInfo } from 'models/partnersInfo.model'
interface SplashRootProps {
fadeTimer?: number
@@ -100,6 +106,7 @@ const SplashRoot = ({
let subscribed = true
async function loadData() {
const initializationService = new InitializationService(client)
+ const partnersInfoService = new PartnersInfoService(client)
const ms = new MigrationService(client)
const migrationsResult: ReleaseNotes = await ms.runMigrations(migrations)
try {
@@ -112,8 +119,8 @@ const SplashRoot = ({
)
//init Terms
- const isLastTermAccepted = await initializationService.initConsent()
- if (subscribed) dispatch(updateTermValidation(isLastTermAccepted))
+ const termsStatus: TermsStatus = await initializationService.initConsent()
+ if (subscribed) dispatch(updateTermValidation(termsStatus))
// Init profile and update ecogestures, challenges, analysis
const profile = await initializationService.initProfile()
@@ -242,8 +249,45 @@ const SplashRoot = ({
...prev,
splashStart: true,
}))
+
+ // Check partnersInfo from backoffice
+ const partnersInfo: PartnersInfo = await partnersInfoService.getPartnersInfo()
+
+ // Get last partnersIssueDate
+ const today = DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('day')
+ .toISO()
+
+ // If notification is activated and konnector is connected, set FluidStatus to PARTNER_ISSUE
+ if (partnersInfo && partnersInfo.notification_activated) {
+ const fluidService = new FluidService(client)
+ const _updatedFluidStatus: FluidStatus[] = await fluidService.getFluidStatus(
+ partnersInfo
+ )
+ let isConcernedByPartnerIssue = false
+ for (const fluid of _updatedFluidStatus) {
+ if (fluid.status === FluidState.PARTNER_ISSUE)
+ isConcernedByPartnerIssue = true
+ }
+ dispatch(setFluidStatus(_updatedFluidStatus))
+ if (
+ today !== (profile && profile.partnersIssueDate.toISO()) &&
+ isConcernedByPartnerIssue
+ ) {
+ dispatch(setPartnersIssue(true))
+ }
+ }
+
+ /*
+ * If the partnersIssueModal has not been seen today
+ * and the user is concerned by any one of the partners' issue
+ * enable the modal
+ */
} catch (err) {
- setError(err)
+ setError(err as any)
}
}
loadData()
diff --git a/src/components/Terms/CGUModalspec.tsx b/src/components/Terms/CGUModal.spec.tsx
similarity index 82%
rename from src/components/Terms/CGUModalspec.tsx
rename to src/components/Terms/CGUModal.spec.tsx
index 942fb2ac2..bcac7e89c 100644
--- a/src/components/Terms/CGUModalspec.tsx
+++ b/src/components/Terms/CGUModal.spec.tsx
@@ -1,6 +1,7 @@
import React from 'react'
import { mount } from 'enzyme'
import CGUModal from './CGUModal'
+import toJson from 'enzyme-to-json'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
@@ -16,7 +17,7 @@ describe('CGUModal component', () => {
it('should be rendered correctly', () => {
const component = mount(
<CGUModal open={true} handleCloseClick={jest.fn()} />
- ).getElement()
- expect(component).toMatchSnapshot()
+ )
+ expect(toJson(component)).toMatchSnapshot()
})
})
diff --git a/src/components/Terms/DataShareConsentContent.spec.tsx b/src/components/Terms/DataShareConsentContent.spec.tsx
index 2a7d74fe3..0eb642b96 100644
--- a/src/components/Terms/DataShareConsentContent.spec.tsx
+++ b/src/components/Terms/DataShareConsentContent.spec.tsx
@@ -1,5 +1,6 @@
import React from 'react'
import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
import DataShareConsentContent from './DataShareConsentContent'
import { profileData } from '../../../tests/__mocks__/profile.mock'
import configureStore from 'redux-mock-store'
@@ -27,8 +28,8 @@ describe('DataShareConsentContent component', () => {
<Provider store={store}>
<DataShareConsentContent />
</Provider>
- ).getElement()
- expect(component).toMatchSnapshot()
+ )
+ expect(toJson(component)).toMatchSnapshot()
})
it('should be rendered correctly without first connexion text', () => {
profileData.isFirstConnection = false
@@ -42,11 +43,6 @@ describe('DataShareConsentContent component', () => {
<DataShareConsentContent />
</Provider>
)
- expect(
- component
- .find('h1')
- .first()
- .text()
- ).toBe('dataShare.title1Update')
+ expect(toJson(component)).toMatchSnapshot()
})
})
diff --git a/src/components/Terms/DataShareConsentContent.tsx b/src/components/Terms/DataShareConsentContent.tsx
index ce5401e3b..95946d4ff 100644
--- a/src/components/Terms/DataShareConsentContent.tsx
+++ b/src/components/Terms/DataShareConsentContent.tsx
@@ -19,11 +19,9 @@ const DataShareConsentContent: React.FC = () => {
? t('dataShare.title1')
: t('dataShare.title1Update')}
</h1>
- <p className="text-14-normal">
- {isFirstConnection
- ? t('dataShare.title2')
- : t('dataShare.title2Update')}
- </p>
+ {!isFirstConnection && (
+ <p className="text-14-normal">{t('dataShare.title2Update')}</p>
+ )}
<p className="text-14-normal">{t('dataShare.part1')}</p>
<p className="text-14-normal">{t('dataShare.part2')}</p>
<p className="text-14-normal">{t('dataShare.part3')}</p>
diff --git a/src/components/Terms/LegalNoticeModal.spec.tsx b/src/components/Terms/LegalNoticeModal.spec.tsx
index 0b2265820..788b2b8f4 100644
--- a/src/components/Terms/LegalNoticeModal.spec.tsx
+++ b/src/components/Terms/LegalNoticeModal.spec.tsx
@@ -1,6 +1,7 @@
import React from 'react'
import { mount } from 'enzyme'
import LegalNoticeModal from './LegalNoticeModal'
+import toJson from 'enzyme-to-json'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
@@ -16,7 +17,7 @@ describe('LegalNoticeModal component', () => {
it('should be rendered correctly', () => {
const component = mount(
<LegalNoticeModal open={true} handleCloseClick={jest.fn()} />
- ).getElement()
- expect(component).toMatchSnapshot()
+ )
+ expect(toJson(component)).toMatchSnapshot()
})
})
diff --git a/src/components/Terms/MinorUpdateContent.spec.tsx b/src/components/Terms/MinorUpdateContent.spec.tsx
new file mode 100644
index 000000000..3ce0d5e38
--- /dev/null
+++ b/src/components/Terms/MinorUpdateContent.spec.tsx
@@ -0,0 +1,23 @@
+import React from 'react'
+import { mount } from 'enzyme'
+import toJson from 'enzyme-to-json'
+import MinorUpdateContent from './MinorUpdateContent'
+
+jest.mock('cozy-ui/transpiled/react/I18n', () => {
+ return {
+ useI18n: jest.fn(() => {
+ return {
+ t: (str: string) => str,
+ }
+ }),
+ }
+})
+
+describe('Minor update content component', () => {
+ it('should be rendered correctly', () => {
+ const component = mount(
+ <MinorUpdateContent toggleLegalNoticeModal={jest.fn()} />
+ )
+ expect(toJson(component)).toMatchSnapshot()
+ })
+})
diff --git a/src/components/Terms/MinorUpdateContent.tsx b/src/components/Terms/MinorUpdateContent.tsx
new file mode 100644
index 000000000..fcc7ca4c8
--- /dev/null
+++ b/src/components/Terms/MinorUpdateContent.tsx
@@ -0,0 +1,24 @@
+import React from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import './termsView.scss'
+
+interface MinorUpdateContentProps {
+ toggleLegalNoticeModal: () => void
+}
+
+const MinorUpdateContent = ({
+ toggleLegalNoticeModal,
+}: MinorUpdateContentProps) => {
+ const { t } = useI18n()
+ return (
+ <div className="dataShare-content-root">
+ <div className="dataShare-content-wrapper">
+ <h1 className="dataShare-content-title text-22-normal">
+ {t('minorUpdate.title')}
+ </h1>
+ </div>
+ </div>
+ )
+}
+
+export default MinorUpdateContent
diff --git a/src/components/Terms/TermsView.spec.tsx b/src/components/Terms/TermsView.spec.tsx
index 9e2a32810..8aa6a6651 100644
--- a/src/components/Terms/TermsView.spec.tsx
+++ b/src/components/Terms/TermsView.spec.tsx
@@ -5,9 +5,10 @@ import { profileData } from '../../../tests/__mocks__/profile.mock'
import configureStore from 'redux-mock-store'
import { Provider } from 'react-redux'
import { Button } from '@material-ui/core'
-
+import toJson from 'enzyme-to-json'
import * as reactRedux from 'react-redux'
import { mockUpToDateTerm } from '../../../tests/__mocks__/termsData.mock'
+import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
@@ -45,6 +46,7 @@ describe('TermsView component', () => {
const store = mockStore({
ecolyo: {
profile: profileData,
+ global: globalStateData,
},
})
mockCreateTerm.mockResolvedValueOnce(mockUpToDateTerm)
@@ -90,19 +92,21 @@ describe('TermsView component', () => {
const store = mockStore({
ecolyo: {
profile: profileData,
+ global: globalStateData,
},
})
const component = mount(
<Provider store={store}>
<TermsView />
</Provider>
- ).getElement()
- expect(component).toMatchSnapshot()
+ )
+ expect(toJson(component)).toMatchSnapshot()
})
it('shouldbe unable to valid consent', async () => {
const store = mockStore({
ecolyo: {
profile: profileData,
+ global: globalStateData,
},
})
mockCreateTerm.mockResolvedValueOnce(mockUpToDateTerm)
diff --git a/src/components/Terms/TermsView.tsx b/src/components/Terms/TermsView.tsx
index b88e451e8..6de439369 100644
--- a/src/components/Terms/TermsView.tsx
+++ b/src/components/Terms/TermsView.tsx
@@ -1,7 +1,7 @@
import React, { useCallback, useState } from 'react'
import classNames from 'classnames'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useDispatch } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
import { Button } from '@material-ui/core'
import TermsService from 'services/terms.service'
import { useClient } from 'cozy-client'
@@ -12,6 +12,8 @@ import { decoreText } from 'utils/decoreText'
import { updateTermValidation } from 'store/global/global.actions'
import CGUModal from './CGUModal'
import LegalNoticeModal from './LegalNoticeModal'
+import { AppStore } from 'store'
+import MinorUpdateContent from './MinorUpdateContent'
const TermsView: React.FC = () => {
const { t } = useI18n()
@@ -26,6 +28,7 @@ const TermsView: React.FC = () => {
const [openLegalNoticeModal, setOpenLegalNoticeModal] = useState<boolean>(
false
)
+ const { termsStatus } = useSelector((state: AppStore) => state.ecolyo.global)
const toggleCGUModal = () => {
setOpenCGUModal(prev => !prev)
@@ -46,64 +49,95 @@ const TermsView: React.FC = () => {
const termsService = new TermsService(client)
const createdTerm = await termsService.createTerm()
if (createdTerm) {
- dispatch(updateTermValidation(true))
+ dispatch(
+ updateTermValidation({
+ accepted: true,
+ versionType: await termsService.getTermsVersionType(),
+ })
+ )
}
history.push('/consumption')
}, [dispatch, client, history])
return (
<div className="terms-wrapper">
- <div className="terms-content">
- <DataShareConsentContent />
- <label
- className={classNames('checkbox', {
- ['answer-checked']: dataConsentValidation,
- })}
- >
- <input
- type={'checkbox'}
- name="Data-consent-validation"
- onChange={handleDataConsentValidation}
- checked={dataConsentValidation}
- />
- {t('dataShare.validDataConsent')}
- </label>
- <label
- className={classNames('checkbox', {
- ['answer-checked']: GCUValidation,
- })}
- >
- <input
- type={'checkbox'}
- name="GCU-validation"
- onChange={handleGCUValidate}
- checked={GCUValidation}
- />
- <span>
- {decoreText(t('dataShare.validCGU'), () => toggleCGUModal())}
- {decoreText(t('dataShare.validLegal'), () =>
- toggleLegalNoticeModal()
- )}
- </span>
- </label>
- </div>
+ {termsStatus.versionType === 'major' ||
+ termsStatus.versionType === 'init' ? (
+ <>
+ <div className="terms-content">
+ <DataShareConsentContent />
+ <label
+ className={classNames('checkbox', {
+ ['answer-checked']: dataConsentValidation,
+ })}
+ >
+ <input
+ type={'checkbox'}
+ name="Data-consent-validation"
+ onChange={handleDataConsentValidation}
+ checked={dataConsentValidation}
+ />
+ {t('dataShare.validDataConsent')}
+ </label>
+ <label
+ className={classNames('checkbox', {
+ ['answer-checked']: GCUValidation,
+ })}
+ >
+ <input
+ type={'checkbox'}
+ name="GCU-validation"
+ onChange={handleGCUValidate}
+ checked={GCUValidation}
+ />
+ <span>
+ {decoreText(t('dataShare.validCGU'), () => toggleCGUModal())}
+ {decoreText(t('dataShare.validLegal'), () =>
+ toggleLegalNoticeModal()
+ )}
+ </span>
+ </label>
+ </div>
+ <div className="terms-footer">
+ <Button
+ aria-label={t('dataShare.accessibility.button_accept')}
+ onClick={handleTermValidate}
+ className={classNames('gcu-modal-button', {
+ ['disabled']: !GCUValidation || !dataConsentValidation,
+ })}
+ disabled={!GCUValidation || !dataConsentValidation}
+ classes={{
+ root: 'btn-profile-next rounded',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('dataShare.button_accept')}
+ </Button>
+ </div>
+ </>
+ ) : (
+ <>
+ <div className="terms-content">
+ <MinorUpdateContent
+ toggleLegalNoticeModal={toggleLegalNoticeModal}
+ />
+ </div>
+ <div className="terms-footer">
+ <Button
+ aria-label={t('minorUpdate.button')}
+ onClick={handleTermValidate}
+ className={'gcu-modal-button'}
+ classes={{
+ root: 'btn-profile-next rounded',
+ label: 'text-16-bold',
+ }}
+ >
+ {t('minorUpdate.button')}
+ </Button>
+ </div>
+ </>
+ )}
- <div className="terms-footer">
- <Button
- aria-label={t('gcu_modal.accessibility.button_accept')}
- onClick={handleTermValidate}
- className={classNames('gcu-modal-button', {
- ['disabled']: !GCUValidation || !dataConsentValidation,
- })}
- disabled={!GCUValidation || !dataConsentValidation}
- classes={{
- root: 'btn-profile-next rounded',
- label: 'text-16-bold',
- }}
- >
- {t('tutorial_welcome.accessibility.finish')}
- </Button>
- </div>
<CGUModal open={openCGUModal} handleCloseClick={toggleCGUModal} />
<LegalNoticeModal
open={openLegalNoticeModal}
diff --git a/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap b/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap
new file mode 100644
index 000000000..2658db800
--- /dev/null
+++ b/src/components/Terms/__snapshots__/CGUModal.spec.tsx.snap
@@ -0,0 +1,1493 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CGUModal component should be rendered correctly 1`] = `
+<CGUModal
+ handleCloseClick={[MockFunction]}
+ open={true}
+>
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Portal)
+ disablePortal={false}
+ >
+ <Portal
+ containerInfo={
+ <body
+ style="padding-right: 0px; overflow: hidden;"
+ >
+ <div
+ class="MuiDialog-root modal-root"
+ role="presentation"
+ style="position: fixed; z-index: 1300; right: 0px; bottom: 0px; top: 0px; left: 0px;"
+ >
+ <div
+ aria-hidden="true"
+ class="MuiBackdrop-root"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ />
+ <div
+ data-test="sentinelStart"
+ tabindex="0"
+ />
+ <div
+ class="MuiDialog-container MuiDialog-scrollPaper"
+ role="none presentation"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ tabindex="-1"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ class="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ feedback.accessibility.window_title
+ </div>
+ <button
+ aria-label="feedback.accessibility.button_close"
+ class="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="16"
+ width="16"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ <div
+ class="gcu-content-root"
+ >
+ <div
+ class="gcu-content-wrapper"
+ >
+ <h1
+ class="gcu-content-title text-22-normal"
+ >
+ gcu.title
+ </h1>
+ <p
+ class="text-14-normal version"
+ >
+ gcu.version
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title1
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part1_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part1_2
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part1_3
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title2
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part2_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part2_2
+ </p>
+ <ul
+ class="text-14-normal"
+ >
+ <li>
+ gcu.content.part2_2_list1
+ </li>
+ <li>
+ gcu.content.part2_2_list2
+ </li>
+ <li>
+ gcu.content.part2_2_list3
+ </li>
+ </ul>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part2_3
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part2_4
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title3
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part3_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part3_2
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part3_3
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part3_4
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title4
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part4_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part4_2
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title5
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part5_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part5_2
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part5_3
+ </p>
+ <ul
+ class="text-14-normal"
+ >
+ <li>
+ gcu.content.part5_3_list1
+ </li>
+ <li>
+ gcu.content.part5_3_list2
+ </li>
+ <li>
+ gcu.content.part5_3_list3
+ </li>
+ </ul>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part5_4
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part5_5
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title6
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part6_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part6_2
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part6_3
+ </p>
+ <ul
+ class="text-14-normal"
+ >
+ <li>
+ gcu.content.part6_3_list1
+ </li>
+ <li>
+ gcu.content.part6_3_list2
+ </li>
+ <li>
+ gcu.content.part6_3_list3
+ </li>
+ </ul>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part6_4
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title8
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part8_1
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ gcu.content.part8_2
+ </p>
+ <div
+ class="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title9
+ </div>
+ <p
+ class="text-14-normal"
+ >
+ <span
+ class="text-14-bold"
+ >
+ gcu.content.part9_1_title
+ </span>
+ <span>
+ gcu.content.part9_1_content
+ </span>
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ <span
+ class="text-14-bold"
+ >
+ gcu.content.part9_2_title
+ </span>
+ <span>
+ gcu.content.part9_2_content
+ </span>
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ <span
+ class="text-14-bold"
+ >
+ gcu.content.part9_3_title
+ </span>
+ <span>
+ gcu.content.part9_3_content
+ </span>
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ <span
+ class="text-14-bold"
+ >
+ gcu.content.part9_4_title
+ </span>
+ <span>
+ gcu.content.part9_4_content
+ </span>
+ </p>
+ <p
+ class="text-14-normal"
+ >
+ <span
+ class="text-14-bold"
+ >
+ gcu.content.part9_5_title
+ </span>
+ <span>
+ gcu.content.part9_5_content
+ </span>
+ </p>
+ </div>
+ </div>
+ <button
+ aria-label="gcu_modal.accessibility.button_accept"
+ class="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ legal.accessibility.button_close
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ </div>
+ </div>
+ <div
+ data-test="sentinelEnd"
+ tabindex="0"
+ />
+ </div>
+ </body>
+ }
+ >
+ <div
+ className="MuiDialog-root modal-root"
+ onKeyDown={[Function]}
+ role="presentation"
+ style={
+ Object {
+ "bottom": 0,
+ "left": 0,
+ "position": "fixed",
+ "right": 0,
+ "top": 0,
+ "zIndex": 1300,
+ }
+ }
+ >
+ <WithStyles(ForwardRef(Backdrop))
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Backdrop)
+ classes={
+ Object {
+ "invisible": "MuiBackdrop-invisible",
+ "root": "MuiBackdrop-root",
+ }
+ }
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Fade)
+ in={true}
+ onClick={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onClick={[Function]}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ aria-hidden={true}
+ className="MuiBackdrop-root"
+ onClick={[Function]}
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ />
+ </Transition>
+ </ForwardRef(Fade)>
+ </ForwardRef(Backdrop)>
+ </WithStyles(ForwardRef(Backdrop))>
+ <TrapFocus
+ disableAutoFocus={false}
+ disableEnforceFocus={false}
+ disableRestoreFocus={false}
+ getDoc={[Function]}
+ isEnabled={[Function]}
+ open={true}
+ >
+ <div
+ data-test="sentinelStart"
+ tabIndex={0}
+ />
+ <ForwardRef(Fade)
+ appear={true}
+ in={true}
+ onEnter={[Function]}
+ onExited={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ className="MuiDialog-container MuiDialog-scrollPaper"
+ onClick={[Function]}
+ onMouseDown={[Function]}
+ role="none presentation"
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ tabIndex="-1"
+ >
+ <WithStyles(ForwardRef(Paper))
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ elevation={24}
+ role="dialog"
+ >
+ <ForwardRef(Paper)
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ classes={
+ Object {
+ "elevation0": "MuiPaper-elevation0",
+ "elevation1": "MuiPaper-elevation1",
+ "elevation10": "MuiPaper-elevation10",
+ "elevation11": "MuiPaper-elevation11",
+ "elevation12": "MuiPaper-elevation12",
+ "elevation13": "MuiPaper-elevation13",
+ "elevation14": "MuiPaper-elevation14",
+ "elevation15": "MuiPaper-elevation15",
+ "elevation16": "MuiPaper-elevation16",
+ "elevation17": "MuiPaper-elevation17",
+ "elevation18": "MuiPaper-elevation18",
+ "elevation19": "MuiPaper-elevation19",
+ "elevation2": "MuiPaper-elevation2",
+ "elevation20": "MuiPaper-elevation20",
+ "elevation21": "MuiPaper-elevation21",
+ "elevation22": "MuiPaper-elevation22",
+ "elevation23": "MuiPaper-elevation23",
+ "elevation24": "MuiPaper-elevation24",
+ "elevation3": "MuiPaper-elevation3",
+ "elevation4": "MuiPaper-elevation4",
+ "elevation5": "MuiPaper-elevation5",
+ "elevation6": "MuiPaper-elevation6",
+ "elevation7": "MuiPaper-elevation7",
+ "elevation8": "MuiPaper-elevation8",
+ "elevation9": "MuiPaper-elevation9",
+ "outlined": "MuiPaper-outlined",
+ "root": "MuiPaper-root",
+ "rounded": "MuiPaper-rounded",
+ }
+ }
+ elevation={24}
+ role="dialog"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ className="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ feedback.accessibility.window_title
+ </div>
+ <WithStyles(ForwardRef(IconButton))
+ aria-label="feedback.accessibility.button_close"
+ className="modal-paper-close-button"
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(IconButton)
+ aria-label="feedback.accessibility.button_close"
+ className="modal-paper-close-button"
+ classes={
+ Object {
+ "colorInherit": "MuiIconButton-colorInherit",
+ "colorPrimary": "MuiIconButton-colorPrimary",
+ "colorSecondary": "MuiIconButton-colorSecondary",
+ "disabled": "Mui-disabled",
+ "edgeEnd": "MuiIconButton-edgeEnd",
+ "edgeStart": "MuiIconButton-edgeStart",
+ "label": "MuiIconButton-label",
+ "root": "MuiIconButton-root",
+ "sizeSmall": "MuiIconButton-sizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="feedback.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="feedback.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <button
+ aria-label="feedback.accessibility.button_close"
+ className="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiIconButton-label"
+ >
+ <Icon
+ icon="test-file-stub"
+ size={16}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
+ center={true}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(IconButton)>
+ </WithStyles(ForwardRef(IconButton))>
+ <GCUContent>
+ <div
+ className="gcu-content-root"
+ >
+ <div
+ className="gcu-content-wrapper"
+ >
+ <h1
+ className="gcu-content-title text-22-normal"
+ >
+ gcu.title
+ </h1>
+ <p
+ className="text-14-normal version"
+ >
+ gcu.version
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title1
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part1_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part1_2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part1_3
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title2
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part2_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part2_2
+ </p>
+ <ul
+ className="text-14-normal"
+ >
+ <li>
+ gcu.content.part2_2_list1
+ </li>
+ <li>
+ gcu.content.part2_2_list2
+ </li>
+ <li>
+ gcu.content.part2_2_list3
+ </li>
+ </ul>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part2_3
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part2_4
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title3
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part3_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part3_2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part3_3
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part3_4
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title4
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part4_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part4_2
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title5
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part5_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part5_2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part5_3
+ </p>
+ <ul
+ className="text-14-normal"
+ >
+ <li>
+ gcu.content.part5_3_list1
+ </li>
+ <li>
+ gcu.content.part5_3_list2
+ </li>
+ <li>
+ gcu.content.part5_3_list3
+ </li>
+ </ul>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part5_4
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part5_5
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title6
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part6_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part6_2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part6_3
+ </p>
+ <ul
+ className="text-14-normal"
+ >
+ <li>
+ gcu.content.part6_3_list1
+ </li>
+ <li>
+ gcu.content.part6_3_list2
+ </li>
+ <li>
+ gcu.content.part6_3_list3
+ </li>
+ </ul>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part6_4
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title8
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part8_1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ gcu.content.part8_2
+ </p>
+ <div
+ className="gcu-content-part-title text-15-normal"
+ >
+ gcu.content.title9
+ </div>
+ <p
+ className="text-14-normal"
+ >
+ <span
+ className="text-14-bold"
+ >
+ gcu.content.part9_1_title
+ </span>
+ <span>
+ gcu.content.part9_1_content
+ </span>
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ <span
+ className="text-14-bold"
+ >
+ gcu.content.part9_2_title
+ </span>
+ <span>
+ gcu.content.part9_2_content
+ </span>
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ <span
+ className="text-14-bold"
+ >
+ gcu.content.part9_3_title
+ </span>
+ <span>
+ gcu.content.part9_3_content
+ </span>
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ <span
+ className="text-14-bold"
+ >
+ gcu.content.part9_4_title
+ </span>
+ <span>
+ gcu.content.part9_4_content
+ </span>
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ <span
+ className="text-14-bold"
+ >
+ gcu.content.part9_5_title
+ </span>
+ <span>
+ gcu.content.part9_5_content
+ </span>
+ </p>
+ </div>
+ </div>
+ </GCUContent>
+ <WithStyles(ForwardRef(Button))
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="gcu-modal-button"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-profile-next rounded",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(Button)
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="gcu-modal-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <button
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ legal.accessibility.button_close
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </ForwardRef(Paper)>
+ </WithStyles(ForwardRef(Paper))>
+ </div>
+ </Transition>
+ </ForwardRef(Fade)>
+ <div
+ data-test="sentinelEnd"
+ tabIndex={0}
+ />
+ </TrapFocus>
+ </div>
+ </Portal>
+ </ForwardRef(Portal)>
+ </ForwardRef(Modal)>
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+</CGUModal>
+`;
diff --git a/src/components/Terms/__snapshots__/DataShareConsentContent.spec.tsx.snap b/src/components/Terms/__snapshots__/DataShareConsentContent.spec.tsx.snap
index 44ab11704..6355e73b8 100644
--- a/src/components/Terms/__snapshots__/DataShareConsentContent.spec.tsx.snap
+++ b/src/components/Terms/__snapshots__/DataShareConsentContent.spec.tsx.snap
@@ -13,6 +13,204 @@ exports[`DataShareConsentContent component should be rendered correctly with fir
}
}
>
- <DataShareConsentContent />
+ <DataShareConsentContent>
+ <div
+ className="dataShare-content-root"
+ >
+ <div
+ className="dataShare-content-wrapper"
+ >
+ <h1
+ className="dataShare-content-title text-22-normal"
+ >
+ dataShare.title1
+ </h1>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part3
+ </p>
+ <ul
+ className="text-14-normal"
+ >
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item1
+ </li>
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item2
+ </li>
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item3
+ </li>
+ </ul>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part4
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part5
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part6
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part7
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part8
+ </p>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.part9
+ </span>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.part10
+ </span>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.link1
+ </span>
+ </div>
+ </div>
+ </DataShareConsentContent>
+</Provider>
+`;
+
+exports[`DataShareConsentContent component should be rendered correctly without first connexion text 1`] = `
+<Provider
+ store={
+ Object {
+ "clearActions": [Function],
+ "dispatch": [Function],
+ "getActions": [Function],
+ "getState": [Function],
+ "replaceReducer": [Function],
+ "subscribe": [Function],
+ }
+ }
+>
+ <DataShareConsentContent>
+ <div
+ className="dataShare-content-root"
+ >
+ <div
+ className="dataShare-content-wrapper"
+ >
+ <h1
+ className="dataShare-content-title text-22-normal"
+ >
+ dataShare.title1Update
+ </h1>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.title2Update
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part3
+ </p>
+ <ul
+ className="text-14-normal"
+ >
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item1
+ </li>
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item2
+ </li>
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item3
+ </li>
+ </ul>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part4
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part5
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part6
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part7
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part8
+ </p>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.part9
+ </span>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.part10
+ </span>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.link1
+ </span>
+ </div>
+ </div>
+ </DataShareConsentContent>
</Provider>
`;
diff --git a/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap b/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap
index 81b5dd5b1..ad5889b4e 100644
--- a/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap
+++ b/src/components/Terms/__snapshots__/LegalNoticeModal.spec.tsx.snap
@@ -4,5 +4,1444 @@ exports[`LegalNoticeModal component should be rendered correctly 1`] = `
<LegalNoticeModal
handleCloseClick={[MockFunction]}
open={true}
-/>
+>
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[MockFunction]}
+ open={true}
+ >
+ <ForwardRef(Portal)
+ disablePortal={false}
+ >
+ <Portal
+ containerInfo={
+ <body
+ style="padding-right: 0px; overflow: hidden;"
+ >
+ <div
+ class="MuiDialog-root modal-root"
+ role="presentation"
+ style="position: fixed; z-index: 1300; right: 0px; bottom: 0px; top: 0px; left: 0px;"
+ >
+ <div
+ aria-hidden="true"
+ class="MuiBackdrop-root"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ />
+ <div
+ data-test="sentinelStart"
+ tabindex="0"
+ />
+ <div
+ class="MuiDialog-container MuiDialog-scrollPaper"
+ role="none presentation"
+ style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
+ tabindex="-1"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ class="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ legal.title_legal
+ </div>
+ <button
+ aria-label="feedback.accessibility.button_close"
+ class="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <svg
+ class="styles__icon___23x3R"
+ height="16"
+ width="16"
+ >
+ <use
+ xlink:href="#test-file-stub"
+ />
+ </svg>
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ <div
+ class="legal-notice-root"
+ >
+ <div
+ class="legal-notice-content"
+ >
+ <h2>
+ legal.title_legal
+ </h2>
+ <p
+ class="version"
+ >
+ legal.version
+ </p>
+ <p>
+ legal.site
+ </p>
+ <p>
+ legal.adress
+ </p>
+ <p>
+ legal.phone
+ </p>
+ <p
+ class="ln-contact"
+ >
+ legal.mail
+ </p>
+ <div
+ class="text-16-normal"
+ >
+ <div
+ class="legal-notice-oneline"
+ >
+ <span
+ class="text-14-normal"
+ >
+ legal.p1b
+ </span>
+ legal.p1
+ </div>
+ <div
+ class="legal-notice-oneline"
+ >
+ <span
+ class="text-14-normal"
+ >
+ legal.p2b
+ </span>
+ legal.p2
+ </div>
+ <div
+ class="legal-notice-oneline"
+ >
+ <span
+ class="text-14-normal"
+ >
+ legal.p3b
+ </span>
+ legal.p3
+ </div>
+ <div
+ class="legal-notice-oneline"
+ >
+ <span
+ class="text-14-normal"
+ >
+ legal.p4b
+ </span>
+ legal.p4
+ </div>
+ <div
+ class="legal-notice-oneline"
+ >
+ <span
+ class="text-14-normal"
+ >
+ legal.p5b
+ </span>
+ legal.p5
+ </div>
+ <div
+ class="legal-notice-oneline"
+ >
+ <span
+ class="text-14-normal"
+ >
+ legal.p6b
+ </span>
+ legal.p6
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+
+ legal.title1
+ </h3>
+ <p>
+ legal.part1
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title2
+ </h3>
+ <p>
+ legal.part2
+ </p>
+ <ul>
+ <li>
+ legal.part2-1
+ </li>
+ <li>
+ legal.part2-2
+ <ul>
+ <li>
+ legal.part2-2-1
+ </li>
+ <li>
+ legal.part2-2-2
+ </li>
+ <li>
+ legal.part2-2-3
+ </li>
+ <li>
+ legal.part2-2-4
+ </li>
+ </ul>
+ </li>
+ <li>
+ legal.part2-3
+ </li>
+ </ul>
+ <p>
+ legal.part2-4
+ </p>
+ <ul>
+ <li>
+ legal.part2-4-1
+ </li>
+ <li>
+ legal.part2-4-2
+ </li>
+ <li>
+ legal.part2-4-3
+ </li>
+ </ul>
+ <p>
+ legal.part2-5
+ </p>
+ <p>
+ legal.part2-6
+ </p>
+ <p>
+ legal.part2-7
+ </p>
+ <p>
+ legal.part2-8
+ </p>
+ <p>
+ legal.part2-9
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title3
+ </h3>
+ <p>
+ legal.part3-1
+ </p>
+ <p>
+ legal.part3-2
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title4
+ </h3>
+ <p>
+ legal.part4-1
+ </p>
+ <p>
+ legal.part4-2
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title5
+ </h3>
+ <p>
+ legal.part5
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title6
+ </h3>
+ <p>
+ legal.part6
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title7
+ </h3>
+ <p>
+ legal.part7-1
+ </p>
+ <p>
+ legal.part7-2
+ </p>
+ <p>
+ legal.part7-3
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title8
+ </h3>
+ <p>
+ legal.part8
+ </p>
+ </div>
+ <div
+ class="legal-notice-part"
+ >
+ <h3>
+ legal.title9
+ </h3>
+ <p>
+ legal.part9-1
+ </p>
+ <p>
+ legal.part9-2
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <button
+ aria-label="gcu_modal.accessibility.button_accept"
+ class="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiButton-label text-16-bold"
+ >
+ legal.accessibility.button_close
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
+ </div>
+ </div>
+ <div
+ data-test="sentinelEnd"
+ tabindex="0"
+ />
+ </div>
+ </body>
+ }
+ >
+ <div
+ className="MuiDialog-root modal-root"
+ onKeyDown={[Function]}
+ role="presentation"
+ style={
+ Object {
+ "bottom": 0,
+ "left": 0,
+ "position": "fixed",
+ "right": 0,
+ "top": 0,
+ "zIndex": 1300,
+ }
+ }
+ >
+ <WithStyles(ForwardRef(Backdrop))
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Backdrop)
+ classes={
+ Object {
+ "invisible": "MuiBackdrop-invisible",
+ "root": "MuiBackdrop-root",
+ }
+ }
+ onClick={[Function]}
+ open={true}
+ transitionDuration={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <ForwardRef(Fade)
+ in={true}
+ onClick={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onClick={[Function]}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ aria-hidden={true}
+ className="MuiBackdrop-root"
+ onClick={[Function]}
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ />
+ </Transition>
+ </ForwardRef(Fade)>
+ </ForwardRef(Backdrop)>
+ </WithStyles(ForwardRef(Backdrop))>
+ <TrapFocus
+ disableAutoFocus={false}
+ disableEnforceFocus={false}
+ disableRestoreFocus={false}
+ getDoc={[Function]}
+ isEnabled={[Function]}
+ open={true}
+ >
+ <div
+ data-test="sentinelStart"
+ tabIndex={0}
+ />
+ <ForwardRef(Fade)
+ appear={true}
+ in={true}
+ onEnter={[Function]}
+ onExited={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ >
+ <Transition
+ appear={true}
+ enter={true}
+ exit={true}
+ in={true}
+ mountOnEnter={false}
+ onEnter={[Function]}
+ onEntered={[Function]}
+ onEntering={[Function]}
+ onExit={[Function]}
+ onExited={[Function]}
+ onExiting={[Function]}
+ role="none presentation"
+ tabIndex="-1"
+ timeout={
+ Object {
+ "enter": 225,
+ "exit": 195,
+ }
+ }
+ unmountOnExit={false}
+ >
+ <div
+ className="MuiDialog-container MuiDialog-scrollPaper"
+ onClick={[Function]}
+ onMouseDown={[Function]}
+ role="none presentation"
+ style={
+ Object {
+ "opacity": 1,
+ "visibility": undefined,
+ }
+ }
+ tabIndex="-1"
+ >
+ <WithStyles(ForwardRef(Paper))
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ elevation={24}
+ role="dialog"
+ >
+ <ForwardRef(Paper)
+ aria-labelledby="accessibility-title"
+ className="MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm"
+ classes={
+ Object {
+ "elevation0": "MuiPaper-elevation0",
+ "elevation1": "MuiPaper-elevation1",
+ "elevation10": "MuiPaper-elevation10",
+ "elevation11": "MuiPaper-elevation11",
+ "elevation12": "MuiPaper-elevation12",
+ "elevation13": "MuiPaper-elevation13",
+ "elevation14": "MuiPaper-elevation14",
+ "elevation15": "MuiPaper-elevation15",
+ "elevation16": "MuiPaper-elevation16",
+ "elevation17": "MuiPaper-elevation17",
+ "elevation18": "MuiPaper-elevation18",
+ "elevation19": "MuiPaper-elevation19",
+ "elevation2": "MuiPaper-elevation2",
+ "elevation20": "MuiPaper-elevation20",
+ "elevation21": "MuiPaper-elevation21",
+ "elevation22": "MuiPaper-elevation22",
+ "elevation23": "MuiPaper-elevation23",
+ "elevation24": "MuiPaper-elevation24",
+ "elevation3": "MuiPaper-elevation3",
+ "elevation4": "MuiPaper-elevation4",
+ "elevation5": "MuiPaper-elevation5",
+ "elevation6": "MuiPaper-elevation6",
+ "elevation7": "MuiPaper-elevation7",
+ "elevation8": "MuiPaper-elevation8",
+ "elevation9": "MuiPaper-elevation9",
+ "outlined": "MuiPaper-outlined",
+ "root": "MuiPaper-root",
+ "rounded": "MuiPaper-rounded",
+ }
+ }
+ elevation={24}
+ role="dialog"
+ >
+ <div
+ aria-labelledby="accessibility-title"
+ className="MuiPaper-root MuiDialog-paper modal-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthSm MuiPaper-elevation24 MuiPaper-rounded"
+ role="dialog"
+ >
+ <div
+ id="accessibility-title"
+ >
+ legal.title_legal
+ </div>
+ <WithStyles(ForwardRef(IconButton))
+ aria-label="feedback.accessibility.button_close"
+ className="modal-paper-close-button"
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(IconButton)
+ aria-label="feedback.accessibility.button_close"
+ className="modal-paper-close-button"
+ classes={
+ Object {
+ "colorInherit": "MuiIconButton-colorInherit",
+ "colorPrimary": "MuiIconButton-colorPrimary",
+ "colorSecondary": "MuiIconButton-colorSecondary",
+ "disabled": "Mui-disabled",
+ "edgeEnd": "MuiIconButton-edgeEnd",
+ "edgeStart": "MuiIconButton-edgeStart",
+ "label": "MuiIconButton-label",
+ "root": "MuiIconButton-root",
+ "sizeSmall": "MuiIconButton-sizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="feedback.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="feedback.accessibility.button_close"
+ centerRipple={true}
+ className="MuiIconButton-root modal-paper-close-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ disabled={false}
+ focusRipple={true}
+ onClick={[MockFunction]}
+ >
+ <button
+ aria-label="feedback.accessibility.button_close"
+ className="MuiButtonBase-root MuiIconButton-root modal-paper-close-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiIconButton-label"
+ >
+ <Icon
+ icon="test-file-stub"
+ size={16}
+ spin={false}
+ >
+ <Component
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <svg
+ className="styles__icon___23x3R"
+ height={16}
+ style={Object {}}
+ width={16}
+ >
+ <use
+ xlinkHref="#test-file-stub"
+ />
+ </svg>
+ </Component>
+ </Icon>
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={true}
+ >
+ <ForwardRef(TouchRipple)
+ center={true}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(IconButton)>
+ </WithStyles(ForwardRef(IconButton))>
+ <LegalNoticeContent>
+ <div
+ className="legal-notice-root"
+ >
+ <div
+ className="legal-notice-content"
+ >
+ <h2>
+ legal.title_legal
+ </h2>
+ <p
+ className="version"
+ >
+ legal.version
+ </p>
+ <p>
+ legal.site
+ </p>
+ <p>
+ legal.adress
+ </p>
+ <p>
+ legal.phone
+ </p>
+ <p
+ className="ln-contact"
+ >
+ legal.mail
+ </p>
+ <div
+ className="text-16-normal"
+ >
+ <div
+ className="legal-notice-oneline"
+ >
+ <span
+ className="text-14-normal"
+ >
+ legal.p1b
+ </span>
+ legal.p1
+ </div>
+ <div
+ className="legal-notice-oneline"
+ >
+ <span
+ className="text-14-normal"
+ >
+ legal.p2b
+ </span>
+ legal.p2
+ </div>
+ <div
+ className="legal-notice-oneline"
+ >
+ <span
+ className="text-14-normal"
+ >
+ legal.p3b
+ </span>
+ legal.p3
+ </div>
+ <div
+ className="legal-notice-oneline"
+ >
+ <span
+ className="text-14-normal"
+ >
+ legal.p4b
+ </span>
+ legal.p4
+ </div>
+ <div
+ className="legal-notice-oneline"
+ >
+ <span
+ className="text-14-normal"
+ >
+ legal.p5b
+ </span>
+ legal.p5
+ </div>
+ <div
+ className="legal-notice-oneline"
+ >
+ <span
+ className="text-14-normal"
+ >
+ legal.p6b
+ </span>
+ legal.p6
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+
+ legal.title1
+ </h3>
+ <p>
+ legal.part1
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title2
+ </h3>
+ <p>
+ legal.part2
+ </p>
+ <ul>
+ <li>
+ legal.part2-1
+ </li>
+ <li>
+ legal.part2-2
+ <ul>
+ <li>
+ legal.part2-2-1
+ </li>
+ <li>
+ legal.part2-2-2
+ </li>
+ <li>
+ legal.part2-2-3
+ </li>
+ <li>
+ legal.part2-2-4
+ </li>
+ </ul>
+ </li>
+ <li>
+ legal.part2-3
+ </li>
+ </ul>
+ <p>
+ legal.part2-4
+ </p>
+ <ul>
+ <li>
+ legal.part2-4-1
+ </li>
+ <li>
+ legal.part2-4-2
+ </li>
+ <li>
+ legal.part2-4-3
+ </li>
+ </ul>
+ <p>
+ legal.part2-5
+ </p>
+ <p>
+ legal.part2-6
+ </p>
+ <p>
+ legal.part2-7
+ </p>
+ <p>
+ legal.part2-8
+ </p>
+ <p>
+ legal.part2-9
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title3
+ </h3>
+ <p>
+ legal.part3-1
+ </p>
+ <p>
+ legal.part3-2
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title4
+ </h3>
+ <p>
+ legal.part4-1
+ </p>
+ <p>
+ legal.part4-2
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title5
+ </h3>
+ <p>
+ legal.part5
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title6
+ </h3>
+ <p>
+ legal.part6
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title7
+ </h3>
+ <p>
+ legal.part7-1
+ </p>
+ <p>
+ legal.part7-2
+ </p>
+ <p>
+ legal.part7-3
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title8
+ </h3>
+ <p>
+ legal.part8
+ </p>
+ </div>
+ <div
+ className="legal-notice-part"
+ >
+ <h3>
+ legal.title9
+ </h3>
+ <p>
+ legal.part9-1
+ </p>
+ <p>
+ legal.part9-2
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </LegalNoticeContent>
+ <WithStyles(ForwardRef(Button))
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="gcu-modal-button"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-profile-next rounded",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <ForwardRef(Button)
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="gcu-modal-button"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ onClick={[MockFunction]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={false}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[MockFunction]}
+ type="button"
+ >
+ <button
+ aria-label="gcu_modal.accessibility.button_accept"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button"
+ disabled={false}
+ onBlur={[Function]}
+ onClick={[MockFunction]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={0}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ legal.accessibility.button_close
+ </span>
+ <NoSsr>
+ <WithStyles(memo)
+ center={false}
+ >
+ <ForwardRef(TouchRipple)
+ center={false}
+ classes={
+ Object {
+ "child": "MuiTouchRipple-child",
+ "childLeaving": "MuiTouchRipple-childLeaving",
+ "childPulsate": "MuiTouchRipple-childPulsate",
+ "ripple": "MuiTouchRipple-ripple",
+ "ripplePulsate": "MuiTouchRipple-ripplePulsate",
+ "rippleVisible": "MuiTouchRipple-rippleVisible",
+ "root": "MuiTouchRipple-root",
+ }
+ }
+ >
+ <span
+ className="MuiTouchRipple-root"
+ >
+ <TransitionGroup
+ childFactory={[Function]}
+ component={null}
+ exit={true}
+ />
+ </span>
+ </ForwardRef(TouchRipple)>
+ </WithStyles(memo)>
+ </NoSsr>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ </ForwardRef(Paper)>
+ </WithStyles(ForwardRef(Paper))>
+ </div>
+ </Transition>
+ </ForwardRef(Fade)>
+ <div
+ data-test="sentinelEnd"
+ tabIndex={0}
+ />
+ </TrapFocus>
+ </div>
+ </Portal>
+ </ForwardRef(Portal)>
+ </ForwardRef(Modal)>
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+</LegalNoticeModal>
`;
diff --git a/src/components/Terms/__snapshots__/MinorUpdateContent.spec.tsx.snap b/src/components/Terms/__snapshots__/MinorUpdateContent.spec.tsx.snap
new file mode 100644
index 000000000..7374bea12
--- /dev/null
+++ b/src/components/Terms/__snapshots__/MinorUpdateContent.spec.tsx.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Minor update content component should be rendered correctly 1`] = `
+<MinorUpdateContent
+ toggleLegalNoticeModal={[MockFunction]}
+>
+ <div
+ className="dataShare-content-root"
+ >
+ <div
+ className="dataShare-content-wrapper"
+ >
+ <h1
+ className="dataShare-content-title text-22-normal"
+ >
+ minorUpdate.title
+ </h1>
+ </div>
+ </div>
+</MinorUpdateContent>
+`;
diff --git a/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap b/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap
index d7e196d6c..4a2393ce3 100644
--- a/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap
+++ b/src/components/Terms/__snapshots__/TermsView.spec.tsx.snap
@@ -13,6 +13,976 @@ exports[`TermsView component should be rendered correctly 1`] = `
}
}
>
- <TermsView />
+ <TermsView>
+ <div
+ className="terms-wrapper"
+ >
+ <div
+ className="terms-content"
+ >
+ <DataShareConsentContent>
+ <div
+ className="dataShare-content-root"
+ >
+ <div
+ className="dataShare-content-wrapper"
+ >
+ <h1
+ className="dataShare-content-title text-22-normal"
+ >
+ dataShare.title1
+ </h1>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part1
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part2
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part3
+ </p>
+ <ul
+ className="text-14-normal"
+ >
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item1
+ </li>
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item2
+ </li>
+ <li
+ className="text-14-normal"
+ >
+ dataShare.item3
+ </li>
+ </ul>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part4
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part5
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part6
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part7
+ </p>
+ <p
+ className="text-14-normal"
+ >
+ dataShare.part8
+ </p>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.part9
+ </span>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.part10
+ </span>
+ <span
+ className="text-14-normal"
+ >
+ dataShare.link1
+ </span>
+ </div>
+ </div>
+ </DataShareConsentContent>
+ <label
+ className="checkbox"
+ >
+ <input
+ checked={false}
+ name="Data-consent-validation"
+ onChange={[Function]}
+ type="checkbox"
+ />
+ dataShare.validDataConsent
+ </label>
+ <label
+ className="checkbox"
+ >
+ <input
+ checked={false}
+ name="GCU-validation"
+ onChange={[Function]}
+ type="checkbox"
+ />
+ <span>
+ dataShare.validCGU
+ dataShare.validLegal
+ </span>
+ </label>
+ </div>
+ <div
+ className="terms-footer"
+ >
+ <WithStyles(ForwardRef(Button))
+ aria-label="dataShare.accessibility.button_accept"
+ className="gcu-modal-button disabled"
+ classes={
+ Object {
+ "label": "text-16-bold",
+ "root": "btn-profile-next rounded",
+ }
+ }
+ disabled={true}
+ onClick={[Function]}
+ >
+ <ForwardRef(Button)
+ aria-label="dataShare.accessibility.button_accept"
+ className="gcu-modal-button disabled"
+ classes={
+ Object {
+ "colorInherit": "MuiButton-colorInherit",
+ "contained": "MuiButton-contained",
+ "containedPrimary": "MuiButton-containedPrimary",
+ "containedSecondary": "MuiButton-containedSecondary",
+ "containedSizeLarge": "MuiButton-containedSizeLarge",
+ "containedSizeSmall": "MuiButton-containedSizeSmall",
+ "disableElevation": "MuiButton-disableElevation",
+ "disabled": "Mui-disabled",
+ "endIcon": "MuiButton-endIcon",
+ "focusVisible": "Mui-focusVisible",
+ "fullWidth": "MuiButton-fullWidth",
+ "iconSizeLarge": "MuiButton-iconSizeLarge",
+ "iconSizeMedium": "MuiButton-iconSizeMedium",
+ "iconSizeSmall": "MuiButton-iconSizeSmall",
+ "label": "MuiButton-label text-16-bold",
+ "outlined": "MuiButton-outlined",
+ "outlinedPrimary": "MuiButton-outlinedPrimary",
+ "outlinedSecondary": "MuiButton-outlinedSecondary",
+ "outlinedSizeLarge": "MuiButton-outlinedSizeLarge",
+ "outlinedSizeSmall": "MuiButton-outlinedSizeSmall",
+ "root": "MuiButton-root btn-profile-next rounded",
+ "sizeLarge": "MuiButton-sizeLarge",
+ "sizeSmall": "MuiButton-sizeSmall",
+ "startIcon": "MuiButton-startIcon",
+ "text": "MuiButton-text",
+ "textPrimary": "MuiButton-textPrimary",
+ "textSecondary": "MuiButton-textSecondary",
+ "textSizeLarge": "MuiButton-textSizeLarge",
+ "textSizeSmall": "MuiButton-textSizeSmall",
+ }
+ }
+ disabled={true}
+ onClick={[Function]}
+ >
+ <WithStyles(ForwardRef(ButtonBase))
+ aria-label="dataShare.accessibility.button_accept"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button disabled Mui-disabled"
+ component="button"
+ disabled={true}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <ForwardRef(ButtonBase)
+ aria-label="dataShare.accessibility.button_accept"
+ className="MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button disabled Mui-disabled"
+ classes={
+ Object {
+ "disabled": "Mui-disabled",
+ "focusVisible": "Mui-focusVisible",
+ "root": "MuiButtonBase-root",
+ }
+ }
+ component="button"
+ disabled={true}
+ focusRipple={true}
+ focusVisibleClassName="Mui-focusVisible"
+ onClick={[Function]}
+ type="button"
+ >
+ <button
+ aria-label="dataShare.accessibility.button_accept"
+ className="MuiButtonBase-root MuiButton-root btn-profile-next rounded MuiButton-text gcu-modal-button disabled Mui-disabled Mui-disabled"
+ disabled={true}
+ onBlur={[Function]}
+ onClick={[Function]}
+ onDragLeave={[Function]}
+ onFocus={[Function]}
+ onKeyDown={[Function]}
+ onKeyUp={[Function]}
+ onMouseDown={[Function]}
+ onMouseLeave={[Function]}
+ onMouseUp={[Function]}
+ onTouchEnd={[Function]}
+ onTouchMove={[Function]}
+ onTouchStart={[Function]}
+ tabIndex={-1}
+ type="button"
+ >
+ <span
+ className="MuiButton-label text-16-bold"
+ >
+ dataShare.button_accept
+ </span>
+ </button>
+ </ForwardRef(ButtonBase)>
+ </WithStyles(ForwardRef(ButtonBase))>
+ </ForwardRef(Button)>
+ </WithStyles(ForwardRef(Button))>
+ </div>
+ <CGUModal
+ handleCloseClick={[Function]}
+ open={false}
+ >
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[Function]}
+ open={false}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[Function]}
+ open={false}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[Function]}
+ open={false}
+ />
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+ </CGUModal>
+ <LegalNoticeModal
+ handleCloseClick={[Function]}
+ open={false}
+ >
+ <WithStyles(ForwardRef(Dialog))
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "paper": "modal-paper",
+ "root": "modal-root",
+ }
+ }
+ onClose={[Function]}
+ open={false}
+ >
+ <ForwardRef(Dialog)
+ aria-labelledby="accessibility-title"
+ classes={
+ Object {
+ "container": "MuiDialog-container",
+ "paper": "MuiDialog-paper modal-paper",
+ "paperFullScreen": "MuiDialog-paperFullScreen",
+ "paperFullWidth": "MuiDialog-paperFullWidth",
+ "paperScrollBody": "MuiDialog-paperScrollBody",
+ "paperScrollPaper": "MuiDialog-paperScrollPaper",
+ "paperWidthFalse": "MuiDialog-paperWidthFalse",
+ "paperWidthLg": "MuiDialog-paperWidthLg",
+ "paperWidthMd": "MuiDialog-paperWidthMd",
+ "paperWidthSm": "MuiDialog-paperWidthSm",
+ "paperWidthXl": "MuiDialog-paperWidthXl",
+ "paperWidthXs": "MuiDialog-paperWidthXs",
+ "root": "MuiDialog-root modal-root",
+ "scrollBody": "MuiDialog-scrollBody",
+ "scrollPaper": "MuiDialog-scrollPaper",
+ }
+ }
+ onClose={[Function]}
+ open={false}
+ >
+ <ForwardRef(Modal)
+ BackdropComponent={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "Naked": Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "propTypes": Object {
+ "children": [Function],
+ "className": [Function],
+ "classes": [Function],
+ "invisible": [Function],
+ "open": [Function],
+ "transitionDuration": [Function],
+ },
+ "render": [Function],
+ },
+ "displayName": "WithStyles(ForwardRef(Backdrop))",
+ "options": Object {
+ "defaultTheme": Object {
+ "breakpoints": Object {
+ "between": [Function],
+ "down": [Function],
+ "keys": Array [
+ "xs",
+ "sm",
+ "md",
+ "lg",
+ "xl",
+ ],
+ "only": [Function],
+ "up": [Function],
+ "values": Object {
+ "lg": 1280,
+ "md": 960,
+ "sm": 600,
+ "xl": 1920,
+ "xs": 0,
+ },
+ "width": [Function],
+ },
+ "direction": "ltr",
+ "mixins": Object {
+ "gutters": [Function],
+ "toolbar": Object {
+ "@media (min-width:0px) and (orientation: landscape)": Object {
+ "minHeight": 48,
+ },
+ "@media (min-width:600px)": Object {
+ "minHeight": 64,
+ },
+ "minHeight": 56,
+ },
+ },
+ "overrides": Object {},
+ "palette": Object {
+ "action": Object {
+ "active": "rgba(0, 0, 0, 0.54)",
+ "disabled": "rgba(0, 0, 0, 0.26)",
+ "disabledBackground": "rgba(0, 0, 0, 0.12)",
+ "hover": "rgba(0, 0, 0, 0.08)",
+ "hoverOpacity": 0.08,
+ "selected": "rgba(0, 0, 0, 0.14)",
+ },
+ "augmentColor": [Function],
+ "background": Object {
+ "default": "#fafafa",
+ "paper": "#fff",
+ },
+ "common": Object {
+ "black": "#000",
+ "white": "#fff",
+ },
+ "contrastThreshold": 3,
+ "divider": "rgba(0, 0, 0, 0.12)",
+ "error": Object {
+ "contrastText": "#fff",
+ "dark": "#d32f2f",
+ "light": "#e57373",
+ "main": "#f44336",
+ },
+ "getContrastText": [Function],
+ "grey": Object {
+ "100": "#f5f5f5",
+ "200": "#eeeeee",
+ "300": "#e0e0e0",
+ "400": "#bdbdbd",
+ "50": "#fafafa",
+ "500": "#9e9e9e",
+ "600": "#757575",
+ "700": "#616161",
+ "800": "#424242",
+ "900": "#212121",
+ "A100": "#d5d5d5",
+ "A200": "#aaaaaa",
+ "A400": "#303030",
+ "A700": "#616161",
+ },
+ "info": Object {
+ "contrastText": "#fff",
+ "dark": "#1976d2",
+ "light": "#64b5f6",
+ "main": "#2196f3",
+ },
+ "primary": Object {
+ "contrastText": "#fff",
+ "dark": "#303f9f",
+ "light": "#7986cb",
+ "main": "#3f51b5",
+ },
+ "secondary": Object {
+ "contrastText": "#fff",
+ "dark": "#c51162",
+ "light": "#ff4081",
+ "main": "#f50057",
+ },
+ "success": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#388e3c",
+ "light": "#81c784",
+ "main": "#4caf50",
+ },
+ "text": Object {
+ "disabled": "rgba(0, 0, 0, 0.38)",
+ "hint": "rgba(0, 0, 0, 0.38)",
+ "primary": "rgba(0, 0, 0, 0.87)",
+ "secondary": "rgba(0, 0, 0, 0.54)",
+ },
+ "tonalOffset": 0.2,
+ "type": "light",
+ "warning": Object {
+ "contrastText": "rgba(0, 0, 0, 0.87)",
+ "dark": "#f57c00",
+ "light": "#ffb74d",
+ "main": "#ff9800",
+ },
+ },
+ "props": Object {},
+ "shadows": Array [
+ "none",
+ "0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)",
+ "0px 3px 1px -2px rgba(0,0,0,0.2),0px 2px 2px 0px rgba(0,0,0,0.14),0px 1px 5px 0px rgba(0,0,0,0.12)",
+ "0px 3px 3px -2px rgba(0,0,0,0.2),0px 3px 4px 0px rgba(0,0,0,0.14),0px 1px 8px 0px rgba(0,0,0,0.12)",
+ "0px 2px 4px -1px rgba(0,0,0,0.2),0px 4px 5px 0px rgba(0,0,0,0.14),0px 1px 10px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 5px 8px 0px rgba(0,0,0,0.14),0px 1px 14px 0px rgba(0,0,0,0.12)",
+ "0px 3px 5px -1px rgba(0,0,0,0.2),0px 6px 10px 0px rgba(0,0,0,0.14),0px 1px 18px 0px rgba(0,0,0,0.12)",
+ "0px 4px 5px -2px rgba(0,0,0,0.2),0px 7px 10px 1px rgba(0,0,0,0.14),0px 2px 16px 1px rgba(0,0,0,0.12)",
+ "0px 5px 5px -3px rgba(0,0,0,0.2),0px 8px 10px 1px rgba(0,0,0,0.14),0px 3px 14px 2px rgba(0,0,0,0.12)",
+ "0px 5px 6px -3px rgba(0,0,0,0.2),0px 9px 12px 1px rgba(0,0,0,0.14),0px 3px 16px 2px rgba(0,0,0,0.12)",
+ "0px 6px 6px -3px rgba(0,0,0,0.2),0px 10px 14px 1px rgba(0,0,0,0.14),0px 4px 18px 3px rgba(0,0,0,0.12)",
+ "0px 6px 7px -4px rgba(0,0,0,0.2),0px 11px 15px 1px rgba(0,0,0,0.14),0px 4px 20px 3px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 12px 17px 2px rgba(0,0,0,0.14),0px 5px 22px 4px rgba(0,0,0,0.12)",
+ "0px 7px 8px -4px rgba(0,0,0,0.2),0px 13px 19px 2px rgba(0,0,0,0.14),0px 5px 24px 4px rgba(0,0,0,0.12)",
+ "0px 7px 9px -4px rgba(0,0,0,0.2),0px 14px 21px 2px rgba(0,0,0,0.14),0px 5px 26px 4px rgba(0,0,0,0.12)",
+ "0px 8px 9px -5px rgba(0,0,0,0.2),0px 15px 22px 2px rgba(0,0,0,0.14),0px 6px 28px 5px rgba(0,0,0,0.12)",
+ "0px 8px 10px -5px rgba(0,0,0,0.2),0px 16px 24px 2px rgba(0,0,0,0.14),0px 6px 30px 5px rgba(0,0,0,0.12)",
+ "0px 8px 11px -5px rgba(0,0,0,0.2),0px 17px 26px 2px rgba(0,0,0,0.14),0px 6px 32px 5px rgba(0,0,0,0.12)",
+ "0px 9px 11px -5px rgba(0,0,0,0.2),0px 18px 28px 2px rgba(0,0,0,0.14),0px 7px 34px 6px rgba(0,0,0,0.12)",
+ "0px 9px 12px -6px rgba(0,0,0,0.2),0px 19px 29px 2px rgba(0,0,0,0.14),0px 7px 36px 6px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 20px 31px 3px rgba(0,0,0,0.14),0px 8px 38px 7px rgba(0,0,0,0.12)",
+ "0px 10px 13px -6px rgba(0,0,0,0.2),0px 21px 33px 3px rgba(0,0,0,0.14),0px 8px 40px 7px rgba(0,0,0,0.12)",
+ "0px 10px 14px -6px rgba(0,0,0,0.2),0px 22px 35px 3px rgba(0,0,0,0.14),0px 8px 42px 7px rgba(0,0,0,0.12)",
+ "0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)",
+ "0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)",
+ ],
+ "shape": Object {
+ "borderRadius": 4,
+ },
+ "spacing": [Function],
+ "transitions": Object {
+ "create": [Function],
+ "duration": Object {
+ "complex": 375,
+ "enteringScreen": 225,
+ "leavingScreen": 195,
+ "short": 250,
+ "shorter": 200,
+ "shortest": 150,
+ "standard": 300,
+ },
+ "easing": Object {
+ "easeIn": "cubic-bezier(0.4, 0, 1, 1)",
+ "easeInOut": "cubic-bezier(0.4, 0, 0.2, 1)",
+ "easeOut": "cubic-bezier(0.0, 0, 0.2, 1)",
+ "sharp": "cubic-bezier(0.4, 0, 0.6, 1)",
+ },
+ "getAutoHeightDuration": [Function],
+ },
+ "typography": Object {
+ "body1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.5,
+ },
+ "body2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.01071em",
+ "lineHeight": 1.43,
+ },
+ "button": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.02857em",
+ "lineHeight": 1.75,
+ "textTransform": "uppercase",
+ },
+ "caption": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.03333em",
+ "lineHeight": 1.66,
+ },
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": 14,
+ "fontWeightBold": 700,
+ "fontWeightLight": 300,
+ "fontWeightMedium": 500,
+ "fontWeightRegular": 400,
+ "h1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "6rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.01562em",
+ "lineHeight": 1.167,
+ },
+ "h2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3.75rem",
+ "fontWeight": 300,
+ "letterSpacing": "-0.00833em",
+ "lineHeight": 1.2,
+ },
+ "h3": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "3rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.167,
+ },
+ "h4": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "2.125rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00735em",
+ "lineHeight": 1.235,
+ },
+ "h5": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.5rem",
+ "fontWeight": 400,
+ "letterSpacing": "0em",
+ "lineHeight": 1.334,
+ },
+ "h6": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1.25rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.0075em",
+ "lineHeight": 1.6,
+ },
+ "htmlFontSize": 16,
+ "overline": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.75rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.08333em",
+ "lineHeight": 2.66,
+ "textTransform": "uppercase",
+ },
+ "pxToRem": [Function],
+ "round": [Function],
+ "subtitle1": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "1rem",
+ "fontWeight": 400,
+ "letterSpacing": "0.00938em",
+ "lineHeight": 1.75,
+ },
+ "subtitle2": Object {
+ "fontFamily": "\\"Roboto\\", \\"Helvetica\\", \\"Arial\\", sans-serif",
+ "fontSize": "0.875rem",
+ "fontWeight": 500,
+ "letterSpacing": "0.00714em",
+ "lineHeight": 1.57,
+ },
+ },
+ "zIndex": Object {
+ "appBar": 1100,
+ "drawer": 1200,
+ "mobileStepper": 1000,
+ "modal": 1300,
+ "snackbar": 1400,
+ "speedDial": 1050,
+ "tooltip": 1500,
+ },
+ },
+ "name": "MuiBackdrop",
+ },
+ "propTypes": Object {
+ "classes": [Function],
+ "innerRef": [Function],
+ },
+ "render": [Function],
+ "useStyles": [Function],
+ }
+ }
+ BackdropProps={
+ Object {
+ "transitionDuration": Object {
+ "enter": 225,
+ "exit": 195,
+ },
+ }
+ }
+ className="MuiDialog-root modal-root"
+ closeAfterTransition={true}
+ disableBackdropClick={false}
+ disableEscapeKeyDown={false}
+ onClose={[Function]}
+ open={false}
+ />
+ </ForwardRef(Dialog)>
+ </WithStyles(ForwardRef(Dialog))>
+ </LegalNoticeModal>
+ </div>
+ </TermsView>
</Provider>
`;
diff --git a/src/components/TotalConsumption/TotalConsumption.tsx b/src/components/TotalConsumption/TotalConsumption.tsx
index cd64092a8..5c40c4833 100644
--- a/src/components/TotalConsumption/TotalConsumption.tsx
+++ b/src/components/TotalConsumption/TotalConsumption.tsx
@@ -37,9 +37,19 @@ const TotalConsumption: React.FC<TotalConsumptionProps> = ({
const converterService = new ConverterService()
let total = 0
+ let totalPrice = 0
actualData.forEach(data => {
- if (data.value !== -1) total += data.value
+ if (data.value !== -1) {
+ total += data.value
+ }
+ if (data.price) {
+ totalPrice += converterService.LoadToEuro(
+ data.value,
+ fluidType,
+ data.price
+ )
+ }
})
const displayedValue =
@@ -50,9 +60,11 @@ const TotalConsumption: React.FC<TotalConsumptionProps> = ({
? '-----'
: fluidType === FluidType.MULTIFLUID
? formatNumberValues(total).toString()
- : formatNumberValues(
+ : totalPrice <= 0
+ ? formatNumberValues(
converterService.LoadToEuro(total, fluidType)
).toString()
+ : formatNumberValues(totalPrice).toString()
setTotalValue(displayedValue)
}
diff --git a/src/components/Tutorial/TutorialWelcome.spec.tsx b/src/components/Tutorial/TutorialWelcome.spec.tsx
deleted file mode 100644
index df97f7d49..000000000
--- a/src/components/Tutorial/TutorialWelcome.spec.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import React from 'react'
-import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
-import {
- createMockStore,
- mockInitialEcolyoState,
-} from '../../../tests/__mocks__/store'
-import mockClient from '../../../tests/__mocks__/client'
-import TutorialWelcome from './TutorialWelcome'
-import * as cc from 'cozy-client'
-import { Button, IconButton } from '@material-ui/core'
-import { act } from 'react-dom/test-utils'
-
-/* eslint-disable @typescript-eslint/camelcase */
-
-jest.mock('cozy-ui/transpiled/react/I18n', () => {
- return {
- useI18n: jest.fn(() => {
- return {
- t: (str: string) => str,
- }
- }),
- }
-})
-let mockPublicName = 'name'
-jest.mock('components/Hooks/userInstanceSettings', () => ({
- __esModule: true,
- default: () => ({
- data: {
- public_name: mockPublicName,
- },
- fetchStatus: 'string',
- }),
-}))
-
-jest.mock('notifications/welcome.hbs', () => {
- return jest.fn(() => {
- return {}
- })
-})
-
-jest.mock('mjml-browser', () => {
- return jest.fn(() => {
- return '<h1>Test</h1>'
- })
-})
-
-const mockUpdateProfile = jest.fn()
-jest.mock('services/profile.service', () => {
- return jest.fn(() => {
- return {
- updateProfile: mockUpdateProfile,
- }
- })
-})
-
-jest.mock('notifications/welcome.hbs', () => {
- return jest.fn(() => {
- return {
- welcomeTemplate: '<h1>Test</h1>',
- }
- })
-})
-
-jest.mock('mjml-browser', () => {
- return jest.fn(() => {
- return {
- mjml2html: {
- html: '<h1>Test</h1>',
- },
- }
- })
-})
-
-describe('TutorialWelcome component', () => {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- let store: any
- beforeEach(() => {
- store = createMockStore(mockInitialEcolyoState)
- })
-
- it('should be rendered correctly', async () => {
- const wrapper = mount(
- <Provider store={store}>
- <TutorialWelcome open={true} />
- </Provider>
- )
- await act(async () => {
- await new Promise(resolve => setTimeout(resolve))
- wrapper.update()
- })
- expect(wrapper).toMatchSnapshot()
- })
- it('should render first slide', async () => {
- const wrapper = mount(
- <Provider store={store}>
- <TutorialWelcome open={true} />
- </Provider>
- )
- await act(async () => {
- await new Promise(resolve => setTimeout(resolve))
- wrapper.update()
- })
- expect(wrapper.find('.welcome-perso')).toBeTruthy()
- })
-
- it('should change slides and end tutorial', async () => {
- const mockUseClient = jest.spyOn(cc, 'useClient')
- mockUseClient.mockReturnValue(mockClient)
-
- const wrapper = mount(
- <Provider store={store}>
- <TutorialWelcome open={true} />
- </Provider>
- )
- await act(async () => {
- await new Promise(resolve => setTimeout(resolve))
- wrapper.update()
- })
- // tmp.getStackClient().fetchJSON.mockResolvedValueOnce({})
- expect(wrapper.find('.illu1')).toBeTruthy()
-
- //click on next button and display next slide
- wrapper
- .find(IconButton)
- .first()
- .simulate('click')
- expect(wrapper.find('.illu2')).toBeTruthy()
- //click on next button and display last slide
- wrapper
- .find(IconButton)
- .at(1)
- .simulate('click')
- expect(wrapper.find('.illu3')).toBeTruthy()
- //click on prev button and display last slide
- wrapper
- .find(IconButton)
- .first()
- .simulate('click')
- expect(wrapper.find('.illu2')).toBeTruthy()
- //click on next button and display last slide
- wrapper
- .find(IconButton)
- .at(1)
- .simulate('click')
- expect(wrapper.find('.illu3')).toBeTruthy()
- //click on finish tuto button and send mail
- wrapper
- .find(Button)
- .first()
- .simulate('click')
- expect(mockUpdateProfile).toHaveBeenCalled()
- })
- it('should render without public name', async () => {
- mockPublicName = ''
- const wrapper = mount(
- <Provider store={store}>
- <TutorialWelcome open={true} />
- </Provider>
- )
- await act(async () => {
- await new Promise(resolve => setTimeout(resolve))
- wrapper.update()
- })
- wrapper
- .find(IconButton)
- .first()
- .simulate('click')
- expect(wrapper.find('.illu2')).toBeTruthy()
- wrapper
- .find(IconButton)
- .at(1)
- .simulate('click')
- expect(wrapper.find('.illu3')).toBeTruthy()
- wrapper
- .find(Button)
- .first()
- .simulate('click')
- expect(!wrapper.find('.public-name'))
- })
- it('should render with public name', async () => {
- const wrapper = mount(
- <Provider store={store}>
- <TutorialWelcome open={true} />
- </Provider>
- )
- await act(async () => {
- await new Promise(resolve => setTimeout(resolve))
- wrapper.update()
- })
- expect(wrapper.find('.public-name')).toBeTruthy()
- })
-})
diff --git a/src/components/Tutorial/TutorialWelcome.tsx b/src/components/Tutorial/TutorialWelcome.tsx
deleted file mode 100644
index 690955291..000000000
--- a/src/components/Tutorial/TutorialWelcome.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import React, { useCallback, useState } from 'react'
-import './tutorialWelcome.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { IconButton } from '@material-ui/core'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { useClient } from 'cozy-client'
-import { useDispatch } from 'react-redux'
-import { updateProfile } from 'store/profile/profile.actions'
-import MailService from 'services/mail.service'
-import userInstanceSettings from 'components/Hooks/userInstanceSettings'
-const welcomeTemplate = require('notifications/welcome.hbs')
-const mjml2html = require('mjml-browser')
-import Dialog from '@material-ui/core/Dialog'
-import Button from '@material-ui/core/Button'
-import CircleEmpty from 'assets/icons/ico/circleEmpty.svg'
-import CircleFilled from 'assets/icons/ico/circleFilled.svg'
-import LeftArrowIcon from 'assets/icons/visu/tuto/arrowLeft.svg'
-import RigthArrowIcon from 'assets/icons/visu/tuto/arrowRight.svg'
-import Illu1 from 'assets/icons/visu/tuto/tuto1.svg'
-import Illu2 from 'assets/icons/visu/tuto/tuto2.svg'
-import Illu3 from 'assets/icons/visu/tuto/tuto3.svg'
-import EnvironementService from 'services/environement.service'
-interface TutorialWelcomeProps {
- open: boolean
-}
-
-const TutorialWelcome: React.FC<TutorialWelcomeProps> = ({
- open,
-}: TutorialWelcomeProps) => {
- const { t } = useI18n()
- const client = useClient()
- const dispatch = useDispatch()
- const { data: instanceSettings } = userInstanceSettings()
- const [tutoSlide, setTutoSlide] = useState<number>(0)
- const setTutorialWelcomeViewed = useCallback(async () => {
- const mailService = new MailService()
- let username = ''
-
- if (instanceSettings.public_name !== '') {
- username = instanceSettings.public_name
- }
- const environementService = new EnvironementService()
- const baseUrl = environementService.getPublicURL()
- const template = welcomeTemplate({
- title: 'Bienvenue sur Ecolyo !',
- username: username,
- baseUrl: baseUrl,
- clientUrl: client.options.uri,
- cloudImageUrl: baseUrl + '/assets/godCloud.png',
- ecolyoPhoneImageUrl: baseUrl + '/assets/ecolyoPhone.png',
- androidImageUrl: baseUrl + '/assets/android.png',
- menuImageUrl: baseUrl + '/assets/menu.png',
- appleImageUrl: baseUrl + '/assets/apple.png',
- shareImageUrl: baseUrl + '/assets/share.png',
- })
-
- const mailData = {
- mode: 'noreply',
- subject: '[Ecolyo] - Bienvenue',
- parts: [
- {
- type: 'text/html',
- body: mjml2html(template).html,
- },
- ],
- }
-
- mailService.SendMail(client, mailData)
-
- dispatch(
- updateProfile({
- isFirstConnection: false,
- tutorial: {
- isWelcomeSeen: true,
- },
- })
- )
- }, [client, dispatch, instanceSettings])
- const tutoNext = () => {
- setTutoSlide(prev => prev + 1)
- }
- const tutoPrev = () => {
- setTutoSlide(prev => prev - 1)
- }
- return (
- <Dialog
- open={open}
- disableBackdropClick
- disableEscapeKeyDown
- aria-labelledby={'accessibility-title'}
- classes={{
- root: 'modal-root',
- paper: 'modal-paper-full-screen dark-background',
- }}
- >
- <div id={'accessibility-title'}>
- {t('tutorial_welcome.accessibility.window_title')}
- </div>
- <div className="welcome-root">
- <div className="welcome-content">
- {tutoSlide === 0 && (
- <>
- <div className="welcome-header text-24-normal tuto-txt-grey">
- <span>{t('tutorial_welcome.title')}</span>
- {instanceSettings && instanceSettings.public_name ? (
- <span className="public-name">
- {` ${instanceSettings.public_name} !`}
- </span>
- ) : (
- ' !'
- )}
- <br />
- {t('tutorial_welcome.perso')}
- </div>
- <Icon icon={Illu1} className="illu1" width="100%" height="60%" />
- <div className="welcome-perso text-16-white">
- {t('tutorial_welcome.slide1Txt')}
- </div>
- </>
- )}
- {tutoSlide === 1 && (
- <>
- <div className="text-16-white tuto-txt-grey">
- {t('tutorial_welcome.slide2Txt')}
- </div>
- <Icon icon={Illu2} className="illu2" width="100%" height="70%" />
- <div className="text-16-white tuto-txt">
- {t('tutorial_welcome.slide2Txt2')}
- </div>
- </>
- )}
- {tutoSlide === 2 && (
- <>
- <Icon icon={Illu3} className="illu3" width="100%" height="60%" />
- <div className="text-16-white tuto-txt">
- {t('tutorial_welcome.slide3Txt')}
- </div>
- </>
- )}
- </div>
- <div className="slide-indicator">
- <Icon icon={tutoSlide === 0 ? CircleFilled : CircleEmpty} size={20} />
- <Icon icon={tutoSlide === 1 ? CircleFilled : CircleEmpty} size={20} />
- <Icon icon={tutoSlide === 2 ? CircleFilled : CircleEmpty} size={20} />
- </div>
- <div className="welcome-footer">
- {tutoSlide > 0 && (
- <IconButton
- aria-label={t('tutorial_welcome.accessibility.previous')}
- className="tuto-navigation-button"
- onClick={tutoPrev}
- classes={{
- root: 'btn-profile-back',
- label: 'text-16-normal',
- }}
- >
- <Icon icon={LeftArrowIcon} className="arrow-icon" size={20} />
- {t('tutorial_welcome.accessibility.previous')}
- </IconButton>
- )}
- {tutoSlide < 2 ? (
- <IconButton
- aria-label={t('tutorial_welcome.accessibility.next')}
- className="tuto-navigation-button nextButton rounded"
- onClick={tutoNext}
- classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
- }}
- >
- {t('tutorial_welcome.accessibility.next')}
- <Icon icon={RigthArrowIcon} className="arrow-icon" size={20} />
- </IconButton>
- ) : (
- <Button
- aria-label={t('tutorial_welcome.accessibility.finish')}
- className="tuto-navigation-button rounded"
- onClick={setTutorialWelcomeViewed}
- classes={{
- root: 'btn-highlight',
- label: 'text-16-bold',
- }}
- >
- {t('tutorial_welcome.accessibility.finish')}
- </Button>
- )}
- </div>
- </div>
- </Dialog>
- )
-}
-
-export default TutorialWelcome
diff --git a/src/components/Tutorial/__snapshots__/TutorialWelcome.spec.tsx.snap b/src/components/Tutorial/__snapshots__/TutorialWelcome.spec.tsx.snap
deleted file mode 100644
index 9cbff23d7..000000000
--- a/src/components/Tutorial/__snapshots__/TutorialWelcome.spec.tsx.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TutorialWelcome component should be rendered correctly 1`] = `ReactWrapper {}`;
diff --git a/src/components/Tutorial/tutorialWelcome.scss b/src/components/Tutorial/tutorialWelcome.scss
deleted file mode 100644
index 04ae51b56..000000000
--- a/src/components/Tutorial/tutorialWelcome.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-@import 'src/styles/base/color';
-@import 'src/styles/base/breakpoint';
-
-.welcome-root {
- height: 100%;
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- text-align: center;
- @media #{$large-phone} {
- width: 100%;
- }
- .welcome-content {
- margin: 2rem 0;
- height: 100%;
- flex: 1;
- max-width: 350px;
- padding: 1rem 1.5rem;
- color: $grey-bright;
- display: flex;
- flex-direction: column;
- justify-content: space-evenly;
- align-items: center;
- .welcome-header {
- background: $multi-color-radial-gradient;
- background-clip: 'text';
- -webkit-background-clip: text;
- color: transparent;
- margin-bottom: 1.25rem;
- text-align: center;
- }
- .tuto-txt {
- text-align: center;
- }
- .tuto-txt-grey {
- color: $soft-grey;
- }
- .illu1,
- .illu2,
- .illu3 {
- margin: 1.5rem 0 2rem 0;
- }
- }
- .slide-indicator {
- display: flex;
- justify-content: space-between;
- width: 80px;
- }
- .welcome-footer {
- border-top: 1px solid $grey-dark;
- margin-top: 2rem;
- min-height: 55px;
- padding: 1.5rem, 0;
- background: $dark-2;
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
-
- .rounded {
- border-radius: 22px;
- margin-left: 1rem;
- margin-right: 1rem;
- }
- .disabled {
- opacity: 0.5;
- }
- button.tuto-navigation-button {
- max-width: 13rem;
- margin: 0.375rem 1rem 0.375rem 0.5rem;
- padding: 0.5rem 1rem;
- display: flex;
- align-items: center;
- .arrow-icon {
- color: black;
- margin: 0 0.3rem;
- }
- @media (max-width: $width-tablet) {
- max-width: 8.5rem;
- }
- }
- button.nextButton > span:first-of-type {
- padding-left: 1rem;
- }
- }
-}
-
-#accessibility-title {
- display: none;
-}
diff --git a/src/constants/config.json b/src/constants/config.json
index edaa0a339..aca5acc83 100644
--- a/src/constants/config.json
+++ b/src/constants/config.json
@@ -4,7 +4,7 @@
"fluidTypeId": 0,
"name": "enedis",
"coefficient": 0.1558,
- "dataDelayOffset": 1,
+ "dataDelayOffset": 3,
"konnectorConfig": {
"name": "Enedis",
"oauth": true,
@@ -17,7 +17,7 @@
"fluidTypeId": 1,
"name": "egl",
"coefficient": 0.00319,
- "dataDelayOffset": 3,
+ "dataDelayOffset": 5,
"konnectorConfig": {
"name": "Eau du Grand Lyon",
"oauth": false,
@@ -30,7 +30,7 @@
"fluidTypeId": 2,
"name": "grdf",
"coefficient": 0.1121,
- "dataDelayOffset": 3,
+ "dataDelayOffset": 5,
"konnectorConfig": {
"name": "GRDF",
"oauth": true,
diff --git a/src/db/fluidPrices.json b/src/db/fluidPrices.json
new file mode 100644
index 000000000..2f1689af3
--- /dev/null
+++ b/src/db/fluidPrices.json
@@ -0,0 +1,434 @@
+[
+ {
+ "fluidType": 0,
+ "price": 0.1256,
+ "startDate": "2012-07-23T00:00:00.000Z",
+ "endDate": "2013-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1329,
+ "startDate": "2013-08-01T00:00:00.000Z",
+ "endDate": "2014-10-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1401,
+ "startDate": "2014-01-11T00:00:00.000Z",
+ "endDate": "2015-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1437,
+ "startDate": "2015-08-01T00:00:00.000Z",
+ "endDate": "2016-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1503,
+ "startDate": "2016-08-01T00:00:00.000Z",
+ "endDate": "2017-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1546,
+ "startDate": "2017-08-01T00:00:00.000Z",
+ "endDate": "2018-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1555,
+ "startDate": "2018-02-01T00:00:00.000Z",
+ "endDate": "2018-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.145,
+ "startDate": "2018-08-01T00:00:00.000Z",
+ "endDate": "2019-05-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1531,
+ "startDate": "2019-06-01T00:00:00.000Z",
+ "endDate": "2019-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1524,
+ "startDate": "2019-08-01T00:00:00.000Z",
+ "endDate": "2020-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1546,
+ "startDate": "2020-02-01T00:00:00.000Z",
+ "endDate": "2020-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1557,
+ "startDate": "2020-08-01T00:00:00.000Z",
+ "endDate": "2021-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1582,
+ "startDate": "2021-02-01T00:00:00.000Z",
+ "endDate": "2021-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 0,
+ "price": 0.1558,
+ "startDate": "2021-08-01T00:00:00.000Z",
+ "endDate": null
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0919,
+ "startDate": "2017-01-01T00:00:00.000Z",
+ "endDate": "2017-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0915,
+ "startDate": "2017-02-01T00:00:00.000Z",
+ "endDate": "2017-02-28T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0932,
+ "startDate": "2017-03-01T00:00:00.000Z",
+ "endDate": "2017-03-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0927,
+ "startDate": "2017-04-01T00:00:00.000Z",
+ "endDate": "2017-04-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0906,
+ "startDate": "2017-05-01T00:00:00.000Z",
+ "endDate": "2017-05-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0906,
+ "startDate": "2017-06-01T00:00:00.000Z",
+ "endDate": "2017-06-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0788,
+ "startDate": "2017-07-01T00:00:00.000Z",
+ "endDate": "2017-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0783,
+ "startDate": "2017-08-01T00:00:00.000Z",
+ "endDate": "2017-08-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0783,
+ "startDate": "2017-09-01T00:00:00.000Z",
+ "endDate": "2017-09-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0791,
+ "startDate": "2017-10-01T00:00:00.000Z",
+ "endDate": "2017-10-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0806,
+ "startDate": "2017-11-01T00:00:00.000Z",
+ "endDate": "2017-11-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0812,
+ "startDate": "2017-12-01T00:00:00.000Z",
+ "endDate": "2017-12-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0857,
+ "startDate": "2018-01-01T00:00:00.000Z",
+ "endDate": "2018-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0866,
+ "startDate": "2018-02-01T00:00:00.000Z",
+ "endDate": "2018-02-28T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0847,
+ "startDate": "2018-03-01T00:00:00.000Z",
+ "endDate": "2018-03-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0839,
+ "startDate": "2018-04-01T00:00:00.000Z",
+ "endDate": "2018-04-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0842,
+ "startDate": "2018-05-01T00:00:00.000Z",
+ "endDate": "2018-05-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0855,
+ "startDate": "2018-06-01T00:00:00.000Z",
+ "endDate": "2018-06-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0959,
+ "startDate": "2018-07-01T00:00:00.000Z",
+ "endDate": "2018-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0961,
+ "startDate": "2018-08-01T00:00:00.000Z",
+ "endDate": "2018-08-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0967,
+ "startDate": "2018-09-01T00:00:00.000Z",
+ "endDate": "2018-09-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0989,
+ "startDate": "2018-10-01T00:00:00.000Z",
+ "endDate": "2018-10-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.1031,
+ "startDate": "2018-11-01T00:00:00.000Z",
+ "endDate": "2018-11-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.1013,
+ "startDate": "2018-12-01T00:00:00.000Z",
+ "endDate": "2018-12-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0999,
+ "startDate": "2019-01-01T00:00:00.000Z",
+ "endDate": "2019-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0993,
+ "startDate": "2019-02-01T00:00:00.000Z",
+ "endDate": "2019-02-28T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0993,
+ "startDate": "2019-03-01T00:00:00.000Z",
+ "endDate": "2019-03-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0977,
+ "startDate": "2019-04-01T00:00:00.000Z",
+ "endDate": "2019-04-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0973,
+ "startDate": "2019-05-01T00:00:00.000Z",
+ "endDate": "2019-05-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0969,
+ "startDate": "2019-06-01T00:00:00.000Z",
+ "endDate": "2019-06-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0795,
+ "startDate": "2019-07-01T00:00:00.000Z",
+ "endDate": "2019-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0791,
+ "startDate": "2019-08-01T00:00:00.000Z",
+ "endDate": "2019-08-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0785,
+ "startDate": "2019-09-01T00:00:00.000Z",
+ "endDate": "2019-09-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.077,
+ "startDate": "2019-10-01T00:00:00.000Z",
+ "endDate": "2019-10-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0789,
+ "startDate": "2019-11-01T00:00:00.000Z",
+ "endDate": "2019-11-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0793,
+ "startDate": "2019-12-01T00:00:00.000Z",
+ "endDate": "2019-12-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0787,
+ "startDate": "2020-01-01T00:00:00.000Z",
+ "endDate": "2020-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0765,
+ "startDate": "2020-02-01T00:00:00.000Z",
+ "endDate": "2020-02-29T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0736,
+ "startDate": "2020-03-01T00:00:00.000Z",
+ "endDate": "2020-03-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.071,
+ "startDate": "2020-04-01T00:00:00.000Z",
+ "endDate": "2020-04-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0703,
+ "startDate": "2020-05-01T00:00:00.000Z",
+ "endDate": "2020-05-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0687,
+ "startDate": "2020-06-01T00:00:00.000Z",
+ "endDate": "2020-06-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0698,
+ "startDate": "2020-07-01T00:00:00.000Z",
+ "endDate": "2020-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0705,
+ "startDate": "2020-08-01T00:00:00.000Z",
+ "endDate": "2020-08-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0709,
+ "startDate": "2020-09-01T00:00:00.000Z",
+ "endDate": "2020-09-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0735,
+ "startDate": "2020-10-01T00:00:00.000Z",
+ "endDate": "2020-10-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0745,
+ "startDate": "2020-11-01T00:00:00.000Z",
+ "endDate": "2020-11-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0759,
+ "startDate": "2020-12-01T00:00:00.000Z",
+ "endDate": "2020-12-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.076,
+ "startDate": "2021-01-01T00:00:00.000Z",
+ "endDate": "2021-01-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0782,
+ "startDate": "2021-02-01T00:00:00.000Z",
+ "endDate": "2021-02-28T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0818,
+ "startDate": "2021-03-01T00:00:00.000Z",
+ "endDate": "2021-03-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.079,
+ "startDate": "2021-04-01T00:00:00.000Z",
+ "endDate": "2021-04-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0797,
+ "startDate": "2021-05-01T00:00:00.000Z",
+ "endDate": "2021-05-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0826,
+ "startDate": "2021-06-01T00:00:00.000Z",
+ "endDate": "2021-06-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0895,
+ "startDate": "2021-07-01T00:00:00.000Z",
+ "endDate": "2021-07-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.0934,
+ "startDate": "2021-08-01T00:00:00.000Z",
+ "endDate": "2021-08-31T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.1002,
+ "startDate": "2021-09-01T00:00:00.000Z",
+ "endDate": "2021-09-30T23:59:59.000Z"
+ },
+ {
+ "fluidType": 2,
+ "price": 0.1121,
+ "startDate": "2021-10-01T00:00:00.000Z",
+ "endDate": null
+ }
+]
diff --git a/src/db/profileData.json b/src/db/profileData.json
index 1bd22593e..e39e20150 100644
--- a/src/db/profileData.json
+++ b/src/db/profileData.json
@@ -12,9 +12,8 @@
"monthlyAnalysisDate": "0000-01-01T00:00:00.000Z",
"sendConsumptionAlert": false,
"waterDailyConsumptionLimit": 0,
- "isLastTermAccepted": false,
"isProfileTypeCompleted": false,
- "tutorial": {
+ "onboarding": {
"isWelcomeSeen": false
}
}
diff --git a/src/db/quizEntity.json b/src/db/quizEntity.json
index 75b6e2ff5..ffa6f2a7e 100644
--- a/src/db/quizEntity.json
+++ b/src/db/quizEntity.json
@@ -154,7 +154,7 @@
}
],
"customQuestion": {
- "questionLabel": "Quel mois avez-vous le plus consommé l'année dernière parmi les mois suivants (tous fluides confondus) :",
+ "questionLabel": "Quel mois avez-vous le plus consommé parmi les mois suivants (tous fluides confondus) :",
"type": 0,
"timeStep": 40,
"interval": 50,
diff --git a/src/doctypes/com-grandlyon-ecolyo-fluidsprices.ts b/src/doctypes/com-grandlyon-ecolyo-fluidsprices.ts
new file mode 100644
index 000000000..49bd78fb1
--- /dev/null
+++ b/src/doctypes/com-grandlyon-ecolyo-fluidsprices.ts
@@ -0,0 +1 @@
+export const FLUIDPRICES_DOCTYPE = 'com.grandlyon.ecolyo.fluidsprices'
diff --git a/src/doctypes/com-grandlyon-enedis-maxpower.ts b/src/doctypes/com-grandlyon-enedis-maxpower.ts
new file mode 100644
index 000000000..f242f45ba
--- /dev/null
+++ b/src/doctypes/com-grandlyon-enedis-maxpower.ts
@@ -0,0 +1 @@
+export const ENEDIS_MAXPOWER_DOCTYPE = 'com.grandlyon.enedis.maxpower'
diff --git a/src/doctypes/com-grandlyon-enedis-monthly-analysis-data.ts b/src/doctypes/com-grandlyon-enedis-monthly-analysis-data.ts
new file mode 100644
index 000000000..90bde3263
--- /dev/null
+++ b/src/doctypes/com-grandlyon-enedis-monthly-analysis-data.ts
@@ -0,0 +1,2 @@
+export const ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE =
+ 'com.grandlyon.enedis.monthly.analysis.data'
diff --git a/src/doctypes/index.ts b/src/doctypes/index.ts
index 14e1b0458..a52d25ff8 100644
--- a/src/doctypes/index.ts
+++ b/src/doctypes/index.ts
@@ -16,6 +16,7 @@ import { CHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-challenge'
import { USERCHALLENGE_DOCTYPE } from './com-grandlyon-ecolyo-userchallenge'
import { DUEL_DOCTYPE } from './com-grandlyon-ecolyo-duel'
import { QUIZ_DOCTYPE } from './com-grandlyon-ecolyo-quiz'
+import { FLUIDPRICES_DOCTYPE } from './com-grandlyon-ecolyo-fluidsprices'
import { USAGEEVENT_DOCTYPE } from './com-grandlyon-ecolyo-usageevent'
import { EXPLORATION_DOCTYPE } from './com-grandlyon-ecolyo-exploration'
import { ENEDIS_YEAR_DOCTYPE } from './com-grandlyon-enedis-year'
@@ -25,6 +26,8 @@ import { GRDF_YEAR_DOCTYPE } from './com-grandlyon-grdf-year'
import { GRDF_MONTH_DOCTYPE } from './com-grandlyon-grdf-month'
import { EGL_YEAR_DOCTYPE } from './com-grandlyon-egl-year'
import { EGL_MONTH_DOCTYPE } from './com-grandlyon-egl-month'
+import { ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE } from './com-grandlyon-enedis-monthly-analysis-data'
+import { ENEDIS_MAXPOWER_DOCTYPE } from './com-grandlyon-enedis-maxpower'
// the documents schema, necessary for CozyClient
const doctypes = {
@@ -152,12 +155,27 @@ const doctypes = {
relationships: {},
},
usageevents: {
- octype: USAGEEVENT_DOCTYPE,
+ doctype: USAGEEVENT_DOCTYPE,
attributes: {},
relationships: {},
},
schemas: {
- octype: SCHEMAS_DOCTYPE,
+ doctype: SCHEMAS_DOCTYPE,
+ attributes: {},
+ relationships: {},
+ },
+ fluidsPrices: {
+ doctype: FLUIDPRICES_DOCTYPE,
+ attributes: {},
+ relationships: {},
+ },
+ enedismonthlyanalysisdata: {
+ doctype: ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
+ attributes: {},
+ relationships: {},
+ },
+ enedismaxpower: {
+ doctype: ENEDIS_MAXPOWER_DOCTYPE,
attributes: {},
relationships: {},
},
@@ -170,6 +188,8 @@ export * from './com-grandlyon-enedis-minute'
export * from './com-grandlyon-enedis-day'
export * from './com-grandlyon-enedis-month'
export * from './com-grandlyon-enedis-year'
+export * from './com-grandlyon-enedis-monthly-analysis-data'
+export * from './com-grandlyon-enedis-maxpower'
export * from './com-grandlyon-grdf-day'
export * from './com-grandlyon-grdf-month'
@@ -189,6 +209,7 @@ export * from './com-grandlyon-ecolyo-ecogesture'
export * from './com-grandlyon-ecolyo-profile'
export * from './com-grandlyon-ecolyo-profiletype'
export * from './com-grandlyon-ecolyo-schemas'
+export * from './com-grandlyon-ecolyo-fluidsprices'
export * from './com-grandlyon-ecolyo-challenge'
export * from './com-grandlyon-ecolyo-userchallenge'
diff --git a/src/enum/dacc.enum.ts b/src/enum/dacc.enum.ts
index ed189b78c..219da93b8 100644
--- a/src/enum/dacc.enum.ts
+++ b/src/enum/dacc.enum.ts
@@ -11,4 +11,7 @@ export enum DaccEvent {
QUIZ_STARS = 'quiz-stars',
SUMMARY_SUBSCRIPTION_MONTHLY = 'summary-subscription-monthly',
FLUID_DATA_GRANULARITY = 'fluid-data-granularity-monthly',
+ PARTNER_SUCESS_MONTHLY = 'konnector-attempts-before-success',
+ CONNECTION_COUNT_MONTHLY = 'connection-count-monthly',
+ PROFILE_COUNT_MONTHLY = 'profile-count',
}
diff --git a/src/enum/fluid.enum.ts b/src/enum/fluid.enum.ts
index e62cd529e..cd67a004d 100644
--- a/src/enum/fluid.enum.ts
+++ b/src/enum/fluid.enum.ts
@@ -11,4 +11,5 @@ export enum FluidState {
DONE = 200,
ERROR = 300,
ERROR_LOGIN_FAILED = 301,
+ PARTNER_ISSUE = 500,
}
diff --git a/src/enum/fluidSlug.enum.ts b/src/enum/fluidSlug.enum.ts
new file mode 100644
index 000000000..33db5dcd2
--- /dev/null
+++ b/src/enum/fluidSlug.enum.ts
@@ -0,0 +1,5 @@
+export enum FluidSlugType {
+ ELECTRICITY = 'enedisgrandlyon',
+ WATER = 'eglgrandlyon',
+ GAS = 'grdfgrandlyon',
+}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index e85ef82d5..de44887c7 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -106,82 +106,90 @@
"estimation": "Comment sont estimés",
"estimation2": "les prix ?"
},
+ "special_elec": {
+ "title": "Spécial Électricité",
+ "average": "Conso moyenne",
+ "weektype": "un jour de ",
+ "week": "semaine",
+ "weekend": "week-end",
+ "min": "Consommation minimum",
+ "maxPower": "Puissance maximum atteinte"
+ },
"auth": {
"enedisgrandlyon": {
"connect": {
- "placeholder": "Adresse mail",
- "label1": "J'accède à mon",
- "label2": "espace client Enedis",
- "info": "Veuillez donner votre accord pour qu’Enedis nous transmette vos données de consommation.",
- "info2": "Enedis est responsable de votre compteur Linky et en charge de relever vos consommations."
+ "label1": "Je me connecte à mon",
+ "label2": "compte Enedis"
},
"no_account": {
- "title": "Pas de compte Enedis ?",
- "text": "Vous pouvez le créer en vous munissant d'une facture d'électricité."
+ "title": "Ecolyo doit se connecter à votre compte Enedis",
+ "subtitle1": "Si vous n’avez pas de compte Enedis",
+ "button_create_account": "Je crée mon compte Enedis",
+ "subtitle2": "Si vous avez déjà un compte Enedis,",
+ "subtitle2_info": "votre accord est nécessaire pour connecter Enedis et Ecolyo",
+ "info": "Enedis est responsable de votre compteur Linky et en charge de relever vos consommations."
},
- "create_account": "Je crée mon compte Enedis",
- "infoModal": {
- "text1": "Vous allez devoir créer un compte Enedis !",
- "text2": "Un zeste de patience et quelques conseils vous seront utiles :",
- "text3": "Munissez-vous d'une facture d'électricité.",
- "text4": "Si vous avez France Connect, utilisez ce mode d'identification sauf si le contrat d'électricité n'est pas à votre nom !",
- "text5": "Sinon, munissez-vous de la pièce d'identité du titulaire du contrat d'électricité, le titulaire du compte Enedis doit avoir le même nom que le titulaire du contrat.",
- "text6": "Promis, vous n'aurez à effectuer cette démarche qu'une seule fois au début !",
- "text7": "Une fois votre compte créé, revenez sur Ecolyo vous connecter.",
- "buttonText": "J'ai compris",
- "accessibility": {
- "window_title": "Fenêtre d'information",
- "buttonText": "Valider",
- "button_close": "Fermer la fenêtre"
- }
+ "title_with_account": "Votre compte Enedis a bien été créé ?",
+ "with_account": {
+ "title": "Votre compte Enedis a bien été créé ?",
+ "subtitle1": "Plus qu’à donner votre accord pour connecter Enedis et Ecolyo !",
+ "subtitle2": "Si vous n’avez pas de compte Enedis",
+ "button_create_account": "Je crée mon compte",
+ "subtitle2_info": "En cas de soucis pour créer votre compte ou pour vous y connecter, un guide en pas-à -pas est disponible pour vous y aider.",
+ "button_goto_guide": "Voir le guide"
}
},
"grdfgrandlyon": {
"connect": {
- "placeholder": "Adresse email",
- "label1": "Je me connecte à ",
- "label2": "mon compte GRDF",
- "info": "Veuillez donner votre accord pour que GRDF nous transmette vos données de consommation.",
- "info2": "GRDF est responsable de votre compteur Gazpar et en charge de relever vos consommations."
+ "label1": "Je me connecte à mon",
+ "label2": "compte GRDF"
},
"no_account": {
- "title": "Pas de compte GRDF ?",
- "text": "Pas de panique, vous pouvez le créer facilement en cliquant également sur le bouton jaune ci-dessus. N'oubliez pas de vous munir d'une facture de gaz."
+ "title": "Ecolyo doit se connecter à votre compte GRDF",
+ "subtitle1": "Si vous n’avez pas de compte GRDF",
+ "button_create_account": "Je crée mon compte GRDF",
+ "subtitle2": "Si vous avez déjà un compte GRDF,",
+ "subtitle2_info": "votre accord est nécessaire pour connecter GRDF et Ecolyo",
+ "info": "GRDF est responsable de votre compteur Gazpar et en charge de relever vos consommations."
},
- "authModal": {
- "text1": "La visualisation de vos données sur Ecolyo demande",
- "text2": " l’activation de tous les paramètres à l’exception de :",
- "listItem1": "- mes données publiées",
- "listItem2": "- mes données contractuelles",
- "endText1": "Une période de consentement de ",
- "duration": "1 an ",
- "endText2": "minimum est demandée pour une expérience optimale.",
- "buttonText": "J'ai compris",
- "accessibility": {
- "window_title": "Fenêtre d'information GRDF",
- "button_close": "Fermer la fenêtre",
- "button_validate": "Valider"
- }
+ "with_account": {
+ "title": "Votre compte GRDF a bien été créé ?",
+ "subtitle1": "Plus qu’à donner votre accord pour connecter GRDF et Ecolyo !",
+ "subtitle1_info": "Une période de consentement minimale d'un an est recommandée",
+ "subtitle2": "Si vous n’avez pas de compte GRDF",
+ "button_create_account": "Je crée mon compte",
+ "subtitle2_info": "En cas de soucis pour créer votre compte ou pour vous y connecter, un guide en pas-à -pas est disponible pour vous y aider.",
+ "button_goto_guide": "Voir le guide"
}
},
"eglgrandlyon": {
"connect": {
- "placeholder": "7 chiffres",
- "label1": "Je me connecte à ",
- "label2": "mon compte Eau du Grand Lyon",
- "info": "Pour accéder à vos données de consommation d’eau, renseignez votre identifiant Eau du Grand Lyon"
+ "login": "Identifiant Eau du Grand Lyon (7 chiffres)",
+ "password": "Mot de passe",
+ "label1": "Je me connecte à mon",
+ "label2": "compte Eau du Grand Lyon"
},
"no_account": {
- "title": "Pas de compte Eau du Grand Lyon ?",
- "text": "Vous pouvez le créer en vous munissant d'une facture d'eau."
+ "title": "Ecolyo doit se connecter à votre compte Eau du Grand Lyon",
+ "subtitle1": "Si vous n’avez pas de compte EGL",
+ "button_create_account": "Je crée mon compte EGL",
+ "subtitle2": "Si vous avez déjà un compte EGL,",
+ "subtitle2_info": "renseignez votre identifiant Eau Du Grand Lyon."
},
- "create_account": "Je crée mon compte Eau du Grand Lyon"
+ "with_account": {
+ "title": "Votre compte Eau du Grand Lyon a bien été créé ?",
+ "subtitle1": "Plus qu’à donner votre accord pour connecter EGL et Ecolyo !",
+ "subtitle2": "Si vous n’avez pas de compte EGL",
+ "button_create_account": "Je crée mon compte",
+ "subtitle2_info": "En cas de soucis pour créer votre compte ou pour vous y connecter, un guide en pas-à -pas est disponible pour vous y aider.",
+ "button_goto_guide": "Voir le guide"
+ }
},
- "password_label": "Mot de passe",
"accessibility": {
"button_reveal_password": "Afficher le mot de passe",
"button_connect": "Se connecter",
- "button_create_account": "Se créer un compte"
+ "button_create_account": "Se créer un compte",
+ "button_goto_guide": "Voir le guide"
}
},
"challenge": {
@@ -240,6 +248,12 @@
"button_previous_value": "Sélectionner la valeur précédente",
"button_next_value": "Sélectionner la valeur suivante",
"checkbox_compare": "Afficher ou cacher la comparaison"
+ },
+ "partners_issue_modal": {
+ "title": "Un problème dans la récupération de vos données",
+ "text_1": "Ces partenaires nous indiquent qu’ils subissent en ce moment un soucis technique :",
+ "text_2": "La visualisation de vos consommations peut s’en trouver affectée.",
+ "button_validate": "J'ai compris"
}
},
"consumption_details": {
@@ -430,7 +444,6 @@
},
"dataShare": {
"title1": "Bienvenue !",
- "title2": "Vous accédez pour la première fois à Ecolyo. Pour cela, nul besoin de vous créer un compte.",
"title1Update": "Ecolyo évolue !",
"title2Update": "Pour continuer à utiliser Ecolyo, merci d’accepter les modalités de traitement des données ci-dessous.",
"part1": "Pour le bon fonctionnement du service, nous avons besoin de l’adresse email utilisée lors la création de votre cloud personnel Grand Lyon.",
@@ -449,7 +462,15 @@
"link1": "<a href=\"https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/\">https://demarches.toodego.com/sve/proteger-mes-donnees-personnelles/</a>",
"validDataConsent": "Je consens au traitement de mes données tel que décrit ci-dessus.",
"validCGU": "Je valide les <span class=\"action\">Conditions Générales d’Utilisation</span> ",
- "validLegal": " du service et ai pris connaissance des <span class=\"action\"> Mentions Légales </span> de celui-ci."
+ "validLegal": " du service et ai pris connaissance des <span class=\"action\"> Mentions Légales </span> de celui-ci.",
+ "button_accept": "C'est parti !",
+ "accessibility": {
+ "button_accept": "Accepter les conditions générales d'utilisation"
+ }
+ },
+ "minorUpdate": {
+ "title": "Ecolyo évolue !",
+ "button": "J'ai compris"
},
"gcu": {
"title": "Conditions générales d’utilisation du service",
@@ -529,6 +550,7 @@
"konnector_form": {
"label_updated_at": "Dernière mise-à -jour le",
"button_update": "Mettre à jour",
+ "wait_end_issue": "Attendre la fin de la maintenance avant de mettre à jour.",
"button_delete": "Supprimer",
"issue": "Le problème semble venir de ",
"resolve": "Une mise à jour peut résoudre ce problème.",
@@ -540,9 +562,6 @@
"error_update": "Un problème est survenu lors du rapatriement de vos données.",
"error_update_oauth": "Le service demande d'autoriser à nouveau votre accès. Merci de supprimer puis reconnecter votre compte. Aucune donnée ne sera perdue.",
"OK": "Ok",
- "not_connected_gas": "Ecolyo n'est pas connecté au gaz ",
- "not_connected_electricity": "Ecolyo n'est pas connecté à l'électricité ",
- "not_connected_water": "Ecolyo n'est pas connecté à l'eau ",
"accessibility": {
"button_install": "Installer le connecteur",
"button_update": "Mettre à jour votre connexion",
@@ -553,6 +572,7 @@
"label_connect_to_electricity": "Se connecter à l'électricité",
"label_connect_to_water": "Se connecter à l'eau",
"label_connect_to_gas": "Se connecter au gaz",
+ "partner_issue": "En maintenance",
"accessibility": {
"label_ko_status": "Connecteur en erreur",
"button_toggle_detail_electricity": "Afficher ou masquer le détail de la connexion à l'électricité",
@@ -660,6 +680,18 @@
"title": "OAuth"
}
},
+ "onboarding": {
+ "welcomeModal": {
+ "title": "Vous êtes à mi-chemin !",
+ "part1": "Votre cloud personnel a bien été créé.",
+ "part2": "Il vous faut maintenant créer ou vous connecter à votre compte chez le gestionnaire de votre compteur communicant afin de donner votre accord pour relier Ecolyo à l’électricité (Enedis), au gaz (GRDF) ou à l’eau (Eau du Grand Lyon).",
+ "button_valid": "Ok",
+ "accessibility": {
+ "window_title": "Fenêtre de bienvenue",
+ "button_valid": "Valider"
+ }
+ }
+ },
"old_fluid_data_modal": {
"errorTxt": "Aïe !",
"oldData": "Vos données semblent anciennes",
@@ -679,6 +711,54 @@
"button_goto_konnector": "Aller aux connecteurs"
}
},
+ "partner_connection_steps": {
+ "electricity": {
+ "step1": {
+ "info1": "Munissez-vous d’une <span>facture d’électricité</span> et d’un zeste de patience.",
+ "info2": ""
+ },
+ "step2": {
+ "info1": "Si le contrat d’électricité est à votre nom, privilégiez l’identification <span>France connect.</span>",
+ "info2": "Sinon, munissez-vous de la <span>pièce d’identité du titulaire du contrat.</span>"
+ },
+ "step3": {
+ "info1": "Une fois votre compte créé, <span>revenez sur Ecolyo</span> pour finaliser la connexion.",
+ "info2": ""
+ },
+ "button_validate": "Aller sur Enedis"
+ },
+ "water": {
+ "step1": {
+ "info1": "Munissez-vous d’une <span>facture d'eau</span> et d’un zeste de patience.",
+ "info2": ""
+ },
+ "step2": {
+ "info1": "Une fois votre compte créé, <span>revenez sur Ecolyo</span> pour finaliser la connexion.",
+ "info2": ""
+ },
+ "button_validate": "Aller sur EGL"
+ },
+ "gas": {
+ "step1": {
+ "info1": "Munissez-vous d’une <span>facture de gaz</span> et d’un zeste de patience.",
+ "info2": ""
+ },
+ "step2": {
+ "info1": "Une fois votre compte créé, <span>revenez sur Ecolyo</span> pour finaliser la connexion.",
+ "info2": ""
+ },
+ "button_validate": "Aller sur GRDF"
+ },
+ "button_previous": "Précédent",
+ "button_next": "Suivant",
+ "accessibility": {
+ "window_title": "Fenêtre d'information sur la création de compte.",
+ "button_validate": "Aller sur le site du partenaire.",
+ "button_close": "Fermer la fenètre.",
+ "button_previous": "Précédent",
+ "button_next": "Suivant"
+ }
+ },
"performance_indicator": {
"bilan": {
"text1": "Par rapport à ",
@@ -927,7 +1007,8 @@
"label1": "Ré-activer sur mon compte Enedis",
"accessibility": {
"button_activate": "Aller sur mon compte Enedis"
- }
+ },
+ "text_analysis": "Pour bénéficier d’une analyse approfondie de votre consommation électrique, il vous faut activer l’enregistrement de votre consommation horaire sur votre compte Enedis"
}
}
},
@@ -956,22 +1037,6 @@
"button_zoom_out": "Sélectionner le pas de temps suivant"
}
},
- "tutorial_welcome": {
- "title": "Bienvenue",
- "perso": "Votre espace personnel a bien été créé.",
- "button_valid": "Ok",
- "accessibility": {
- "window_title": "Fenêtre de bienvenue",
- "button_valid": "Valider",
- "next": "Suivant",
- "previous": "Précédent",
- "finish": "C'est parti !"
- },
- "slide1Txt": "Pour accéder à vos consommations d'énergie ou d'eau, vous allez devoir configurer des \"connecteurs\" dans la partie Options.",
- "slide2Txt": "Les données issues de vos compteurs communicants nous seront transmises, après votre accord, par Enedis pour l'électricité, GRDF pour le gaz et Eau du Grand Lyon pour l'eau.",
- "slide2Txt2": "Il vous faudra donc un compte Enedis, GRDF ou Eau du Grand Lyon pour vous identifier.",
- "slide3Txt": "Si vous n'en avez pas, vous pourrez vous en créer un sur le site du partenaire. Le lien vers ce site se trouve dans la partie Options. Une fois votre compte créé, revenez vous identifier dans Ecolyo."
- },
"unsubscribe": {
"title": "Etes-vous sûr de ne plus vouloir recevoir notre email mensuel ?",
"content": "Dans ce cas, vous ne recevrez plus la notification de votre bilan ainsi que les conseils associés au mois en cours.",
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index 08c343058..ec04ee686 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -6,11 +6,13 @@ import {
EGL_DAY_DOCTYPE,
EGL_MONTH_DOCTYPE,
EGL_YEAR_DOCTYPE,
+ FLUIDPRICES_DOCTYPE,
} from 'doctypes'
import { Profile, ProfileType, UserChallenge } from 'models'
import { Client } from 'cozy-client'
import { DateTime } from 'luxon'
import { UserQuizState } from 'enum/userQuiz.enum'
+import fluidsPricesData from 'db/fluidPrices.json'
export const SCHEMA_INITIAL_VERSION = 0
@@ -264,4 +266,57 @@ export const migrations: Migration[] = [
return docs
},
},
+ {
+ baseSchemaVersion: 8,
+ targetSchemaVersion: 9,
+ appVersion: '1.6.0',
+ description: 'Init new doctype fluidPrices',
+ releaseNotes: null,
+ docTypes: FLUIDPRICES_DOCTYPE,
+ isCreate: true,
+ run: async (_client: Client, docs: any[]): Promise<any> => {
+ for (const fluidPrice of fluidsPricesData) {
+ await _client.create(FLUIDPRICES_DOCTYPE, fluidPrice)
+ }
+ },
+ },
+ {
+ baseSchemaVersion: 9,
+ targetSchemaVersion: 10,
+ appVersion: '1.6.0',
+ description:
+ "Profil now contains partnersIssueDate in order to handle partners' issue display",
+ releaseNotes: null,
+ docTypes: PROFILE_DOCTYPE,
+ run: async (_client: Client, docs: any[]): Promise<Profile[]> => {
+ return docs.map((doc: Profile) => {
+ doc.partnersIssueDate = DateTime.local()
+ .minus({ day: 1 })
+ .startOf('day')
+ console.log(doc)
+ return doc
+ })
+ },
+ },
+ {
+ baseSchemaVersion: 10,
+ targetSchemaVersion: 11,
+ appVersion: '1.6.0',
+ description:
+ 'Rename tutorial to onboaring in ecolyo profile, remove isLastTermAccepted',
+ releaseNotes: null,
+ docTypes: PROFILE_DOCTYPE,
+ run: async (_client: Client, docs: any[]): Promise<ProfileType[]> => {
+ return docs.map(doc => {
+ if (doc.tutorial) {
+ doc.onboarding = { ...doc.tutorial }
+ delete doc.tutorial
+ }
+ if (typeof doc.isLastTermAccepted != 'undefined') {
+ delete doc.isLastTermAccepted
+ }
+ return doc
+ })
+ },
+ },
]
diff --git a/src/migrations/migration.service.ts b/src/migrations/migration.service.ts
index 41c97963f..01c738c8d 100644
--- a/src/migrations/migration.service.ts
+++ b/src/migrations/migration.service.ts
@@ -41,9 +41,8 @@ export class MigrationService {
if (result.type === MIGRATION_RESULT_FAILED) {
// Error in case of second failure
- const err = new Error(result.errors.toString())
log.error(migrationLog(migration, result))
- throw err
+ throw new Error()
} else {
log.info(migrationLog(migration, result))
}
diff --git a/src/migrations/migration.spec.ts b/src/migrations/migration.spec.ts
index 8c44c2cb2..3da001c93 100644
--- a/src/migrations/migration.spec.ts
+++ b/src/migrations/migration.spec.ts
@@ -1,6 +1,6 @@
-import { QueryResult } from 'cozy-client'
-import { PROFILE_DOCTYPE } from 'doctypes'
-import { Profile } from 'models'
+import { Client, QueryResult } from 'cozy-client'
+import { FLUIDPRICES_DOCTYPE, PROFILE_DOCTYPE } from 'doctypes'
+import { FluidPrice, Profile } from 'models'
import { Schema } from 'models/schema.models'
import mockClient from '../../tests/__mocks__/client'
import { profileData } from '../../tests/__mocks__/profile.mock'
@@ -190,3 +190,52 @@ describe('migration', () => {
})
})
})
+
+describe('migration create', () => {
+ it('it should return migration complete for creation', async () => {
+ const migrationTestCreate: Migration = {
+ baseSchemaVersion: 0,
+ targetSchemaVersion: 1,
+ appVersion: '1.2.4',
+ description: 'Add fluid price',
+ docTypes: FLUIDPRICES_DOCTYPE,
+ releaseNotes: null,
+ isCreate: true,
+ run: async (tmpMock, docs: any[]): Promise<FluidPrice[]> => {
+ return []
+ },
+ }
+ const runSpy = jest.spyOn(migrationTestCreate, 'run')
+
+ const mockCreationDoctypeSchema: QueryResult<Schema[]> = {
+ data: [{ _id: 'abc', version: 0 }],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ const mockCreationSchema: QueryResult<Schema[]> = {
+ data: [{ _id: 'abc', version: 0 }],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ const mockCreationDoctype: QueryResult<FluidPrice[]> = {
+ data: [],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+
+ mockClient.query
+ .mockResolvedValueOnce(mockCreationDoctypeSchema)
+ .mockResolvedValueOnce(mockCreationSchema)
+ .mockResolvedValueOnce(mockCreationDoctype)
+ .mockResolvedValueOnce(mockCreationSchema)
+
+ const result = await migrate(migrationTestCreate, mockClient)
+ expect(result).toEqual({
+ type: MIGRATION_RESULT_COMPLETE,
+ errors: [],
+ })
+ })
+})
diff --git a/src/migrations/migration.ts b/src/migrations/migration.ts
index 0e690905a..fa9c222a1 100644
--- a/src/migrations/migration.ts
+++ b/src/migrations/migration.ts
@@ -152,15 +152,20 @@ export async function migrate(
result = migrationNoop()
}
+ // Handle new doctype creation
+ if (migration.isCreate) {
+ await migration.run(_client, docToUpdate)
+ result = { type: MIGRATION_RESULT_COMPLETE, errors: [] }
+ }
+
switch (result.type) {
case MIGRATION_RESULT_NOOP:
- await updateSchemaVersion(_client, migration.targetSchemaVersion)
- break
case MIGRATION_RESULT_COMPLETE:
await updateSchemaVersion(_client, migration.targetSchemaVersion)
break
}
} catch (err) {
+ console.error(err)
result = {
type: MIGRATION_RESULT_FAILED,
errors: [err.toString()],
diff --git a/src/migrations/migration.type.ts b/src/migrations/migration.type.ts
index ae576864b..84ebe24e5 100644
--- a/src/migrations/migration.type.ts
+++ b/src/migrations/migration.type.ts
@@ -27,6 +27,7 @@ export type Migration = {
description: string
releaseNotes: Notes | null
docTypes: string
+ isCreate?: boolean
queryOptions?: MigrationQueryOptions
appVersion: string
run: (_client: Client, docs: any[]) => Promise<any[]>
diff --git a/src/models/dataload.model.ts b/src/models/dataload.model.ts
index 66dec0de4..9a2b157c3 100644
--- a/src/models/dataload.model.ts
+++ b/src/models/dataload.model.ts
@@ -3,6 +3,7 @@ import { DateTime } from 'luxon'
export interface Dataload {
date: DateTime
value: number
+ price?: number
valueDetail: number[] | null
}
@@ -17,4 +18,5 @@ export interface DataloadEntity {
minute: number
month: number
year: number
+ price?: number
}
diff --git a/src/models/enedisMonthlyAnalysis.ts b/src/models/enedisMonthlyAnalysis.ts
new file mode 100644
index 000000000..78d16f727
--- /dev/null
+++ b/src/models/enedisMonthlyAnalysis.ts
@@ -0,0 +1,14 @@
+import { Dataload } from 'models'
+
+export interface EnedisMonthlyAnalysisData {
+ weekDaysHalfHourAverageValues: number[]
+ weekEndDaysHalfHourAverageValues: number[]
+ month: number
+ year: number
+ minLoad: number | null
+ maxPower: number | null
+}
+export interface AggregatedEnedisMonthlyDataloads {
+ week: Dataload[]
+ weekend: Dataload[]
+}
diff --git a/src/models/fluidPrice.model.ts b/src/models/fluidPrice.model.ts
new file mode 100644
index 000000000..e1ca1fcf9
--- /dev/null
+++ b/src/models/fluidPrice.model.ts
@@ -0,0 +1,11 @@
+import { FluidType } from 'enum/fluid.enum'
+
+export interface FluidPrice {
+ fluidType: FluidType
+ price: number
+ startDate: string
+ endDate: string
+ _id: string
+ _rev?: string
+ _type?: string
+}
diff --git a/src/models/global.model.ts b/src/models/global.model.ts
index d36194024..fe53a81b9 100644
--- a/src/models/global.model.ts
+++ b/src/models/global.model.ts
@@ -1,5 +1,6 @@
import { FluidType } from 'enum/fluid.enum'
import { ScreenType } from 'enum/screen.enum'
+import { TermsStatus } from 'models'
import { FluidStatus } from './fluid.model'
import { ReleaseNotes } from './releaseNotes.model'
@@ -10,7 +11,8 @@ export interface GlobalState {
challengeActionNotification: boolean
challengeDuelNotification: boolean
analysisNotification: boolean
- isLastTermAccepted: boolean
+ termsStatus: TermsStatus
fluidStatus: FluidStatus[]
fluidTypes: FluidType[]
+ openPartnersIssueModal: boolean
}
diff --git a/src/models/index.ts b/src/models/index.ts
index eec00dde4..caed855c2 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -24,3 +24,4 @@ export * from './term.model'
export * from './trigger.model'
export * from './usageEvent.model'
export * from './userInstanceSettings.model'
+export * from './fluidPrice.model'
diff --git a/src/models/indicator.model.ts b/src/models/indicator.model.ts
index dbff5acc5..35174f342 100644
--- a/src/models/indicator.model.ts
+++ b/src/models/indicator.model.ts
@@ -2,4 +2,5 @@ export interface PerformanceIndicator {
value: number | null
compareValue: number | null
percentageVariation: number | null
+ price?: number | null
}
diff --git a/src/models/maxPower.model.ts b/src/models/maxPower.model.ts
new file mode 100644
index 000000000..fe1784ef0
--- /dev/null
+++ b/src/models/maxPower.model.ts
@@ -0,0 +1,4 @@
+export interface MaxPowerEntity {
+ load: number
+ date: string
+}
diff --git a/src/models/partnersInfo.model.ts b/src/models/partnersInfo.model.ts
new file mode 100644
index 000000000..410458467
--- /dev/null
+++ b/src/models/partnersInfo.model.ts
@@ -0,0 +1,6 @@
+export interface PartnersInfo {
+ grdf_failure: boolean
+ enedis_failure: boolean
+ egl_failure: boolean
+ notification_activated: boolean
+}
diff --git a/src/models/profile.model.ts b/src/models/profile.model.ts
index 4b7960cdb..f28a546c8 100644
--- a/src/models/profile.model.ts
+++ b/src/models/profile.model.ts
@@ -1,6 +1,6 @@
import { DateTime } from 'luxon'
-interface Tutorial {
+interface Onboarding {
isWelcomeSeen: boolean
}
@@ -19,14 +19,19 @@ export interface ProfileEntity {
sendConsumptionAlert: boolean
waterDailyConsumptionLimit: number
isProfileTypeCompleted: boolean
- tutorial: Tutorial
+ onboarding: Onboarding
mailToken: string
+ partnersIssueDate: string
_id?: string
_rev?: string
}
export interface Profile
- extends Omit<ProfileEntity, 'lastConnectionDate' | 'monthlyAnalysisDate'> {
+ extends Omit<
+ ProfileEntity,
+ 'lastConnectionDate' | 'monthlyAnalysisDate' | 'partnersIssueDate'
+ > {
lastConnectionDate: DateTime
monthlyAnalysisDate: DateTime
+ partnersIssueDate: DateTime
}
diff --git a/src/models/step.model.ts b/src/models/step.model.ts
new file mode 100644
index 000000000..10bff78f8
--- /dev/null
+++ b/src/models/step.model.ts
@@ -0,0 +1,5 @@
+export interface Step {
+ icon: string
+ info1: string
+ info2: string
+}
diff --git a/src/models/term.model.ts b/src/models/term.model.ts
index c075cfa10..c67abed9d 100644
--- a/src/models/term.model.ts
+++ b/src/models/term.model.ts
@@ -7,3 +7,9 @@ export interface Term {
url?: string
version: string
}
+
+export type VersionType = 'minor' | 'major' | 'init'
+export interface TermsStatus {
+ versionType: VersionType
+ accepted: boolean
+}
diff --git a/src/services/consumption.service.spec.ts b/src/services/consumption.service.spec.ts
index 0ef29357b..120fd6bee 100644
--- a/src/services/consumption.service.spec.ts
+++ b/src/services/consumption.service.spec.ts
@@ -1,402 +1,475 @@
-import ConsumptionDataManager from './consumption.service'
-import mockClient from '../../tests/__mocks__/client'
-import { TimeStep } from 'enum/timeStep.enum'
-import { DateTime } from 'luxon'
-import { FluidType } from 'enum/fluid.enum'
-import { Dataload, TimePeriod } from 'models'
-
-const mockFetchFluidData = jest.fn()
-const mockFetchFluidMaxData = jest.fn()
-const mockGetLastDateData = jest.fn()
-const mockGetEntries = jest.fn()
-jest.mock('./queryRunner.service', () => {
- return jest.fn(() => {
- return {
- fetchFluidData: mockFetchFluidData,
- fetchFluidMaxData: mockFetchFluidMaxData,
- getLastDateData: mockGetLastDateData,
- getEntries: mockGetEntries,
- }
- })
-})
-
-describe('Consumption service', () => {
- const consumptionDataManager = new ConsumptionDataManager(mockClient)
- let fluidTypes: FluidType[] = [0]
- const mockTimePeriod: TimePeriod = {
- startDate: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- endDate: DateTime.fromISO('2020-10-03T23:59:59.999Z'),
- }
- const mockTimePeriodComparison: TimePeriod = {
- startDate: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
- endDate: DateTime.fromISO('2020-09-03T23:59:59.999Z'),
- }
- const mockFetchDataActual: Dataload[] = [
- {
- date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- value: 291.9,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
- value: 260.15,
- valueDetail: null,
- },
- ]
- const mockFetchDataComparison: Dataload[] = [
- {
- date: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
- value: 228.23,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-09-02T00:00:00.000Z'),
- value: 238.71,
- valueDetail: null,
- },
- ]
- describe('getGraphData method', () => {
- it('should return null', async () => {
- const result = await consumptionDataManager.getGraphData(
- mockTimePeriod,
- TimeStep.DAY,
- [],
- mockTimePeriodComparison,
- false
- )
- expect(result).toBeNull()
- })
- it('should return a mapped data for one fluid', async () => {
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
- const mockResult = {
- actualData: [
- {
- date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- value: 291.9,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
- value: 260.15,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-10-03T00:00:00.000Z'),
- value: -1,
- valueDetail: null,
- },
- ],
- comparisonData: [
- {
- date: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
- value: 228.23,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-09-02T00:00:00.000Z'),
- value: 238.71,
- valueDetail: null,
- },
- {
- date: DateTime.fromISO('2020-09-03T00:00:00.000Z'),
- value: -1,
- valueDetail: null,
- },
- ],
- }
- const result = await consumptionDataManager.getGraphData(
- mockTimePeriod,
- TimeStep.DAY,
- fluidTypes,
- mockTimePeriodComparison,
- false
- )
- expect(result).toEqual(mockResult)
- })
-
- it('should return a mapped data for multiple fluid', async () => {
- fluidTypes = [0, 1, 2]
- for (let i = 0; i < fluidTypes.length; i++) {
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
- }
-
- const mockResult = {
- actualData: [
- {
- date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- value: 79.131171,
- valueDetail: [45.478019999999994, 0.931161, 32.72199],
- },
- {
- date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
- value: 70.5240635,
- valueDetail: [40.531369999999995, 0.8298785, 29.162815],
- },
- {
- date: DateTime.fromISO('2020-10-03T00:00:00.000Z'),
- value: -1,
- valueDetail: null,
- },
- ],
- comparisonData: [
- {
- date: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
- value: 61.8708707,
- valueDetail: [35.558234, 0.7280537, 25.584583],
- },
- {
- date: DateTime.fromISO('2020-09-02T00:00:00.000Z'),
- value: 64.7118939,
- valueDetail: [37.191018, 0.7614849, 26.759391],
- },
- {
- date: DateTime.fromISO('2020-09-03T00:00:00.000Z'),
- value: -1,
- valueDetail: null,
- },
- ],
- }
- const result = await consumptionDataManager.getGraphData(
- mockTimePeriod,
- TimeStep.DAY,
- fluidTypes,
- mockTimePeriodComparison,
- true
- )
- expect(result).toEqual(mockResult)
- })
- it('should return a mapped data for one fluid without comparison date', async () => {
- const mockResult = {
- actualData: [
- {
- date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- value: 79.131171,
- valueDetail: [45.478019999999994, 0.931161, 32.72199],
- },
- {
- date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
- value: 70.5240635,
- valueDetail: [40.531369999999995, 0.8298785, 29.162815],
- },
- {
- date: DateTime.fromISO('2020-10-03T00:00:00.000Z'),
- value: -1,
- valueDetail: null,
- },
- ],
- comparisonData: [],
- }
- for (let i = 0; i < fluidTypes.length; i++) {
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
- }
- const result = await consumptionDataManager.getGraphData(
- mockTimePeriod,
- TimeStep.DAY,
- fluidTypes
- )
- expect(result).toEqual(mockResult)
- })
- it('should return null because of wrong parameters', async () => {
- const mockFluidTypes = [1]
- const result = await consumptionDataManager.getGraphData(
- mockTimePeriod,
- TimeStep.DAY,
- mockFluidTypes,
- mockTimePeriodComparison,
- true
- )
- expect(result).toBeNull()
- })
- it('should return null because of timePeriod and comparaison', async () => {
- const wrongTimePeriod = {
- startDate: DateTime.fromISO('2020-10-03T23:59:59.999Z'),
- endDate: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- }
- const result = await consumptionDataManager.getGraphData(
- wrongTimePeriod,
- TimeStep.DAY,
- fluidTypes,
- mockTimePeriodComparison,
- true
- )
- expect(result).toBeNull()
- })
- })
- describe('getMaxLoad method', () => {
- it('should return the maxed value for a time period for the home', async () => {
- for (let i = 0; i < fluidTypes.length; i++) {
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
- }
- const expectedResult = 79.131171
- const result = await consumptionDataManager.getMaxLoad(
- mockTimePeriod,
- TimeStep.DAY,
- fluidTypes,
- mockTimePeriodComparison,
- true
- )
- expect(result).toEqual(expectedResult)
- })
- it('should return the maxed value for a time period', async () => {
- const mockFluidTypes = [1]
- const expectedResult = 63.1254
- mockFetchFluidMaxData.mockResolvedValueOnce(expectedResult)
- const result = await consumptionDataManager.getMaxLoad(
- mockTimePeriod,
- TimeStep.DAY,
- mockFluidTypes,
- mockTimePeriodComparison,
- false
- )
- expect(result).toEqual(expectedResult)
- })
- })
- describe('getPerformanceIndicators method', () => {
- it('should return the performance indicator', async () => {
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
- mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
- //Incomplete Data to test all possibilities
- mockFetchFluidData.mockResolvedValueOnce([
- {
- date: DateTime.fromISO('2020-10-01T00:23:20.000Z'),
- value: 298.283,
- },
- ])
- mockFetchFluidData.mockResolvedValueOnce([
- {
- date: DateTime.fromISO('2020-10-01T03:10:00.000Z'),
- value: 398.283,
- },
- ])
-
- const mockTimePeriodComplete = {
- startDate: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
- endDate: DateTime.fromISO('2020-10-02T23:59:59.999Z'),
- }
- const mockTimePeriodComparisonComplete = {
- startDate: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
- endDate: DateTime.fromISO('2020-09-02T23:59:59.999Z'),
- }
- const expectedResult = [
- {
- compareValue: 466.94,
- percentageVariation: -0.18227181222426858,
- value: 552.05,
- },
- {
- compareValue: 466.94,
- percentageVariation: -0.18227181222426858,
- value: 552.05,
- },
- { compareValue: null, percentageVariation: null, value: null },
- ]
- const result = await consumptionDataManager.getPerformanceIndicators(
- mockTimePeriodComplete,
- TimeStep.DAY,
- fluidTypes,
- mockTimePeriodComparisonComplete
- )
- expect(result).toEqual(expectedResult)
- })
- })
- describe('fetchLastDateData method', () => {
- it('should return the latest date data of one fluid', async () => {
- const mockFluidTypes = [0]
- const expectedResult = DateTime.fromISO('2020-09-03T23:59:59.999Z')
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-03T23:59:59.999Z')
- )
- const result = await consumptionDataManager.fetchLastDateData(
- mockFluidTypes
- )
- expect(result).toEqual(expectedResult)
- })
- it('should return the latest date data of multiple fluid', async () => {
- const mockFluidTypes = [0, 2]
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-03T23:59:59.999Z')
- )
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-02T23:59:59.999Z')
- )
- const expectedResult = DateTime.fromISO('2020-09-03T23:59:59.999Z')
- const result = await consumptionDataManager.fetchLastDateData(
- mockFluidTypes
- )
- expect(result).toEqual(expectedResult)
- })
- it('should return the latest date data of all fluids', async () => {
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-02T23:59:59.999Z')
- )
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-03T23:59:59.999Z')
- )
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-01T23:59:59.999Z')
- )
- const expectedResult = DateTime.fromISO('2020-09-01T23:59:59.999Z')
- const result = await consumptionDataManager.fetchLastDateData(
- fluidTypes,
- true
- )
- expect(result).toEqual(expectedResult)
- })
- })
- describe('fetchAllLastDateData method', () => {
- it('should return the latest date data of one fluid', async () => {
- const mockFluidTypes = [0]
- const expectedResult = [DateTime.fromISO('2020-09-03T23:59:59.999Z')]
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-03T23:59:59.999Z')
- )
- const result = await consumptionDataManager.fetchAllLastDateData(
- mockFluidTypes
- )
- expect(result).toEqual(expectedResult)
- })
- it('should return the latest date data of All fluid', async () => {
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-02T23:59:59.999Z')
- )
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-03T23:59:59.999Z')
- )
- mockGetLastDateData.mockResolvedValueOnce(
- DateTime.fromISO('2020-09-01T23:59:59.999Z')
- )
- const expectedResult = [
- DateTime.fromISO('2020-09-02T23:59:59.999Z'),
- DateTime.fromISO('2020-09-03T23:59:59.999Z'),
- DateTime.fromISO('2020-09-01T23:59:59.999Z'),
- ]
- const result = await consumptionDataManager.fetchAllLastDateData(
- fluidTypes
- )
- expect(result).toEqual(expectedResult)
- })
- })
- describe('checkDoctypeEntries method', () => {
- it('should return a boolean if doctype are correct', async () => {
- let fluidType = 2
- mockGetEntries.mockResolvedValueOnce({ data: [1] })
- let result = await consumptionDataManager.checkDoctypeEntries(
- fluidType,
- TimeStep.DAY
- )
- expect(result).toBeTruthy()
- fluidType = 999
- mockGetEntries.mockResolvedValueOnce({ data: [] })
- result = await consumptionDataManager.checkDoctypeEntries(
- fluidType,
- TimeStep.DAY
- )
- expect(result).toBeFalsy()
- })
- })
-})
+import ConsumptionDataManager from './consumption.service'
+import mockClient from '../../tests/__mocks__/client'
+import { TimeStep } from 'enum/timeStep.enum'
+import { DateTime } from 'luxon'
+import { FluidType } from 'enum/fluid.enum'
+import { Dataload, DataloadEntity, FluidPrice, TimePeriod } from 'models'
+import { ENEDIS_MINUTE_DOCTYPE } from 'doctypes'
+import { fluidPrices } from '../../tests/__mocks__/fluidPrice.mock'
+import { QueryResult } from 'cozy-client'
+import { loadDayData } from '../../tests/__mocks__/loadDayData.mock'
+import { baseDataLoad } from '../../tests/__mocks__/datachartData.mock'
+
+const mockFetchFluidData = jest.fn()
+const mockFetchFluidMaxData = jest.fn()
+const mockGetLastDateData = jest.fn()
+const mockGetEntries = jest.fn()
+jest.mock('./queryRunner.service', () => {
+ return jest.fn(() => {
+ return {
+ fetchFluidData: mockFetchFluidData,
+ fetchFluidMaxData: mockFetchFluidMaxData,
+ getLastDateData: mockGetLastDateData,
+ getEntries: mockGetEntries,
+ }
+ })
+})
+
+describe('Consumption service', () => {
+ const consumptionDataManager = new ConsumptionDataManager(mockClient)
+ let fluidTypes: FluidType[] = [0]
+ const mockTimePeriod: TimePeriod = {
+ startDate: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ endDate: DateTime.fromISO('2020-10-03T23:59:59.999Z'),
+ }
+ const mockTimePeriodComparison: TimePeriod = {
+ startDate: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
+ endDate: DateTime.fromISO('2020-09-03T23:59:59.999Z'),
+ }
+ const mockFetchDataActual: Dataload[] = [
+ {
+ date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ value: 291.9,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
+ value: 260.15,
+ valueDetail: null,
+ },
+ ]
+ const mockFetchDataComparison: Dataload[] = [
+ {
+ date: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
+ value: 228.23,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2020-09-02T00:00:00.000Z'),
+ value: 238.71,
+ valueDetail: null,
+ },
+ ]
+ describe('getGraphData method', () => {
+ it('should return null', async () => {
+ const result = await consumptionDataManager.getGraphData(
+ mockTimePeriod,
+ TimeStep.DAY,
+ [],
+ mockTimePeriodComparison,
+ false
+ )
+ expect(result).toBeNull()
+ })
+ it('should return a mapped data for one fluid', async () => {
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
+ const mockResult = {
+ actualData: [
+ {
+ date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ value: 291.9,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
+ value: 260.15,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2020-10-03T00:00:00.000Z'),
+ value: -1,
+ valueDetail: null,
+ },
+ ],
+ comparisonData: [
+ {
+ date: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
+ value: 228.23,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2020-09-02T00:00:00.000Z'),
+ value: 238.71,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2020-09-03T00:00:00.000Z'),
+ value: -1,
+ valueDetail: null,
+ },
+ ],
+ }
+ const result = await consumptionDataManager.getGraphData(
+ mockTimePeriod,
+ TimeStep.DAY,
+ fluidTypes,
+ mockTimePeriodComparison,
+ false
+ )
+ expect(result).toEqual(mockResult)
+ })
+
+ it('should return a mapped data for multiple fluid', async () => {
+ fluidTypes = [0, 1, 2]
+ for (let i = 0; i < fluidTypes.length; i++) {
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
+ }
+
+ const mockResult = {
+ actualData: [
+ {
+ date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ value: 79.131171,
+ valueDetail: [45.478019999999994, 0.931161, 32.72199],
+ },
+ {
+ date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
+ value: 70.5240635,
+ valueDetail: [40.531369999999995, 0.8298785, 29.162815],
+ },
+ {
+ date: DateTime.fromISO('2020-10-03T00:00:00.000Z'),
+ value: -1,
+ valueDetail: null,
+ },
+ ],
+ comparisonData: [
+ {
+ date: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
+ value: 61.8708707,
+ valueDetail: [35.558234, 0.7280537, 25.584583],
+ },
+ {
+ date: DateTime.fromISO('2020-09-02T00:00:00.000Z'),
+ value: 64.7118939,
+ valueDetail: [37.191018, 0.7614849, 26.759391],
+ },
+ {
+ date: DateTime.fromISO('2020-09-03T00:00:00.000Z'),
+ value: -1,
+ valueDetail: null,
+ },
+ ],
+ }
+ const result = await consumptionDataManager.getGraphData(
+ mockTimePeriod,
+ TimeStep.DAY,
+ fluidTypes,
+ mockTimePeriodComparison,
+ true
+ )
+ expect(result).toEqual(mockResult)
+ })
+ it('should return a mapped data for one fluid without comparison date', async () => {
+ const mockResult = {
+ actualData: [
+ {
+ date: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ value: 79.131171,
+ valueDetail: [45.478019999999994, 0.931161, 32.72199],
+ },
+ {
+ date: DateTime.fromISO('2020-10-02T00:00:00.000Z'),
+ value: 70.5240635,
+ valueDetail: [40.531369999999995, 0.8298785, 29.162815],
+ },
+ {
+ date: DateTime.fromISO('2020-10-03T00:00:00.000Z'),
+ value: -1,
+ valueDetail: null,
+ },
+ ],
+ comparisonData: [],
+ }
+ for (let i = 0; i < fluidTypes.length; i++) {
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
+ }
+ const result = await consumptionDataManager.getGraphData(
+ mockTimePeriod,
+ TimeStep.DAY,
+ fluidTypes
+ )
+ expect(result).toEqual(mockResult)
+ })
+ it('should return null because of wrong parameters', async () => {
+ const mockFluidTypes = [1]
+ const result = await consumptionDataManager.getGraphData(
+ mockTimePeriod,
+ TimeStep.DAY,
+ mockFluidTypes,
+ mockTimePeriodComparison,
+ true
+ )
+ expect(result).toBeNull()
+ })
+ it('should return null because of timePeriod and comparaison', async () => {
+ const wrongTimePeriod = {
+ startDate: DateTime.fromISO('2020-10-03T23:59:59.999Z'),
+ endDate: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ }
+ const result = await consumptionDataManager.getGraphData(
+ wrongTimePeriod,
+ TimeStep.DAY,
+ fluidTypes,
+ mockTimePeriodComparison,
+ true
+ )
+ expect(result).toBeNull()
+ })
+ })
+ describe('getMaxLoad method', () => {
+ it('should return the maxed value for a time period for the home', async () => {
+ for (let i = 0; i < fluidTypes.length; i++) {
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
+ }
+ const expectedResult = 79.131171
+ const result = await consumptionDataManager.getMaxLoad(
+ mockTimePeriod,
+ TimeStep.DAY,
+ fluidTypes,
+ mockTimePeriodComparison,
+ true
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ it('should return the maxed value for a time period', async () => {
+ const mockFluidTypes = [1]
+ const expectedResult = 63.1254
+ mockFetchFluidMaxData.mockResolvedValueOnce(expectedResult)
+ const result = await consumptionDataManager.getMaxLoad(
+ mockTimePeriod,
+ TimeStep.DAY,
+ mockFluidTypes,
+ mockTimePeriodComparison,
+ false
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ })
+ describe('getPerformanceIndicators method', () => {
+ it('should return the performance indicator', async () => {
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataActual)
+ mockFetchFluidData.mockResolvedValueOnce(mockFetchDataComparison)
+ //Incomplete Data to test all possibilities
+ mockFetchFluidData.mockResolvedValueOnce([
+ {
+ date: DateTime.fromISO('2020-10-01T00:23:20.000Z'),
+ value: 298.283,
+ },
+ ])
+ mockFetchFluidData.mockResolvedValueOnce([
+ {
+ date: DateTime.fromISO('2020-10-01T03:10:00.000Z'),
+ value: 398.283,
+ },
+ ])
+
+ const mockTimePeriodComplete = {
+ startDate: DateTime.fromISO('2020-10-01T00:00:00.000Z'),
+ endDate: DateTime.fromISO('2020-10-02T23:59:59.999Z'),
+ }
+ const mockTimePeriodComparisonComplete = {
+ startDate: DateTime.fromISO('2020-09-01T00:00:00.000Z'),
+ endDate: DateTime.fromISO('2020-09-02T23:59:59.999Z'),
+ }
+ const expectedResult = [
+ {
+ compareValue: 466.94,
+ percentageVariation: -0.18227181222426858,
+ value: 552.05,
+ price: null,
+ },
+ {
+ compareValue: 466.94,
+ percentageVariation: -0.18227181222426858,
+ value: 552.05,
+ price: null,
+ },
+ {
+ compareValue: null,
+ percentageVariation: null,
+ value: null,
+ price: null,
+ },
+ ]
+ const result = await consumptionDataManager.getPerformanceIndicators(
+ mockTimePeriodComplete,
+ TimeStep.DAY,
+ fluidTypes,
+ mockTimePeriodComparisonComplete
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ })
+ describe('fetchLastDateData method', () => {
+ it('should return the latest date data of one fluid', async () => {
+ const mockFluidTypes = [0]
+ const expectedResult = DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ )
+ const result = await consumptionDataManager.fetchLastDateData(
+ mockFluidTypes
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ it('should return the latest date data of multiple fluid', async () => {
+ const mockFluidTypes = [0, 2]
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ )
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-02T23:59:59.999Z')
+ )
+ const expectedResult = DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ const result = await consumptionDataManager.fetchLastDateData(
+ mockFluidTypes
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ it('should return the latest date data of all fluids', async () => {
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-02T23:59:59.999Z')
+ )
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ )
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-01T23:59:59.999Z')
+ )
+ const expectedResult = DateTime.fromISO('2020-09-01T23:59:59.999Z')
+ const result = await consumptionDataManager.fetchLastDateData(
+ fluidTypes,
+ true
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ })
+ describe('fetchAllLastDateData method', () => {
+ it('should return the latest date data of one fluid', async () => {
+ const mockFluidTypes = [0]
+ const expectedResult = [DateTime.fromISO('2020-09-03T23:59:59.999Z')]
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ )
+ const result = await consumptionDataManager.fetchAllLastDateData(
+ mockFluidTypes
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ it('should return the latest date data of All fluid', async () => {
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-02T23:59:59.999Z')
+ )
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-03T23:59:59.999Z')
+ )
+ mockGetLastDateData.mockResolvedValueOnce(
+ DateTime.fromISO('2020-09-01T23:59:59.999Z')
+ )
+ const expectedResult = [
+ DateTime.fromISO('2020-09-02T23:59:59.999Z'),
+ DateTime.fromISO('2020-09-03T23:59:59.999Z'),
+ DateTime.fromISO('2020-09-01T23:59:59.999Z'),
+ ]
+ const result = await consumptionDataManager.fetchAllLastDateData(
+ fluidTypes
+ )
+ expect(result).toEqual(expectedResult)
+ })
+ })
+ describe('checkDoctypeEntries method', () => {
+ it('should return a boolean if doctype are correct', async () => {
+ let fluidType = 2
+ mockGetEntries.mockResolvedValueOnce({ data: [1] })
+ let result = await consumptionDataManager.checkDoctypeEntries(
+ fluidType,
+ TimeStep.DAY
+ )
+ expect(result).toBeTruthy()
+ fluidType = 999
+ mockGetEntries.mockResolvedValueOnce({ data: [] })
+ result = await consumptionDataManager.checkDoctypeEntries(
+ fluidType,
+ TimeStep.DAY
+ )
+ expect(result).toBeFalsy()
+ })
+ })
+ describe('getFirstDataDateFromDoctypeWithPrice', () => {
+ it('should Get the first entry of a given data doctype', async () => {
+ const data: QueryResult<FluidPrice[]> = {
+ data: [fluidPrices[0]],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+
+ mockClient.query.mockResolvedValueOnce(data)
+ const result = await consumptionDataManager.getFirstDataDateFromDoctypeWithPrice(
+ ENEDIS_MINUTE_DOCTYPE
+ )
+ expect(result).toEqual(data.data[0])
+ })
+ })
+ describe('getLastHourData', () => {
+ it('should get last hour data', async () => {
+ const mockQueryResult: QueryResult<DataloadEntity[]> = {
+ data: [loadDayData[0]],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await consumptionDataManager.getLastHourData(
+ mockClient,
+ 12
+ )
+ expect(result).toEqual(mockQueryResult.data)
+ expect(result.length).toEqual(1)
+ })
+ })
+ describe('saveDoc & saveDocs', () => {
+ it('should saveDoc', async () => {
+ const mockQueryResult: QueryResult<DataloadEntity> = {
+ data: loadDayData[0],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+
+ mockClient.save.mockResolvedValueOnce(mockQueryResult)
+ const result = await consumptionDataManager.saveDoc(loadDayData[0])
+ expect(result).toEqual(mockQueryResult.data)
+ })
+ it('should saveDocs', async () => {
+ const mockQueryResult: QueryResult<DataloadEntity[]> = {
+ data: loadDayData,
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+
+ mockClient.saveAll.mockResolvedValueOnce(mockQueryResult)
+ const result = await consumptionDataManager.saveDocs(loadDayData)
+ expect(result).toEqual(mockQueryResult.data)
+ expect(result.length).toEqual(4)
+ })
+ })
+})
diff --git a/src/services/consumption.service.ts b/src/services/consumption.service.ts
index 4e7fed0fd..f4648871f 100644
--- a/src/services/consumption.service.ts
+++ b/src/services/consumption.service.ts
@@ -1,5 +1,5 @@
import { DateTime } from 'luxon'
-import { Client, QueryDefinition, Q } from 'cozy-client'
+import { Client, QueryDefinition, Q, QueryResult } from 'cozy-client'
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import {
@@ -14,6 +14,8 @@ import QueryRunnerService from 'services/queryRunner.service'
import ConsumptionValidatorService from 'services/consumptionValidator.service'
import ConverterService from 'services/converter.service'
import { ENEDIS_MINUTE_DOCTYPE } from 'doctypes'
+import { Doctype } from 'cozy-client/types/types'
+import { EnedisMonthlyAnalysisData } from 'models/enedisMonthlyAnalysis'
// eslint-disable-next-line @typescript-eslint/interface-name-prefix
export interface ISingleFluidChartData {
@@ -57,10 +59,8 @@ export default class ConsumptionDataManager {
compareTimePeriod
)
if (!InputisValid) return null
-
if (fluidTypes.length === 1 && !isHome) {
//TODO validating input data
-
//TODO applying buisness logic to the query arguments
// running the query
@@ -182,16 +182,22 @@ export default class ConsumptionDataManager {
value: null,
compareValue: null,
percentageVariation: null,
+ price: null,
}
const actualDataIsValid = this.PerformanceIndicatorsDataIsValid(
graphData.actualData
)
- if (actualDataIsValid)
+ if (actualDataIsValid) {
performanceIndicator.value = this.calculatePerformanceIndicatorValue(
graphData.actualData
)
+ if (graphData.actualData[0].price)
+ performanceIndicator.price = this.calculatePerformanceIndicatorPrice(
+ graphData.actualData
+ )
+ }
if (
actualDataIsValid &&
@@ -228,6 +234,10 @@ export default class ConsumptionDataManager {
return data.reduce((a, b) => (b.value !== -1 ? a + b.value : a), 0)
}
+ public calculatePerformanceIndicatorPrice(data: Dataload[]): number {
+ return data.reduce((a, b) => (b.price !== null ? a + b.price : a), 0)
+ }
+
private calculatePerformanceIndicatorVariationPercentage(
dataSum: number,
comparisonDataSum: number
@@ -434,7 +444,8 @@ export default class ConsumptionDataManager {
else {
convertedValue = converterService.LoadToEuro(
value,
- singleFluidChart.chartFluid
+ singleFluidChart.chartFluid,
+ singleFluidChart.chartData.actualData[i].price
)
agreggatedConvertedValue += convertedValue
}
@@ -453,7 +464,8 @@ export default class ConsumptionDataManager {
else {
convertedComparisonValue = converterService.LoadToEuro(
comparisonValue,
- singleFluidChart.chartFluid
+ singleFluidChart.chartFluid,
+ singleFluidChart.chartData.comparisonData[i].price
)
comparisonAgreggatedConvertedValue += convertedComparisonValue
}
@@ -523,4 +535,72 @@ export default class ConsumptionDataManager {
const data = await client.query(query)
return data.data
}
+
+ /**
+ * Get the first entry of a given data doctype (enedis, grdf, egl)
+ * @param doctype
+ * @returns
+ */
+ public async getFirsDataDateFromDoctype(
+ doctype: Doctype
+ ): Promise<DataloadEntity[] | EnedisMonthlyAnalysisData[] | null> {
+ const query: QueryDefinition = Q(doctype)
+ .where({})
+ .sortBy([{ year: 'asc' }, { month: 'asc' }])
+ .limitBy(1)
+ const data = await this._client.query(query)
+ return data.data
+ }
+
+ public async getFirstDataDateFromDoctypeWithPrice(
+ doctype: Doctype
+ ): Promise<DataloadEntity | null> {
+ const query: QueryDefinition = Q(doctype)
+ .where({
+ price: {
+ $exists: false,
+ },
+ })
+ .partialIndex({
+ price: {
+ $exists: false,
+ },
+ })
+ .indexFields(['year', 'month'])
+ .sortBy([{ year: 'asc' }, { month: 'asc' }])
+ .limitBy(1)
+ const data = await this._client.query(query)
+ return data.data[0]
+ }
+
+ /**
+ * Save one doc
+ * @param {DataloadEntity} consumptionDoc - Doc to save
+ * @returns {DataloadEntity} Saved doc
+ */
+ public async saveDoc(
+ consumptionDoc: DataloadEntity
+ ): Promise<DataloadEntity> {
+ const {
+ data: savedDoc,
+ }: QueryResult<DataloadEntity> = await this._client.save(consumptionDoc)
+ return savedDoc
+ }
+
+ /**
+ * Save an array of docs
+ * @param {DataloadEntity[]} consumptionDocs - Array of doc to save
+ * @returns {DataloadEntity[]} Array of saved docs
+ */
+ public async saveDocs(
+ consumptionDocs: DataloadEntity[]
+ ): Promise<DataloadEntity[]> {
+ const {
+ data: savedDocs,
+ }: QueryResult<DataloadEntity[]> = await this._client.saveAll(
+ consumptionDocs
+ )
+
+ return savedDocs
+ }
}
diff --git a/src/services/converter.service.spec.ts b/src/services/converter.service.spec.ts
index 8cb447124..da324b069 100644
--- a/src/services/converter.service.spec.ts
+++ b/src/services/converter.service.spec.ts
@@ -38,5 +38,11 @@ describe('Converter service', () => {
const result = converterService.LoadToEuro(0.002, FluidType.WATER)
expect(result).toEqual(expectedConversion)
})
+
+ it('should return 1.2 beacause there is a price of 1.2 set for doctype', () => {
+ const expectedConversion = 1.2
+ const result = converterService.LoadToEuro(0.002, FluidType.WATER, 1.2)
+ expect(result).toEqual(expectedConversion)
+ })
})
})
diff --git a/src/services/converter.service.ts b/src/services/converter.service.ts
index 29519cbba..c7e45fa56 100644
--- a/src/services/converter.service.ts
+++ b/src/services/converter.service.ts
@@ -9,13 +9,17 @@ export default class ConverterService {
this._fluidConfig = new ConfigService().getFluidConfig()
}
- public LoadToEuro(load: number, fluidType: FluidType): number {
+ public LoadToEuro(
+ load: number,
+ fluidType: FluidType,
+ price?: number | null
+ ): number {
let convertedLoad: number
// If Multifluid do not apply coeff because it doesn't exist
if (fluidType === FluidType.MULTIFLUID) {
convertedLoad = load
} else {
- convertedLoad = load * this._fluidConfig[fluidType].coefficient
+ convertedLoad = this.applyPrice(this._fluidConfig[fluidType], load, price)
}
// Prevent round 0 case when the actual value is not 0
@@ -24,4 +28,23 @@ export default class ConverterService {
}
return convertedLoad
}
+
+ /**
+ * Return calculated price
+ * @param {FluidConfig} fluidConfig - Fluid configuration
+ * @param {number} load - Load value
+ * @param {number} [price] - Price if exist
+ * @returns {number}
+ */
+ private applyPrice(
+ fluidConfig: FluidConfig,
+ load: number,
+ price?: number | null
+ ): number {
+ if (price) {
+ return price
+ } else {
+ return load * fluidConfig.coefficient
+ }
+ }
}
diff --git a/src/services/dateChart.service.ts b/src/services/dateChart.service.ts
index b29c55e39..2d85d3fd2 100644
--- a/src/services/dateChart.service.ts
+++ b/src/services/dateChart.service.ts
@@ -312,19 +312,19 @@ export default class DateChartService {
).count('days')
if (
fluidType === FluidType.ELECTRICITY &&
- inter <= fluidConfig[0].dataDelayOffset + 3
+ inter <= fluidConfig[0].dataDelayOffset + 1
) {
return true
}
if (
fluidType === FluidType.WATER &&
- inter <= fluidConfig[1].dataDelayOffset + 3
+ inter <= fluidConfig[1].dataDelayOffset + 1
) {
return true
}
if (
fluidType === FluidType.GAS &&
- inter <= fluidConfig[2].dataDelayOffset + 3
+ inter <= fluidConfig[2].dataDelayOffset + 1
) {
return true
} else {
@@ -382,9 +382,9 @@ export default class DateChartService {
keepLocalTime: true,
})
const inter = Interval.fromDateTimes(date, today).count('days')
- const limitDate = fluidConfig[fluidType].dataDelayOffset + 1
+ const limitDate = fluidConfig[fluidType].dataDelayOffset + 2
if (inter > limitDate) {
- return inter - limitDate
+ return inter - 2
} else return null
} else return null
}
diff --git a/src/services/enedisMonthlyAnalysisData.service.spec.ts b/src/services/enedisMonthlyAnalysisData.service.spec.ts
new file mode 100644
index 000000000..4ed0ea216
--- /dev/null
+++ b/src/services/enedisMonthlyAnalysisData.service.spec.ts
@@ -0,0 +1,96 @@
+import { QueryResult } from 'cozy-client'
+import mockClient from '../../tests/__mocks__/client'
+import EnedisMonthlyAnalysisDataService from './enedisMonthlyAnalysisData.service'
+import { EnedisMonthlyAnalysisData } from 'models/enedisMonthlyAnalysis'
+import {
+ maxPowerData,
+ mockDataLoadEnedisAnalysis,
+ mockEnedisMonthlyAnalysis,
+ mockEnedisMonthlyAnalysisArray,
+} from '../../tests/__mocks__/enedisMonthlyAnalysisData.mock'
+import { MaxPowerEntity } from 'models/maxPower.model'
+
+describe('Enedis Monthly Analysis service', () => {
+ const emas = new EnedisMonthlyAnalysisDataService(mockClient)
+
+ it('should return all Enedis Monthly Analysis', async () => {
+ const mockQueryResult: QueryResult<EnedisMonthlyAnalysisData[]> = {
+ data: mockEnedisMonthlyAnalysisArray,
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await emas.getAllEnedisMonthlyAnalysisData()
+ expect(result).toEqual(mockEnedisMonthlyAnalysisArray)
+ })
+ it('should return no enedis analysis', async () => {
+ const mockQueryResult: QueryResult<EnedisMonthlyAnalysisData[]> = {
+ data: [],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await emas.getLastEnedisMonthlyAnalysis()
+ expect(result).toEqual([])
+ })
+ it('should return the last enedis analysis', async () => {
+ const mockQueryResult: QueryResult<EnedisMonthlyAnalysisData> = {
+ data: mockEnedisMonthlyAnalysis,
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await emas.getLastEnedisMonthlyAnalysis()
+ expect(result).toEqual(mockEnedisMonthlyAnalysis)
+ })
+ it('should aggregate the analysis data to a dataload', () => {
+ const result = emas.aggregateValuesToDataLoad(
+ mockEnedisMonthlyAnalysisArray[0]
+ )
+ expect(result).toEqual(mockDataLoadEnedisAnalysis)
+ })
+ it('should get one analysis by Date', async () => {
+ const mockQueryResult1: QueryResult<EnedisMonthlyAnalysisData[]> = {
+ data: [mockEnedisMonthlyAnalysisArray[2]],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult1)
+ const result = await emas.getEnedisMonthlyAnalysisByDate(2021, 8)
+ expect(result).toEqual([mockEnedisMonthlyAnalysisArray[2]])
+ })
+ it('should create an enedis monthly analysis', async () => {
+ const mockQueryResult: QueryResult<EnedisMonthlyAnalysisData> = {
+ data: mockEnedisMonthlyAnalysisArray[0],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.create.mockResolvedValueOnce(mockQueryResult)
+ const result = await emas.createEnedisMonthlyAnalysisData(
+ mockEnedisMonthlyAnalysisArray[0]
+ )
+ expect(result).toEqual(mockEnedisMonthlyAnalysisArray[0])
+ })
+ it('should fail create a enedis monthly analysis', async () => {
+ mockClient.create.mockRejectedValue(new Error())
+ await expect(
+ emas.createEnedisMonthlyAnalysisData(mockEnedisMonthlyAnalysisArray[0])
+ ).rejects.toThrow(new Error())
+ })
+ it('should get maxPower for a given month', async () => {
+ const mockQueryResult: QueryResult<MaxPowerEntity[]> = {
+ data: maxPowerData,
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await emas.getMaxPowerByDate(2021, 11)
+ expect(result).toEqual(maxPowerData)
+ })
+})
diff --git a/src/services/enedisMonthlyAnalysisData.service.ts b/src/services/enedisMonthlyAnalysisData.service.ts
new file mode 100644
index 000000000..dbb828bdb
--- /dev/null
+++ b/src/services/enedisMonthlyAnalysisData.service.ts
@@ -0,0 +1,158 @@
+import { Client, QueryDefinition, QueryResult, Q } from 'cozy-client'
+
+import {
+ ENEDIS_MAXPOWER_DOCTYPE,
+ ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
+} from 'doctypes'
+import { DateTime } from 'luxon'
+import { Dataload } from 'models'
+import {
+ AggregatedEnedisMonthlyDataloads,
+ EnedisMonthlyAnalysisData,
+} from 'models/enedisMonthlyAnalysis'
+import { MaxPowerEntity } from 'models/maxPower.model'
+
+export default class EnedisMonthlyAnalysisDataService {
+ private readonly _client: Client
+
+ constructor(_client: Client) {
+ this._client = _client
+ }
+
+ /**
+ * Retrieve all exploration entities from db
+ * @returns {EnedisMonthlyAnalysisData[]}
+ */
+ public async getAllEnedisMonthlyAnalysisData(): Promise<
+ EnedisMonthlyAnalysisData[]
+ > {
+ const query: QueryDefinition = Q(ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE)
+ const {
+ data: enedisMonthlyAnalysisData,
+ }: QueryResult<EnedisMonthlyAnalysisData[]> = await this._client.query(
+ query
+ )
+ return enedisMonthlyAnalysisData
+ }
+
+ /**
+ * getLastEnedisMonthlyAnalysis
+ * @param {Client} client
+ * @returns {Promise<EnedisMonthlyAnalysisData[]>}
+ */
+ public async getLastEnedisMonthlyAnalysis(): Promise<
+ EnedisMonthlyAnalysisData[]
+ > {
+ const query: QueryDefinition = Q(ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE)
+ .where({})
+ .sortBy([{ year: 'desc' }, { month: 'desc' }])
+ .limitBy(1)
+ const data = await this._client.query(query)
+ return data.data
+ }
+
+ /**
+ * Aggregates Enedis Analysis data in order to create Dataload inhjectable in graph component
+ * @param {EnedisMonthlyAnalysisData} data
+ * @returns {AggregatedEnedisMonthlyDataloads}
+ */
+ public aggregateValuesToDataLoad = (
+ data: EnedisMonthlyAnalysisData
+ ): AggregatedEnedisMonthlyDataloads => {
+ const dataLoadWeekDays: Dataload[] = []
+ const dataLoadWeekEndDays: Dataload[] = []
+ data.weekDaysHalfHourAverageValues.forEach((value, index) => {
+ dataLoadWeekDays.push({
+ value: value,
+ valueDetail: null,
+ date: DateTime.fromObject({
+ year: data.year,
+ month: data.month,
+ minute: 0,
+ })
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .plus({ minute: 30 * index }),
+ })
+ })
+ data.weekEndDaysHalfHourAverageValues.forEach((value, index) => {
+ dataLoadWeekEndDays.push({
+ value: value,
+ valueDetail: null,
+ date: DateTime.fromObject({
+ year: data.year,
+ month: data.month,
+ minute: 0,
+ })
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .plus({ minute: 30 * index }),
+ })
+ })
+ return {
+ week: dataLoadWeekDays,
+ weekend: dataLoadWeekEndDays,
+ }
+ }
+
+ /**
+ * Get an enedis monthly analysis for given month and year
+ * @param {number} year
+ * @param {number} month
+ * @returns {Promise<EnedisMonthlyAnalysisData[]>}
+ */
+ public async getEnedisMonthlyAnalysisByDate(
+ year: number,
+ month: number
+ ): Promise<EnedisMonthlyAnalysisData[]> {
+ const query: QueryDefinition = Q(ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE)
+ .where({ year: year, month: month })
+ .sortBy([{ year: 'desc' }, { month: 'desc' }])
+ .limitBy(1)
+ const data = await this._client.query(query)
+
+ return data.data
+ }
+
+ /**
+ * Creates a new EnedisMonthlyAnalysis
+ * @param {EnedisMonthlyAnalysisData} newEnedisMonthlyAnalysisData
+ * @returns {Promise<EnedisMonthlyAnalysisData | null>}
+ */
+ public async createEnedisMonthlyAnalysisData(
+ newEnedisMonthlyAnalysisData: EnedisMonthlyAnalysisData
+ ): Promise<EnedisMonthlyAnalysisData | null> {
+ try {
+ const {
+ data: EnedisMonthlyAnalysis,
+ }: QueryResult<EnedisMonthlyAnalysisData> = await this._client.create(
+ ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
+ newEnedisMonthlyAnalysisData
+ )
+ return EnedisMonthlyAnalysis
+ } catch (error) {
+ console.log('Error creating new EnedisMonthlyAnalysis: ', error)
+ throw error
+ }
+ }
+
+ /**
+ * Get Max power for a given month and year
+ * @param {number} year
+ * @param {number} month
+ * @returns {Promise<MaxPowerEntity[]>}
+ */
+ public async getMaxPowerByDate(
+ year: number,
+ month: number
+ ): Promise<MaxPowerEntity[]> {
+ const query: QueryDefinition = Q(ENEDIS_MAXPOWER_DOCTYPE)
+ .where({ year: year, month: month })
+ .sortBy([{ year: 'desc' }, { month: 'desc' }])
+ const data = await this._client.query(query)
+
+ return data.data
+ }
+}
diff --git a/src/services/environement.service.spec.ts b/src/services/environement.service.spec.ts
index c59e2c104..3ff3841ee 100644
--- a/src/services/environement.service.spec.ts
+++ b/src/services/environement.service.spec.ts
@@ -1,34 +1,23 @@
-import EnvironementService from './environement.service'
+import EnvironmentService from './environment.service'
describe('Environement service', () => {
- const OLD_ENV = process.env
- beforeEach(() => {
- jest.resetModules() // Most important - it clears the cache
- process.env = { ...OLD_ENV } // Make a copy
- })
-
- afterAll(() => {
- process.env = OLD_ENV // Restore old environment
- })
- const environementService = new EnvironementService()
+ const environmentService = new EnvironmentService()
describe('isProduction method', () => {
- it('should return true', async () => {
- process.env.NODE_ENV = 'production'
- const result = environementService.isProduction()
+ it('should return true and prod url', async () => {
+ global.__IS_ALPHA__ = false
+ const result = environmentService.isProduction()
expect(result).toEqual(true)
+ const url = environmentService.getPublicURL()
+ expect(url).toEqual('https://ecolyo-agent.grandlyon.com')
})
- it('should return false, developement case', async () => {
- process.env.NODE_ENV = 'development'
- const result = environementService.isProduction()
- expect(result).toEqual(false)
- })
-
- it('should return false, non existing case', async () => {
- process.env.NODE_ENV = 'toto'
- const result = environementService.isProduction()
+ it('should return false and rec url, alpha case', async () => {
+ global.__IS_ALPHA__ = true
+ const result = environmentService.isProduction()
expect(result).toEqual(false)
+ const url = environmentService.getPublicURL()
+ expect(url).toEqual('https://ecolyo-agent-rec.grandlyon.com')
})
})
})
diff --git a/src/services/environement.service.ts b/src/services/environment.service.ts
similarity index 50%
rename from src/services/environement.service.ts
rename to src/services/environment.service.ts
index ada633c3a..0fb89f8f4 100644
--- a/src/services/environement.service.ts
+++ b/src/services/environment.service.ts
@@ -1,16 +1,21 @@
-export default class EnvironementService {
- private getEnvironement() {
- return process.env.NODE_ENV
+declare const __IS_ALPHA__: boolean
+
+export default class EnvironmentService {
+ private isAlpha() {
+ if (__IS_ALPHA__) {
+ return __IS_ALPHA__
+ }
+ return false
}
public isProduction() {
- if (this.getEnvironement() === 'production') {
+ if (!this.isAlpha()) {
return true
}
return false
}
public getPublicURL() {
- if (this.getEnvironement() === 'production') {
+ if (!this.isAlpha()) {
return 'https://ecolyo-agent.grandlyon.com'
} else {
return 'https://ecolyo-agent-rec.grandlyon.com'
diff --git a/src/services/fluid.service.spec.ts b/src/services/fluid.service.spec.ts
index 05995a31c..fe9caea0a 100644
--- a/src/services/fluid.service.spec.ts
+++ b/src/services/fluid.service.spec.ts
@@ -7,6 +7,10 @@ import { triggerStateData } from '../../tests/__mocks__/triggerStateData.mock'
import { DateTime } from 'luxon'
import { FluidState, FluidType } from 'enum/fluid.enum'
import { FluidStatus } from 'models'
+import {
+ mockPartnersInfoActivated,
+ mockPartnersInfoDisabled,
+} from '../../tests/__mocks__/fluidStatusData.mock'
const mockGetAccountByType = jest.fn()
jest.mock('./account.service', () => {
@@ -651,5 +655,151 @@ describe('FLuid service', () => {
const result: FluidType[] = await FluidService.getOldFluidData([])
expect(result).toEqual([])
})
+ it('should return the fluids concerned by partnerIssue', async () => {
+ const mockFluidStatus: FluidStatus[] = [
+ {
+ fluidType: FluidType.ELECTRICITY,
+ status: FluidState.PARTNER_ISSUE,
+ lastDataDate: DateTime.fromISO('2020-01-01').setZone('utc', {
+ keepLocalTime: true,
+ }),
+ connection: {
+ konnector: konnectorsData[0],
+ account: accountsData[0],
+ trigger: triggersData[0],
+ triggerState: triggerStateData,
+ shouldLaunchKonnector: false,
+ isUpdating: false,
+ konnectorConfig: {
+ name: 'Enedis',
+ oauth: true,
+ slug: 'enedisgrandlyon',
+ siteLink: 'https://mon-compte-client.enedis.fr/',
+ activation: 'https://mon-compte-particulier.enedis.fr/donnees/',
+ },
+ },
+ },
+ {
+ fluidType: FluidType.WATER,
+ status: FluidState.ERROR_LOGIN_FAILED,
+ lastDataDate: DateTime.fromISO('2020-01-01').setZone('utc', {
+ keepLocalTime: true,
+ }),
+ connection: {
+ konnector: konnectorsData[0],
+ account: accountsData[0],
+ trigger: triggersData[0],
+ triggerState: triggerStateData,
+ shouldLaunchKonnector: false,
+ isUpdating: false,
+ konnectorConfig: {
+ name: 'Eau du Grand Lyon',
+ oauth: true,
+ slug: 'eglgrandlyon',
+ siteLink: '',
+ activation: '',
+ },
+ },
+ },
+ ]
+ const result: FluidType[] = await fluidService.getFluidsConcernedByPartnerIssue(
+ mockFluidStatus
+ )
+ expect(result).toEqual([FluidType.ELECTRICITY])
+ })
+ it('should return the fluids concerned by partnerIssue', async () => {
+ const mockFluidStatus: FluidStatus[] = [
+ {
+ fluidType: FluidType.ELECTRICITY,
+ status: FluidState.PARTNER_ISSUE,
+ lastDataDate: DateTime.fromISO('2020-01-01').setZone('utc', {
+ keepLocalTime: true,
+ }),
+ connection: {
+ konnector: konnectorsData[0],
+ account: accountsData[0],
+ trigger: triggersData[0],
+ triggerState: triggerStateData,
+ shouldLaunchKonnector: false,
+ isUpdating: false,
+ konnectorConfig: {
+ name: 'Enedis',
+ oauth: true,
+ slug: 'enedisgrandlyon',
+ siteLink: 'https://mon-compte-client.enedis.fr/',
+ activation: 'https://mon-compte-particulier.enedis.fr/donnees/',
+ },
+ },
+ },
+ {
+ fluidType: FluidType.WATER,
+ status: FluidState.ERROR_LOGIN_FAILED,
+ lastDataDate: DateTime.fromISO('2020-01-01').setZone('utc', {
+ keepLocalTime: true,
+ }),
+ connection: {
+ konnector: konnectorsData[0],
+ account: accountsData[0],
+ trigger: triggersData[0],
+ triggerState: triggerStateData,
+ shouldLaunchKonnector: false,
+ isUpdating: false,
+ konnectorConfig: {
+ name: 'Eau du Grand Lyon',
+ oauth: true,
+ slug: 'eglgrandlyon',
+ siteLink: '',
+ activation: '',
+ },
+ },
+ },
+ {
+ fluidType: FluidType.GAS,
+ status: FluidState.ERROR_LOGIN_FAILED,
+ lastDataDate: DateTime.fromISO('2020-01-01').setZone('utc', {
+ keepLocalTime: true,
+ }),
+ connection: {
+ konnector: konnectorsData[0],
+ account: accountsData[0],
+ trigger: triggersData[0],
+ triggerState: triggerStateData,
+ shouldLaunchKonnector: false,
+ isUpdating: false,
+ konnectorConfig: {
+ name: 'GRDF',
+ oauth: true,
+ slug: 'grdfgrandlyon',
+ siteLink: '',
+ activation: '',
+ },
+ },
+ },
+ ]
+ const result: boolean = fluidService.isFluidInPartnerIssue(
+ FluidType.ELECTRICITY,
+ mockFluidStatus[FluidType.ELECTRICITY].status,
+ mockPartnersInfoActivated
+ )
+ expect(result).toEqual(true)
+ const result2: boolean = fluidService.isFluidInPartnerIssue(
+ FluidType.WATER,
+ FluidState.PARTNER_ISSUE,
+ mockPartnersInfoActivated
+ )
+ expect(result2).toEqual(true)
+ const result3: boolean = fluidService.isFluidInPartnerIssue(
+ FluidType.GAS,
+ FluidState.PARTNER_ISSUE,
+ mockPartnersInfoActivated
+ )
+ expect(result3).toEqual(true)
+ const result4: boolean = fluidService.isFluidInPartnerIssue(
+ FluidType.GAS,
+ FluidState.PARTNER_ISSUE,
+ mockPartnersInfoDisabled
+ )
+ expect(result4).toEqual(false)
+ })
})
})
diff --git a/src/services/fluid.service.ts b/src/services/fluid.service.ts
index c31603038..b23c492a3 100644
--- a/src/services/fluid.service.ts
+++ b/src/services/fluid.service.ts
@@ -8,6 +8,7 @@ import ConsumptionService from 'services/consumption.service'
import AccountService from 'services/account.service'
import TriggerService from 'services/triggers.service'
import { DateTime } from 'luxon'
+import { PartnersInfo } from 'models/partnersInfo.model'
export default class FluidService {
private _client: Client
@@ -40,7 +41,53 @@ export default class FluidService {
}
}
- public getFluidStatus = async (): Promise<FluidStatus[]> => {
+ public isFluidInPartnerIssue = (
+ fluidType: FluidType,
+ fluidState: FluidState,
+ partnersInfo: PartnersInfo
+ ) => {
+ if (
+ fluidType === FluidType.GAS &&
+ partnersInfo.grdf_failure &&
+ fluidState !== FluidState.NOT_CONNECTED &&
+ fluidState !== FluidState.KONNECTOR_NOT_FOUND
+ ) {
+ return true
+ }
+ if (
+ fluidType === FluidType.ELECTRICITY &&
+ partnersInfo.enedis_failure &&
+ fluidState !== FluidState.NOT_CONNECTED &&
+ fluidState !== FluidState.KONNECTOR_NOT_FOUND
+ ) {
+ return true
+ }
+ if (
+ fluidType === FluidType.WATER &&
+ partnersInfo.egl_failure &&
+ fluidState !== FluidState.NOT_CONNECTED &&
+ fluidState !== FluidState.KONNECTOR_NOT_FOUND
+ ) {
+ return true
+ }
+ return false
+ }
+
+ public getFluidsConcernedByPartnerIssue = async (
+ statusArray: FluidStatus[]
+ ): Promise<FluidType[]> => {
+ const concernedFluids: FluidType[] = []
+ statusArray.forEach(fluid => {
+ if (fluid.status === FluidState.PARTNER_ISSUE) {
+ concernedFluids.push(fluid.fluidType)
+ }
+ })
+ return concernedFluids
+ }
+
+ public getFluidStatus = async (
+ partnersInfo?: PartnersInfo
+ ): Promise<FluidStatus[]> => {
const fluidConfig = new ConfigService().getFluidConfig()
const accountService = new AccountService(this._client)
const [
@@ -107,7 +154,16 @@ export default class FluidService {
const result: FluidStatus[] = [
{
fluidType: FluidType.ELECTRICITY,
- status: this.parseFluidStatus(elecKonnector, elecStatus),
+ status:
+ partnersInfo &&
+ partnersInfo.notification_activated &&
+ this.isFluidInPartnerIssue(
+ FluidType.ELECTRICITY,
+ this.parseFluidStatus(elecKonnector, elecStatus),
+ partnersInfo
+ )
+ ? FluidState.PARTNER_ISSUE
+ : this.parseFluidStatus(elecKonnector, elecStatus),
lastDataDate: lastDataDates[FluidType.ELECTRICITY],
connection: {
shouldLaunchKonnector: false,
@@ -121,7 +177,16 @@ export default class FluidService {
},
{
fluidType: FluidType.WATER,
- status: this.parseFluidStatus(waterKonnector, waterStatus),
+ status:
+ partnersInfo &&
+ partnersInfo.notification_activated &&
+ this.isFluidInPartnerIssue(
+ FluidType.WATER,
+ this.parseFluidStatus(waterKonnector, waterStatus),
+ partnersInfo
+ )
+ ? FluidState.PARTNER_ISSUE
+ : this.parseFluidStatus(waterKonnector, waterStatus),
lastDataDate: lastDataDates[FluidType.WATER],
connection: {
shouldLaunchKonnector: false,
@@ -135,7 +200,16 @@ export default class FluidService {
},
{
fluidType: FluidType.GAS,
- status: this.parseFluidStatus(gasKonnector, gasStatus),
+ status:
+ partnersInfo &&
+ partnersInfo.notification_activated &&
+ this.isFluidInPartnerIssue(
+ FluidType.GAS,
+ this.parseFluidStatus(gasKonnector, gasStatus),
+ partnersInfo
+ )
+ ? FluidState.PARTNER_ISSUE
+ : this.parseFluidStatus(gasKonnector, gasStatus),
lastDataDate: lastDataDates[FluidType.GAS],
connection: {
shouldLaunchKonnector: false,
diff --git a/src/services/fluidsPrices.service.spec.ts b/src/services/fluidsPrices.service.spec.ts
new file mode 100644
index 000000000..a146ffba2
--- /dev/null
+++ b/src/services/fluidsPrices.service.spec.ts
@@ -0,0 +1,63 @@
+import FluidPricesService from './fluidsPrices.service'
+import mockClient from '../../tests/__mocks__/client'
+import { QueryResult } from 'cozy-client'
+import { FluidPrice } from 'models'
+import { fluidPrices } from '../../tests/__mocks__/fluidPrice.mock'
+import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
+
+describe('FluidPrices service', () => {
+ const fluidPricesService = new FluidPricesService(mockClient)
+
+ describe('Fluid Prices - getAllPrices', () => {
+ it('should getAllPrices', async () => {
+ const mockQueryResult: QueryResult<FluidPrice[]> = {
+ data: fluidPrices,
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const prices = await fluidPricesService.getAllPrices()
+ expect(prices).toBe(fluidPrices)
+ expect(mockClient.query).toBeCalled()
+ })
+ })
+
+ describe('Fluid Prices - getPrices', () => {
+ it('should getPrices for elec', async () => {
+ const mockQueryResult: QueryResult<FluidPrice[]> = {
+ data: [fluidPrices[0]],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const prices = await fluidPricesService.getPrices(
+ FluidType.ELECTRICITY,
+ DateTime.fromISO('2021-01-01T00:00:00.000Z', {
+ zone: 'utc',
+ })
+ )
+ expect(prices).toBe(fluidPrices[0])
+ expect(mockClient.query).toBeCalled()
+ })
+ it('should getPrices for gas', async () => {
+ const mockQueryResult: QueryResult<FluidPrice[]> = {
+ data: [fluidPrices[3]],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const prices = await fluidPricesService.getPrices(
+ FluidType.GAS,
+ DateTime.fromISO('2021-10-11T00:00:00.000Z', {
+ zone: 'utc',
+ })
+ )
+ expect(prices).toBe(fluidPrices[3])
+ expect(mockClient.query).toBeCalled()
+ })
+ })
+})
diff --git a/src/services/fluidsPrices.service.ts b/src/services/fluidsPrices.service.ts
new file mode 100644
index 000000000..30a8e354f
--- /dev/null
+++ b/src/services/fluidsPrices.service.ts
@@ -0,0 +1,46 @@
+import { Q, Client, QueryDefinition, QueryResult } from 'cozy-client'
+import { FLUIDPRICES_DOCTYPE } from 'doctypes'
+import { FluidType } from 'enum/fluid.enum'
+import { DateTime } from 'luxon'
+import { FluidPrice } from 'models'
+
+export default class FluidPricesService {
+ private readonly _client: Client
+
+ constructor(_client: Client) {
+ this._client = _client
+ }
+
+ /**
+ * Get all prices available in database
+ * @returns {FluidPrice[]}
+ */
+ public async getAllPrices(): Promise<FluidPrice[]> {
+ const query: QueryDefinition = Q(FLUIDPRICES_DOCTYPE)
+ const {
+ data: fluidsPrices,
+ }: QueryResult<FluidPrice[]> = await this._client.query(query)
+ return fluidsPrices
+ }
+
+ /**
+ * Get a price according to a fluidType and a data. This method return the nearest and valid price for the given date.
+ * @param {FluidType} fluidType
+ * @param {DateTime} date
+ * @returns {FluidPrice}
+ */
+ public async getPrices(
+ fluidType: FluidType,
+ date: DateTime
+ ): Promise<FluidPrice> {
+ const query: QueryDefinition = Q(FLUIDPRICES_DOCTYPE)
+ .where({ startDate: { $lt: date.toString() }, fluidType })
+ .sortBy([{ startDate: 'desc' }])
+ .limitBy(1)
+
+ const {
+ data: fluidsPrices,
+ }: QueryResult<FluidPrice[]> = await this._client.query(query)
+ return fluidsPrices[0]
+ }
+}
diff --git a/src/services/initialization.service.spec.ts b/src/services/initialization.service.spec.ts
index 5ef38662a..a79575e9f 100644
--- a/src/services/initialization.service.spec.ts
+++ b/src/services/initialization.service.spec.ts
@@ -22,6 +22,10 @@ import { allChallengeEntityData } from '../../tests/__mocks__/challengeEntity.mo
import { allDuelEntity } from '../../tests/__mocks__/duelData.mock'
import { allQuizEntities } from '../../tests/__mocks__/quizData.mock'
import { allExplorationEntities } from '../../tests/__mocks__/explorationData.mock'
+import {
+ mockOutdatedTerm,
+ mockUpToDateTerm,
+} from '../../tests/__mocks__/termsData.mock'
const mockCreateIndexKonnector = jest.fn()
jest.mock('./konnector.service', () => {
@@ -133,11 +137,15 @@ jest.mock('./fluid.service', () => {
const mockIsConsentVersionUpToDate = jest.fn()
const mockIsLastTermValidated = jest.fn()
+const mockGetTermsVersionType = jest.fn()
+const mockGetLastTerm = jest.fn()
jest.mock('./terms.service', () => {
return jest.fn(() => {
return {
isConsentVersionUpToDate: mockIsConsentVersionUpToDate,
isLastTermValidated: mockIsLastTermValidated,
+ getTermsVersionType: mockGetTermsVersionType,
+ getLastTerm: mockGetLastTerm,
}
})
})
@@ -894,12 +902,20 @@ describe('Initialization service', () => {
it('should not show consent page', async () => {
mockIsConsentVersionUpToDate.mockResolvedValueOnce(true)
mockIsLastTermValidated.mockResolvedValueOnce(true)
- await expect(initializationService.initConsent()).resolves.toEqual(true)
+ mockGetLastTerm.mockResolvedValueOnce(mockUpToDateTerm)
+ await expect(initializationService.initConsent()).resolves.toEqual({
+ accepted: true,
+ versionType: 'init',
+ })
})
it('should show consent page', async () => {
mockIsConsentVersionUpToDate.mockResolvedValueOnce(false)
mockIsLastTermValidated.mockResolvedValueOnce(false)
- await expect(initializationService.initConsent()).resolves.toEqual(false)
+ mockGetLastTerm.mockResolvedValueOnce(mockOutdatedTerm)
+ await expect(initializationService.initConsent()).resolves.toEqual({
+ accepted: false,
+ versionType: 'major',
+ })
})
it('should throw an error when it fails to checks for consent', async () => {
mockIsConsentVersionUpToDate.mockRejectedValueOnce(new Error())
diff --git a/src/services/initialization.service.ts b/src/services/initialization.service.ts
index dcee9ea98..e01aae8ad 100644
--- a/src/services/initialization.service.ts
+++ b/src/services/initialization.service.ts
@@ -2,7 +2,6 @@ import { Client, Q, QueryDefinition } from 'cozy-client'
import {
ECOGESTURE_DOCTYPE,
PROFILE_DOCTYPE,
- PROFILETYPE_DOCTYPE,
EGL_DAY_DOCTYPE,
EGL_MONTH_DOCTYPE,
EGL_YEAR_DOCTYPE,
@@ -25,6 +24,7 @@ import {
FluidStatus,
Profile,
ProfileType,
+ TermsStatus,
UserChallenge,
} from 'models'
@@ -648,28 +648,48 @@ export default class InitializationService {
throw error
}
}
- public async initConsent(): Promise<boolean> {
- let isLastTermAccepted = false
+ public async initConsent(): Promise<TermsStatus> {
+ const termsStatus: TermsStatus = {
+ accepted: false,
+ versionType: 'init',
+ }
try {
const termService = new TermsService(this._client)
const isUpToDate = await termService.isConsentVersionUpToDate()
-
- if (isUpToDate) {
- const isLastConsentValidated = await termService.isLastTermValidated()
- if (isLastConsentValidated) {
- isLastTermAccepted = true
- log.info(
- '[Initialization] Last Consent successfully loaded and valid'
- )
+ const lastTerm = await termService.getLastTerm()
+ if (lastTerm) {
+ if (isUpToDate) {
+ const isLastConsentValidated = await termService.isLastTermValidated()
+ if (isLastConsentValidated) {
+ termsStatus.accepted = true
+ termsStatus.versionType = 'init'
+ log.info(
+ '[Initialization] Last Consent successfully loaded and valid'
+ )
+ } else {
+ termsStatus.versionType = 'init'
+ termsStatus.accepted = false
+ log.info('[Initialization] Consent not up-to-date')
+ }
} else {
- isLastTermAccepted = false
- log.info('[Initialization] New Consent to Validate')
+ const versionType = await termService.getTermsVersionType()
+ if (versionType === 'minor') {
+ termsStatus.accepted = false
+ termsStatus.versionType = 'minor'
+ log.info('[Initialization] Minor Terms update detected')
+ } else {
+ termsStatus.accepted = false
+ termsStatus.versionType = 'major'
+ log.info('[Initialization] Major Terms update detected')
+ }
}
} else {
- isLastTermAccepted = false
- log.info('[Initialization] New Consent to Validate')
+ termsStatus.accepted = false
+ termsStatus.versionType = 'init'
+ log.info('[Initialization] Init first terms')
}
- return isLastTermAccepted
+
+ return termsStatus
} catch (error) {
log.error('Initialization error - initConsent: ', error)
throw error
diff --git a/src/services/partnersInfo.service.spec.ts b/src/services/partnersInfo.service.spec.ts
new file mode 100644
index 000000000..f96b94fb4
--- /dev/null
+++ b/src/services/partnersInfo.service.spec.ts
@@ -0,0 +1,28 @@
+import { PartnersInfo } from 'models/partnersInfo.model'
+import mockClient from '../../tests/__mocks__/client'
+import PartnersInfoService from './partnersInfo.service'
+
+jest.mock('services/environment.service', () => {
+ return jest.fn(() => {
+ return {
+ isProduction: () => true,
+ }
+ })
+})
+
+describe('PartnersInfo service', () => {
+ const partnersInfoService = new PartnersInfoService(mockClient)
+
+ it('should return partnersInfo', async () => {
+ const result: PartnersInfo = await partnersInfoService.getPartnersInfo()
+ expect(result).toEqual(undefined)
+ })
+ it('should return an error', async () => {
+ mockClient.query.mockRejectedValue(new Error())
+ try {
+ await partnersInfoService.getPartnersInfo()
+ } catch (error) {
+ expect(error).rejects.toThrow(new Error())
+ }
+ })
+})
diff --git a/src/services/partnersInfo.service.ts b/src/services/partnersInfo.service.ts
new file mode 100644
index 000000000..2ac011189
--- /dev/null
+++ b/src/services/partnersInfo.service.ts
@@ -0,0 +1,32 @@
+import { Client } from 'cozy-client'
+import { PartnersInfo } from 'models/partnersInfo.model'
+import EnvironmentService from './environment.service'
+
+export default class PartnersInfoService {
+ private readonly _client: Client
+
+ constructor(_client: Client) {
+ this._client = _client
+ }
+
+ /*
+ * Get information from backoffice about the status of partners' service
+ * On success, respond the partnersInfo
+ * Else, throw an error
+ */
+ public async getPartnersInfo(): Promise<PartnersInfo> {
+ const env = new EnvironmentService()
+ const remoteUrl = env.isProduction()
+ ? `/remote/org.ecolyo.backoffice.partners.info`
+ : `/remote/org.ecolyo.backoffice.partners.info.rec`
+ try {
+ const result = await this._client
+ .getStackClient()
+ .fetchJSON('GET', remoteUrl)
+ return result as PartnersInfo
+ } catch (error) {
+ console.error(error)
+ throw new Error("Failed to get partners' info")
+ }
+ }
+}
diff --git a/src/services/performanceIndicator.service.ts b/src/services/performanceIndicator.service.ts
index 59a0143c3..63ce89456 100644
--- a/src/services/performanceIndicator.service.ts
+++ b/src/services/performanceIndicator.service.ts
@@ -17,7 +17,11 @@ export default class PerformanceIndicatorService {
const performanceIndicator = performanceIndicators[key]
const fluidType = parseInt(key)
currentValue += performanceIndicator.value
- ? converterService.LoadToEuro(performanceIndicator.value, fluidType)
+ ? converterService.LoadToEuro(
+ performanceIndicator.value,
+ fluidType,
+ performanceIndicator ? performanceIndicator.price : null
+ )
: 0
}
if (
@@ -33,7 +37,8 @@ export default class PerformanceIndicatorService {
compareValue += performanceIndicator.compareValue
? converterService.LoadToEuro(
performanceIndicator.compareValue,
- fluidType
+ fluidType,
+ performanceIndicator ? performanceIndicator.price : null
)
: 0
}
@@ -47,7 +52,11 @@ export default class PerformanceIndicatorService {
const performanceIndicator = performanceIndicators[key]
const fluidType = parseInt(key)
currentValue += performanceIndicator.value
- ? converterService.LoadToEuro(performanceIndicator.value, fluidType)
+ ? converterService.LoadToEuro(
+ performanceIndicator.value,
+ fluidType,
+ performanceIndicator ? performanceIndicator.price : null
+ )
: 0
}
}
@@ -60,7 +69,8 @@ export default class PerformanceIndicatorService {
compareValue += performanceIndicator.compareValue
? converterService.LoadToEuro(
performanceIndicator.compareValue,
- fluidType
+ fluidType,
+ performanceIndicator ? performanceIndicator.price : null
)
: 0
}
diff --git a/src/services/profile.service.spec.ts b/src/services/profile.service.spec.ts
index 55d223e9e..5cb4f6d59 100644
--- a/src/services/profile.service.spec.ts
+++ b/src/services/profile.service.spec.ts
@@ -62,6 +62,7 @@ describe('UserProfile service', () => {
const userProfile = {
...profileData,
monthlyAnalysisDate: '2020-11-03T00:00:00.000Z',
+ partnersIssueDate: '2020-11-03T00:00:00.000Z',
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const mockQueryResult: QueryResult<any[]> = {
@@ -88,6 +89,9 @@ describe('UserProfile service', () => {
monthlyAnalysisDate: DateTime.fromISO('2020-11-03T00:00:00.000Z', {
zone: 'utc',
}),
+ partnersIssueDate: DateTime.fromISO('2020-11-03T00:00:00.000Z', {
+ zone: 'utc',
+ }),
haveSeenLastAnalysis: false,
}
const result = await profileService.updateProfile({
diff --git a/src/services/profile.service.ts b/src/services/profile.service.ts
index 3ea5d3a83..0f2629456 100644
--- a/src/services/profile.service.ts
+++ b/src/services/profile.service.ts
@@ -26,6 +26,9 @@ export default class ProfileService {
lastConnectionDate: DateTime.fromISO(profileEntity.lastConnectionDate, {
zone: 'utc',
}),
+ partnersIssueDate: DateTime.fromISO(profileEntity.partnersIssueDate, {
+ zone: 'utc',
+ }),
}
return profile
}
diff --git a/src/services/profileTypeEntity.service.ts b/src/services/profileTypeEntity.service.ts
index a60765b6b..f736f6a17 100644
--- a/src/services/profileTypeEntity.service.ts
+++ b/src/services/profileTypeEntity.service.ts
@@ -13,9 +13,9 @@ export default class ProfileTypeEntityService {
}
/**
- * Retrieve ProfileType from the PROFILETYPE_DOCTYPE
- * When called with date parameter, fetch closest profileType to the date
- * When called without parameters, fetch last profileType in doctype
+ * Retrieves ProfileType from the PROFILETYPE_DOCTYPE
+ * When called with date parameter, fetches closest profileType to the date
+ * When called without parameters, fetches last profileType in doctype
* @param {DateTime} date
* @returns {ProfileType}
*/
@@ -75,10 +75,10 @@ export default class ProfileTypeEntityService {
}
/**
- * Retrieve all ProfileTypes from the PROFILETYPE_DOCTYPE
- * When called with period parameter, return all profileTypes found for this period or null
- * When called without parameters, return all profileTypes or null if none exist
- * @param {DateTime} date
+ * Retrieves all ProfileTypes from the PROFILETYPE_DOCTYPE
+ * When called with period parameter, returns all profileTypes found for this period or null
+ * When called without parameters, returns all profileTypes or null if none exist
+ * @param {TimePeriod} timePeriod
* @returns {ProfileType}
*/
public async getAllProfileTypes(
@@ -89,7 +89,9 @@ export default class ProfileTypeEntityService {
const data: QueryResult<ProfileType[]> = await this._client.query(
query
.where({
- updateDate: { $gte: timePeriod.startDate.toString() },
+ updateDate: {
+ $gte: timePeriod.startDate.toString(),
+ },
})
.sortBy([{ updateDate: 'asc' }])
.limitBy(100)
@@ -122,6 +124,10 @@ export default class ProfileTypeEntityService {
return null
}
+ /**
+ * Saves profileType in database
+ * @returns {ProfileType}
+ */
public async updateProfileType(
attributes: Partial<ProfileType>
): Promise<ProfileType | null> {
@@ -142,7 +148,7 @@ export default class ProfileTypeEntityService {
}
/**
- * Delete Array of ProfileTypes
+ * Deletes Array of ProfileTypes
* @returns {boolean}
*/
public async deleteProfileTypes(
@@ -159,7 +165,7 @@ export default class ProfileTypeEntityService {
}
/**
- * Retrieve Profile from the ProfileEntity
+ * Retrieves ProfileType from the ProfileTypeEntity
* @param {ProfileType} profileTypeEntity
* @returns {ProfileType}
*/
diff --git a/src/services/queryRunner.service.spec.ts b/src/services/queryRunner.service.spec.ts
index 4ce211146..9c6d35c3d 100644
--- a/src/services/queryRunner.service.spec.ts
+++ b/src/services/queryRunner.service.spec.ts
@@ -123,6 +123,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 25.25,
+ price: 0.12,
valueDetail: null,
},
{
@@ -130,6 +131,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -137,6 +139,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -144,6 +147,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -177,6 +181,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -184,6 +189,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -191,6 +197,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -382,6 +389,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 25.25,
+ price: 0.12,
valueDetail: null,
},
{
@@ -389,6 +397,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -396,6 +405,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -403,6 +413,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -436,6 +447,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -443,6 +455,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -450,6 +463,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -483,6 +497,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 25.25,
+ price: 0.12,
valueDetail: null,
},
{
@@ -490,6 +505,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -497,6 +513,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -504,6 +521,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -630,6 +648,7 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-01T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.12,
value: 25.25,
valueDetail: null,
},
@@ -637,6 +656,7 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-02T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.14,
value: 20.5,
valueDetail: null,
},
@@ -644,6 +664,7 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-03T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.18,
value: 30.33,
valueDetail: null,
},
@@ -652,6 +673,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -685,6 +707,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -692,12 +715,14 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
date: DateTime.fromISO('2020-11-04T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.16,
value: 1.22,
valueDetail: null,
},
@@ -731,6 +756,7 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-01T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.12,
value: 25.25,
valueDetail: null,
},
@@ -739,6 +765,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -746,6 +773,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -753,6 +781,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -872,6 +901,7 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-01T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.12,
value: 25.25,
valueDetail: null,
},
@@ -880,6 +910,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -887,6 +918,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -894,6 +926,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -926,6 +959,7 @@ describe('queryRunner service', () => {
date: DateTime.fromISO('2020-11-01T00:00:00.000Z', {
zone: 'utc',
}),
+ price: 0.12,
value: 25.25,
valueDetail: null,
},
@@ -934,6 +968,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 20.5,
+ price: 0.14,
valueDetail: null,
},
{
@@ -941,6 +976,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 30.33,
+ price: 0.18,
valueDetail: null,
},
{
@@ -948,6 +984,7 @@ describe('queryRunner service', () => {
zone: 'utc',
}),
value: 1.22,
+ price: 0.16,
valueDetail: null,
},
]
@@ -1227,4 +1264,31 @@ describe('queryRunner service', () => {
expect(result).toBeNull()
})
})
+
+ describe('fetchFluidData method', () => {
+ it('should return the data of the elec fluid and year time step', async () => {
+ const mockTimePeriod = {
+ startDate: DateTime.fromISO('2018-01-01T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ endDate: DateTime.fromISO('2020-11-30T23:59:59.999Z', {
+ zone: 'utc',
+ }),
+ }
+ const mockQueryResult: QueryResult<DataloadEntity[]> = {
+ data: loadYearData,
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValue(mockQueryResult)
+ const result: QueryResult<any> = await queryRunner.fetchFluidRawDoctype(
+ mockTimePeriod,
+ TimeStep.YEAR,
+ FluidType.ELECTRICITY
+ )
+ expect(result).toEqual(mockQueryResult)
+ expect(result.data.length).toEqual(3)
+ })
+ })
})
diff --git a/src/services/queryRunner.service.ts b/src/services/queryRunner.service.ts
index 6dfc2a187..f9733ef3d 100644
--- a/src/services/queryRunner.service.ts
+++ b/src/services/queryRunner.service.ts
@@ -17,6 +17,8 @@ import {
import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import { Dataload, TimePeriod } from 'models'
+import { QueryResult } from 'cozy-client/types/types'
+import log from 'utils/logger'
export default class QueryRunner {
// TODO to be clean up
@@ -110,6 +112,7 @@ export default class QueryRunner {
} catch (error) {
// log stuff
// throw new Error('Fetch data failed in query runner')
+ log.error('QueryRunner error: ', error)
}
return result
}
@@ -143,6 +146,7 @@ export default class QueryRunner {
keepLocalTime: true,
}),
value: entry.load,
+ price: entry.price,
valueDetail: null,
}))
@@ -329,6 +333,7 @@ export default class QueryRunner {
this._max_limit
)
const result = await this.fetchData(query)
+
if (result && result.data) {
const filteredResult = this.filterDataList(result, timePeriod)
const mappedResult: Dataload[] = this.mapDataList(filteredResult)
@@ -337,6 +342,20 @@ export default class QueryRunner {
return null
}
+ public async fetchFluidRawDoctype(
+ timePeriod: TimePeriod,
+ timeStep: TimeStep,
+ fluidType: FluidType
+ ): Promise<QueryResult> {
+ const query: QueryDefinition = this.buildListQuery(
+ timeStep,
+ timePeriod,
+ fluidType,
+ this._max_limit
+ )
+ return this.fetchData(query)
+ }
+
public async fetchFluidMaxData(
maxTimePeriod: TimePeriod,
timeStep: TimeStep,
diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index 8624f3d0f..1749a5edc 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -23,6 +23,8 @@ import {
} from 'enum/userQuiz.enum'
import { shuffle } from 'lodash'
import { formatNumberValues } from 'utils/utils'
+import log from 'utils/logger'
+
export default class QuizService {
private readonly _client: Client
@@ -403,7 +405,9 @@ export default class QuizService {
}
/**
- * Calcul the max load and return the value and the corresponding date
+ * Finds max load on given past time period
+ * when no max load is found looks x month/year back for a max value
+ * if nothing is found fall back on most recent data
* @param timeStep
* @param interval
* @param fluidType
@@ -419,7 +423,7 @@ export default class QuizService {
})
let max = 0
const consumptionService = new ConsumptionDataManager(this._client)
-
+ const limit = { date: interval.startDate, reached: false }
let graphData = await consumptionService.getGraphData(
interval,
timeStep,
@@ -429,8 +433,7 @@ export default class QuizService {
max = Math.max(...graphData.actualData.map(d => d.value))
if (max == -1) {
- const newInterval: TimePeriod = interval
-
+ const newInterval: TimePeriod = { ...interval }
let objectTimeStep: object
switch (timeStep) {
case TimeStep.MONTH:
@@ -442,23 +445,51 @@ export default class QuizService {
default:
objectTimeStep = { week: 1 }
}
-
do {
newInterval.startDate = newInterval.startDate.minus(objectTimeStep)
newInterval.endDate = newInterval.endDate.minus(objectTimeStep)
+ limit.date = newInterval.startDate
graphData = await consumptionService.getGraphData(
- interval,
+ newInterval,
timeStep,
fluidType
)
+ if (limit.date < DateTime.now().minus({ year: 5 })) {
+ limit.reached = true
+ }
+
if (graphData && graphData.actualData) {
max = Math.max(...graphData.actualData.map(d => d.value))
}
- } while (max == -1 && graphData && graphData.actualData)
+ } while (
+ max == -1 &&
+ graphData &&
+ graphData.actualData &&
+ !limit.reached
+ )
+ }
+ if (limit.reached) {
+ const newInterval: TimePeriod = {
+ startDate: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .minus({ year: 1 }),
+ endDate: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('month'),
+ }
+ graphData = await consumptionService.getGraphData(
+ newInterval,
+ timeStep,
+ fluidType
+ )
}
-
if (graphData && graphData.actualData) {
+ max = Math.max(...graphData.actualData.map(d => d.value))
graphData.actualData.forEach(d => {
if (d.value === max) dateMax = d.date
})
@@ -484,6 +515,7 @@ export default class QuizService {
singleFluid: boolean
): Promise<number> {
const consumptionService = new ConsumptionDataManager(this._client)
+ log.info('GetAverageOnGivenPeriod is about to call getgraphdata')
const graphData = await consumptionService.getGraphData(
interval,
timeStep,
diff --git a/src/services/terms.service.spec.ts b/src/services/terms.service.spec.ts
index 316e21062..6eeeba252 100644
--- a/src/services/terms.service.spec.ts
+++ b/src/services/terms.service.spec.ts
@@ -71,6 +71,30 @@ describe('TermsService service', () => {
const result = await termsService.isLastTermValidated()
expect(result).toEqual(false)
})
+ it('should return a major update', async () => {
+ mockUpToDateTerm.accepted = false
+ const mockQueryResult: QueryResult<Term[]> = {
+ data: [mockUpToDateTerm],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await termsService.getTermsVersionType()
+ expect(result).toEqual('major')
+ })
+ it('should return a minor update', async () => {
+ mockUpToDateTerm.accepted = false
+ const mockQueryResult: QueryResult<Term[]> = {
+ data: [mockTermsData[1]],
+ bookmark: '',
+ next: false,
+ skip: 0,
+ }
+ mockClient.query.mockResolvedValueOnce(mockQueryResult)
+ const result = await termsService.getTermsVersionType()
+ expect(result).toEqual('minor')
+ })
it('should create a new term', async () => {
const mockDate = DateTime.fromISO(mockUpToDateTerm.acceptedAt.toString(), {
zone: 'utc',
diff --git a/src/services/terms.service.ts b/src/services/terms.service.ts
index 6d60b19ec..2fea47dfd 100644
--- a/src/services/terms.service.ts
+++ b/src/services/terms.service.ts
@@ -2,7 +2,7 @@ import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
import { TERMS_DOCTYPE } from 'doctypes'
import { DateTime } from 'luxon'
-import { Term } from 'models'
+import { Term, VersionType } from 'models'
import config from '../constants/config.json'
export default class TermsService {
private _client: Client
@@ -50,6 +50,21 @@ export default class TermsService {
else return false
}
+ public async getTermsVersionType(): Promise<VersionType> {
+ const lastTerm = await this.getLastTerm()
+ if (lastTerm) {
+ const splittedLastVersion: string[] = lastTerm.version.split('.')
+ const splittedConfVersion: string[] = config.termsVersion.split('.')
+ if (
+ splittedLastVersion[0] === splittedConfVersion[0] &&
+ (splittedLastVersion[1] !== splittedConfVersion[1] ||
+ splittedLastVersion[2] !== splittedConfVersion[2])
+ ) {
+ return 'minor'
+ } else return 'major'
+ } else return 'init'
+ }
+
/**
* Creates a new term
* @param newTerm
diff --git a/src/services/timePeriod.service.spec.ts b/src/services/timePeriod.service.spec.ts
index 87ce15daf..7cbc14501 100644
--- a/src/services/timePeriod.service.spec.ts
+++ b/src/services/timePeriod.service.spec.ts
@@ -108,18 +108,18 @@ describe('timePeriod service', () => {
let fluidTypes: FluidType[] = [0, 1, 2]
it('should return the offset day in function of the fluid', () => {
let result = timePeriodService.calculateFluidTypesOffset(fluidTypes)
- expect(result).toBe(3)
+ expect(result).toBe(5)
fluidTypes = [0]
result = timePeriodService.calculateFluidTypesOffset(fluidTypes)
- expect(result).toBe(1)
+ expect(result).toBe(3)
fluidTypes = [1]
result = timePeriodService.calculateFluidTypesOffset(fluidTypes)
- expect(result).toBe(3)
+ expect(result).toBe(5)
fluidTypes = [2]
result = timePeriodService.calculateFluidTypesOffset(fluidTypes)
- expect(result).toBe(3)
+ expect(result).toBe(5)
})
})
describe('applyOffsetToDate method', () => {
diff --git a/src/services/usageEvent.service.ts b/src/services/usageEvent.service.ts
index e08967ec0..0d5cb79a9 100644
--- a/src/services/usageEvent.service.ts
+++ b/src/services/usageEvent.service.ts
@@ -91,11 +91,12 @@ export default class UsageEventService {
*/
static async getEvents(
client: Client,
- filterParams: MongoSelector
+ filterParams: MongoSelector,
+ desc = false
): Promise<UsageEvent[]> {
const query: QueryDefinition = Q(USAGEEVENT_DOCTYPE)
.where(filterParams)
- .sortBy([{ eventDate: 'asc' }])
+ .sortBy([{ eventDate: desc ? 'desc' : 'asc' }])
const {
data: usageEventEntities,
}: QueryResult<UsageEventEntity[]> = await client.query(query)
diff --git a/src/store/global/global.actions.ts b/src/store/global/global.actions.ts
index 072b7fddc..ae47957ff 100644
--- a/src/store/global/global.actions.ts
+++ b/src/store/global/global.actions.ts
@@ -1,6 +1,6 @@
import { FluidType } from 'enum/fluid.enum'
import { ScreenType } from 'enum/screen.enum'
-import { FluidConnection, FluidStatus } from 'models'
+import { FluidConnection, FluidStatus, TermsStatus } from 'models'
import { Notes } from 'models/releaseNotes.model'
export const CHANGE_SCREEN_TYPE = 'CHANGE_SCREEN_TYPE'
@@ -15,6 +15,7 @@ export const TOGGLE_ANALYSIS_NOTIFICATION = 'TOGGLE_ANALYSIS_NOTIFICATION'
export const SET_FLUID_STATUS = 'SET_FLUID_STATUS'
export const UPDATE_FLUID_CONNECTION = 'UPDATE_FLUID_CONNECTION'
export const UPDATE_TERMS_VALIDATION = 'UPDATE_TERMS_VALIDATION'
+export const SET_PARTNERS_ISSUE = 'SET_PARTNERS_ISSUE'
interface ChangeScreenType {
type: typeof CHANGE_SCREEN_TYPE
@@ -53,7 +54,7 @@ interface UpdatedFluidConnection {
interface UpdateTermValidation {
type: typeof UPDATE_TERMS_VALIDATION
- payload?: boolean
+ payload?: TermsStatus
}
interface ShowReleaseNotes {
@@ -61,6 +62,11 @@ interface ShowReleaseNotes {
payload?: { show: boolean; notes: Notes[] }
}
+interface SetPartnersIssue {
+ type: typeof SET_PARTNERS_ISSUE
+ payload?: boolean
+}
+
export type GlobalActionTypes =
| ChangeScreenType
| ToogleChallengeExplorationNotification
@@ -71,6 +77,7 @@ export type GlobalActionTypes =
| UpdatedFluidConnection
| UpdateTermValidation
| ShowReleaseNotes
+ | SetPartnersIssue
export function changeScreenType(screenType: ScreenType): GlobalActionTypes {
return {
@@ -140,10 +147,19 @@ export function updatedFluidConnection(
}
export function updateTermValidation(
- isLastTermAccepted: boolean
+ termsStatus: TermsStatus
): GlobalActionTypes {
return {
type: UPDATE_TERMS_VALIDATION,
- payload: isLastTermAccepted,
+ payload: termsStatus,
+ }
+}
+
+export function setPartnersIssue(
+ openPartnersIssueModal: boolean
+): GlobalActionTypes {
+ return {
+ type: SET_PARTNERS_ISSUE,
+ payload: openPartnersIssueModal,
}
}
diff --git a/src/store/global/global.reducer.ts b/src/store/global/global.reducer.ts
index e4e408f99..13dad1217 100644
--- a/src/store/global/global.reducer.ts
+++ b/src/store/global/global.reducer.ts
@@ -10,6 +10,7 @@ import {
GlobalActionTypes,
UPDATE_TERMS_VALIDATION,
SHOW_RELEASE_NOTES,
+ SET_PARTNERS_ISSUE,
} from 'store/global/global.actions'
import { FluidStatus, GlobalState } from 'models'
import { ScreenType } from 'enum/screen.enum'
@@ -30,7 +31,10 @@ const initialState: GlobalState = {
challengeActionNotification: false,
challengeDuelNotification: false,
analysisNotification: false,
- isLastTermAccepted: false,
+ termsStatus: {
+ accepted: false,
+ versionType: 'init',
+ },
fluidStatus: [
{
fluidType: FluidType.ELECTRICITY,
@@ -94,6 +98,7 @@ const initialState: GlobalState = {
},
],
fluidTypes: [],
+ openPartnersIssueModal: false,
}
const getFluidTypesFromStatus = (fluidStatus: FluidStatus[]): FluidType[] => {
@@ -162,7 +167,7 @@ export const globalReducer: Reducer<GlobalState> = (
return action.payload != undefined
? {
...state,
- isLastTermAccepted: action.payload,
+ termsStatus: action.payload,
}
: state
case SHOW_RELEASE_NOTES:
@@ -172,6 +177,13 @@ export const globalReducer: Reducer<GlobalState> = (
releaseNotes: action.payload,
}
: state
+ case SET_PARTNERS_ISSUE:
+ return action.payload != undefined
+ ? {
+ ...state,
+ openPartnersIssueModal: action.payload,
+ }
+ : state
case UPDATE_FLUID_CONNECTION:
if (action.payload !== undefined) {
const updatedFluidStatus = [...state.fluidStatus]
diff --git a/src/store/profile/profile.reducer.ts b/src/store/profile/profile.reducer.ts
index 93af8b3c4..94fdf371c 100644
--- a/src/store/profile/profile.reducer.ts
+++ b/src/store/profile/profile.reducer.ts
@@ -14,6 +14,7 @@ const initialState: Profile = {
quizHash: '',
explorationHash: '',
isFirstConnection: false,
+ partnersIssueDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
lastConnectionDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
haveSeenLastAnalysis: true,
sendAnalysisNotification: true,
@@ -22,7 +23,7 @@ const initialState: Profile = {
mailToken: '',
monthlyAnalysisDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
isProfileTypeCompleted: false,
- tutorial: {
+ onboarding: {
isWelcomeSeen: false,
},
}
diff --git a/src/styles/components/_barchart.scss b/src/styles/components/_barchart.scss
index 70bd59c11..9cd721113 100644
--- a/src/styles/components/_barchart.scss
+++ b/src/styles/components/_barchart.scss
@@ -145,6 +145,20 @@
stroke-width: 2;
stroke: $multi-color;
}
+.week {
+ fill: $elec-compare-color;
+ &.selected {
+ fill: $elec-compare-color;
+ filter: drop-shadow(0 -0.1rem 0.2rem $elec-compare-color);
+ }
+}
+.weekend {
+ fill: $multi-compare-color;
+ &.selected {
+ fill: $multi-compare-color;
+ filter: drop-shadow(0 -0.1rem 0.2rem $multi-color);
+ }
+}
/** Animation **/
.bounce-1 {
animation-name: bounce-1;
diff --git a/src/styles/components/_buttons.scss b/src/styles/components/_buttons.scss
index 256493ab3..a5bab7174 100644
--- a/src/styles/components/_buttons.scss
+++ b/src/styles/components/_buttons.scss
@@ -85,7 +85,7 @@ button {
}
}
&.btn-profile-back {
- @include button(none, $grey-dark, none, none) {
+ @include button(none, $soft-grey, none, none) {
}
}
}
diff --git a/src/styles/index.css b/src/styles/index.css
index e3d1fa6b6..049ceff48 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -14,55 +14,55 @@
/** TABS GRADIENT **/
/** SCROLLBAR **/
@import url("https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap");
-/* line 4, src/styles/base/_layout.scss */
+/* line 5, src/styles/base/_layout.scss */
html {
background: #1b1c22; }
-/* line 8, src/styles/base/_layout.scss */
+/* line 9, src/styles/base/_layout.scss */
body {
background: #1b1c22;
overflow: unset !important; }
-/* line 13, src/styles/base/_layout.scss */
+/* line 14, src/styles/base/_layout.scss */
.column {
display: flex;
flex-direction: column; }
-/* line 18, src/styles/base/_layout.scss */
+/* line 19, src/styles/base/_layout.scss */
.row {
display: flex;
flex-direction: row; }
-/* line 23, src/styles/base/_layout.scss */
+/* line 24, src/styles/base/_layout.scss */
.cozy-bar {
width: 100%;
display: flex;
align-items: center;
justify-content: center; }
-/* line 30, src/styles/base/_layout.scss */
+/* line 31, src/styles/base/_layout.scss */
[role='banner'] .coz-bar-container {
background-color: #ffffff; }
@media only screen and (max-width: 768px) {
- /* line 30, src/styles/base/_layout.scss */
+ /* line 31, src/styles/base/_layout.scss */
[role='banner'] .coz-bar-container {
padding: 0 0 0 0;
background-color: unset; } }
-/* line 38, src/styles/base/_layout.scss */
+/* line 39, src/styles/base/_layout.scss */
.coz-bar-wrapper {
box-shadow: unset !important;
background: unset !important; }
-/* line 42, src/styles/base/_layout.scss */
+/* line 43, src/styles/base/_layout.scss */
.cv-button {
width: 4.25rem; }
-/* line 45, src/styles/base/_layout.scss */
+/* line 46, src/styles/base/_layout.scss */
.coz-label {
color: #32363f; }
-/* line 49, src/styles/base/_layout.scss */
+/* line 50, src/styles/base/_layout.scss */
.header {
display: flex;
align-items: center;
@@ -74,63 +74,63 @@ body {
top: 48px;
left: 0; }
@media only screen and (max-width: 768px) {
- /* line 49, src/styles/base/_layout.scss */
+ /* line 50, src/styles/base/_layout.scss */
.header {
top: 0; } }
- /* line 62, src/styles/base/_layout.scss */
+ /* line 63, src/styles/base/_layout.scss */
.header .header-top {
background: radial-gradient(74.83% 76.97% at 50% 13.64%, #343641 0%, #1b1c22 100%);
width: 100%; }
- /* line 69, src/styles/base/_layout.scss */
+ /* line 70, src/styles/base/_layout.scss */
.header .header-top .header-text {
padding: 0 1rem 1rem 1rem;
color: #e0e0e0; }
- /* line 74, src/styles/base/_layout.scss */
+ /* line 75, src/styles/base/_layout.scss */
.header .header-content {
margin: 0 0 0 220px;
display: flex;
flex-direction: column; }
@media only screen and (max-width: 1023px) {
- /* line 74, src/styles/base/_layout.scss */
+ /* line 75, src/styles/base/_layout.scss */
.header .header-content {
margin: 0; } }
@media only screen and (max-width: 768px) {
- /* line 74, src/styles/base/_layout.scss */
+ /* line 75, src/styles/base/_layout.scss */
.header .header-content {
margin: 60px 0 0 0; } }
- /* line 84, src/styles/base/_layout.scss */
+ /* line 85, src/styles/base/_layout.scss */
.header .header-content .header-content-top {
display: flex;
flex-direction: row; }
- /* line 87, src/styles/base/_layout.scss */
+ /* line 88, src/styles/base/_layout.scss */
.header .header-content .header-content-top.header-content-top-right {
justify-content: flex-end; }
- /* line 90, src/styles/base/_layout.scss */
+ /* line 91, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text {
padding: 2rem 1rem;
flex: 1; }
- /* line 94, src/styles/base/_layout.scss */
+ /* line 95, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text-desktop {
display: flex;
flex: 1;
padding: 2rem 1.25rem;
color: #e0e0e0; }
- /* line 100, src/styles/base/_layout.scss */
+ /* line 101, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-back-button {
padding: 0 0.75rem; }
@media only screen and (max-width: 768px) {
- /* line 104, src/styles/base/_layout.scss */
+ /* line 105, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text {
padding: 0 1rem 1rem 1rem;
color: #e0e0e0; }
- /* line 108, src/styles/base/_layout.scss */
+ /* line 109, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text-desktop {
display: none; }
- /* line 111, src/styles/base/_layout.scss */
+ /* line 112, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-feedbacks-button {
display: none; } }
-/* line 119, src/styles/base/_layout.scss */
+/* line 120, src/styles/base/_layout.scss */
.content-view-loading {
height: 80vh;
width: 100%;
@@ -139,28 +139,28 @@ body {
justify-content: center;
align-items: center;
color: #e0e0e0; }
- /* line 127, src/styles/base/_layout.scss */
+ /* line 128, src/styles/base/_layout.scss */
.content-view-loading .content-view-loading-text {
padding-top: 1rem;
margin: 0 2rem;
text-align: center; }
- /* line 132, src/styles/base/_layout.scss */
+ /* line 133, src/styles/base/_layout.scss */
.content-view-loading .content-view-loading-button {
max-width: 50vw;
margin-top: 1rem; }
-/* line 138, src/styles/base/_layout.scss */
+/* line 139, src/styles/base/_layout.scss */
[role='main'] {
/* width */
/* Track */
/* Handle */ }
- /* line 140, src/styles/base/_layout.scss */
+ /* line 141, src/styles/base/_layout.scss */
[role='main']::-webkit-scrollbar {
width: 10px; }
- /* line 144, src/styles/base/_layout.scss */
+ /* line 145, src/styles/base/_layout.scss */
[role='main']::-webkit-scrollbar-track {
background: #3e4045; }
- /* line 148, src/styles/base/_layout.scss */
+ /* line 149, src/styles/base/_layout.scss */
[role='main']::-webkit-scrollbar-thumb {
background: #6f7074; }
@@ -675,15 +675,23 @@ p {
.value-text.selected {
fill: #e0e0e0; }
-/* line 24, src/styles/components/_barchart.scss */
+/* line 26, src/styles/components/_barchart.scss */
+.barContainer:hover,
+.barFill:hover {
+ cursor: pointer; }
+
+/* line 30, src/styles/components/_barchart.scss */
.background-true {
opacity: 0.1; }
+ /* line 32, src/styles/components/_barchart.scss */
+ .background-true:hover {
+ cursor: pointer; }
-/* line 27, src/styles/components/_barchart.scss */
+/* line 36, src/styles/components/_barchart.scss */
.background-false {
opacity: 0; }
-/* line 38, src/styles/components/_barchart.scss */
+/* line 47, src/styles/components/_barchart.scss */
.bar-compare-ELECTRICITY:hover,
.bar-compare-GAS:hover,
.bar-compare-WATER:hover,
@@ -694,103 +702,119 @@ p {
.bar-ELECTRICITY:hover {
cursor: pointer; }
-/* line 42, src/styles/components/_barchart.scss */
+/* line 51, src/styles/components/_barchart.scss */
.bar-ELECTRICITY {
fill: #5d3d2a; }
- /* line 44, src/styles/components/_barchart.scss */
+ /* line 53, src/styles/components/_barchart.scss */
.bar-ELECTRICITY.selected {
fill: #d87b39;
filter: drop-shadow(0 -0.1rem 0.2rem #d87b39); }
-/* line 50, src/styles/components/_barchart.scss */
+/* line 59, src/styles/components/_barchart.scss */
.bar-compare-ELECTRICITY {
fill: #795c47; }
- /* line 52, src/styles/components/_barchart.scss */
+ /* line 61, src/styles/components/_barchart.scss */
.bar-compare-ELECTRICITY.selected {
fill: #e2bca1;
filter: drop-shadow(0 -0.1rem 0.2rem #e2bca1); }
-/* line 58, src/styles/components/_barchart.scss */
+/* line 67, src/styles/components/_barchart.scss */
.bar-WATER {
fill: #20415e; }
- /* line 60, src/styles/components/_barchart.scss */
+ /* line 69, src/styles/components/_barchart.scss */
.bar-WATER.selected {
fill: #3a98ec;
filter: drop-shadow(0 -0.1rem 0.2rem #3a98ec); }
-/* line 66, src/styles/components/_barchart.scss */
+/* line 75, src/styles/components/_barchart.scss */
.bar-compare-WATER {
fill: #4d5c6e; }
- /* line 68, src/styles/components/_barchart.scss */
+ /* line 77, src/styles/components/_barchart.scss */
.bar-compare-WATER.selected {
fill: #abd4fa;
filter: drop-shadow(0 -0.1rem 0.2rem #abd4fa); }
-/* line 74, src/styles/components/_barchart.scss */
+/* line 83, src/styles/components/_barchart.scss */
.bar-GAS {
fill: #184940; }
- /* line 76, src/styles/components/_barchart.scss */
+ /* line 85, src/styles/components/_barchart.scss */
.bar-GAS.selected {
fill: #45d1b8;
filter: drop-shadow(0 -0.1rem 0.2rem #45d1b8); }
-/* line 82, src/styles/components/_barchart.scss */
+/* line 91, src/styles/components/_barchart.scss */
.bar-compare-GAS {
fill: #597773; }
- /* line 84, src/styles/components/_barchart.scss */
+ /* line 93, src/styles/components/_barchart.scss */
.bar-compare-GAS.selected {
fill: #a8f7e9;
filter: drop-shadow(0 -0.1rem 0.2rem #a8f7e9); }
-/* line 90, src/styles/components/_barchart.scss */
+/* line 99, src/styles/components/_barchart.scss */
.bar-MULTIFLUID {
fill: #705d1d; }
- /* line 92, src/styles/components/_barchart.scss */
+ /* line 101, src/styles/components/_barchart.scss */
.bar-MULTIFLUID.selected {
fill: #e3b82a;
filter: drop-shadow(0 -0.1rem 0.2rem #e3b82a); }
- /* line 97, src/styles/components/_barchart.scss */
+ /* line 106, src/styles/components/_barchart.scss */
.bar-MULTIFLUID.disabled:hover {
cursor: default; }
-/* line 102, src/styles/components/_barchart.scss */
+/* line 111, src/styles/components/_barchart.scss */
.bar-duel {
fill: #61f0f2; }
- /* line 104, src/styles/components/_barchart.scss */
+ /* line 113, src/styles/components/_barchart.scss */
.bar-duel.selected {
fill: #61f0f2;
filter: drop-shadow(0 -0.1rem 0.2rem #61f0f2); }
- /* line 109, src/styles/components/_barchart.scss */
+ /* line 118, src/styles/components/_barchart.scss */
.bar-duel.disabled:hover {
cursor: default; }
-/* line 114, src/styles/components/_barchart.scss */
+/* line 123, src/styles/components/_barchart.scss */
.bar-UNCOMING {
fill: #242633;
opacity: 0.6; }
- /* line 117, src/styles/components/_barchart.scss */
+ /* line 126, src/styles/components/_barchart.scss */
.bar-UNCOMING.selected {
fill: #e3b82a;
filter: drop-shadow(0 -0.1rem 0.2rem #e3b82a); }
- /* line 122, src/styles/components/_barchart.scss */
+ /* line 131, src/styles/components/_barchart.scss */
.bar-UNCOMING.disabled:hover {
cursor: default; }
-/* line 128, src/styles/components/_barchart.scss */
+/* line 137, src/styles/components/_barchart.scss */
.bar-compare-MULTIFLUID {
fill: #7d6a4e; }
- /* line 130, src/styles/components/_barchart.scss */
+ /* line 139, src/styles/components/_barchart.scss */
.bar-compare-MULTIFLUID.selected {
fill: #ffd597;
filter: drop-shadow(0 -0.1rem 0.2rem #e3b82a); }
-/* line 135, src/styles/components/_barchart.scss */
+/* line 144, src/styles/components/_barchart.scss */
.bar-average {
stroke-width: 2;
stroke: #e3b82a; }
+/* line 148, src/styles/components/_barchart.scss */
+.week {
+ fill: #e2bca1; }
+ /* line 150, src/styles/components/_barchart.scss */
+ .week.selected {
+ fill: #e2bca1;
+ filter: drop-shadow(0 -0.1rem 0.2rem #e2bca1); }
+
+/* line 155, src/styles/components/_barchart.scss */
+.weekend {
+ fill: #ffd597; }
+ /* line 157, src/styles/components/_barchart.scss */
+ .weekend.selected {
+ fill: #ffd597;
+ filter: drop-shadow(0 -0.1rem 0.2rem #e3b82a); }
+
/** Animation **/
-/* line 140, src/styles/components/_barchart.scss */
+/* line 163, src/styles/components/_barchart.scss */
.bounce-1 {
animation-name: bounce-1;
animation-timing-function: cubic-bezier(1, 1, 0.42, 1);
@@ -812,7 +836,7 @@ p {
75% {
transform: scale(1, 1); } }
-/* line 168, src/styles/components/_barchart.scss */
+/* line 191, src/styles/components/_barchart.scss */
.bounce-2 {
animation-name: bounce-2;
animation-timing-function: cubic-bezier(1, 1, 0.42, 1);
@@ -834,7 +858,7 @@ p {
75% {
transform: scale(1, 1); } }
-/* line 196, src/styles/components/_barchart.scss */
+/* line 219, src/styles/components/_barchart.scss */
.bounce-3 {
animation-name: bounce-3;
animation-timing-function: cubic-bezier(1, 1, 0.42, 1);
@@ -853,59 +877,59 @@ p {
opacity: 1; } }
/** Animatio ndelay **/
-/* line 218, src/styles/components/_barchart.scss */
+/* line 241, src/styles/components/_barchart.scss */
.delay {
animation-duration: 0.4s; }
-/* line 221, src/styles/components/_barchart.scss */
+/* line 244, src/styles/components/_barchart.scss */
.delay--0 {
animation-duration: 0.6s; }
-/* line 224, src/styles/components/_barchart.scss */
+/* line 247, src/styles/components/_barchart.scss */
.delay--1 {
animation-duration: 0.7s; }
-/* line 227, src/styles/components/_barchart.scss */
+/* line 250, src/styles/components/_barchart.scss */
.delay--2 {
animation-duration: 0.8s; }
-/* line 230, src/styles/components/_barchart.scss */
+/* line 253, src/styles/components/_barchart.scss */
.delay--3 {
animation-duration: 0.9s; }
-/* line 233, src/styles/components/_barchart.scss */
+/* line 256, src/styles/components/_barchart.scss */
.delay--4 {
animation-duration: 1s; }
-/* line 236, src/styles/components/_barchart.scss */
+/* line 259, src/styles/components/_barchart.scss */
.delay--5 {
animation-duration: 1.1s; }
-/* line 239, src/styles/components/_barchart.scss */
+/* line 262, src/styles/components/_barchart.scss */
.delay--6 {
animation-duration: 1.2s; }
-/* line 242, src/styles/components/_barchart.scss */
+/* line 265, src/styles/components/_barchart.scss */
.delay--7 {
animation-duration: 1.3s; }
-/* line 245, src/styles/components/_barchart.scss */
+/* line 268, src/styles/components/_barchart.scss */
.delay--8 {
animation-duration: 1.4s; }
-/* line 248, src/styles/components/_barchart.scss */
+/* line 271, src/styles/components/_barchart.scss */
.delay--9 {
animation-duration: 1.5s; }
-/* line 251, src/styles/components/_barchart.scss */
+/* line 274, src/styles/components/_barchart.scss */
.delay--10 {
animation-duration: 1.6s; }
-/* line 254, src/styles/components/_barchart.scss */
+/* line 277, src/styles/components/_barchart.scss */
.delay--11 {
animation-duration: 1.8s; }
-/* line 257, src/styles/components/_barchart.scss */
+/* line 280, src/styles/components/_barchart.scss */
.delay--12 {
animation-duration: 1.9s; }
@@ -1123,7 +1147,7 @@ button.btn-profile-back {
cursor: pointer; }
/* line 15, src/styles/base/_mixins.scss */
button.btn-profile-back span:first-child {
- color: #7b7b7b; }
+ color: #a0a0a0; }
/* line 24, src/styles/base/_mixins.scss */
button.btn-profile-back:disabled {
cursor: not-allowed; }
@@ -1163,11 +1187,11 @@ button.btn-profile-back {
/** App colors **/
/** TABS GRADIENT **/
/** SCROLLBAR **/
-/* line 4, src/styles/components/_dialog.scss */
+/* line 5, src/styles/components/_dialog.scss */
div.modal-root .MuiBackdrop-root {
background-color: rgba(27, 28, 34, 0.85); }
-/* line 9, src/styles/components/_dialog.scss */
+/* line 10, src/styles/components/_dialog.scss */
div.modal-paper {
background: linear-gradient(180deg, #323339 0%, #25262b 100%);
width: 36rem;
@@ -1181,27 +1205,27 @@ div.modal-paper {
align-items: center;
color: #ffffff; }
@media only screen and (max-width: 1023px) {
- /* line 9, src/styles/components/_dialog.scss */
+ /* line 10, src/styles/components/_dialog.scss */
div.modal-paper {
width: 35rem;
margin: 0; } }
@media only screen and (max-width: 768px) {
- /* line 9, src/styles/components/_dialog.scss */
+ /* line 10, src/styles/components/_dialog.scss */
div.modal-paper {
padding: 1rem;
width: 85%;
max-width: 35rem;
margin: 0; } }
- /* line 31, src/styles/components/_dialog.scss */
+ /* line 32, src/styles/components/_dialog.scss */
div.modal-paper.no-padding {
padding: 0; }
- /* line 34, src/styles/components/_dialog.scss */
+ /* line 35, src/styles/components/_dialog.scss */
div.modal-paper.blue-border {
border: 1px solid #58ffff40; }
- /* line 37, src/styles/components/_dialog.scss */
+ /* line 38, src/styles/components/_dialog.scss */
div.modal-paper.yellow-border {
border: 1px solid rgba(227, 184, 42, 0.4); }
- /* line 40, src/styles/components/_dialog.scss */
+ /* line 41, src/styles/components/_dialog.scss */
div.modal-paper .modal-paper-close-button {
position: absolute;
top: 0.5rem;
@@ -1209,7 +1233,7 @@ div.modal-paper {
padding: 5px 5px;
z-index: 10; }
-/* line 49, src/styles/components/_dialog.scss */
+/* line 50, src/styles/components/_dialog.scss */
div.modal-paper-full-screen {
background: linear-gradient(180deg, #323339 0%, #25262b 100%);
width: 100%;
@@ -1224,7 +1248,7 @@ div.modal-paper-full-screen {
color: #ffffff;
display: flex;
align-items: center; }
- /* line 63, src/styles/components/_dialog.scss */
+ /* line 64, src/styles/components/_dialog.scss */
div.modal-paper-full-screen.dark-background {
background: #121212; }
diff --git a/src/targets/services/aggregatorUsageEvents.ts b/src/targets/services/aggregatorUsageEvents.ts
index 2406bc765..854e74c7a 100644
--- a/src/targets/services/aggregatorUsageEvents.ts
+++ b/src/targets/services/aggregatorUsageEvents.ts
@@ -12,7 +12,7 @@ import FluidService from 'services/fluid.service'
import { FluidState, FluidType } from 'enum/fluid.enum'
import { getFluidType } from 'utils/utils'
import { TimeStep } from 'enum/timeStep.enum'
-import EnvironementService from 'services/environement.service'
+import EnvironmentService from 'services/environment.service'
import { DaccEvent } from 'enum/dacc.enum'
import { UsageEventProperties } from 'enum/usageEventProperties.enum'
import ChallengeService from 'services/challenge.service'
@@ -20,6 +20,7 @@ import { UserChallengeState } from 'enum/userChallenge.enum'
import ProfileTypeEntityService from 'services/profileTypeEntity.service'
import TermsService from 'services/terms.service'
import { WarmingType } from 'enum/profileType.enum'
+import { FluidSlugType } from 'enum/fluidSlug.enum'
const log = logger.namespace('aggregatorUsageEvents')
@@ -48,10 +49,10 @@ const sendIndicator = async (
client: Client
): Promise<boolean> => {
try {
- const environementService = new EnvironementService()
+ const environmentService = new EnvironmentService()
log(
'info',
- environementService.isProduction()
+ environmentService.isProduction()
? 'Sending data to dacc'
: 'Sending data to dacc-dev'
)
@@ -61,7 +62,7 @@ const sendIndicator = async (
.getStackClient()
.fetchJSON(
'POST',
- environementService.isProduction()
+ environmentService.isProduction()
? '/remote/cc.cozycloud.dacc'
: '/remote/cc.cozycloud.dacc.dev',
{
@@ -581,6 +582,74 @@ const calculateConsumptionVariation = async (client: Client) => {
}
}
+const sendConnectionCount = async (client: Client) => {
+ log('info', `sendConnectionCount`)
+ // Get daily connexion
+ const events: UsageEvent[] = await UsageEventService.getEvents(client, {
+ type: UsageEventType.CONNECTION_EVENT,
+ eventDate: {
+ $lt: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .endOf('month')
+ .minus({ month: 1 })
+ .toString(),
+ $gt: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('month')
+ .minus({ month: 1 })
+ .toString(),
+ },
+ })
+
+ // If there is at least one connection, filter each unique connection in order to send it
+ if (events.length > 0) {
+ const uniqueDates = events
+ .map(s => s.eventDate.day)
+ .filter((s, i, a) => a.indexOf(s) == i)
+
+ const connectionMonthly: Indicator = {
+ createdBy: 'ecolyo',
+ measureName: DaccEvent.CONNECTION_COUNT_MONTHLY,
+ startDate: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('day')
+ .toISODate(),
+ value: uniqueDates.length,
+ }
+ await sendIndicator(connectionMonthly, client)
+ }
+}
+
+const sendProfileCount = async (client: Client) => {
+ log('info', `sendProfileCount`)
+ // Get profile setEvents
+ const events: UsageEvent[] = await UsageEventService.getEvents(client, {
+ type: UsageEventType.PROFILE_SET_EVENT,
+ })
+
+ // If there is at least one connection, filter each unique connection in order to send it
+ if (events.length > 0) {
+ const profileSet: Indicator = {
+ createdBy: 'ecolyo',
+ measureName: DaccEvent.PROFILE_COUNT_MONTHLY,
+ startDate: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('day')
+ .toISODate(),
+ value: events.length,
+ }
+ await sendIndicator(profileSet, client)
+ }
+}
+
const sendEmailSubscription = async (client: Client) => {
log('info', `sendEmailSubscription`)
const profile = await new ProfileService(client).getProfile()
@@ -635,6 +704,107 @@ const sendHalfHourConsumption = async (client: Client) => {
await sendIndicator(halfHourConsumption, client)
}
+/**
+ * Send indicator to dacc, each month send if user has succed to configure a connector with the number of try.
+ * @param client CozyClient
+ */
+const sendKonnectorEvents = async (client: Client) => {
+ log('info', `sendKonnectorEvents`)
+ const slugs = Object.values(FluidSlugType)
+ const today = DateTime.local().setZone('utc', {
+ keepLocalTime: true,
+ })
+ slugs.forEach(async slug => {
+ let successEvents: UsageEvent[] = await UsageEventService.getEvents(
+ client,
+ {
+ type: UsageEventType.KONNECTOR_CONNECT_EVENT,
+ target: slug,
+ result: 'success',
+ eventDate: {
+ $lte: today
+ .endOf('month')
+ .minus({ month: 1 })
+ .toString(),
+ $gte: today
+ .startOf('month')
+ .minus({ month: 1 })
+ .toString(),
+ },
+ },
+ true
+ )
+
+ // If there is no success in month, send nothing
+ if (successEvents && successEvents.length > 0) {
+ // Get all success events
+ successEvents = await UsageEventService.getEvents(
+ client,
+ {
+ type: UsageEventType.KONNECTOR_CONNECT_EVENT,
+ target: slug,
+ result: 'success',
+ },
+ true
+ )
+ // Remove success from other month, they should have been already proceced
+ // successEvents.length = successEventsOfCurrentMonth
+
+ for (let index = 0; index < successEvents.length; index++) {
+ const successEvent = successEvents[index]
+ let query = null
+
+ // If there is a previous value take it as reference for the query
+ // Else get all previous because it's the first one
+ if (index + 1 < successEvents.length) {
+ query = {
+ type: UsageEventType.KONNECTOR_CONNECT_EVENT,
+ target: slug,
+ result: 'error',
+ eventDate: {
+ $lte: successEvent.eventDate,
+ $gte: successEvents[index + 1].eventDate,
+ },
+ }
+ } else {
+ query = {
+ type: UsageEventType.KONNECTOR_CONNECT_EVENT,
+ target: slug,
+ result: 'error',
+ eventDate: {
+ $lte: successEvent.eventDate,
+ },
+ }
+ }
+
+ const allConnectionEvents: UsageEvent[] = await UsageEventService.getEvents(
+ client,
+ query,
+ true
+ )
+
+ const konnectorSuccess: Indicator = {
+ createdBy: 'ecolyo',
+ measureName: DaccEvent.PARTNER_SUCESS_MONTHLY,
+ // eslint-disable-next-line @typescript-eslint/camelcase
+ group1: { fluid_type: slug },
+ startDate: DateTime.local()
+ .setZone('utc', {
+ keepLocalTime: true,
+ })
+ .startOf('day')
+ .toISODate(),
+ value: allConnectionEvents.length + 1, //+1 in order to count the success
+ }
+ // Send indicator if it's in current month
+ if (successEvent.eventDate.month === today.minus({ month: 1 }).month) {
+ await sendIndicator(konnectorSuccess, client)
+ }
+ }
+ }
+ })
+}
+
const aggregateEvents = async (
events: UsageEvent[],
eventType: UsageEventType,
@@ -1001,6 +1171,9 @@ const AggregatorUsageEvents = async ({
calculateConsumptionVariation(client)
sendEmailSubscription(client)
sendHalfHourConsumption(client)
+ sendKonnectorEvents(client)
+ sendConnectionCount(client)
+ sendProfileCount(client)
}
const uniqueReadUsageEvents: UsageEvent[] = uniq(readUsageEvents)
log(
diff --git a/src/targets/services/consumptionAlert.ts b/src/targets/services/consumptionAlert.ts
index 772273944..b34de110b 100644
--- a/src/targets/services/consumptionAlert.ts
+++ b/src/targets/services/consumptionAlert.ts
@@ -10,7 +10,7 @@ import mjml2html from 'mjml'
import { FluidType } from 'enum/fluid.enum'
import ConsumptionService from 'services/consumption.service'
import { getPreviousMonthName } from 'utils/utils'
-import EnvironementService from 'services/environement.service'
+import EnvironmentService from 'services/environment.service'
const log = logger.namespace('alert')
@@ -75,10 +75,10 @@ const consumptionAlert = async ({ client }: ConsumptionAlertProps) => {
const mailService = new MailService()
const today = DateTime.local().setZone('utc', { keepLocalTime: true })
- const environementService = new EnvironementService()
+ const environmentService = new EnvironmentService()
const template = consumptionLimit({
title: 'Ça déborde !',
- baseUrl: environementService.getPublicURL(),
+ baseUrl: environmentService.getPublicURL(),
username: username,
clientUrl: `${appLink}/#/consumption/water`,
unsubscribeUrl: `${appLink}/#/options`,
diff --git a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
new file mode 100644
index 000000000..3f03bbdcb
--- /dev/null
+++ b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
@@ -0,0 +1,292 @@
+import logger from 'cozy-logger'
+import { Client } from 'cozy-client'
+import { DateTime } from 'luxon'
+import { Datachart, DataloadEntity, TimePeriod } from 'models'
+import { runService } from './service'
+import { FluidType } from 'enum/fluid.enum'
+import { TimeStep } from 'enum/timeStep.enum'
+import ConsumptionService from 'services/consumption.service'
+import { EnedisMonthlyAnalysisData } from 'models/enedisMonthlyAnalysis'
+import EnedisMonthlyAnalysisDataService from 'services/enedisMonthlyAnalysisData.service'
+import {
+ ENEDIS_MINUTE_DOCTYPE,
+ ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
+} from 'doctypes'
+import { union } from 'lodash'
+
+const log = logger.namespace('report')
+
+interface EnedisMonthlyProps {
+ client: Client
+}
+
+/**
+ * Gets the minimum consumption value in a month
+ * @param weekEndValuesArray
+ * @param weekValuesArray
+ * @returns number
+ */
+const getMinMonthlyLoad = (
+ weekEndValuesArray: number[][],
+ weekValuesArray: number[][]
+): number => {
+ const totalArray = union(...weekEndValuesArray, ...weekValuesArray)
+ const filteredTotal = totalArray.filter(val => val !== -1 && val !== 0)
+ const minLoad = Math.min(...filteredTotal)
+ log('info', `Minimum value is ${minLoad} `)
+ return minLoad
+}
+
+/**
+ *
+ * @param monthlyArray
+ * @param dataChart
+ * @param isWeekend
+ * @returns
+ */
+const populateArrayWithTotalData = (
+ monthlyArray: number[][],
+ dataChart: Datachart,
+ isWeekend: boolean
+) => {
+ let halfHourDayData: number[]
+ if (isWeekend) {
+ // we only keep weekend days
+ halfHourDayData = dataChart.actualData
+ .filter(day => day.date.weekday === 6 || day.date.weekday === 7)
+ .map(day => day.value)
+ } else {
+ // we only keep weekdays
+ halfHourDayData = dataChart.actualData
+ .filter(day => day.date.weekday !== 6 && day.date.weekday !== 7)
+ .map(day => day.value)
+ }
+ if (halfHourDayData.length > 0) {
+ halfHourDayData.forEach((halfHourValue, index) => {
+ if (halfHourValue >= 0) {
+ if (!monthlyArray[index]) {
+ monthlyArray.push([])
+ }
+ monthlyArray[index] = [...monthlyArray[index], halfHourValue]
+ }
+ })
+ }
+}
+/**
+ * Gets max Power value for a given month
+ * @param month
+ * @param year
+ * @param client
+ * @returns
+ */
+const getMonthMaxPower = async (
+ month: number,
+ year: number,
+ client: Client
+) => {
+ const emas = new EnedisMonthlyAnalysisDataService(client)
+ log('info', `Fetching max power for month ${month} of year ${year}`)
+ const data = await emas.getMaxPowerByDate(year, month)
+ const maxPowerArray: number[] = []
+ if (data && data.length) {
+ for (const day of data) {
+ maxPowerArray.push(day.load)
+ }
+ }
+ return Math.max(...maxPowerArray)
+}
+/**
+ * Get the average arrays of half-hour value on a given month
+ * @param client
+ * @param month
+ * @param year
+ * @returns {Promise<MonthlyAveragesLoads>}
+ */
+const getEnedisMonthAnalysisData = async (
+ client: Client,
+ month: number,
+ year: number
+): Promise<EnedisMonthlyAnalysisData | undefined> => {
+ log('info', `Getting enedis analysis data for month ${month} of year ${year}`)
+
+ const timePeriod = {
+ startDate: DateTime.fromObject({ month: month, year: year }).startOf(
+ 'month'
+ ),
+ endDate: DateTime.fromObject({ month: month, year: year }).endOf('month'),
+ }
+ const cs = new ConsumptionService(client)
+ const data = await cs.getGraphData(timePeriod, TimeStep.DAY, [
+ FluidType.ELECTRICITY,
+ ])
+ const monthlyAveragesLoads: EnedisMonthlyAnalysisData = {
+ weekDaysHalfHourAverageValues: [],
+ weekEndDaysHalfHourAverageValues: [],
+ minLoad: null,
+ maxPower: null,
+ month: month,
+ year: year,
+ }
+ if (data) {
+ // 48 is the number of halfhour entries in a day
+ const weekEndValuesArray: number[][] = new Array([])
+ const weekValuesArray: number[][] = new Array([])
+
+ for (const day of data.actualData) {
+ const timePeriod: TimePeriod = {
+ startDate: day.date.startOf('day'),
+ endDate: day.date.endOf('day'),
+ }
+ // for each day, we get its halfHour DataChart
+ // so we get 48 entries per day
+ const halfHourDayData = await cs.getGraphData(
+ timePeriod,
+ TimeStep.HALF_AN_HOUR,
+ [FluidType.ELECTRICITY]
+ )
+ if (halfHourDayData) {
+ populateArrayWithTotalData(weekEndValuesArray, halfHourDayData, true)
+ populateArrayWithTotalData(weekValuesArray, halfHourDayData, false)
+ }
+ }
+ monthlyAveragesLoads.minLoad = getMinMonthlyLoad(
+ weekValuesArray,
+ weekEndValuesArray
+ )
+ const arrAvg = (arr: number[]) =>
+ arr.reduce((a, b) => a + b, 0) / arr.length
+ // at this point we have an array of sums for each 48 half hour timestep
+ // so we calculate the average
+ const weekEndAverages: number[] = weekEndValuesArray.map(halfHourArray =>
+ arrAvg(halfHourArray)
+ )
+ // so we calculate the average
+ const weekAverages = weekValuesArray.map(halfHourArray =>
+ arrAvg(halfHourArray)
+ )
+ monthlyAveragesLoads.weekDaysHalfHourAverageValues = weekAverages
+ monthlyAveragesLoads.weekEndDaysHalfHourAverageValues = weekEndAverages
+ monthlyAveragesLoads.maxPower = await getMonthMaxPower(month, year, client)
+ return monthlyAveragesLoads
+ }
+}
+
+/**
+ * Synchronize enedis monthly analysis with database depending on if the service has already ran
+ * and if the enedis minute tracking has been activated
+ * @param {Client} client
+ * @returns
+ */
+const syncEnedisMonthlyAnalysisDataDoctype = async ({
+ client,
+}: EnedisMonthlyProps) => {
+ //SERVICE RUNS ONLY IF ENEDIS MINUTE IS ACTIVATED
+ const emas = new EnedisMonthlyAnalysisDataService(client)
+ const cs = new ConsumptionService(client)
+ const firstMinuteData = (await cs.getFirsDataDateFromDoctype(
+ ENEDIS_MINUTE_DOCTYPE
+ )) as DataloadEntity[]
+
+ const lastEnedisMonthlyAnalysis = await emas.getLastEnedisMonthlyAnalysis()
+ if (firstMinuteData) {
+ //First creates the analysis of the month - 1
+ log('info', 'Fetching last Enedis monthly Analysis...')
+ const firstMinuteDate = DateTime.fromObject({
+ year: firstMinuteData[0].year,
+ month: firstMinuteData[0].month,
+ }).startOf('month')
+ const today = DateTime.local().setZone('utc', {
+ keepLocalTime: true,
+ })
+ const analysisDate: DateTime = today.minus({
+ month: 1,
+ })
+
+ const data = await getEnedisMonthAnalysisData(
+ client,
+ analysisDate.month,
+ analysisDate.year
+ )
+ if (data) {
+ const created = await emas.createEnedisMonthlyAnalysisData(data)
+ if (created) {
+ log('success', 'Created successfully ! ')
+ } else {
+ log('error', 'Failed to create last Enedis monthly Analysis ')
+ }
+ }
+ log('info', 'Getting first endis half hour data date')
+
+ if (lastEnedisMonthlyAnalysis.length > 0) {
+ //If user has more than one entry (already synced), fetch the full history
+ const firstEnedisMonthlyAnalysis = (await cs.getFirsDataDateFromDoctype(
+ ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE
+ )) as EnedisMonthlyAnalysisData[]
+ if (
+ firstEnedisMonthlyAnalysis &&
+ firstEnedisMonthlyAnalysis[0].month === firstMinuteData[0].month &&
+ firstEnedisMonthlyAnalysis[0].year === firstMinuteData[0].year
+ ) {
+ log('info', 'Every Enedis Anlysis already synchronized')
+ return
+ } else if (firstEnedisMonthlyAnalysis) {
+ log(
+ 'info',
+ 'Doctype is partially completed, fetiching all available history'
+ )
+ const firstEnedisMonthlyAnalysisDate = DateTime.fromObject({
+ year: firstEnedisMonthlyAnalysis[0].year,
+ month: firstEnedisMonthlyAnalysis[0].month,
+ }).startOf('month')
+ const diffInmonths = Math.ceil(
+ firstEnedisMonthlyAnalysisDate.diff(firstMinuteDate, 'months').months
+ )
+ for (let i = 1; i < diffInmonths; i++) {
+ const analysistoCreate = firstEnedisMonthlyAnalysisDate.minus({
+ month: i,
+ })
+ const data = await getEnedisMonthAnalysisData(
+ client,
+ analysistoCreate.month,
+ analysistoCreate.year
+ )
+ if (data) {
+ await emas.createEnedisMonthlyAnalysisData(data)
+ }
+ }
+ }
+ } else {
+ //If user only have the last analysis available, fetch one year history
+ log(
+ 'info',
+ 'Doctype is empty, fetching history for one year maximum or until first enedis minute date'
+ )
+ const maximumDate = analysisDate.minus({ month: 12 }).startOf('month')
+ const diffInmonths = Math.ceil(
+ firstMinuteDate.diff(maximumDate, 'months').months
+ )
+ const limitDate = diffInmonths > 0 ? firstMinuteDate : maximumDate
+ const diffInMonthsWithLimitDate = Math.ceil(
+ analysisDate.diff(limitDate, 'months').months
+ )
+ for (let i = 1; i < diffInMonthsWithLimitDate; i++) {
+ const analysistoCreate = analysisDate.minus({ month: i })
+ const data = await getEnedisMonthAnalysisData(
+ client,
+ analysistoCreate.month,
+ analysistoCreate.year
+ )
+ if (data) {
+ await emas.createEnedisMonthlyAnalysisData(data)
+ }
+ }
+ }
+ } else {
+ log(
+ 'info',
+ 'Enedis Minute is not activated or there is no data yet in this doctype'
+ )
+ }
+}
+
+runService(syncEnedisMonthlyAnalysisDataDoctype)
diff --git a/src/targets/services/fluidsPrices.ts b/src/targets/services/fluidsPrices.ts
new file mode 100644
index 000000000..d658871d4
--- /dev/null
+++ b/src/targets/services/fluidsPrices.ts
@@ -0,0 +1,211 @@
+import logger from 'cozy-logger'
+import { Client } from 'cozy-client'
+import { runService } from './service'
+import { DateTime } from 'luxon'
+import FluidPricesService from 'services/fluidsPrices.service'
+import { DataloadEntity, TimePeriod } from 'models'
+import ConsumptionDataManager from 'services/consumption.service'
+import { TimeStep } from 'enum/timeStep.enum'
+import {
+ ENEDIS_DAY_DOCTYPE,
+ ENEDIS_MINUTE_DOCTYPE,
+ GRDF_DAY_DOCTYPE,
+} from 'doctypes'
+import { FluidType } from 'enum/fluid.enum'
+import QueryRunner from 'services/queryRunner.service'
+const log = logger.namespace('fluidPrices')
+
+interface PricesProps {
+ client: Client
+}
+
+const price = (item: DataloadEntity): number | null => {
+ return item.price ? item.price : null
+}
+
+const sum = (prev: number, next: number): number => {
+ return prev + next
+}
+
+const getTimePeriod = async (
+ timeStep: TimeStep,
+ date: DateTime
+): Promise<TimePeriod> => {
+ switch (timeStep) {
+ case TimeStep.HALF_AN_HOUR:
+ return {
+ startDate: date,
+ endDate: date.plus({ day: 1 }).startOf('day'),
+ }
+ case TimeStep.DAY:
+ case TimeStep.MONTH:
+ return {
+ startDate: date.startOf('month'),
+ endDate: date.endOf('month'),
+ }
+ case TimeStep.YEAR:
+ return {
+ startDate: date.startOf('year'),
+ endDate: date.endOf('year'),
+ }
+ default:
+ log('error', 'Unhandled time period')
+ throw Error('Unhandled time period')
+ }
+}
+
+const aggregatePrices = async (
+ client: Client,
+ qr: QueryRunner,
+ cdm: ConsumptionDataManager,
+ firstDate: DateTime,
+ today: DateTime,
+ fluidType: FluidType
+) => {
+ const tsa = [TimeStep.MONTH, TimeStep.YEAR]
+ log('debug', `Aggregation...`)
+ const aggregartePromises = tsa.map(async ts => {
+ return new Promise<void>(async resolve => {
+ let date: DateTime = DateTime.local()
+ Object.assign(date, firstDate)
+ do {
+ log(
+ 'debug',
+ `Step: ${ts} | Fluid: ${fluidType} | Date: ${date.day}/${date.month}/${date.year}`
+ )
+ const tp = await getTimePeriod(ts, date)
+ // Get doc for aggregation
+ const data = await qr.fetchFluidRawDoctype(tp, TimeStep.DAY, fluidType)
+
+ // Get doc to update
+ const docToUpdate = await qr.fetchFluidRawDoctype(tp, ts, fluidType)
+
+ if (docToUpdate && data && docToUpdate.data && data.data) {
+ docToUpdate.data[0].price = data.data.map(price).reduce(sum)
+ }
+
+ // Save updated docs
+ await cdm.saveDocs(docToUpdate.data)
+ // Update date according to timestep
+ if (ts === TimeStep.YEAR) {
+ date = date.plus({ year: 1 }).startOf('month')
+ } else {
+ date = date.plus({ month: 1 }).startOf('month')
+ }
+ } while (date < today)
+ resolve()
+ })
+ })
+
+ await Promise.all(aggregartePromises)
+ log('debug', `Aggregation done`)
+}
+
+const getDoctypeTypeByFluid = (fluidType: FluidType): string => {
+ if (fluidType === FluidType.ELECTRICITY) {
+ return ENEDIS_DAY_DOCTYPE
+ }
+ if (fluidType === FluidType.GAS) {
+ return GRDF_DAY_DOCTYPE
+ }
+ log('error', 'Unkown FluidType')
+ throw new Error()
+}
+
+const getTimeSetByFluid = (fluidType: FluidType): TimeStep[] => {
+ if (fluidType === FluidType.ELECTRICITY) {
+ return [TimeStep.DAY, TimeStep.HALF_AN_HOUR]
+ }
+ if (fluidType === FluidType.GAS) {
+ return [TimeStep.DAY]
+ }
+ log('error', 'Unkown FluidType')
+ throw new Error()
+}
+
+const applyPrices = async (client: Client, fluidType: FluidType) => {
+ // If no doctypes exists, do nothing
+ const fluidsPricesService = new FluidPricesService(client)
+ const cdm = new ConsumptionDataManager(client)
+ const qr = new QueryRunner(client)
+ const prices = await fluidsPricesService.getAllPrices()
+ // Prices data exsit
+ if (prices.length > 0) {
+ log('debug', 'fluidPrices data found')
+ const firstMinuteData = await cdm.getFirstDataDateFromDoctypeWithPrice(
+ getDoctypeTypeByFluid(fluidType)
+ )
+
+ // If there is data, update hourly data and daily data
+ if (firstMinuteData) {
+ // Format first date
+ const firstDate = DateTime.fromObject({
+ year: firstMinuteData.year,
+ month: firstMinuteData.month,
+ day: firstMinuteData.day,
+ })
+ const today = DateTime.now()
+ const tsa = getTimeSetByFluid(fluidType)
+
+ // Hourly and daily prices
+ const promises = tsa.map(async timeStep => {
+ return new Promise<void>(async resolve => {
+ let date: DateTime = DateTime.local()
+ Object.assign(date, firstDate)
+ do {
+ // Get price
+ const priceData = await fluidsPricesService.getPrices(
+ fluidType,
+ date
+ )
+ // log(
+ // 'debug',
+ // `Step: ${timeStep} | Fluid : ${fluidType} | Date: ${date.day}/${date.month}/${date.year} | Price: ${priceData.price}`
+ // )
+ const tp = await getTimePeriod(timeStep, date)
+
+ // Get doc to update
+ const data = await qr.fetchFluidRawDoctype(tp, timeStep, fluidType)
+
+ // If lastItem has a price, skip this day (in order to save perf)
+ const lastItem = data.data[data.data.length - 1]
+ if (lastItem && !lastItem.price && priceData) {
+ data &&
+ data.data.forEach((element: DataloadEntity) => {
+ element.price = element.load * priceData.price
+ })
+
+ // Save updated docs
+ await cdm.saveDocs(data.data)
+ }
+
+ // Update date
+ if (timeStep === TimeStep.HALF_AN_HOUR) {
+ date = date.plus({ days: 1 })
+ } else {
+ date = date.plus({ month: 1 }).startOf('month')
+ }
+ } while (date < today)
+ resolve()
+ })
+ })
+
+ await Promise.all(promises)
+
+ // Call aggregation method
+ await aggregatePrices(client, qr, cdm, firstDate, today, fluidType)
+ } else log('info', `No data found for fluid ${fluidType}`)
+ } else log('info', 'No fluidesPrices data')
+}
+
+const processPrices = async ({ client }: PricesProps) => {
+ log('info', `Processing electricity data...`)
+ const elec = applyPrices(client, FluidType.ELECTRICITY)
+ log('info', `Electricity data done`)
+ log('info', `Processing gas data...`)
+ const gas = applyPrices(client, FluidType.GAS)
+ await Promise.all([elec, gas])
+ log('info', `Gas data done`)
+}
+
+runService(processPrices)
diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts
index 9e40cbd78..e6f0e0b33 100644
--- a/src/targets/services/monthlyReportNotification.ts
+++ b/src/targets/services/monthlyReportNotification.ts
@@ -12,7 +12,7 @@ import { FluidType } from 'enum/fluid.enum'
import { TimeStep } from 'enum/timeStep.enum'
import ConsumptionService from 'services/consumption.service'
import { MonthlReport } from 'models/monthlyReport.model'
-import EnvironementService from 'services/environement.service'
+import EnvironmentService from 'services/environment.service'
import { getMonthNameWithPrep, getPreviousMonthName } from 'utils/utils'
const log = logger.namespace('report')
@@ -71,12 +71,12 @@ const buildConsumptionText = async (client: Client) => {
if (value) {
if (value > 0) {
text +=
- '<span class="elec-text">+ ' +
+ '<span class="elec-text">- ' +
Math.ceil(value * 100) +
" % d'électricité</span>"
} else {
text +=
- '<span class="elec-text">- ' +
+ '<span class="elec-text">+ ' +
Math.ceil(Math.abs(value * 100)) +
" % d'électricité</span>"
}
@@ -94,12 +94,12 @@ const buildConsumptionText = async (client: Client) => {
}
if (value > 0) {
text +=
- '<span class="gas-text">+ ' +
+ '<span class="gas-text">- ' +
Math.ceil(value * 100) +
' % de gaz</span>'
} else {
text +=
- '<span class="gas-text">- ' +
+ '<span class="gas-text">+ ' +
Math.ceil(Math.abs(value * 100)) +
' % de gaz</span>'
}
@@ -115,12 +115,12 @@ const buildConsumptionText = async (client: Client) => {
}
if (value > 0) {
text +=
- '<span class="water-text">+ ' +
+ '<span class="water-text">- ' +
Math.ceil(value * 100) +
" % d'eau</span>"
} else {
text +=
- '<span class="water-text">- ' +
+ '<span class="water-text">+ ' +
Math.ceil(Math.abs(value * 100)) +
" % d'eau</span>"
}
@@ -138,10 +138,10 @@ const getMonthlyReport = async (
client: Client
): Promise<MonthlReport> => {
try {
- const environementService = new EnvironementService()
+ const environmentService = new EnvironmentService()
log(
'info',
- environementService.isProduction()
+ environmentService.isProduction()
? 'Fetching data from BO prod'
: 'Fetching data from BO rec'
)
@@ -150,7 +150,7 @@ const getMonthlyReport = async (
.getStackClient()
.fetchJSON(
'GET',
- environementService.isProduction()
+ environmentService.isProduction()
? `/remote/org.ecolyo.backoffice?year=${year}&month=${month}`
: `/remote/org.ecolyo.backoffice.rec?year=${year}&month=${month}`
)
@@ -260,8 +260,8 @@ const monthlyReportNotification = async ({
.setZone('utc', { keepLocalTime: true })
.minus({ month: 1 })
- const environementService = new EnvironementService()
- const baseUrl = environementService.getPublicURL()
+ const environmentService = new EnvironmentService()
+ const baseUrl = environmentService.getPublicURL()
const template = monthlyReportTemplate({
title: 'Du nouveau dans votre espace Ecolyo !',
@@ -285,7 +285,7 @@ const monthlyReportNotification = async ({
),
pollText: monthlyReport.question.replace(/{cozyUrl}/g, appLink + '#/'),
pollUrl: monthlyReport.link,
- previousMonth: getPreviousMonthName(date),
+ previousMonth: getPreviousMonthName(date.minus({ month: 1 })),
consoImageUrl: baseUrl + '/assets/multifluidConsumption.png',
})
diff --git a/src/types/cozy-client.d.ts b/src/types/cozy-client.d.ts
index 37bdf2ed8..b61868595 100644
--- a/src/types/cozy-client.d.ts
+++ b/src/types/cozy-client.d.ts
@@ -1,371 +1,383 @@
-import * as CozyStackClient from 'cozy-stack-client'
-import { TRealtimePlugin, RealtimePlugin } from 'cozy-realtime'
-import { TDoctype } from 'doctypes'
-import { Relation } from 'models'
-
-declare module 'cozy-client' {
- /**
- * @typedef {object} HydratedDocument
- */
-
- export const CozyProvider: React.FC<{ client: Client; store?: any }>
-
- export function useClient(): Client
- export function Q(doctype: TDoctype): QueryDefinition
-
- export type SortOptions = { [field: string]: 'asc' | 'desc' }
- export type QueryDefinition = {
- checkSortOrder(opts: {
- sort: SortOptions
- selector: unknown
- indexedFields: unknown
- }): QueryDefinition
- getById(id: string): QueryDefinition
- getByIds(ids: Array<string>): QueryDefinition
- include(relations: Array<string>): QueryDefinition
- indexFields(indexedFields: Array<string>): QueryDefinition
- limitBy(limit: number): QueryDefinition
- offset(skip: number): QueryDefinition
- offsetBookmark(bookmark: string): QueryDefinition
- offsetCursor(cursor): QueryDefinition
- referencedBy(document: unknown): QueryDefinition
- select(field: Array<string> | undefined): QueryDefinition
- sortBy(sort: Array<SortOptions>): QueryDefinition
- where(selector: MongoSelector): QueryDefinition
- }
- export type QueryResult<T, I = undefined> = {
- bookmark: string
- next: boolean
- meta?: { count: number }
- skip: number
- data: T
- included?: I
- }
-
- export interface MongoSelector {
- [field: unknown]: unknown
- }
- export interface AllQueryOptions {
- bookmark?: string
- keys?: unknown
- limit?: number
- skip?: number
- }
- export interface FindQueryOptions {
- bookmark?: string
- fields?: Array<string>
- indexId?: string
- limit?: number
- skip?: number
- sort?: SortOptions[]
- }
- interface ClientInstanceOpts {
- cozyAppEditor: string
- cozyAppName: string
- cozyAppNamePrefix: string
- cozyAppSlug: string
- cozyDomain: string
- cozyIconPath: string
- cozyLocale: string
- cozyToken: string
- }
- interface ClientToJSON {
- uri: string
- }
- interface ClientLogin {
- token: string
- uri: string
- }
- interface ClientSchema {
- byDoctype: TDoctype
- client: Client
- }
-
- export class Client {
- appMetadata: { version: string; slug: string }
- options: ClientLogin
- idCounter: number
- isLogged: boolean
- instanceOptions: ClientInstanceOpts
- links: unknown
- chain: unknown
- schema: unknown
- plugins: { realtime: TRealtimePlugin; [key: string]: unknown }
-
- reducer(): any
- setStore(store: any)
-
- /**
- * A plugin is a class whose constructor receives the client as first argument.
- * The main mean of interaction with the client should be with events
- * like "login"/"logout".
- *
- * The plugin system is meant to encourage separation of concerns, modularity
- * and testability : instead of registering events at module level, please
- * create a plugin that subscribes to events.
- *
- * Plugin instances are stored internally in the `plugins` attribute of the client
- * and can be accessed via this mean. A plugin class must have the attribute
- * `pluginName` that will be use as the key in the `plugins` object.
- *
- * Two plugins with the same `pluginName` cannot co-exist.
- *
- * @example
- * ```
- * class AlertPlugin {
- * constructor(client, options) {
- * this.client = client
- * this.options = options
- * this.handleLogin = this.handleLogin.bind(this)
- * this.handleLogout = this.handleLogout.bind(this)
- * this.client.on("login", this.handleLogin)
- * this.client.on("logout", this.handleLogout)
- * }
- *
- * handleLogin() {
- * alert(this.options.onLoginAlert)
- * }
- *
- * handleLogout() {
- * alert(this.options.onLogoutAlert)
- * }
- * }
- *
- * AlertPlugin.pluginName = 'alerts'
- *
- * client.registerPlugin(AlertPlugin, {
- * onLoginAlert: 'client has logged in !',
- * onLogoutAlert: 'client has logged out !'
- * })
- *
- * // the instance of the plugin is accessible via
- * client.plugins.alerts
- * ```
- */
- registerPlugin(Plugin: RealtimePlugin | unknown, options?: unknown)
-
- /**
- * Notify the links that they can start and set isLogged to true.
- *
- * On mobile, where url/token are set after instantiation, use this method
- * to set the token and uri via options.
- *
- * Emits
- *
- * - "beforeLogin" at the beginning, before links have been set up
- * - "login" when the client is fully logged in and links have been set up
- *
- * @param {object} options - Options
- * @param {string} options.token - If passed, the token is set on the client
- * @param {string} options.uri - If passed, the uri is set on the client
- * @returns {Promise} - Resolves when all links have been setup and client is fully logged in
- *
- */
- login(options: ClientLogin): Promise<unknown>
-
- /**
- * Logs out the client and reset all the links
- *
- * Emits
- *
- * - "beforeLogout" at the beginning, before links have been reset
- * - "login" when the client is fully logged out and links have been reset
- *
- * @returns {Promise} - Resolves when all links have been reset and client is fully logged out
- */
- logout(): Promise<unknown>
-
- /**
- * Forwards to a stack client instance and returns
- * a [DocumentCollection]{@link https://docs.cozy.io/en/cozy-client/api/cozy-stack-client/#DocumentCollection} instance.
- *
- * @param {string} doctype - The collection doctype.
- * @returns {CozyStackClient.DocumentCollection} - Collection corresponding to the doctype
- */
- collection(doctype: TDoctype): CozyStackClient.AllCollections
-
- /**
- * Fetches an endpoint in an authorized way.
- *
- * @param {string} method The HTTP method.
- * @param {string} path The URI.
- * @param {object} body The payload.
- * @param {object} opts Options for fetch
- * @returns {Promise}
- * @throws {FetchError}
- */
- fetch(
- method: string,
- path: string,
- body: unknown,
- options?: unknown
- ): Promise<unknown>
-
- find(doctype: string, selector?: MongoSelector): QueryDefinition
- get(doctype: TDoctype, id: string): unknown
- validate<D>(document: D): unknown
- save<D, M = undefined>(
- documentType: D,
- mutationOptions?: M
- ): Promise<QueryResult<T, I>>
-
- /**
- * Creates a list of mutations to execute to create a document and its relationships.
- *
- * ```js
- * const baseDoc = { _type: 'io.cozy.todo', label: 'Go hiking' }
- * // relations can be arrays or single objects
- * const relationships = {
- * attachments: [{ _id: 12345, _type: 'io.cozy.files' }, { _id: 6789, _type: 'io.cozy.files' }],
- * bills: { _id: 9999, _type: 'io.cozy.bills' }
- * }
- * client.getDocumentSavePlan(baseDoc, relationships)
- * ```
- *
- * @param {object} document The base document to create
- * @param {object} relationships The list of relationships to add, as a dictionnary. Keys should be relationship names and values the documents to link.
- * @returns {Mutation[]} One or more mutation to execute
- */
- getDocumentSavePlan<D>(document: D, relationships: unknown)
- triggerHook<D>(name: string, document: D): unknown
-
- /**
- * Destroys a document. {before,after}:destroy hooks will be fired.
- *
- * @param {Document} document - Document to be deleted
- * @returns {Document} The document that has been deleted
- */
- destroy<D>(document: D): Promise<QueryResult<T, I>>
- upload(file: File, dirPath: string, mutationOptions?: unknown)
- ensureQueryExists(
- queryId: string,
- queryDefinition: QueryDefinition
- ): unknown
-
- /**
- * Executes a query and returns its results.
- *
- * Results from the query will be saved internally and can be retrieved via
- * `getQueryFromState` or directly using `<Query />`. `<Query />` automatically
- * executes its query when mounted if no fetch policy has been indicated.
- *
- * @param {QueryDefinition} queryDefinition - Definition that will be executed
- * @param {string} options - Options
- * @param {string} options.as - Names the query so it can be reused (by multiple components for example)
- * @param {string} options.fetchPolicy - Fetch policy to bypass fetching based on what's already inside the state. See "Fetch policies"
- * @returns {QueryResult}
- */
- query(
- queryDefinition: QueryDefinition,
- { update, ...options }?: unknown
- ): Promise<QueryResult<T, I>>
-
- /**
- * Will fetch all documents for a `queryDefinition`, automatically fetching more
- * documents if the total of documents is superior to the pagination limit. Can
- * result in a lot of network requests.
- *
- * @param {QueryDefinition} queryDefinition - Definition to be executed
- * @param {object} options - Options to the query
- * @returns {Array} All documents matching the query
- */
- queryAll(
- queryDefinition: QueryDefinition,
- options: object
- ): Promise<QueryResult<T, I>>
- makeObservableQuery(
- queryDefinition: QueryDefinition,
- options?: unknown
- ): unknown
- create<D>(
- doctype: TDoctype,
- entry: D,
- relationships?: unknown,
- options?: unknown
- ): Promise<QueryResult<T, I>>
- getStackClient(): ClientStackClient
- getInstanceOptions(): ClientInstanceOpts
- toJSON(): ClientToJSON
-
- /**
- * Returns documents with their relationships resolved according to their schema.
- * If related documents are not in the store, they will not be fetched automatically.
- * Instead, the relationships will have null documents.
- *
- * @param {string} doctype - Doctype of the documents being hydrated
- * @param {Array<Document>} documents - Documents to be hydrated
- * @returns {Array<HydratedDocument>}
- */
- hydrateDocuments<D>(
- doctype: TDoctype,
- documents: Array<D>
- ): Array<HydratedDocument>
-
- /**
- * Resolves relationships on a document.
- *
- * The original document is kept in the target attribute of
- * the relationship
- *
- * @param {Document} document for which relationships must be resolved
- * @param {Schema} schemaArg for the document doctype
- * @returns {HydratedDocument}
- */
- hydrateDocument<D>(document: D, schemaArg?: TDoctype): HydratedDocument
- }
-
- class CCozyClient {
- constructor(n: unknown): Client
- }
- const CozyClient: {
- new (n: unknown): Client
- } = CCozyClient
- export default CozyClient
-
- export type HydratedDoc = any
-
- // FIX BEGIN :: Types temporary
- export class HasMany {
- /**
- * Sets a relationship item with the relationship name and id
- *
- * @param {object} doc - Document to be updated
- * @param {string} relName - Name of the relationship
- * @param {string} relItemId - Id of the relationship item
- * @param {object} relItemAttrs - Attributes to be set (at least _id and _type)
- */
- static setHasManyItem<D, R>(
- doc: D,
- relName: string,
- relItemId: string,
- relItemAttrs: Relation
- ): R
-
- /**
- * Gets a relationship item with the relationship name and id
- *
- * @param {object} doc - Document to be updated
- * @param {string} relName - Name of the relationship
- * @param {string} relItemId - Id of the relationship item
- */
- static getHasManyItem<D, R>(doc: D, relName: string, relItemId: string): R
-
- /**
- * Updates a relationship item with the relationship name and id
- *
- * @param {object} doc - Document to be updated
- * @param {string} relName - Name of the relationship
- * @param {string} relItemId - Id of the relationship item
- * @param {Function} updater - receives the current relationship item and should
- * return an updated version. Merge should be used in the updater
- * if previous relationship item fields are to be kept.
- */
- static updateHasManyItem<D, R>(
- doc: D,
- relName: string,
- relItemId: string,
- updater: (relItem: Relation) => Relation
- ): Promise<QueryResult<R>>
- }
- // FIX END
-}
+import * as CozyStackClient from 'cozy-stack-client'
+import { TRealtimePlugin, RealtimePlugin } from 'cozy-realtime'
+import { TDoctype } from 'doctypes'
+import { Relation } from 'models'
+
+declare module 'cozy-client' {
+ /**
+ * @typedef {object} HydratedDocument
+ */
+
+ export const CozyProvider: React.FC<{ client: Client; store?: any }>
+
+ export function useClient(): Client
+ export function Q(doctype: TDoctype): QueryDefinition
+
+ export type SortOptions = { [field: string]: 'asc' | 'desc' }
+ export type QueryDefinition = {
+ checkSortOrder(opts: {
+ sort: SortOptions
+ selector: unknown
+ indexedFields: unknown
+ }): QueryDefinition
+ getById(id: string): QueryDefinition
+ getByIds(ids: Array<string>): QueryDefinition
+ include(relations: Array<string>): QueryDefinition
+ indexFields(indexedFields: Array<string>): QueryDefinition
+ partialIndex(partialFilter: object): QueryDefinition
+ limitBy(limit: number): QueryDefinition
+ offset(skip: number): QueryDefinition
+ offsetBookmark(bookmark: string): QueryDefinition
+ offsetCursor(cursor): QueryDefinition
+ referencedBy(document: unknown): QueryDefinition
+ select(field: Array<string> | undefined): QueryDefinition
+ sortBy(sort: Array<SortOptions>): QueryDefinition
+ where(selector: MongoSelector): QueryDefinition
+ }
+ export type QueryResult<T, I = undefined> = {
+ bookmark: string
+ next: boolean
+ meta?: { count: number }
+ skip: number
+ data: T
+ included?: I
+ }
+
+ export interface MongoSelector {
+ [field: unknown]: unknown
+ }
+ export interface AllQueryOptions {
+ bookmark?: string
+ keys?: unknown
+ limit?: number
+ skip?: number
+ }
+ export interface FindQueryOptions {
+ bookmark?: string
+ fields?: Array<string>
+ indexId?: string
+ limit?: number
+ skip?: number
+ sort?: SortOptions[]
+ }
+ interface ClientInstanceOpts {
+ cozyAppEditor: string
+ cozyAppName: string
+ cozyAppNamePrefix: string
+ cozyAppSlug: string
+ cozyDomain: string
+ cozyIconPath: string
+ cozyLocale: string
+ cozyToken: string
+ }
+ interface ClientToJSON {
+ uri: string
+ }
+ interface ClientLogin {
+ token: string
+ uri: string
+ }
+ interface ClientSchema {
+ byDoctype: TDoctype
+ client: Client
+ }
+
+ export class Client {
+ appMetadata: { version: string; slug: string }
+ options: ClientLogin
+ idCounter: number
+ isLogged: boolean
+ instanceOptions: ClientInstanceOpts
+ links: unknown
+ chain: unknown
+ schema: unknown
+ plugins: { realtime: TRealtimePlugin; [key: string]: unknown }
+
+ reducer(): any
+ setStore(store: any)
+
+ /**
+ * A plugin is a class whose constructor receives the client as first argument.
+ * The main mean of interaction with the client should be with events
+ * like "login"/"logout".
+ *
+ * The plugin system is meant to encourage separation of concerns, modularity
+ * and testability : instead of registering events at module level, please
+ * create a plugin that subscribes to events.
+ *
+ * Plugin instances are stored internally in the `plugins` attribute of the client
+ * and can be accessed via this mean. A plugin class must have the attribute
+ * `pluginName` that will be use as the key in the `plugins` object.
+ *
+ * Two plugins with the same `pluginName` cannot co-exist.
+ *
+ * @example
+ * ```
+ * class AlertPlugin {
+ * constructor(client, options) {
+ * this.client = client
+ * this.options = options
+ * this.handleLogin = this.handleLogin.bind(this)
+ * this.handleLogout = this.handleLogout.bind(this)
+ * this.client.on("login", this.handleLogin)
+ * this.client.on("logout", this.handleLogout)
+ * }
+ *
+ * handleLogin() {
+ * alert(this.options.onLoginAlert)
+ * }
+ *
+ * handleLogout() {
+ * alert(this.options.onLogoutAlert)
+ * }
+ * }
+ *
+ * AlertPlugin.pluginName = 'alerts'
+ *
+ * client.registerPlugin(AlertPlugin, {
+ * onLoginAlert: 'client has logged in !',
+ * onLogoutAlert: 'client has logged out !'
+ * })
+ *
+ * // the instance of the plugin is accessible via
+ * client.plugins.alerts
+ * ```
+ */
+ registerPlugin(Plugin: RealtimePlugin | unknown, options?: unknown)
+
+ /**
+ * Notify the links that they can start and set isLogged to true.
+ *
+ * On mobile, where url/token are set after instantiation, use this method
+ * to set the token and uri via options.
+ *
+ * Emits
+ *
+ * - "beforeLogin" at the beginning, before links have been set up
+ * - "login" when the client is fully logged in and links have been set up
+ *
+ * @param {object} options - Options
+ * @param {string} options.token - If passed, the token is set on the client
+ * @param {string} options.uri - If passed, the uri is set on the client
+ * @returns {Promise} - Resolves when all links have been setup and client is fully logged in
+ *
+ */
+ login(options: ClientLogin): Promise<unknown>
+
+ /**
+ * Logs out the client and reset all the links
+ *
+ * Emits
+ *
+ * - "beforeLogout" at the beginning, before links have been reset
+ * - "login" when the client is fully logged out and links have been reset
+ *
+ * @returns {Promise} - Resolves when all links have been reset and client is fully logged out
+ */
+ logout(): Promise<unknown>
+
+ /**
+ * Forwards to a stack client instance and returns
+ * a [DocumentCollection]{@link https://docs.cozy.io/en/cozy-client/api/cozy-stack-client/#DocumentCollection} instance.
+ *
+ * @param {string} doctype - The collection doctype.
+ * @returns {CozyStackClient.DocumentCollection} - Collection corresponding to the doctype
+ */
+ collection(doctype: TDoctype): CozyStackClient.AllCollections
+
+ /**
+ * Fetches an endpoint in an authorized way.
+ *
+ * @param {string} method The HTTP method.
+ * @param {string} path The URI.
+ * @param {object} body The payload.
+ * @param {object} opts Options for fetch
+ * @returns {Promise}
+ * @throws {FetchError}
+ */
+ fetch(
+ method: string,
+ path: string,
+ body: unknown,
+ options?: unknown
+ ): Promise<unknown>
+
+ find(doctype: string, selector?: MongoSelector): QueryDefinition
+ get(doctype: TDoctype, id: string): unknown
+ validate<D>(document: D): unknown
+ save<D, M = undefined>(
+ documentType: D,
+ mutationOptions?: M
+ ): Promise<QueryResult<T, I>>
+
+ /**
+ * Saves multiple documents in one batch
+ * - Can only be called with documents from the same doctype
+ * - Does not support automatic creation of references
+ *
+ * @param {CozyClientDocument[]} docs
+ * @param {Object} mutationOptions
+ * @returns {Promise<void>}
+ */
+ saveAll(docs: D[], mutationOptions?: any): Promise<QueryResult<T, I>>
+
+ /**
+ * Creates a list of mutations to execute to create a document and its relationships.
+ *
+ * ```js
+ * const baseDoc = { _type: 'io.cozy.todo', label: 'Go hiking' }
+ * // relations can be arrays or single objects
+ * const relationships = {
+ * attachments: [{ _id: 12345, _type: 'io.cozy.files' }, { _id: 6789, _type: 'io.cozy.files' }],
+ * bills: { _id: 9999, _type: 'io.cozy.bills' }
+ * }
+ * client.getDocumentSavePlan(baseDoc, relationships)
+ * ```
+ *
+ * @param {object} document The base document to create
+ * @param {object} relationships The list of relationships to add, as a dictionnary. Keys should be relationship names and values the documents to link.
+ * @returns {Mutation[]} One or more mutation to execute
+ */
+ getDocumentSavePlan<D>(document: D, relationships: unknown)
+ triggerHook<D>(name: string, document: D): unknown
+
+ /**
+ * Destroys a document. {before,after}:destroy hooks will be fired.
+ *
+ * @param {Document} document - Document to be deleted
+ * @returns {Document} The document that has been deleted
+ */
+ destroy<D>(document: D): Promise<QueryResult<T, I>>
+ upload(file: File, dirPath: string, mutationOptions?: unknown)
+ ensureQueryExists(
+ queryId: string,
+ queryDefinition: QueryDefinition
+ ): unknown
+
+ /**
+ * Executes a query and returns its results.
+ *
+ * Results from the query will be saved internally and can be retrieved via
+ * `getQueryFromState` or directly using `<Query />`. `<Query />` automatically
+ * executes its query when mounted if no fetch policy has been indicated.
+ *
+ * @param {QueryDefinition} queryDefinition - Definition that will be executed
+ * @param {string} options - Options
+ * @param {string} options.as - Names the query so it can be reused (by multiple components for example)
+ * @param {string} options.fetchPolicy - Fetch policy to bypass fetching based on what's already inside the state. See "Fetch policies"
+ * @returns {QueryResult}
+ */
+ query(
+ queryDefinition: QueryDefinition,
+ { update, ...options }?: unknown
+ ): Promise<QueryResult<T, I>>
+
+ /**
+ * Will fetch all documents for a `queryDefinition`, automatically fetching more
+ * documents if the total of documents is superior to the pagination limit. Can
+ * result in a lot of network requests.
+ *
+ * @param {QueryDefinition} queryDefinition - Definition to be executed
+ * @param {object} options - Options to the query
+ * @returns {Array} All documents matching the query
+ */
+ queryAll(
+ queryDefinition: QueryDefinition,
+ options: object
+ ): Promise<QueryResult<T, I>>
+ makeObservableQuery(
+ queryDefinition: QueryDefinition,
+ options?: unknown
+ ): unknown
+ create<D>(
+ doctype: TDoctype,
+ entry: D,
+ relationships?: unknown,
+ options?: unknown
+ ): Promise<QueryResult<T, I>>
+ getStackClient(): ClientStackClient
+ getInstanceOptions(): ClientInstanceOpts
+ toJSON(): ClientToJSON
+
+ /**
+ * Returns documents with their relationships resolved according to their schema.
+ * If related documents are not in the store, they will not be fetched automatically.
+ * Instead, the relationships will have null documents.
+ *
+ * @param {string} doctype - Doctype of the documents being hydrated
+ * @param {Array<Document>} documents - Documents to be hydrated
+ * @returns {Array<HydratedDocument>}
+ */
+ hydrateDocuments<D>(
+ doctype: TDoctype,
+ documents: Array<D>
+ ): Array<HydratedDocument>
+
+ /**
+ * Resolves relationships on a document.
+ *
+ * The original document is kept in the target attribute of
+ * the relationship
+ *
+ * @param {Document} document for which relationships must be resolved
+ * @param {Schema} schemaArg for the document doctype
+ * @returns {HydratedDocument}
+ */
+ hydrateDocument<D>(document: D, schemaArg?: TDoctype): HydratedDocument
+ }
+
+ class CCozyClient {
+ constructor(n: unknown): Client
+ }
+ const CozyClient: {
+ new (n: unknown): Client
+ } = CCozyClient
+ export default CozyClient
+
+ export type HydratedDoc = any
+
+ // FIX BEGIN :: Types temporary
+ export class HasMany {
+ /**
+ * Sets a relationship item with the relationship name and id
+ *
+ * @param {object} doc - Document to be updated
+ * @param {string} relName - Name of the relationship
+ * @param {string} relItemId - Id of the relationship item
+ * @param {object} relItemAttrs - Attributes to be set (at least _id and _type)
+ */
+ static setHasManyItem<D, R>(
+ doc: D,
+ relName: string,
+ relItemId: string,
+ relItemAttrs: Relation
+ ): R
+
+ /**
+ * Gets a relationship item with the relationship name and id
+ *
+ * @param {object} doc - Document to be updated
+ * @param {string} relName - Name of the relationship
+ * @param {string} relItemId - Id of the relationship item
+ */
+ static getHasManyItem<D, R>(doc: D, relName: string, relItemId: string): R
+
+ /**
+ * Updates a relationship item with the relationship name and id
+ *
+ * @param {object} doc - Document to be updated
+ * @param {string} relName - Name of the relationship
+ * @param {string} relItemId - Id of the relationship item
+ * @param {Function} updater - receives the current relationship item and should
+ * return an updated version. Merge should be used in the updater
+ * if previous relationship item fields are to be kept.
+ */
+ static updateHasManyItem<D, R>(
+ doc: D,
+ relName: string,
+ relItemId: string,
+ updater: (relItem: Relation) => Relation
+ ): Promise<QueryResult<R>>
+ }
+ // FIX END
+}
diff --git a/src/utils/decoreText.spec.tsx b/src/utils/decoreText.spec.tsx
new file mode 100644
index 000000000..b9c0f2150
--- /dev/null
+++ b/src/utils/decoreText.spec.tsx
@@ -0,0 +1,16 @@
+import React from 'react'
+import { decoreText } from './decoreText'
+
+describe('decoreText utilis test', () => {
+ it('should return text with span', () => {
+ const text = 'text <span>with span</span> end of text'
+ const result = decoreText(text)
+
+ const expected: JSX.Element = (
+ <>
+ text <span>with span</span> end of text
+ </>
+ )
+ expect(result).toStrictEqual(expected)
+ })
+})
diff --git a/src/utils/decoreText.tsx b/src/utils/decoreText.tsx
index 96dff47d5..595da2417 100644
--- a/src/utils/decoreText.tsx
+++ b/src/utils/decoreText.tsx
@@ -18,6 +18,16 @@ export const decoreText = (line: string, action?: () => void) => {
{line.substring(indexEnd + 4, line.length)}
</>
)
+ } else if (line.includes('<span>')) {
+ const indexStart = line.indexOf('<span>')
+ const indexEnd = line.indexOf('</span>')
+ return (
+ <>
+ {line.substring(0, indexStart)}
+ <span>{line.substring(indexStart + 6, indexEnd)}</span>
+ {line.substring(indexEnd + 7, line.length)}
+ </>
+ )
} else if (line.includes('<span class="action">')) {
const indexStart = line.indexOf('<span class="action">')
const indexEnd = line.indexOf('</span>')
diff --git a/src/utils/picto.spec.ts b/src/utils/picto.spec.ts
index 886bd2ca3..68ca4e3e3 100644
--- a/src/utils/picto.spec.ts
+++ b/src/utils/picto.spec.ts
@@ -12,7 +12,13 @@ import ElecParamIcon from 'assets/icons/visu/elec-param.svg'
import WaterParamIcon from 'assets/icons/visu/water-param.svg'
import GasParamIcon from 'assets/icons/visu/gas-param.svg'
import MultiIcon from 'assets/icons/visu/multi-icon.svg'
-import { getAddPicto, getParamPicto, getPicto } from './picto'
+import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import iconEnedisWhiteLogo from 'assets/icons/visu/enedis-logo-white.svg'
+import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
+import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
+import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
+import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
+import { getAddPicto, getParamPicto, getPartnerPicto, getPicto } from './picto'
describe('picto utilis test', () => {
describe('getPicto test', () => {
@@ -106,4 +112,35 @@ describe('picto utilis test', () => {
expect(result).toBe(ElecParamIcon)
})
})
+
+ describe('getPartnerPicto test', () => {
+ it('should return enedis logo icon', () => {
+ const result = getPartnerPicto('enedisgrandlyon', false)
+ expect(result).toBe(iconEnedisLogo)
+ })
+ it('should return white enedis logo icon', () => {
+ const result = getPartnerPicto('enedisgrandlyon', true)
+ expect(result).toBe(iconEnedisWhiteLogo)
+ })
+ it('should return egl logo icon', () => {
+ const result = getPartnerPicto('eglgrandlyon', false)
+ expect(result).toBe(iconEglLogo)
+ })
+ it('should return white egl logo icon', () => {
+ const result = getPartnerPicto('eglgrandlyon', true)
+ expect(result).toBe(iconEglWhiteLogo)
+ })
+ it('should return grdf logo icon', () => {
+ const result = getPartnerPicto('grdfgrandlyon', false)
+ expect(result).toBe(iconGrdfLogo)
+ })
+ it('should return white grdf logo icon', () => {
+ const result = getPartnerPicto('grdfgrandlyon', true)
+ expect(result).toBe(iconGrdfWhiteLogo)
+ })
+ it('should return default Icon', () => {
+ const result = getPartnerPicto('', false)
+ expect(result).toBe('')
+ })
+ })
})
diff --git a/src/utils/picto.ts b/src/utils/picto.ts
index f85d0efc5..6f5d9e5b5 100644
--- a/src/utils/picto.ts
+++ b/src/utils/picto.ts
@@ -17,7 +17,14 @@ import DisconnectedActive from 'assets/icons/visu/disconnected.svg'
import Disconnected from 'assets/icons/visu/disconnected-grey.svg'
import WaterParamIcon from 'assets/icons/visu/water-param.svg'
import GasParamIcon from 'assets/icons/visu/gas-param.svg'
+import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
+import iconEnedisWhiteLogo from 'assets/icons/visu/enedis-logo-white.svg'
+import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg'
+import iconGrdfWhiteLogo from 'assets/icons/visu/grdf-logo-white.svg'
+import iconEglLogo from 'assets/icons/visu/egl-logo.svg'
+import iconEglWhiteLogo from 'assets/icons/visu/egl-logo-white.svg'
import { FluidType } from '../enum/fluid.enum'
+import ConfigService from 'services/fluidConfig.service'
/**
* Return an icon corresponding to FuildType enum
@@ -113,3 +120,22 @@ export function getNavPicto(
return ElecIcon
}
}
+
+/**
+ * Return an partner icon corresponding to FuildType enum
+ * @param slug string
+ * @param blackLogo boolean - define the color of the logo (black or white)
+ */
+export function getPartnerPicto(slug: string, blackLogo = true) {
+ const fluidconfig = new ConfigService().getFluidConfig()
+ switch (slug) {
+ case fluidconfig[FluidType.ELECTRICITY].konnectorConfig.slug:
+ return blackLogo ? iconEnedisLogo : iconEnedisWhiteLogo
+ case fluidconfig[FluidType.WATER].konnectorConfig.slug:
+ return blackLogo ? iconEglLogo : iconEglWhiteLogo
+ case fluidconfig[FluidType.GAS].konnectorConfig.slug:
+ return blackLogo ? iconGrdfLogo : iconGrdfWhiteLogo
+ default:
+ return ''
+ }
+}
diff --git a/src/utils/steps.spec.ts b/src/utils/steps.spec.ts
new file mode 100644
index 000000000..6ad20cad8
--- /dev/null
+++ b/src/utils/steps.spec.ts
@@ -0,0 +1,36 @@
+import { FluidType } from 'enum/fluid.enum'
+import { Step } from 'models/step.model'
+import { getPartnerSteps } from './steps'
+import {
+ electricitySteps,
+ gasSteps,
+ waterSteps,
+} from '../../tests/__mocks__/stepsData.mock'
+
+describe('steps utilis test', () => {
+ describe('getPartnerSteps test', () => {
+ it('should return Electricty steps', () => {
+ const result = getPartnerSteps(FluidType.ELECTRICITY)
+ const expected: Step[] = electricitySteps
+ expect(result).toEqual(expected)
+ })
+
+ it('should return Water steps', () => {
+ const result = getPartnerSteps(FluidType.WATER)
+ const expected: Step[] = waterSteps
+ expect(result).toEqual(expected)
+ })
+
+ it('should return Gas steps', () => {
+ const result = getPartnerSteps(FluidType.GAS)
+ const expected: Step[] = gasSteps
+ expect(result).toEqual(expected)
+ })
+
+ it('should return empty array', () => {
+ const result = getPartnerSteps(999)
+ const expected: Step[] = []
+ expect(result).toEqual(expected)
+ })
+ })
+})
diff --git a/src/utils/steps.ts b/src/utils/steps.ts
new file mode 100644
index 000000000..646fe5029
--- /dev/null
+++ b/src/utils/steps.ts
@@ -0,0 +1,60 @@
+import { FluidType } from 'enum/fluid.enum'
+import { Step } from 'models/step.model'
+import ElectricityBillIcon from 'assets/icons/visu/partnerSteps/electricity_bill.svg'
+import FranceConnectIcon from 'assets/icons/visu/partnerSteps/france_connect.svg'
+import EnedisIcon from 'assets/icons/visu/partnerSteps/enedis.svg'
+import WaterBillIcon from 'assets/icons/visu/partnerSteps/water_bill.svg'
+import EglIcon from 'assets/icons/visu/partnerSteps/egl.svg'
+import GasBillIcon from 'assets/icons/visu/partnerSteps/gas_bill.svg'
+import GrdfIcon from 'assets/icons/visu/partnerSteps/grdf.svg'
+
+export const getPartnerSteps = (fluidType: FluidType): Step[] => {
+ switch (fluidType) {
+ case FluidType.ELECTRICITY:
+ return [
+ {
+ icon: ElectricityBillIcon,
+ info1: 'partner_connection_steps.electricity.step1.info1',
+ info2: 'partner_connection_steps.electricity.step1.info2',
+ },
+ {
+ icon: FranceConnectIcon,
+ info1: 'partner_connection_steps.electricity.step2.info1',
+ info2: 'partner_connection_steps.electricity.step2.info2',
+ },
+ {
+ icon: EnedisIcon,
+ info1: 'partner_connection_steps.electricity.step3.info1',
+ info2: 'partner_connection_steps.electricity.step3.info2',
+ },
+ ]
+ case FluidType.WATER:
+ return [
+ {
+ icon: WaterBillIcon,
+ info1: 'partner_connection_steps.water.step1.info1',
+ info2: 'partner_connection_steps.water.step1.info2',
+ },
+ {
+ icon: EglIcon,
+ info1: 'partner_connection_steps.water.step2.info1',
+ info2: 'partner_connection_steps.water.step2.info2',
+ },
+ ]
+ case FluidType.GAS:
+ return [
+ {
+ icon: GasBillIcon,
+ info1: 'partner_connection_steps.gas.step1.info1',
+ info2: 'partner_connection_steps.gas.step1.info2',
+ },
+ {
+ icon: GrdfIcon,
+ info1: 'partner_connection_steps.gas.step2.info1',
+ info2: 'partner_connection_steps.gas.step2.info2',
+ },
+ ]
+ default:
+ return []
+ }
+}
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 17322fbe9..7367f2650 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -35,7 +35,8 @@ export function isKonnectorActive(
fluidStatus.filter(
fluid =>
fluid.status === FluidState.NOT_CONNECTED ||
- fluid.status === FluidState.ERROR_LOGIN_FAILED
+ fluid.status === FluidState.ERROR_LOGIN_FAILED ||
+ fluid.status === FluidState.KONNECTOR_NOT_FOUND
).length === 3
) {
return false
@@ -43,7 +44,10 @@ export function isKonnectorActive(
return true
}
}
- if (fluidStatus[fluidType].status === FluidState.NOT_CONNECTED) {
+ if (
+ fluidStatus[fluidType].status === FluidState.NOT_CONNECTED ||
+ fluidStatus[fluidType].status === FluidState.KONNECTOR_NOT_FOUND
+ ) {
return false
} else return true
}
@@ -151,7 +155,7 @@ export const getPreviousMonthName = (date: DateTime) => {
*/
export const getMonthNameWithPrep = (date: DateTime) => {
const monthNames = [
- 'de janavier',
+ 'de janvier',
'de février',
'de mars',
`d'avril`,
@@ -164,7 +168,7 @@ export const getMonthNameWithPrep = (date: DateTime) => {
'de novembre',
'de décembre',
]
- return monthNames[date.month]
+ return monthNames[date.month - 1]
}
/**
diff --git a/tests/__mocks__/client.ts b/tests/__mocks__/client.ts
index 4b6790d12..3f49f639a 100644
--- a/tests/__mocks__/client.ts
+++ b/tests/__mocks__/client.ts
@@ -4,6 +4,7 @@ const mockClient = ({
query: jest.fn(),
create: jest.fn(),
save: jest.fn(),
+ saveAll: jest.fn(),
destroy: jest.fn(),
collection: jest.fn().mockReturnValue({
create: jest.fn(),
diff --git a/tests/__mocks__/datachartData.mock.ts b/tests/__mocks__/datachartData.mock.ts
index 53627571c..de82121d0 100644
--- a/tests/__mocks__/datachartData.mock.ts
+++ b/tests/__mocks__/datachartData.mock.ts
@@ -56,6 +56,36 @@ export const baseDataLoad: Dataload = {
value: 12,
valueDetail: null,
}
+export const dataLoadArray: Dataload[] = [
+ {
+ date: DateTime.fromISO('2021-09-23T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 12,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-09-23T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 12,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-09-23T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 12,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-09-23T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 12,
+ valueDetail: null,
+ },
+]
export const graphMonthData: Datachart = {
actualData: [
diff --git a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
new file mode 100644
index 000000000..179c85a83
--- /dev/null
+++ b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
@@ -0,0 +1,106 @@
+import { DateTime } from 'luxon'
+import {
+ AggregatedEnedisMonthlyDataloads,
+ EnedisMonthlyAnalysisData,
+} from 'models/enedisMonthlyAnalysis'
+import { MaxPowerEntity } from 'models/maxPower.model'
+
+export const mockEnedisMonthlyAnalysis: EnedisMonthlyAnalysisData = {
+ weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
+ weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
+ month: 11,
+ year: 2021,
+ minLoad: 3,
+ maxPower: 2,
+}
+
+export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
+ {
+ weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33],
+ weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23],
+ month: 11,
+ year: 2021,
+ minLoad: 3,
+ maxPower: 2,
+ },
+ {
+ weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
+ weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
+ month: 10,
+ year: 2021,
+ minLoad: 3,
+ maxPower: 2,
+ },
+ {
+ weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
+ weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
+ month: 8,
+ year: 2021,
+ minLoad: 3,
+ maxPower: 2,
+ },
+ {
+ weekDaysHalfHourAverageValues: [0.35, 0.34, 0.33, 0.32, 0.31, 0.3],
+ weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
+ month: 7,
+ year: 2021,
+ minLoad: 3,
+ maxPower: 2,
+ },
+]
+
+export const mockDataLoadEnedisAnalysis: AggregatedEnedisMonthlyDataloads = {
+ week: [
+ {
+ date: DateTime.fromISO('2021-11-01T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 0.35,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-11-01T00:30:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 0.34,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-11-01T01:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 0.33,
+ valueDetail: null,
+ },
+ ],
+ weekend: [
+ {
+ date: DateTime.fromISO('2021-11-01T00:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 0.25,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-11-01T00:30:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 0.24,
+ valueDetail: null,
+ },
+ {
+ date: DateTime.fromISO('2021-11-01T01:00:00.000Z', {
+ zone: 'utc',
+ }),
+ value: 0.23,
+ valueDetail: null,
+ },
+ ],
+}
+
+export const maxPowerData: MaxPowerEntity[] = [
+ {
+ load: 5.3,
+ date: '20/11/2021',
+ },
+]
diff --git a/tests/__mocks__/fluidPrice.mock.ts b/tests/__mocks__/fluidPrice.mock.ts
new file mode 100644
index 000000000..c1212860c
--- /dev/null
+++ b/tests/__mocks__/fluidPrice.mock.ts
@@ -0,0 +1,32 @@
+import { FluidPrice } from 'models'
+
+export const fluidPrices: FluidPrice[] = [
+ {
+ _id: '03045ea1afecc7a86e5443a52e00b07d',
+ endDate: '2020-12-31T23:59:59.000Z',
+ fluidType: 0,
+ price: 0.1429,
+ startDate: '2020-08-01T00:00:00.000Z',
+ },
+ {
+ _id: '03045ea1afecc7a86e5443a52e00b07d',
+ endDate: '2021-10-09T23:59:59.000Z',
+ fluidType: 0,
+ price: 0.1529,
+ startDate: '2021-01-01T00:00:00.000Z',
+ },
+ {
+ _id: '03045ea1afecc7a86e5443a52e00b07d',
+ endDate: '2021-10-31T23:59:59.000Z',
+ fluidType: 0,
+ price: 0.1329,
+ startDate: '2021-10-10T00:00:00.000Z',
+ },
+ {
+ _id: '03045ea1afecc7a86e5443a52e00b07d',
+ endDate: '2014-10-31T23:59:59.000Z',
+ fluidType: 2,
+ price: 1.029,
+ startDate: '2013-08-01T00:00:00.000Z',
+ },
+]
diff --git a/tests/__mocks__/fluidStatusData.mock.ts b/tests/__mocks__/fluidStatusData.mock.ts
index 8505c1a5e..82efc473a 100644
--- a/tests/__mocks__/fluidStatusData.mock.ts
+++ b/tests/__mocks__/fluidStatusData.mock.ts
@@ -1,6 +1,8 @@
import { FluidState } from 'enum/fluid.enum'
import { DateTime } from 'luxon'
import { FluidStatus } from 'models'
+import { PartnersInfo } from 'models/partnersInfo.model'
+/* eslint-disable @typescript-eslint/camelcase */
export const fluidStatusData: FluidStatus[] = [
{
@@ -71,6 +73,18 @@ export const fluidStatusData: FluidStatus[] = [
},
},
]
+export const mockPartnersInfoActivated: PartnersInfo = {
+ grdf_failure: true,
+ enedis_failure: true,
+ egl_failure: true,
+ notification_activated: true,
+}
+export const mockPartnersInfoDisabled: PartnersInfo = {
+ grdf_failure: false,
+ enedis_failure: false,
+ egl_failure: false,
+ notification_activated: false,
+}
export const fluidStatusConnectedData: FluidStatus[] = [
{
diff --git a/tests/__mocks__/globalStateData.mock.ts b/tests/__mocks__/globalStateData.mock.ts
index 2fe70f70c..7315927e7 100644
--- a/tests/__mocks__/globalStateData.mock.ts
+++ b/tests/__mocks__/globalStateData.mock.ts
@@ -4,11 +4,19 @@ import { GlobalState } from 'models'
export const globalStateData: GlobalState = {
screenType: ScreenType.MOBILE,
+ releaseNotes: {
+ show: false,
+ notes: [],
+ },
challengeExplorationNotification: false,
challengeActionNotification: false,
challengeDuelNotification: false,
analysisNotification: false,
- isLastTermAccepted: false,
+ termsStatus: {
+ accepted: false,
+ versionType: 'major',
+ },
+ openPartnersIssueModal: false,
fluidStatus: [
{
fluidType: FluidType.ELECTRICITY,
diff --git a/tests/__mocks__/loadDayData.mock.ts b/tests/__mocks__/loadDayData.mock.ts
index 400062adb..31b34918d 100644
--- a/tests/__mocks__/loadDayData.mock.ts
+++ b/tests/__mocks__/loadDayData.mock.ts
@@ -1,52 +1,56 @@
-import { DataloadEntity } from 'models'
-
-export const loadDayData: DataloadEntity[] = [
- {
- id: 'bf1ce3a5774e140056714c4c200c093e',
- _id: 'bf1ce3a5774e140056714c4c200c093e',
- _type: 'com.grandlyon.enedis.day',
- _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
- day: 1,
- hour: 0,
- load: 25.25,
- minute: 0,
- month: 11,
- year: 2020,
- },
- {
- id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
- _id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
- _type: 'com.grandlyon.enedis.day',
- _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
- day: 2,
- hour: 0,
- load: 20.5,
- minute: 0,
- month: 11,
- year: 2020,
- },
- {
- id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
- _id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
- _type: 'com.grandlyon.enedis.day',
- _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
- day: 3,
- hour: 0,
- load: 30.33,
- minute: 0,
- month: 11,
- year: 2020,
- },
- {
- id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
- _id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
- _type: 'com.grandlyon.enedis.day',
- _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
- day: 4,
- hour: 0,
- load: 1.22,
- minute: 0,
- month: 11,
- year: 2020,
- },
-]
+import { DataloadEntity } from 'models'
+
+export const loadDayData: DataloadEntity[] = [
+ {
+ id: 'bf1ce3a5774e140056714c4c200c093e',
+ _id: 'bf1ce3a5774e140056714c4c200c093e',
+ _type: 'com.grandlyon.enedis.day',
+ _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
+ day: 1,
+ hour: 0,
+ load: 25.25,
+ minute: 0,
+ month: 11,
+ year: 2020,
+ price: 0.12,
+ },
+ {
+ id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
+ _id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
+ _type: 'com.grandlyon.enedis.day',
+ _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
+ day: 2,
+ hour: 0,
+ load: 20.5,
+ minute: 0,
+ month: 11,
+ year: 2020,
+ price: 0.14,
+ },
+ {
+ id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
+ _id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
+ _type: 'com.grandlyon.enedis.day',
+ _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
+ day: 3,
+ hour: 0,
+ load: 30.33,
+ minute: 0,
+ month: 11,
+ year: 2020,
+ price: 0.18,
+ },
+ {
+ id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
+ _id: 'cf7dc6f44a19b354f99b01ba1a0b4840',
+ _type: 'com.grandlyon.enedis.day',
+ _rev: '1-4fe971dff073a3c3c6cc12a0246e642e',
+ day: 4,
+ hour: 0,
+ load: 1.22,
+ minute: 0,
+ month: 11,
+ year: 2020,
+ price: 0.16,
+ },
+]
diff --git a/tests/__mocks__/profile.mock.ts b/tests/__mocks__/profile.mock.ts
index 2faa1510b..fa8a65ba6 100644
--- a/tests/__mocks__/profile.mock.ts
+++ b/tests/__mocks__/profile.mock.ts
@@ -13,6 +13,9 @@ export const profileData: Profile = {
isFirstConnection: true,
sendConsumptionAlert: false,
waterDailyConsumptionLimit: 0,
+ partnersIssueDate: DateTime.fromISO('2020-11-03T00:00:00.000Z', {
+ zone: 'utc',
+ }),
mailToken: '',
lastConnectionDate: DateTime.fromISO('2020-11-03T00:00:00.000Z', {
zone: 'utc',
@@ -23,7 +26,7 @@ export const profileData: Profile = {
}),
sendAnalysisNotification: false,
isProfileTypeCompleted: false,
- tutorial: {
+ onboarding: {
isWelcomeSeen: false,
},
}
diff --git a/tests/__mocks__/stepsData.mock.ts b/tests/__mocks__/stepsData.mock.ts
new file mode 100644
index 000000000..dc5db01a0
--- /dev/null
+++ b/tests/__mocks__/stepsData.mock.ts
@@ -0,0 +1,50 @@
+import { Step } from 'models/step.model'
+import ElectricityBillIcon from 'assets/icons/visu/partnerSteps/electricity_bill.svg'
+import FranceConnectIcon from 'assets/icons/visu/partnerSteps/france_connect.svg'
+import EnedisIcon from 'assets/icons/visu/partnerSteps/enedis.svg'
+import WaterBillIcon from 'assets/icons/visu/partnerSteps/water_bill.svg'
+import EglIcon from 'assets/icons/visu/partnerSteps/egl.svg'
+import GasBillIcon from 'assets/icons/visu/partnerSteps/gas_bill.svg'
+import GrdfIcon from 'assets/icons/visu/partnerSteps/grdf.svg'
+
+export const electricitySteps: Step[] = [
+ {
+ icon: ElectricityBillIcon,
+ info1: 'partner_connection_steps.electricity.step1.info1',
+ info2: 'partner_connection_steps.electricity.step1.info2',
+ },
+ {
+ icon: FranceConnectIcon,
+ info1: 'partner_connection_steps.electricity.step2.info1',
+ info2: 'partner_connection_steps.electricity.step2.info2',
+ },
+ {
+ icon: EnedisIcon,
+ info1: 'partner_connection_steps.electricity.step3.info1',
+ info2: 'partner_connection_steps.electricity.step3.info2',
+ },
+]
+export const waterSteps: Step[] = [
+ {
+ icon: WaterBillIcon,
+ info1: 'partner_connection_steps.water.step1.info1',
+ info2: 'partner_connection_steps.water.step1.info2',
+ },
+ {
+ icon: EglIcon,
+ info1: 'partner_connection_steps.water.step2.info1',
+ info2: 'partner_connection_steps.water.step2.info2',
+ },
+]
+export const gasSteps: Step[] = [
+ {
+ icon: GasBillIcon,
+ info1: 'partner_connection_steps.gas.step1.info1',
+ info2: 'partner_connection_steps.gas.step1.info2',
+ },
+ {
+ icon: GrdfIcon,
+ info1: 'partner_connection_steps.gas.step2.info1',
+ info2: 'partner_connection_steps.gas.step2.info2',
+ },
+]
diff --git a/tests/__mocks__/store.ts b/tests/__mocks__/store.ts
index d389f3f9a..12e187a9a 100644
--- a/tests/__mocks__/store.ts
+++ b/tests/__mocks__/store.ts
@@ -32,7 +32,11 @@ export const mockInitialGlobalState: GlobalState = {
challengeActionNotification: false,
challengeDuelNotification: false,
analysisNotification: false,
- isLastTermAccepted: false,
+ termsStatus: {
+ accepted: false,
+ versionType: 'init',
+ },
+ openPartnersIssueModal: false,
releaseNotes: { show: false, notes: [{ description: '', title: '' }] },
fluidStatus: [
{
@@ -107,6 +111,7 @@ export const mockInitialProfileState: Profile = {
quizHash: '',
explorationHash: '',
isFirstConnection: false,
+ partnersIssueDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
lastConnectionDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
haveSeenLastAnalysis: true,
sendConsumptionAlert: false,
@@ -115,7 +120,7 @@ export const mockInitialProfileState: Profile = {
mailToken: '',
monthlyAnalysisDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
isProfileTypeCompleted: false,
- tutorial: {
+ onboarding: {
isWelcomeSeen: false,
},
}
diff --git a/yarn.lock b/yarn.lock
index 8b53c0d0c..ba2048428 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3348,7 +3348,7 @@ browserslist-config-cozy@^0.3.0, browserslist-config-cozy@^0.3.1:
resolved "https://registry.yarnpkg.com/browserslist-config-cozy/-/browserslist-config-cozy-0.3.2.tgz#0a06ed1357480e4e90bbe826aa3159c7e8bc85b3"
integrity sha512-d3wUIrKK8OYUPpgY3FJdb2I3xoDLtia7s2hhNfVUvQMldhw/xivmbtrPlkDdtsOjXa/SXKNhJT45uiS1QOhqVg==
-browserslist@^4.11.1, browserslist@^4.17.5, browserslist@^4.17.6, browserslist@^4.3.4:
+browserslist@^4.11.1, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.3.4:
version "4.18.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
@@ -4512,11 +4512,11 @@ copy-webpack-plugin@6.4.1:
webpack-sources "^1.4.3"
core-js-compat@^3.18.0:
- version "3.19.1"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.1.tgz#fe598f1a9bf37310d77c3813968e9f7c7bb99476"
- integrity sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==
+ version "3.19.2"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.2.tgz#18066a3404a302433cb0aa8be82dd3d75c76e5c4"
+ integrity sha512-ObBY1W5vx/LFFMaL1P5Udo4Npib6fu+cMokeziWkA8Tns4FcDemKF5j9JvaI5JhdkW8EQJQGJN1EcrzmEwuAqQ==
dependencies:
- browserslist "^4.17.6"
+ browserslist "^4.18.1"
semver "7.0.0"
core-js-pure@^3.19.0:
@@ -10754,15 +10754,8 @@ mini-css-extract-plugin@0.5.0:
schema-utils "^1.0.0"
webpack-sources "^1.1.0"
-minilog@3.1.0:
- version "3.1.0"
- resolved "git+https://github.com/cozy/minilog.git#6da0aa58759c4f1a1a7e0fd093dbe2a67c035c55"
- dependencies:
- microee "0.0.6"
-
-"minilog@https://github.com/cozy/minilog.git#master":
+minilog@3.1.0, "minilog@https://github.com/cozy/minilog.git#master":
version "3.1.0"
- uid "6da0aa58759c4f1a1a7e0fd093dbe2a67c035c55"
resolved "https://github.com/cozy/minilog.git#6da0aa58759c4f1a1a7e0fd093dbe2a67c035c55"
dependencies:
microee "0.0.6"
--
GitLab