diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js index fd6a419..26f2b36 100644 --- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js +++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js @@ -552,11 +552,11 @@ const BusCustomFormWizard = (props) => { .matches(/^(?=.*\W)/, { message: displayErrorMsg(intl.formatMessage({id: 'atLeast1SpecialChar'})) }), confirmPassword: yup.string().min(8, displayErrorMsg(intl.formatMessage({id: 'atLeast8CharPassword'}))).required(displayErrorMsg(intl.formatMessage({id: 'pleaseConfirmPassword'}))).oneOf([yup.ref('password'), null], displayErrorMsg(intl.formatMessage({id: 'samePassword'}))), enName: yup.string().max(40,getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({id: 'userRequireEnglishName'}))), - enCompanyName: yup.string().matches(/^[^$^*()]+$/, { message: displayErrorMsg('No special characters $/^/*/(/)') }).when('chCompanyName', { + enCompanyName: yup.string().matches(/^[^!@#$%^&*,.?":{}|<>]+$/, { message: displayErrorMsg('Does not contain special characters !@#$%^&*,.?":{}|<>') }).when('chCompanyName', { is: (chCompanyName) => !chCompanyName || chCompanyName.length === 0, then: yup.string().required(displayErrorMsg('Please enter either English or Chinese name')), }), - chCompanyName: yup.string().matches(/^[^$^*()]+$/, { message: displayErrorMsg(intl.formatMessage({id: 'notContainSpecialChar'})) }).when('enCompanyName', { + chCompanyName: yup.string().matches(/^[^!@#$%^&*,.?":{}|<>]+$/, { message: displayErrorMsg(intl.formatMessage({id: 'notContainSpecialChar'})) }).when('enCompanyName', { is: (enCompanyName) => !enCompanyName || enCompanyName.length === 0, then: yup.string().required(displayErrorMsg(intl.formatMessage({id: 'validateEngOrChiName'}))), }), diff --git a/src/translations/en.json b/src/translations/en.json index aaa2cff..e123f7b 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -300,7 +300,7 @@ "validateAddressLine2": "Please enter the second line of address", "validateAddressLine3": "Please enter the third line of address", "validateEngOrChiName": "Please enter the English or Chinese name", - "notContainSpecialChar": "Does not contain special characters $/^/*/(/)", + "notContainSpecialChar": "Does not contain special characters !@#$%^&*,.?\":{}|<>", "samePassword": "Please enter the same password", "atLeast8CharPassword": "Please enter a password of at least 8 digits", "atLeast1SpecialChar": "Please include at least 1 special character", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index dc92252..b97794b 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -333,7 +333,7 @@ "validateAddressLine2": "请输入第二行地址", "validateAddressLine3": "请输入第三行地址", "validateEngOrChiName": "请输入英文或中文名称", - "notContainSpecialChar": "不包含特殊字符 $/^/*/(/)", + "notContainSpecialChar": "不包含特殊字符 !@#$%^&*,.?\":{}|<>", "samePassword": "请输入相同密码", "atLeast8CharPassword": "请输入最少8位密码", "atLeast1SpecialChar": "请包括最少1个特殊字符", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index fe03388..64f6e86 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -334,7 +334,7 @@ "validateAddressLine2": "請輸入第二行地址", "validateAddressLine3": "請輸入第三行地址", "validateEngOrChiName": "請輸入英文或中文名稱", - "notContainSpecialChar": "不包含特殊字符 $/^/*/(/)", + "notContainSpecialChar": "不包含特殊字符 !@#$%^&*,.?\":{}|<>", "samePassword": "請輸入相同密碼", "atLeast8CharPassword": "請輸入最少8位密碼", "atLeast1SpecialChar": "請包括最少1個特殊字符",