From 6319242393ac692609a235f594988e1671efbfa4 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Fri, 26 Jan 2024 17:31:32 +0700
Subject: [PATCH 1/3] fix: incorrect error message appear when enter Cyrillic
 letters into Zip field

---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index fc426002809a..876edc3a33e9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1150,7 +1150,7 @@ export default {
             dateShouldBeBefore: ({dateString}: DateShouldBeBeforeParams) => `Date should be before ${dateString}.`,
             dateShouldBeAfter: ({dateString}: DateShouldBeAfterParams) => `Date should be after ${dateString}.`,
             hasInvalidCharacter: 'Name can only include Latin characters.',
-            incorrectZipFormat: ({zipFormat}: IncorrectZipFormatParams) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
+            incorrectZipFormat: (params: IncorrectZipFormatParams) => `Incorrect zip code format.${params?.zipFormat ? ` Acceptable format: ${params?.zipFormat}` : ''}`,
         },
     },
     resendValidationForm: {

From 2dde9b95ab68f7afd6732525d59e620d4f09e089 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 30 Jan 2024 11:33:10 +0700
Subject: [PATCH 2/3] fix logic show error zip format

---
 src/languages/en.ts    | 3 +--
 src/languages/es.ts    | 3 +--
 src/languages/types.ts | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2994cb3d26f7..3a4cedef7737 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -25,7 +25,6 @@ import type {
     FormattedMaxLengthParams,
     GoBackMessageParams,
     GoToRoomParams,
-    IncorrectZipFormatParams,
     InstantSummaryParams,
     LocalTimeParams,
     LoggedInAsParams,
@@ -1156,7 +1155,7 @@ export default {
             dateShouldBeBefore: ({dateString}: DateShouldBeBeforeParams) => `Date should be before ${dateString}.`,
             dateShouldBeAfter: ({dateString}: DateShouldBeAfterParams) => `Date should be after ${dateString}.`,
             hasInvalidCharacter: 'Name can only include Latin characters.',
-            incorrectZipFormat: (params: IncorrectZipFormatParams) => `Incorrect zip code format.${params?.zipFormat ? ` Acceptable format: ${params?.zipFormat}` : ''}`,
+            incorrectZipFormat: (zipFormat?: string) => `Incorrect zip code format.${zipFormat ? ` Acceptable format: ${zipFormat}` : ''}`,
         },
     },
     resendValidationForm: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 427097d5d16b..b8fc6655a48f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -24,7 +24,6 @@ import type {
     FormattedMaxLengthParams,
     GoBackMessageParams,
     GoToRoomParams,
-    IncorrectZipFormatParams,
     InstantSummaryParams,
     LocalTimeParams,
     LoggedInAsParams,
@@ -1153,7 +1152,7 @@ export default {
         error: {
             dateShouldBeBefore: ({dateString}: DateShouldBeBeforeParams) => `La fecha debe ser anterior a ${dateString}.`,
             dateShouldBeAfter: ({dateString}: DateShouldBeAfterParams) => `La fecha debe ser posterior a ${dateString}.`,
-            incorrectZipFormat: ({zipFormat}: IncorrectZipFormatParams) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
+            incorrectZipFormat: (zipFormat?: string) => `Formato de código postal incorrecto.${zipFormat ? ` Formato aceptable: ${zipFormat}` : ''}`,
             hasInvalidCharacter: 'El nombre sólo puede incluir caracteres latinos.',
         },
     },
diff --git a/src/languages/types.ts b/src/languages/types.ts
index 11adf01ac252..020037f7cf72 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -163,8 +163,6 @@ type DateShouldBeBeforeParams = {dateString: string};
 
 type DateShouldBeAfterParams = {dateString: string};
 
-type IncorrectZipFormatParams = {zipFormat?: string};
-
 type WeSentYouMagicSignInLinkParams = {login: string; loginType: string};
 
 type ToValidateLoginParams = {primaryLogin: string; secondaryLogin: string};
@@ -315,7 +313,6 @@ export type {
     FormattedMaxLengthParams,
     GoBackMessageParams,
     GoToRoomParams,
-    IncorrectZipFormatParams,
     InstantSummaryParams,
     LocalTimeParams,
     LoggedInAsParams,

From 24d812e60a25c519170e9bf8b3aa194c8a284e5a Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Thu, 1 Feb 2024 09:55:37 +0700
Subject: [PATCH 3/3] fix logic incorrect zip format

---
 src/components/AddressForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AddressForm.js b/src/components/AddressForm.js
index 68d451e5c7c8..cd7c39cc1c9c 100644
--- a/src/components/AddressForm.js
+++ b/src/components/AddressForm.js
@@ -103,7 +103,7 @@ function AddressForm({city, country, formID, onAddressChanged, onSubmit, shouldS
         if (countrySpecificZipRegex) {
             if (!countrySpecificZipRegex.test(values.zipPostCode.trim().toUpperCase())) {
                 if (ValidationUtils.isRequiredFulfilled(values.zipPostCode.trim())) {
-                    errors.zipPostCode = ['privatePersonalDetails.error.incorrectZipFormat', {zipFormat: countryZipFormat}];
+                    errors.zipPostCode = ['privatePersonalDetails.error.incorrectZipFormat', countryZipFormat];
                 } else {
                     errors.zipPostCode = 'common.error.fieldRequired';
                 }