Accept numeric values only in transfer input

swan-io · Nov 24, 2023 · c5cd8e0 · c5cd8e0
1 parent 46731f4
commit c5cd8e0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/clients/banking/src/components/NewMembershipWizard.tsx b/clients/banking/src/components/NewMembershipWizard.tsx
@@ -33,9 +33,9 @@ import { projectConfiguration } from "../utils/projectId";
 import { Router } from "../utils/routes";
 import {
   validateAddressLine,
+  validateBeneficiaryName,
   validateBirthdate,
   validateEmail,
-  validateName,
   validateRequired,
 } from "../utils/validations";
 
@@ -163,13 +163,13 @@ export const NewMembershipWizard = ({
     firstName: {
       initialValue: partiallySavedValues?.firstName ?? "",
       strategy: "onBlur",
-      validate: validateName,
+      validate: validateBeneficiaryName,
       sanitize: value => value.trim(),
     },
     lastName: {
       initialValue: partiallySavedValues?.lastName ?? "",
       strategy: "onBlur",
-      validate: validateName,
+      validate: validateBeneficiaryName,
       sanitize: value => value.trim(),
     },
     birthDate: {

diff --git a/clients/banking/src/components/TransferWizardBeneficiary.tsx b/clients/banking/src/components/TransferWizardBeneficiary.tsx
@@ -19,7 +19,7 @@ import { P, match } from "ts-pattern";
 import { GetIbanValidationDocument } from "../graphql/partner";
 import { t } from "../utils/i18n";
 import { printIbanFormat, validateIban } from "../utils/iban";
-import { validateName, validateRequired } from "../utils/validations";
+import { validateBeneficiaryName, validateRequired } from "../utils/validations";
 
 export type Beneficiary = {
   name: string;
@@ -54,7 +54,7 @@ export const TransferWizardBeneficiary = ({ initialBeneficiary, onSave }: Props)
   const { Field, listenFields, submitForm } = useForm({
     name: {
       initialValue: initialBeneficiary?.name ?? "",
-      validate: validateName,
+      validate: validateBeneficiaryName,
     },
     iban: {
       initialValue: initialBeneficiary?.iban ?? "",

diff --git a/clients/banking/src/utils/validations.ts b/clients/banking/src/utils/validations.ts
@@ -29,6 +29,27 @@ export const validateName: Validator<string> = value => {
   }
 
   // This regex was copied from the backend to ensure that the validation is the same
+  // Matches all unicode letters, spaces, dashes, apostrophes, commas, and single quotes
+  const isValid = value.match(
+    /^(?:[A-Za-zÀ-ÖÙ-öù-ƿǄ-ʯʹ-ʽΈ-ΊΎ-ΡΣ-ҁҊ-Ֆա-ևႠ-Ⴥა-ჺᄀ-፜፩-ᎏᵫ-ᶚḀ-῾ⴀ-ⴥ⺀-⿕ぁ-ゖゝ-ㇿ㋿-鿯鿿-ꒌꙀ-ꙮꚀ-ꚙꜦ-ꞇꞍ-ꞿꥠ-ꥼＡ-Ｚａ-ｚ]| |'|-|Ά|Ό|,)*$/,
+  );
+
+  if (!isValid) {
+    return t("common.form.invalidName");
+  }
+};
+
+//Beneficiary name input must accept numeric value, unlike other validation name
+export const validateBeneficiaryName: Validator<string> = value => {
+  if (!value) {
+    return t("common.form.required");
+  }
+
+  // Rule copied from the backend
+  if (value.length > 100) {
+    return t("common.form.invalidName");
+  }
+
   // Matches all unicode letters, spaces, dashes, apostrophes, commas, and single quotes
   const isValid = value.match(
     /^(?:[A-Za-zÀ-ÖÙ-öù-ƿǄ-ʯʹ-ʽΈ-ΊΎ-ΡΣ-ҁҊ-Ֆա-ևႠ-Ⴥა-ჺᄀ-፜፩-ᎏᵫ-ᶚḀ-῾ⴀ-ⴥ⺀-⿕ぁ-ゖゝ-ㇿ㋿-鿯鿿-ꒌꙀ-ꙮꚀ-ꚙꜦ-ꞇꞍ-ꞿꥠ-ꥼＡ-Ｚａ-ｚ]| |'|-|Ά|Ό|,|[1-9])*$/,