diff --git a/src/components/Exploration/ExplorationError.tsx b/src/components/Exploration/ExplorationError.tsx index 10041e46d43f991398bd612fddaf2e3d2cb3f724..06b1a036d3a6bc819a99d2c56600ca1ef114d7a7 100644 --- a/src/components/Exploration/ExplorationError.tsx +++ b/src/components/Exploration/ExplorationError.tsx @@ -1,35 +1,36 @@ -import React, { useCallback } from 'react' -import { useI18n } from 'cozy-ui/transpiled/react/I18n' -import { useHistory } from 'react-router-dom' -import './explorationError.scss' -import MuiButton from '@material-ui/core/Button' - -const ExplorationError: React.FC = () => { - const { t } = useI18n() - const history = useHistory() - - const goBack = useCallback(() => { - history.goBack() - }, [history]) - - return ( - <div className="exploration-error-container"> - <div className="exploration-error-message"> - {t('exploration.global_error')} - </div> - <div className="exploration-error-button"> - <MuiButton - onClick={goBack} - classes={{ - root: 'btn-secondary-negative', - label: 'text-16-normal', - }} - > - {t('exploration.go_back')} - </MuiButton> - </div> - </div> - ) -} - -export default ExplorationError +import React, { useCallback } from 'react' +import { useI18n } from 'cozy-ui/transpiled/react/I18n' +import { useHistory } from 'react-router-dom' +import './explorationError.scss' +import Button from '@material-ui/core/Button' + +const ExplorationError: React.FC = () => { + const { t } = useI18n() + const history = useHistory() + + const goBack = useCallback(() => { + history.goBack() + }, [history]) + + return ( + <div className="exploration-error-container"> + <div className="exploration-error-message"> + {t('exploration.global_error')} + </div> + <div className="exploration-error-button"> + <Button + aria-label={t('exploration.accessibility.button_go_back')} + onClick={goBack} + classes={{ + root: 'btn-secondary-negative', + label: 'text-16-normal', + }} + > + {t('exploration.button_go_back')} + </Button> + </div> + </div> + ) +} + +export default ExplorationError diff --git a/src/components/Exploration/ExplorationFinished.spec.tsx b/src/components/Exploration/ExplorationFinished.spec.tsx index 7b4a2566b8260cc6b946fe821744db9be3f58866..acf9914d843657e48536ba121d006d7daa61b0e5 100644 --- a/src/components/Exploration/ExplorationFinished.spec.tsx +++ b/src/components/Exploration/ExplorationFinished.spec.tsx @@ -5,7 +5,7 @@ import configureStore from 'redux-mock-store' import ExplorationFinished from './ExplorationFinished' import { globalStateData } from '../../../tests/__mocks__/globalStateData.mock' import { userChallengeData } from '../../../tests/__mocks__/userChallengeData.mock' -import MuiButton from '@material-ui/core/Button' +import Button from '@material-ui/core/Button' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' jest.mock('cozy-ui/transpiled/react/I18n', () => { @@ -59,7 +59,7 @@ describe('ExplorationFinished', () => { </Provider> ) wrapper - .find(MuiButton) + .find(Button) .first() .simulate('click') }) diff --git a/src/components/Exploration/ExplorationFinished.tsx b/src/components/Exploration/ExplorationFinished.tsx index 5ce36eb3d072365f7098b3ebe039105f6c81e9e5..de05d075324919ffba26079dcd414df43205c0ee 100644 --- a/src/components/Exploration/ExplorationFinished.tsx +++ b/src/components/Exploration/ExplorationFinished.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react' import './explorationFinished.scss' import { useI18n } from 'cozy-ui/transpiled/react/I18n' import starResult from 'assets/icons/visu/quiz/starResult.svg' -import MuiButton from '@material-ui/core/Button' +import Button from '@material-ui/core/Button' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import { UserChallenge } from 'models' import { useHistory } from 'react-router-dom' @@ -59,15 +59,16 @@ const ExplorationFinished: React.FC<ExplorationFinishedProps> = ({ size={30} /> </div> - <MuiButton + <Button + aria-label={t('exploration.accessibility.button_confirm')} onClick={goBack} classes={{ root: 'btn-secondary-negative', label: 'text-16-normal', }} > - {t('exploration.confirm')} - </MuiButton> + {t('exploration.button_confirm')} + </Button> </div> </div> ) diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx index 0ef7374e274f27fdd17d31a1521f40405ae382a0..6dc55e62b5ca08a13ed8bf02d086ac45a04bcb26 100644 --- a/src/components/Exploration/ExplorationOngoing.tsx +++ b/src/components/Exploration/ExplorationOngoing.tsx @@ -7,7 +7,7 @@ import { useDispatch } from 'react-redux' import { UserChallenge } from 'models' import { UserChallengeUpdateFlag } from 'enum/userChallenge.enum' -import MuiButton from '@material-ui/core/Button' +import Button from '@material-ui/core/Button' import StarsContainer from 'components/Challenge/StarsContainer' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import { @@ -58,24 +58,26 @@ const ExplorationOngoing: React.FC<ExplorationOngoingProps> = ({ case UserExplorationType.DECLARATIVE: return ( <div className="button-start"> - <MuiButton + <Button + aria-label={t('exploration.accessibility.button_already_done')} onClick={validExploration} classes={{ root: 'btn-secondary-negative', label: 'text-16-normal', }} > - {t('exploration.already_done')} - </MuiButton> - <MuiButton + {t('exploration.button_already_done')} + </Button> + <Button + aria-label={t('exploration.accessibility.button_already_done')} onClick={goBack} classes={{ root: 'btn-secondary-negative', label: 'text-16-normal', }} > - {t('exploration.come_back')} - </MuiButton> + {t('exploration.button_come_back')} + </Button> </div> ) case UserExplorationType.ACTION: @@ -83,15 +85,16 @@ const ExplorationOngoing: React.FC<ExplorationOngoingProps> = ({ case UserExplorationType.CONSUMPTION: return ( <div className="button-start"> - <MuiButton + <Button + aria-label={t('exploration.accessibility.button_start')} onClick={startExploration} classes={{ root: 'btn-secondary-negative', label: 'text-16-normal', }} > - {t('exploration.start')} - </MuiButton> + {t('exploration.button_start')} + </Button> </div> ) } diff --git a/src/locales/fr.json b/src/locales/fr.json index e76bb38910961cd36dfa90e6414014291e78108a..a09f459f82421e06da830f7fa3dd7dee1f512cf7 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -317,17 +317,24 @@ }, "exploration": { "global_error": "Oups.. Une erreur est parvenue. Veuillez retourner à l'écran des défis", - "go_back": "Retour", - "already_done": "C’est déjà fait !", - "come_back": "Je reviens quand ce sera fait", + "button_go_back": "Retour", + "button_already_done": "C’est déjà fait !", + "button_come_back": "Je reviens quand ce sera fait", "watch_ecogesture": "Je vais voir cet écogeste", - "start": "C'est parti !", + "button_start": "C'est parti !", "watch_consumption": "Je fonce", "congratulation": "Bravo !", "earn": "Vous remportez", - "confirm": "Ok", + "button_confirm": "Ok", "interval": { "explanation": "Vous pouvez vérifier cette informations sur l'écran Conso." + }, + "accessibility": { + "button_already_done": "Marquer l'exploration comme déjà réalisée", + "button_confirm": "Valider", + "button_come_back": "Fermer l'exploration", + "button_go_back": "Retour", + "button_start": "Lancer l'exploration" } }, "faq": {