Skip to content

Commit 7d08f71

Browse files
Merge pull request #165 from ahmed-deriv/ahmed/DAPI-790/fix--markup-error-message
Ahmed/dapi 790/fix markup error message
2 parents eae2f2f + 324f556 commit 7d08f71

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

i18n/en/code.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
"Enter a valid URL. (Example: https://www.[YourDomainName].com)": {
123123
"message": "Enter a valid URL. (Example: https://www.[YourDomainName].com)"
124124
},
125-
"Your markup value must be equal to or above 0.00": {
126-
"message": "Your markup value must be equal to or above 0.00"
125+
"Your markup value must be equal to or above 0.00.": {
126+
"message": "Your markup value must be equal to or above 0.00."
127127
},
128128
"Your markup value must be no more than 3.00.": {
129129
"message": "Your markup value must be no more than 3.00."
@@ -1110,6 +1110,9 @@
11101110
"message": "This page is unlisted. Search engines will not index it, and only users having a direct link can access it.",
11111111
"description": "The unlisted content banner message"
11121112
},
1113+
"Markup value is required and must be between 0.00 and 3.00.": {
1114+
"message": "Markup value is required and must be between 0.00 and 3.00."
1115+
},
11131116
"Clear response": {
11141117
"message": "Clear response"
11151118
}

i18n/fr/code.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
"Enter a valid URL. (Example: https://www.[YourDomainName].com)": {
123123
"message": "Saisissez une URL valide. (Exemple : https://www.[VotreNomDeDomaine].com)"
124124
},
125-
"Your markup value must be equal to or above 0.00": {
126-
"message": "Votre valeur de majoration doit être égale ou supérieure à 0,00"
125+
"Your markup value must be equal to or above 0.00.": {
126+
"message": "Votre valeur de majoration doit être égale ou supérieure à 0,00."
127127
},
128128
"Your markup value must be no more than 3.00.": {
129129
"message": "Votre valeur de majoration ne doit pas dépasser 3,00."
@@ -1110,6 +1110,9 @@
11101110
"message": "Cette page n'est pas répertoriée. Les moteurs de recherche ne l'indexeront pas, et seuls les utilisateurs disposant d'un lien direct peuvent y accéder.",
11111111
"description": "The unlisted content banner message"
11121112
},
1113+
"Markup value is required and must be between 0.00 and 3.00.": {
1114+
"message": "La valeur de la majoration est requise et doit être comprise entre 0,00 et 3,00."
1115+
},
11131116
"Clear response": {
11141117
"message": "Effacer la réponse"
11151118
}

src/features/dashboard/types.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,17 @@ const base_schema = {
6161
}),
6262
app_markup_percentage: yup
6363
.number()
64-
.required()
64+
.nullable()
65+
.transform((value, originalValue) => (originalValue === '' ? null : value))
66+
.required(
67+
translate({
68+
message: 'Markup value is required and must be between 0.00 and 3.00.',
69+
}),
70+
)
6571
.min(
6672
0,
6773
translate({
68-
message: 'Your markup value must be equal to or above 0.00',
74+
message: 'Your markup value must be equal to or above 0.00.',
6975
}),
7076
)
7177
.max(

0 commit comments

Comments
 (0)