diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx index aced331fa856ba0eb65f9131dbd911e916bab940..288be905f3c2426cbed9dcc8960890165c41504e 100644 --- a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx +++ b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx @@ -133,7 +133,6 @@ const ProfileComparator = ({ {t('analysis.approximative_description')} </div> <Button - aria-label={t('analysis.accessibility.button_go_to_profil')} onClick={() => navigate('/profileType')} classes={{ root: 'btnPrimary', diff --git a/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap b/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap index ec5c29db91c2ef279614c9ceef7838977dbdb46a..40897d20f9d65accdadbbc1b929458ef5a404575 100644 --- a/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap +++ b/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap @@ -32,7 +32,6 @@ exports[`AnalysisConsumption component should be rendered correctly with profile analysis.approximative_description </div> <button - aria-label="analysis.accessibility.button_go_to_profil" class="MuiButtonBase-root MuiButton-root btnPrimary MuiButton-text MuiButton-textSizeLarge MuiButton-sizeLarge" data-testid="goToProfile" tabindex="0" diff --git a/src/components/Challenge/ChallengeCard/ChallengeCard.tsx b/src/components/Challenge/ChallengeCard/ChallengeCard.tsx index 12673d7f69056d61713fdd13d9ab1e8948b14848..e68175ff64d2f79ad49c70ffeba5551d36d44821 100644 --- a/src/components/Challenge/ChallengeCard/ChallengeCard.tsx +++ b/src/components/Challenge/ChallengeCard/ChallengeCard.tsx @@ -1,3 +1,4 @@ +import { useI18n } from 'cozy-ui/transpiled/react/I18n' import { UserChallengeState } from 'enums' import { UserChallenge } from 'models' import React from 'react' @@ -25,6 +26,8 @@ const ChallengeCard = ({ cardHeight, moveToSlide, }: ChallengeCardProps) => { + const { t } = useI18n() + const renderCard = (userChallenge: UserChallenge | undefined) => { switch (userChallenge?.state) { case UserChallengeState.LOCKED: @@ -43,6 +46,7 @@ const ChallengeCard = ({ return ( <button + aria-label={t('challenge.card.goto')} onClick={() => moveToSlide(index)} className={indexSlider === index ? 'slide active' : 'slide inactive'} style={{ diff --git a/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap b/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap index 9631c07baf921f835533adfd5d6718f56ee80c93..bdba3583167a557a78f45872e7dbcbe5bf83db09 100644 --- a/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap +++ b/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap @@ -3,6 +3,7 @@ exports[`ChallengeCard component should be rendered correctly 1`] = ` <div> <button + aria-label="challenge.card.goto" class="slide active" style="min-width: 200px; max-width: 200px; min-height: 400px; background: none; padding: 0px;" > @@ -55,7 +56,6 @@ RUISSEAU class="buttons" > <button - aria-label="challenge.card_done.final_defi_view" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -70,7 +70,6 @@ RUISSEAU /> </button> <button - aria-label="challenge.card_done.reset_defi" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimaryNegative" tabindex="0" type="button" diff --git a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx index d62b47d36700bfebc8cddf816d03ef991ab9ba93..ec7e9511042657b725442790da1133df0c10e116 100644 --- a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx +++ b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx @@ -65,7 +65,9 @@ describe('ChallengeCardDone component', () => { <ChallengeCardDone userChallenge={userChallengeData[0]} /> </Provider> ) - const resetBtn = screen.getByLabelText('challenge.card_done.reset_defi') + const resetBtn = screen.getByRole('button', { + name: 'challenge.card_done.reset_defi', + }) expect(resetBtn).toHaveProperty('disabled') expect(mockDispatch).toHaveBeenCalledTimes(0) expect(mockUpdateUserChallenge).toHaveBeenCalledTimes(0) @@ -76,7 +78,9 @@ describe('ChallengeCardDone component', () => { <ChallengeCardDone userChallenge={userChallengeData[1]} /> </Provider> ) - const resetBtn = screen.getByLabelText('challenge.card_done.reset_defi') + const resetBtn = screen.getByRole('button', { + name: 'challenge.card_done.reset_defi', + }) expect(resetBtn).toHaveClass('btnPrimaryNegative') }) it('should be secondary button is challenge is won', async () => { @@ -85,7 +89,9 @@ describe('ChallengeCardDone component', () => { <ChallengeCardDone userChallenge={userChallengeData[0]} /> </Provider> ) - const resetBtn = screen.getByLabelText('challenge.card_done.reset_defi') + const resetBtn = screen.getByRole('button', { + name: 'challenge.card_done.reset_defi', + }) expect(resetBtn).toHaveClass('btnSecondary') }) }) diff --git a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx index ec66ecbaaa8c37c70d9a38835794d5d0c6f96097..f671152a31ce1d1a404786ff7456fd9a01ed3eb6 100644 --- a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx +++ b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx @@ -115,15 +115,10 @@ const ChallengeCardDone = ({ </span> </div> <div className="buttons"> - <Button - aria-label={t('challenge.card_done.final_defi_view')} - onClick={goDuel} - className="btnSecondary" - > + <Button onClick={goDuel} className="btnSecondary"> {t('challenge.card_done.final_defi_view')} </Button> <Button - aria-label={t('challenge.card_done.reset_defi')} onClick={handleChallengeReset} className={ userChallenge.success === UserChallengeSuccess.WIN diff --git a/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap b/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap index 7df066b7f28a181089a3075beb5f502a88dba5ae..8e652c9da261c26fa84eca16f6493cf8fe2474b6 100644 --- a/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap +++ b/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap @@ -51,7 +51,6 @@ VEILLE class="buttons" > <button - aria-label="challenge.card_done.final_defi_view" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -66,7 +65,6 @@ VEILLE /> </button> <button - aria-label="challenge.card_done.reset_defi" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" diff --git a/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx b/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx index 2fef4046dc7682b742ff8e871321843be3dc119a..a4eaf33c5611ddd55167b08f6762dc3257e4bcf9 100644 --- a/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx +++ b/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx @@ -23,11 +23,7 @@ const ChallengeCardLast = () => { <StyledIcon icon={ecolyoIcon} size={62} /> <div className="text-22-bold">{t('challenge.card_last.title')}</div> <div className="text-18-normal">{t('challenge.card_last.message1')}</div> - <Button - aria-label={t('challenge.card_last.button')} - onClick={handleClickFeedbacks} - className="btnSecondary" - > + <Button onClick={handleClickFeedbacks} className="btnSecondary"> {t('challenge.card_last.button')} </Button> </div> diff --git a/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap b/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap index 7d36624206fb1815aa9f10d018895ebf36b1e652..7100f0f0f9ac4dd3124a6c7a62edf28447039580 100644 --- a/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap +++ b/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap @@ -26,7 +26,6 @@ exports[`ChallengeCardLast component should be rendered correctly 1`] = ` challenge.card_last.message1 </div> <button - aria-label="challenge.card_last.button" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" diff --git a/src/components/Connection/EPGLConnect/EpglForm.tsx b/src/components/Connection/EPGLConnect/EpglForm.tsx index 7191e963194e170835f4c0ab1c57bb3251afb7e2..b609b1136282053bacc43b05080ccf67daf68807 100644 --- a/src/components/Connection/EPGLConnect/EpglForm.tsx +++ b/src/components/Connection/EPGLConnect/EpglForm.tsx @@ -119,7 +119,12 @@ const EpglForm = ({ hasCreatedAccount }: { hasCreatedAccount: boolean }) => { <span> <StyledIconButton icon={TrailingIcon} - aria-label={t('auth.accessibility.button_reveal_password')} + aria-label={ + showPassword + ? t('auth.accessibility.button_hide_password') + : t('auth.accessibility.button_reveal_password') + } + aria-checked={showPassword} className="iconShowPassword" sized={22} onClick={() => setShowPassword(prev => !prev)} diff --git a/src/components/ConsumptionVisualizer/NoDataModal.tsx b/src/components/ConsumptionVisualizer/NoDataModal.tsx index 18f23c2ccea90ceeaae98c971ac673b5c86d3173..b930837d793c8ebe7a959c3380a137c2c81ead77 100644 --- a/src/components/ConsumptionVisualizer/NoDataModal.tsx +++ b/src/components/ConsumptionVisualizer/NoDataModal.tsx @@ -52,11 +52,7 @@ const NoDataModal = ({ open, handleCloseClick }: NoDataModalProps) => { <li>{t('consumption_visualizer.dataModal.item3')}</li> <li>{t('consumption_visualizer.dataModal.item4')}</li> </ul> - <Button - aria-label={t('ecogesture_info_modal.button_close')} - onClick={handleCloseClick} - className="btnPrimary" - > + <Button onClick={handleCloseClick} className="btnPrimary"> {t('ecogesture_info_modal.button_close')} </Button> </div> diff --git a/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap b/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap index 0e55d2ee5612b347dd565a0e4c80c535cd4e86f2..a15d8b061d7ef889f00d00d47dbb84a68c5bd93a 100644 --- a/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap +++ b/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap @@ -103,7 +103,6 @@ exports[`NoDataModal component should render correctly 1`] = ` </li> </ul> <button - aria-label="ecogesture_info_modal.button_close" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx index bb80e51c277159a6a86b66b005e075cc0867f08a..20f5c94c90cbe9613cafdb70e5e70a8c4db99aff 100644 --- a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx +++ b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx @@ -32,7 +32,9 @@ describe('EcogestureEmptyList component', () => { /> ) await act(async () => { - await userEvent.click(screen.getByLabelText('ecogesture.emptyList.btn1')) + await userEvent.click( + screen.getByRole('button', { name: 'ecogesture.emptyList.btn1' }) + ) }) expect(mockChangeTab).toHaveBeenCalledTimes(1) }) @@ -46,7 +48,9 @@ describe('EcogestureEmptyList component', () => { /> ) await act(async () => { - await userEvent.click(screen.getByLabelText('ecogesture.emptyList.btn2')) + await userEvent.click( + screen.getByRole('button', { name: 'ecogesture.emptyList.btn2' }) + ) }) expect(mockedNavigate).toHaveBeenCalledWith('/ecogesture-form') }) diff --git a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx index 67fded06ba6c642247edc1f04b8a7696258674c3..2e42535913646a4a73f3478668543c455abc3c76 100644 --- a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx +++ b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx @@ -38,27 +38,18 @@ const EcogestureEmptyList = ({ {t(`ecogesture.emptyList.${objOrDoing}2${isDone}`)} </div> <div className="buttons"> - <Button - aria-label={t('ecogesture.emptyList.btn1')} - onClick={() => setTab(2)} - className="btnSecondary" - > + <Button onClick={() => setTab(2)} className="btnSecondary"> {t('ecogesture.emptyList.btn1')} </Button> {isSelectionDone && ( - <Button - aria-label={t('ecogesture.reset')} - onClick={openResetEcogestureModal} - className="btnSecondary" - > + <Button onClick={openResetEcogestureModal} className="btnSecondary"> {t('ecogesture.reset')} </Button> )} {!isSelectionDone && ( <Button - aria-label={t('ecogesture.emptyList.btn2')} onClick={() => { navigate('/ecogesture-form') }} diff --git a/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap b/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap index 3fcc1897fd30e95764ae4a513e3220b41e039d85..e3f1bf13dff495bdea274da2fa76b1bd01728d3c 100644 --- a/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap +++ b/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap @@ -32,7 +32,6 @@ exports[`EcogestureEmptyList component should be rendered correctly 1`] = ` class="buttons" > <button - aria-label="ecogesture.emptyList.btn1" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -47,7 +46,6 @@ exports[`EcogestureEmptyList component should be rendered correctly 1`] = ` /> </button> <button - aria-label="ecogesture.emptyList.btn2" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx b/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx index c4bf6436168bc290dd586869332eacff4c980af0..4f2b5cd15e6b230c2b02458d2202337e2f87eeff 100644 --- a/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx +++ b/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx @@ -29,7 +29,6 @@ const EcogestureNotFound = ({ <div className="text-18-bold head">{text}</div> <Button - aria-label={t('error_page.back')} onClick={() => navigate(`/${returnPage}`)} className="btnPrimary" > diff --git a/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap b/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap index c6390dcbde7545e575c73c7134cb4eac3b4bc6a4..bc2f4b297e7baf3862807c12a31ec31424b98761 100644 --- a/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap +++ b/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap @@ -28,7 +28,6 @@ exports[`EcogestureNotFound component should be rendered correctly 1`] = ` test </div> <button - aria-label="error_page.back" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx b/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx index b12843e7146f744b7e1c80364cf4dfa2196a66c6..837319408543eceb10846b1e2525185e5827ee47 100644 --- a/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx +++ b/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx @@ -62,18 +62,10 @@ const EcogestureResetModal = ({ {t('ecogesture.resetModal.text2')} </div> <div className="buttons-container"> - <Button - aria-label={t('ecogesture.resetModal.btn1')} - onClick={closeEcogestureResetModal} - className="btnSecondary" - > + <Button onClick={closeEcogestureResetModal} className="btnSecondary"> {t('ecogesture.resetModal.btn1')} </Button> - <Button - aria-label={t('ecogesture.resetModal.btn2')} - onClick={handleConfirmReset} - className="btnPrimary" - > + <Button onClick={handleConfirmReset} className="btnPrimary"> {t('ecogesture.resetModal.btn2')} </Button> </div> diff --git a/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap b/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap index ccaf95b8f6b19289da3a04c5bc41f1e36d7b7e95..dbb5c320ec979eec2e63365d8c44f0ae41e5b17b 100644 --- a/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap +++ b/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap @@ -110,7 +110,6 @@ exports[`EcogestureResetModal component should be rendered correctly 1`] = ` class="buttons-container" > <button - aria-label="ecogesture.resetModal.btn1" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -125,7 +124,6 @@ exports[`EcogestureResetModal component should be rendered correctly 1`] = ` /> </button> <button - aria-label="ecogesture.resetModal.btn2" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap index 7ccd151382e3967c0377207e3fe1b6bf5c066cc7..e1aeb701831ac33e157476bf3a59781392e6d98b 100644 --- a/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap +++ b/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap @@ -126,7 +126,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable class="buttons" > <button - aria-label="ecogesture.emptyList.btn1" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -138,7 +137,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable </span> </button> <button - aria-label="ecogesture.emptyList.btn2" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" @@ -189,7 +187,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable class="buttons" > <button - aria-label="ecogesture.emptyList.btn1" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -201,7 +198,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable </span> </button> <button - aria-label="ecogesture.emptyList.btn2" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx b/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx index 139480c97513372cf97867be4bad1b082c1b9df7..055a71bf620592a1c7bcf3b4f5daff1a959c2b50 100644 --- a/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx +++ b/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx @@ -72,7 +72,6 @@ const EcogestureSelectionDetail = ({ </div> <div className="buttons"> <Button - aria-label={t('ecogesture_selection.button_objective')} classes={{ root: 'btnSecondary', label: 'text-14-bold', @@ -83,7 +82,6 @@ const EcogestureSelectionDetail = ({ {t('ecogesture_selection.button_objective')} </Button> <Button - aria-label={t('ecogesture_selection.button_doing')} classes={{ root: 'btnSecondary', label: 'text-14-bold', @@ -94,7 +92,6 @@ const EcogestureSelectionDetail = ({ {t('ecogesture_selection.button_doing')} </Button> <Button - aria-label={t('ecogesture_selection.button_skip')} classes={{ root: 'btnSecondary', label: 'text-14-bold', diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap b/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap index bbd6adbd92d72288c227dec29d4990211f4e943e..8cf01231bcc3e1356f09dfd7252a97ad5d3fe0ab 100644 --- a/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap +++ b/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap @@ -69,7 +69,6 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] = class="buttons" > <button - aria-label="ecogesture_selection.button_objective" class="MuiButtonBase-root MuiButton-root btnSecondary MuiButton-text" tabindex="0" type="button" @@ -94,7 +93,6 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] = /> </button> <button - aria-label="ecogesture_selection.button_doing" class="MuiButtonBase-root MuiButton-root btnSecondary MuiButton-text" tabindex="0" type="button" @@ -119,7 +117,6 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] = /> </button> <button - aria-label="ecogesture_selection.button_skip" class="MuiButtonBase-root MuiButton-root btnSecondary MuiButton-text" tabindex="0" type="button" diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx b/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx index e1b6ca29b7741cb3d08cd9c85ed37c897f9d6132..e2782d56a94fb5bf971b2e6938ec2dcf0ec03413 100644 --- a/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx +++ b/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx @@ -1,10 +1,10 @@ import { Button } from '@material-ui/core' import Dialog from '@material-ui/core/Dialog' import CloseIcon from 'assets/icons/ico/close.svg' +import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' import { useI18n } from 'cozy-ui/transpiled/react/I18n' import React from 'react' import './ecogestureSelectionModal.scss' -import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' interface EcogestureSelectionModalProps { open: boolean @@ -43,11 +43,7 @@ const EcogestureSelectionModal = ({ <div className="text text-16-normal"> {t('ecogesture_selection.selectionModal.text')} </div> - <Button - aria-label={t('ecogesture_selection.selectionModal.button_close')} - onClick={handleCloseClick} - className="btnPrimary" - > + <Button onClick={handleCloseClick} className="btnPrimary"> {t('ecogesture_selection.selectionModal.button_close')} </Button> </div> diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap b/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap index ae72635379c48ac6555a3475f1cb13e08bb71b27..313bf71d75b7813132e146c6cf2ee84398093635 100644 --- a/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap +++ b/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap @@ -75,7 +75,6 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = ` ecogesture_selection.selectionModal.text </div> <button - aria-label="ecogesture_selection.selectionModal.button_close" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx index 347081ae2935b8ac21e527414341c2829c2d3059..f734f64e0cc099049c5292096a74fedf5ee0502d 100644 --- a/src/components/Exploration/ExplorationOngoing.tsx +++ b/src/components/Exploration/ExplorationOngoing.tsx @@ -61,7 +61,7 @@ const ExplorationOngoing = ({ userChallenge }: ExplorationOngoingProps) => { {t('exploration.button_already_done')} </Button> <Button - aria-label={t('exploration.accessibility.button_already_done')} + aria-label={t('exploration.accessibility.button_come_back')} onClick={() => navigate(-1)} className="btnSecondary" > diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx index 762c0def3da3f44ad32cb010178f56d61ca40a2e..799c881a247a4ba49d5c83737982e27ef505186c 100644 --- a/src/components/Feedback/FeedbackModal.tsx +++ b/src/components/Feedback/FeedbackModal.tsx @@ -56,18 +56,10 @@ const FeedbackModal = () => { <p className="text">{t('feedback.text1')}</p> <p className="text">{t('feedback.text2')}</p> <div className="actions"> - <Button - aria-label={t('feedback.later')} - onClick={closeModal} - className="btnSecondary" - > + <Button onClick={closeModal} className="btnSecondary"> {t('feedback.later')} </Button> - <Button - aria-label={t('feedback.lets_go')} - onClick={goToSAU} - className="btnPrimary" - > + <Button onClick={goToSAU} className="btnPrimary"> {t('feedback.lets_go')} </Button> </div> diff --git a/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap b/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap index 465fa6a2f6d37fef027d805c21ce71b7770c7a37..c0ee001c3cee54ccc17a1f2c7efc104aea6d07da 100644 --- a/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap +++ b/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap @@ -93,7 +93,6 @@ exports[`FeedbackModal component should render the component 1`] = ` class="actions" > <button - aria-label="feedback.later" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -108,7 +107,6 @@ exports[`FeedbackModal component should render the component 1`] = ` /> </button> <button - aria-label="feedback.lets_go" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap b/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap index a3632b692c622240252ef0fa38c1fa03883d25dd..87ed15eef71459661e160feecee01830fa618b7e 100644 --- a/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap +++ b/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap @@ -101,7 +101,6 @@ exports[`ExportLoadingModal component should be rendered correctly 1`] = ` export.modal_loading.text2 </div> <button - aria-label="export.modal_loading.button_cancel" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" diff --git a/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap b/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap index d0917f71a040af447805ce972709de3148e6736d..ceeae77c5f9bcc149f823ba51154641db6d22310 100644 --- a/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap +++ b/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap @@ -95,7 +95,6 @@ exports[`exportStartModal component should be rendered correctly 1`] = ` class="buttons" > <button - aria-label="export.modal_start.button_cancel" class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary" tabindex="0" type="button" @@ -110,7 +109,6 @@ exports[`exportStartModal component should be rendered correctly 1`] = ` /> </button> <button - aria-label="export.button_download" class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary" tabindex="0" type="button" diff --git a/src/components/Options/ExportData/Modals/exportLoadingModal.tsx b/src/components/Options/ExportData/Modals/exportLoadingModal.tsx index 4d91881857d15a972da17918212b89cb1a05437e..f5da6d6f7384d166ddb97a9c438e53ab876a1c7d 100644 --- a/src/components/Options/ExportData/Modals/exportLoadingModal.tsx +++ b/src/components/Options/ExportData/Modals/exportLoadingModal.tsx @@ -204,11 +204,7 @@ const ExportLoadingModal = ({ {t('export.modal_loading.text1')} </div> <div>{t('export.modal_loading.text2')}</div> - <Button - aria-label={t('export.modal_loading.button_cancel')} - onClick={handleCloseClick} - className="btnSecondary" - > + <Button onClick={handleCloseClick} className="btnSecondary"> {t('export.modal_loading.button_cancel')} </Button> </div> diff --git a/src/components/Options/ExportData/Modals/exportStartModal.tsx b/src/components/Options/ExportData/Modals/exportStartModal.tsx index 6412e8c7bd1108d2ec7d460af856f17461ac1bcd..1e72628571d669d104119fc63d89392a2050ce12 100644 --- a/src/components/Options/ExportData/Modals/exportStartModal.tsx +++ b/src/components/Options/ExportData/Modals/exportStartModal.tsx @@ -55,18 +55,10 @@ const ExportStartModal = ({ {t('export.modal_start.text3')} </div> <div className="buttons"> - <Button - aria-label={t('export.modal_start.button_cancel')} - onClick={handleCloseClick} - className="btnSecondary" - > + <Button onClick={handleCloseClick} className="btnSecondary"> {t('export.modal_start.button_cancel')} </Button> - <Button - aria-label={t('export.button_download')} - onClick={handleDownloadClick} - className="btnPrimary" - > + <Button onClick={handleDownloadClick} className="btnPrimary"> {t('export.button_download')} </Button> </div> diff --git a/src/components/Terms/TermsView.tsx b/src/components/Terms/TermsView.tsx index 1ee54c07923b169c5e9ff0769b53dd57350e1a83..2d580cc4b81ff99acfc993e5c3a5a4d7b10f7993 100644 --- a/src/components/Terms/TermsView.tsx +++ b/src/components/Terms/TermsView.tsx @@ -101,11 +101,7 @@ const TermsView = () => { <MinorUpdateContent /> </div> <div className="terms-footer"> - <Button - aria-label={t('minorUpdate.button')} - onClick={handleTermValidate} - className="btnPrimary" - > + <Button onClick={handleTermValidate} className="btnPrimary"> {t('minorUpdate.button')} </Button> </div> diff --git a/src/locales/fr.json b/src/locales/fr.json index a37abcc8d2009d0c7058b24d0c47aeda1a4628f6..0de0637301abb9c55da69e49380031e020048ebe 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -277,6 +277,7 @@ }, "accessibility": { "button_reveal_password": "Afficher le mot de passe", + "button_hide_password": "Masquer le mot de passe", "button_connect": "Se connecter", "button_create_account": "Se créer un compte", "window_title": "Fenêtre d'information sur la création de compte.", @@ -302,7 +303,8 @@ }, "locked": { "desc": "À débloquer en terminant le défi précédent" - } + }, + "goto": "Aller vers le challenge" }, "card_done": { "saving": "Économie de",