Merge pull request #1071 from tchapgouv/1067-reset-password-warning-c…

…lose-window feat(auth): add warning dont close message on check mail
tchapgouv · Jul 22, 2024 · 8a32e22 · 8a32e22
2 parents b8fae56 + df23391
commit 8a32e22
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/...pendencies/matrix-react-sdk/src/components/structures/auth/forgot-password/CheckEmail.tsx b/...pendencies/matrix-react-sdk/src/components/structures/auth/forgot-password/CheckEmail.tsx
@@ -61,6 +61,9 @@ export const CheckEmail: React.FC<CheckEmailProps> = ({
  {_t("auth|check_email_wrong_email_button")}
  </AccessibleButton>
  </div>
+ {/* :TCHAP: reset-password-warning-close-window */}
+ <ErrorMessage message={_t("auth|warning|dont_close_windows")} />
+ {/* end :TCHAP: */}
  </div>
  {errorText && <ErrorMessage message={errorText} />}
  <input onClick={onSubmitForm} type="button" className="mx_Login_submit" value={_t("action|next")} />

diff --git a/modules/tchap-translations/tchap_translations.json b/modules/tchap-translations/tchap_translations.json
@@ -777,5 +777,9 @@
  "create_space|add_details_prompt_2": {
  "en": "<a>Learn more </a>",
  "fr": "<a>En savoir plus</a>"
+ },
+ "auth|warning|dont_close_windows": {
+ "en": "Please don't close this window. You will need it later.",
+ "fr": "Ne pas fermer cette page. Elle sera nécessaire pour la suite."
  }
 }
diff --git a/patches/subtree-modifications.json b/patches/subtree-modifications.json
@@ -58,5 +58,11 @@
  "src/components/views/context_menus/SpaceContextMenu.tsx",
  "src/components/structures/SpaceRoomView.tsx"
  ]
+ },
+ "reset-password-warning-close-window": {
+ "issue": "https://github.com/tchapgouv/tchap-web-v4/issues/1067",
+ "files": [
+ "src/components/structures/auth/forgot-password/CheckEmail.tsx"
+ ]
  }
 }
diff --git a/res/themes/tchap-common/css/_tchap_custom.pcss b/res/themes/tchap-common/css/_tchap_custom.pcss
@@ -66,4 +66,10 @@
 .mx_ThreadsActivityCentreButton .mx_ThreadsActivityCentreButton_Icon,
 .mx_ThreadsActivityCentreButton .mx_ThreadsActivityCentreButton_Text {
  color: white !important;
+}
+
+/* reset-password-warning-close-window */
+.mx_AuthBody_text .mx_ErrorMessage {
+ margin-top: 10px;
+ font-weight: bold;
 }