chore: add link to change password (#740)

* chore: add link to change password * chore: changed link for better accessibility
betagouv · Jan 21, 2025 · efcadf6 · efcadf6
1 parent 342daf6
commit efcadf6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 24 deletions.
diff --git a/src/components/MemberPage/Email/EmailContainer.tsx b/src/components/MemberPage/Email/EmailContainer.tsx
@@ -5,6 +5,7 @@ import { fr } from "@codegouvfr/react-dsfr";
 import Accordion from "@codegouvfr/react-dsfr/Accordion";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 import Badge from "@codegouvfr/react-dsfr/Badge";
+import Button from "@codegouvfr/react-dsfr/Button";
 import Table from "@codegouvfr/react-dsfr/Table";
 import { match } from "ts-pattern";
 
@@ -17,6 +18,7 @@ import BlocEmailResponder from "./BlocEmailResponder";
 import BlocRedirection from "./BlocRedirection";
 import { WebMailButtons } from "./WebMailButtons";
 import { MemberPageProps } from "../MemberPage";
+import { BadgeEmailPlan } from "@/components/BadgeEmailPlan";
 import frontConfig from "@/frontConfig";
 import {
     EmailInfos,
@@ -26,8 +28,6 @@ import {
 import { EmailStatusCode } from "@/models/member";
 import { EMAIL_STATUS_READABLE_FORMAT } from "@/models/misc";
 import { EMAIL_PLAN_TYPE, OvhRedirection, OvhResponder } from "@/models/ovh";
-import { BadgeEmailPlan } from "@/components/BadgeEmailPlan";
-import Button from "@codegouvfr/react-dsfr/Button";
 
 const EmailLink = ({ email }: { email: string }) => (
     <a href={`mailto:${email}`}>{email}</a>
@@ -66,6 +66,15 @@ const emailStatusRow = (
                         }
                     </Badge>
                 ))}
+            {userInfos.primary_email_status ===
+                EmailStatusCode.EMAIL_ACTIVE_AND_PASSWORD_DEFINITION_PENDING && (
+                <span>
+                    Le mot de passe doit être défini. Rendez vous dans{" "}
+                    <a href={"/account?tab=compte-email#password"}>
+                        Changer mon mot de passe
+                    </a>
+                </span>
+            )}
         </>,
     ];
 };

diff --git a/src/components/MemberPage/MemberContact.tsx b/src/components/MemberPage/MemberContact.tsx
@@ -49,15 +49,17 @@ export const MemberContact = ({
                             }
                         </Badge>
                     )}
-                    {userInfos.primary_email_status ===
-                        EmailStatusCode.EMAIL_VERIFICATION_WAITING && (
-                        <span>
-                            Le mot de passe doit être défini. Rendez vous dans{" "}
-                            <a href={"/account?tab=compte-email#password"}>
-                                Changer mon mot de passe
-                            </a>
-                        </span>
-                    )}
+                    {isCurrentUser &&
+                        userInfos.primary_email_status ===
+                            EmailStatusCode.EMAIL_ACTIVE_AND_PASSWORD_DEFINITION_PENDING && (
+                            <span>
+                                Le mot de passe doit être défini. Rendez vous
+                                dans{" "}
+                                <a href={"/account?tab=compte-email#password"}>
+                                    Changer mon mot de passe
+                                </a>
+                            </span>
+                        )}
                 </>
             ),
         });

diff --git a/src/components/MemberPage/MemberStatus.tsx b/src/components/MemberPage/MemberStatus.tsx
@@ -187,13 +187,13 @@ const emailStatusRow = (
                                         <br />
                                         Le mot de passe doit être défini. Rendez
                                         vous dans{" "}
-                                        <Link
+                                        <a
                                             href={
                                                 "/account?tab=compte-email#password"
                                             }
                                         >
                                             Changer mon mot de passe
-                                        </Link>
+                                        </a>
                                     </>
                                 )
                             )
@@ -298,11 +298,11 @@ const MatomoInfoRow = (
             </Accordion>
         ) : isCurrentUser ? (
             <>
-                Tu n'as pas de compte matomo. Si tu as besoin d'un compte tu
-                peux en faire la demande{" "}
-                <a href="/services/matomo" className="fr-link">
-                    ici
+                "Tu n'as pas de compte Matomo. Si tu en as besoin, tu peux{" "}
+                <a href="/services/matomo">
+                    faire une demande de compte Matomo
                 </a>
+                .
             </>
         ) : (
             <>
@@ -336,11 +336,11 @@ const sentryInfoRow = (sentry: MemberPageProps["sentryInfo"]) => {
         match([sentry && sentry.status, !!sentry])
             .with([P._, false], () => (
                 <>
-                    Tu n'as pas de compte sentry. Si tu as besoin d'un compte tu
-                    peux en faire la demande{" "}
-                    <a href="/services/sentry" className="fr-link">
-                        ici
+                    "Tu n'as pas de compte Sentry. Si tu en as besoin, tu peux{" "}
+                    <a href="/services/sentry">
+                        faire une demande de compte Sentry
                     </a>
+                    .
                 </>
             ))
             .with([ACCOUNT_SERVICE_STATUS.ACCOUNT_INVITATION_SENT, P._], () => {

diff --git a/src/components/WhatIsGoingOnWithMemberPage/WhatIsGoingOnWithMember.tsx b/src/components/WhatIsGoingOnWithMemberPage/WhatIsGoingOnWithMember.tsx
@@ -12,17 +12,17 @@ import { useRouter } from "next/navigation";
 import { useLiveChat } from "../live-chat/useLiveChat";
 import MemberSelect from "../MemberSelect";
 import { safeGetUserPublicInfo } from "@/app/api/member/actions";
+import { BadgeEmailPlan } from "@/components/BadgeEmailPlan";
 import { EmailStatusCode } from "@/models/member";
 import {
     memberPublicInfoSchemaType,
     memberWrapperPublicInfoSchemaType,
 } from "@/models/member";
 import { EMAIL_STATUS_READABLE_FORMAT } from "@/models/misc";
+import { EMAIL_PLAN_TYPE } from "@/models/ovh";
 import { startupSchemaType } from "@/models/startup";
 import routes from "@/routes/routes";
 import { getLastMission } from "@/utils/member";
-import { EMAIL_PLAN_TYPE } from "@/models/ovh";
-import { BadgeEmailPlan } from "@/components/BadgeEmailPlan";
 
 enum STEP {
     whichMember = "whichMember",
@@ -1248,7 +1248,6 @@ export const WhatIsGoingOnWithMember = function (
                             <li>
                                 Fais un renouvellement de mot de passe :{" "}
                                 <a
-                                    className="fr-link"
                                     href="https://mattermost.incubateur.net/reset_password"
                                     target={"_blank"}
                                 >