make password match rule reusable

commafeed-client/src/components/settings/ProfileSettings.tsx

@@ -1,4 +1,3 @@
-import { msg } from "@lingui/core/macro"
 import { useLingui } from "@lingui/react"
 import { Trans } from "@lingui/react/macro"
 import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
@@ -29,7 +28,7 @@ export function ProfileSettings() {
     const form = useForm<FormData>({
         validate: {
             newPassword: validationRules.password,
-            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? _(msg`Passwords do not match`) : null),
+            newPasswordConfirmation: (value, values) => validationRules.passwordConfirmation(value, values.newPassword),
         },
         validateInputOnChange: true,
     })

commafeed-client/src/hooks/useValidationRules.ts

@@ -11,5 +11,7 @@ export function useValidationRules() {
             value && minimumPasswordLength && value.length < minimumPasswordLength
                 ? _(msg`Password must be at least ${minimumPasswordLength} characters`)
                 : null,
+        passwordConfirmation: (newPasswordConfirmation: string | undefined, newPassword: string | undefined) =>
+            newPasswordConfirmation && newPasswordConfirmation !== newPassword ? _(msg`Passwords do not match`) : null,
     }
 }

commafeed-client/src/locales/ar/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "استعادة كلمة المرور"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "كلمات المرور غير متطابقة"
 

commafeed-client/src/locales/ca/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Recuperació de contrasenya"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Les contrasenyes no coincideixen"
 

commafeed-client/src/locales/cs/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Obnovení hesla"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 

commafeed-client/src/locales/cy/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Adfer Cyfrinair"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Nid yw cyfrineiriau yn cyfateb"
 

commafeed-client/src/locales/da/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Gendannelse af adgangskode"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Adgangskoder stemmer ikke overens"
 

commafeed-client/src/locales/de/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Passwortwiederherstellung"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 

commafeed-client/src/locales/en/messages.po

@@ -794,8 +794,7 @@ msgstr "Password must be at least {minimumPasswordLength} characters"
 msgid "Password Recovery"
 msgstr "Password Recovery"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 

commafeed-client/src/locales/es/messages.po

@@ -795,8 +795,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Recuperación de contraseña"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 

commafeed-client/src/locales/fa/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "بازیابی رمز عبور"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "گذرواژه ها مطابقت ندارند"
 

commafeed-client/src/locales/fi/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Salasanan palautus"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää"
 

commafeed-client/src/locales/fr/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Récupération de mot de passe"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 

commafeed-client/src/locales/gl/messages.po

@@ -795,8 +795,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Recuperación do contrasinal"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 

commafeed-client/src/locales/hu/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Jelszó helyreállítás"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "A jelszavak nem egyeznek"
 

commafeed-client/src/locales/id/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Pemulihan Kata Sandi"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Kata sandi tidak cocok"
 

commafeed-client/src/locales/it/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Recupero password"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Le password non corrispondono"
 

commafeed-client/src/locales/ja/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "パスワード回復"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 

commafeed-client/src/locales/ko/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "비밀번호 복구"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "비밀번호가 일치하지 않습니다"
 

commafeed-client/src/locales/ms/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Pemulihan Kata Laluan"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Kata laluan tidak sepadan"
 

commafeed-client/src/locales/nb/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Passordgjenoppretting"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Passordene samsvarer ikke"
 

commafeed-client/src/locales/nl/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Wachtwoordherstel"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Wachtwoorden komen niet overeen"
 

commafeed-client/src/locales/nn/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Passordgjenoppretting"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Passordene samsvarer ikke"
 

commafeed-client/src/locales/pl/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Odzyskiwanie hasła"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Hasła nie pasują"
 

commafeed-client/src/locales/pt/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Recuperação de Senha"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Senhas não coincidem"
 

commafeed-client/src/locales/ru/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Восстановление пароля"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 

commafeed-client/src/locales/sk/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Obnovenie hesla"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 

commafeed-client/src/locales/sv/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Lösenordsåterställning"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Lösenorden matchar inte"
 

commafeed-client/src/locales/tr/messages.po

@@ -794,8 +794,7 @@ msgstr ""
 msgid "Password Recovery"
 msgstr "Parola Kurtarma"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "Parolalar eşleşmiyor"
 

commafeed-client/src/locales/zh/messages.po

@@ -794,8 +794,7 @@ msgstr "密码最少需要 {minimumPasswordLength} 个字符"
 msgid "Password Recovery"
 msgstr "密码恢复"
 
-#: src/components/settings/ProfileSettings.tsx
+#: src/hooks/useValidationRules.ts
-#: src/pages/auth/PasswordResetPage.tsx
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 

commafeed-client/src/pages/auth/PasswordResetPage.tsx

@@ -32,7 +32,7 @@ export function PasswordResetPage() {
         },
         validate: {
             password: validationRules.password,
-            passwordConfirmation: (value, values) => (value === values.password ? null : _(msg`Passwords do not match`)),
+            passwordConfirmation: (value, values) => validationRules.passwordConfirmation(value, values.password),
         },
         validateInputOnChange: true,
     })