Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

8ba80c2a

Commit 8ba80c2a authored 4 years ago by Aurélie HAUTBOIS

Downloads
- Plain Diff

Merge branch 'features/US387-Update-profileType' into 'dev'

Features/us387 update profile type

See merge request web-et-numerique/llle_project/ecolyo!262

parents 12370ce5 da1b4b29

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Options/ProfileTypeOptions.spec.tsx 2 additions, 0 deletions

src/components/Options/ProfileTypeOptions.spec.tsx
src/components/Options/ProfileTypeOptions.tsx 1 addition, 3 deletions

src/components/Options/ProfileTypeOptions.tsx
src/constants/consumptionConstants/electricSpecific.json 1 addition, 1 deletion

src/constants/consumptionConstants/electricSpecific.json
src/constants/consumptionConstants/heating.json 8 additions, 8 deletions

src/constants/consumptionConstants/heating.json
src/locales/fr.json 1 addition, 0 deletions

src/locales/fr.json
src/store/profile/profile.reducer.ts 10 additions, 14 deletions

src/store/profile/profile.reducer.ts
test/__mocks__/profile.mock.ts 12 additions, 15 deletions

test/__mocks__/profile.mock.ts
test/__mocks__/store.ts 10 additions, 14 deletions

test/__mocks__/store.ts

with 45 additions and 55 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment