Skip to content

Commit

Permalink
Merge branch 'master' of github.com:glific/glific-frontend into enhan…
Browse files Browse the repository at this point in the history
…cement/rich-text-editor
  • Loading branch information
akanshaaa19 committed Feb 14, 2025
2 parents 1468593 + f5024b5 commit aa6d910
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 32 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "glific-frontend",
"version": "6.2.4",
"version": "6.2.6",
"private": true,
"type": "module",
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ export const PaymentDetails = ({ handleStepChange, saveData }: FormStepProps) =>
const FormSchema = Yup.object().shape({
firstName: Yup.string()
.required(t('First name is required.'))
.max(25, t('Please enter not more than 25 characters')),
lastName: Yup.string().required(t('Last name is required.')).max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
lastName: Yup.string()
.required(t('Last name is required.'))
.max(100, t('Please enter not more than 100 characters')),
designation: Yup.string()
.required(t('Designation is required.'))
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
phone: Yup.string().required(t('Phone number is required.')).min(7, t('Enter a valid phone number.')),
email: Yup.string().required(t('Email is required.')).email(t('Enter a valid email.')),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const PlatformDetails = ({ handleStepChange, saveData }: FormStepProps) =
const [loading, setLoading] = useState(false);

const FormSchema = Yup.object().shape({
name: Yup.string().required(t('Name is required.')),
name: Yup.string().required(t('Name is required.')).max(250, t('Name cannot be more than 250 characters.')),
app_name: Yup.string().required(t('App name is required.')),
api_key: Yup.string().required(t('API key is required.')),
shortcode: Yup.string()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ export const SigningAuthority = ({ handleStepChange, openReachOutToUs, saveData
const FormSchema = Yup.object().shape({
submitterFirstName: Yup.string()
.required(t('First name is required.'))
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
submitterLastName: Yup.string()
.required(t('Last name is required.'))
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
submitterEmail: Yup.string().required(t('Email is required.')).email(t('Enter a valid email.')),
submitterDesignation: Yup.string()
.required('Designation is required.')
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
signingAuthorityFirstName: Yup.string()
.required(t('First name is required.'))
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
signingAuthorityLastName: Yup.string()
.required(t('Last name is required.'))
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
signingAuthorityDesignation: Yup.string()
.required('Designation is required.')
.max(25, t('Please enter not more than 25 characters')),
.max(100, t('Please enter not more than 100 characters')),
signingAuthorityEmail: Yup.string().required(t('Email is required.')).email('Enter a valid email.'),
permissions: Yup.object({
terms_agreed: Yup.boolean()
Expand Down
5 changes: 3 additions & 2 deletions src/i18n/en/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
"Registered address is required.": "Registered address is required.",
"Address should not exceed 300 characters": "Address should not exceed 300 characters",
"Current address is required.": "Current address is required.",
"Please enter not more than 25 characters": "Please enter not more than 25 characters",
"Please enter not more than 100 characters": "Please enter not more than 100 characters",
"Designation is required.": "Designation is required.",
"Phone number is required.": "Phone number is required.",
"Enter a valid email.": "Enter a valid email.",
Expand Down Expand Up @@ -531,5 +531,6 @@
"First name is required.": "First Name is required.",
"Last name is required.": "Last name is required.",
"Failed": "Failed",
"Members": "Members"
"Members": "Members",
"Name cannot be more than 250 characters.": "Name cannot be more than 250 characters."
}
23 changes: 4 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5514,16 +5514,8 @@ streamx@^2.12.0, streamx@^2.12.5, streamx@^2.13.2, streamx@^2.14.0:
optionalDependencies:
bare-events "^2.2.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
name string-width-cjs
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -5617,14 +5609,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -6458,4 +6443,4 @@ zen-observable-ts@^1.2.5:
zen-observable@0.8.15:
version "0.8.15"
resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==

0 comments on commit aa6d910

Please sign in to comment.