feat(verify_device): add help on modal verify device after login

tchapgouv · Oct 24, 2024 · 8085466 · 8085466
1 parent 8cbff06
commit 8085466
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/linked-dependencies/matrix-react-sdk/src/components/structures/auth/SetupEncryptionBody.tsx b/linked-dependencies/matrix-react-sdk/src/components/structures/auth/SetupEncryptionBody.tsx
@@ -23,6 +23,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "matrix-react-sdk/src/dispatcher/actions";
 import { UserTab } from "matrix-react-sdk/src/components/views/dialogs/UserTab";
 import { OpenToTabPayload } from "matrix-react-sdk/src/dispatcher/payloads/OpenToTabPayload";
+import TchapUrls from "../../../../../../src/tchap/util/TchapUrls"; // :TCHAP: help-access-verify-device
 
 function keyHasPassphrase(keyInfo: SecretStorageKeyDescription): boolean {
     return Boolean(keyInfo.passphrase && keyInfo.passphrase.salt && keyInfo.passphrase.iterations);
@@ -201,13 +202,34 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                     );
                 }
 
+                // :TCHAP:
+                const translationHelpLink =  (sub) => (
+                    <AccessibleButton kind="link_inline" onClick={() => {
+                        window.open(TchapUrls.helpVerifyDevicesPage,"_blank")
+                    }}>
+                        {sub}
+                    </AccessibleButton>
+                )
+                const tchapHelpButton = (
+                    <AccessibleButton kind="primary_outline" onClick={() => { window.open(TchapUrls.helpVerifyDevicesPage,"_blank") }}>
+                            {_t("common|help")}
+                    </AccessibleButton>
+                )
+                // end :TCHAP: 
                 return (
                     <div>
-                        <p>{_t("encryption|verification|verification_description")}</p>
-
+                        {/*:TCHAP: help-access-verify-device - <p>{_t("encryption|verification|verification_description")} */}
+                        <p>{_t("encryption|verification|verification_description")} {_t("encryption|verification|help_link",  {}, {
+                             a: translationHelpLink,
+                            })}
+                        </p>
+                        {/* end :TCHAP: */}
                         <div className="mx_CompleteSecurity_actionRow">
                             {verifyButton}
                             {useRecoveryKeyButton}
+                            {/* :TCHAP: help-access-verify-device */}
+                            {tchapHelpButton}
+                            {/* end :TCHAP: */}
                         </div>
                         <div className="mx_SetupEncryptionBody_reset">
                             {_t("encryption|reset_all_button", undefined, {

diff --git a/modules/tchap-translations/tchap_translations.json b/modules/tchap-translations/tchap_translations.json
@@ -877,5 +877,13 @@
     "auth|proconnect|error_sso_inactive": {
         "en": "ProConnect is disabled for your domain",
         "fr": "ProConnect est désactivé pour votre domaine"
+    },
+    "encryption|verification|help_link": {
+        "en": "<a>Learn more and get help<a>",
+        "fr": "<a>En savoir plus et obtenir de l'aide <a>"
+    },
+    "encryption|verification|help_button": {
+        "en": "<a>Help<a>",
+        "fr": "<a>Aide <a>"
     }
 }
diff --git a/patches/subtree-modifications.json b/patches/subtree-modifications.json
@@ -94,5 +94,9 @@
             "src/components/views/right_panel/RightPanelTabs.tsx",
             "src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx"
         ]
+    },
+    "help-access-verify-device": {
+        "issue": "https://github.com/tchapgouv/tchap-web-v4/issues/1140",
+        "files": []
     }
 }
diff --git a/src/tchap/util/TchapUrls.ts b/src/tchap/util/TchapUrls.ts
@@ -10,4 +10,7 @@ export default class TchapUrls {
 
     //tchap FAQ page on locked messages. Should redirect to the appropriate crisp page on https://aide.tchap.beta.gouv.fr
     public static lockedMessagesPage = "https://tchap.beta.gouv.fr/faq/messages-verrouilles";
+
+    // help page to verify decices, used 
+    public static helpVerifyDevicesPage = "https://aide.tchap.beta.gouv.fr/fr/article/comment-verifier-un-nouvel-appareil-sur-tchap-xm0b0y/";
 }