From 39237a668a1c4a5a88c7429c08ed405929ae9026 Mon Sep 17 00:00:00 2001
From: yurytut1993 <yurii.zusik@bigcommerce.com>
Date: Tue, 7 May 2024 22:31:30 +0300
Subject: [PATCH] after testing fixes

---
 core/app/[locale]/(default)/login/page.tsx                  | 2 +-
 .../_components/register-customer-form/_actions/login.ts    | 0
 .../register-customer-form/_actions/register-customer.ts    | 0
 .../_components/register-customer-form/fields/password.tsx  | 6 ++++--
 .../register-customer-form/fields/picklist-or-text.tsx      | 2 +-
 .../_components/register-customer-form/fields/picklist.tsx  | 0
 .../register-customer-form/fields/shared/field-wrapper.tsx  | 0
 .../_components/register-customer-form/fields/text.tsx      | 4 ++--
 .../_components/register-customer-form/index.tsx            | 6 +++---
 .../[locale]/(default)/login/register-customer/page-data.ts | 0
 .../app/[locale]/(default)/login/register-customer/page.tsx | 0
 core/messages/en.json                                       | 4 ++--
 12 files changed, 13 insertions(+), 11 deletions(-)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/login.ts (100%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/register-customer.ts (100%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx (92%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx (98%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist.tsx (100%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/shared/field-wrapper.tsx (100%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx (95%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx (98%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/page-data.ts (100%)
 rename {apps/core => core}/app/[locale]/(default)/login/register-customer/page.tsx (100%)

diff --git a/core/app/[locale]/(default)/login/page.tsx b/core/app/[locale]/(default)/login/page.tsx
index a2c44e990..f92c72875 100644
--- a/core/app/[locale]/(default)/login/page.tsx
+++ b/core/app/[locale]/(default)/login/page.tsx
@@ -96,7 +96,7 @@ export default async function Login({ params: { locale }, searchParams }: Props)
             <li>{t('CreateAccount.ordersTracking')}</li>
             <li>{t('CreateAccount.wishlists')}</li>
           </ul>
-          <Button asChild className="w-fit items-center px-8 py-2">
+          <Button asChild className="w-fit items-center px-8 py-2 hover:text-white">
             <Link href="/login/register-customer">{t('CreateAccount.createLink')}</Link>
           </Button>
         </div>
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/login.ts b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/login.ts
similarity index 100%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/login.ts
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/login.ts
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/register-customer.ts b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/register-customer.ts
similarity index 100%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/register-customer.ts
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/_actions/register-customer.ts
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx
similarity index 92%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx
index 799cb4752..2d1c1c092 100644
--- a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx
+++ b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/password.tsx
@@ -39,7 +39,7 @@ export const Password = ({ field, isValid, name, onChange }: PasswordProps) => {
       </FieldControl>
       {field.isRequired && (
         <FieldMessage
-          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-red-200"
+          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error-secondary"
           match="valueMissing"
         >
           {t('emptyPasswordValidatoinMessage')}
@@ -47,8 +47,10 @@ export const Password = ({ field, isValid, name, onChange }: PasswordProps) => {
       )}
       {FieldNameToFieldId[field.entityId] === 'confirmPassword' && (
         <FieldMessage
-          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-red-200"
+          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error-secondary"
           match={() => {
+            console.log(isValid, 'isValid');
+            
             return !isValid;
           }}
         >
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx
similarity index 98%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx
index e90b2ba7b..99db82f01 100644
--- a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx
+++ b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist-or-text.tsx
@@ -70,7 +70,7 @@ export const PicklistOrText = ({
       </FieldControl>
       {field.isRequired && options.length === 0 && (
         <FieldMessage
-          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-red-200"
+          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error-secondary"
           match="valueMissing"
         >
           {t('emptyTextValidatoinMessage')}
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist.tsx b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist.tsx
similarity index 100%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist.tsx
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/picklist.tsx
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/shared/field-wrapper.tsx b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/shared/field-wrapper.tsx
similarity index 100%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/shared/field-wrapper.tsx
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/shared/field-wrapper.tsx
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx
similarity index 95%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx
index 599a07e3c..ea379d08f 100644
--- a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx
+++ b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/fields/text.tsx
@@ -40,7 +40,7 @@ export const Text = ({ field, isValid, name, onChange, type }: TextProps) => {
       </FieldControl>
       {field.isRequired && (
         <FieldMessage
-          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-red-200"
+          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error-secondary"
           match="valueMissing"
         >
           {t('emptyTextValidatoinMessage')}
@@ -48,7 +48,7 @@ export const Text = ({ field, isValid, name, onChange, type }: TextProps) => {
       )}
       {FieldNameToFieldId[field.entityId] === 'email' && (
         <FieldMessage
-          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-red-200"
+          className="absolute inset-x-0 bottom-0 inline-flex w-full text-xs font-normal text-error-secondary"
           match="typeMismatch"
         >
           {t('emailValidationMessage')}
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx
similarity index 98%
rename from apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx
rename to core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx
index 3d8492e6d..3efe5cc0e 100644
--- a/apps/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx
+++ b/core/app/[locale]/(default)/login/register-customer/_components/register-customer-form/index.tsx
@@ -169,7 +169,7 @@ export const RegisterCustomerForm = ({
       case 'confirmPassword': {
         const confirmPassword = e.target.value;
 
-        const passwordFieldName = createFieldName('customer', +fieldId);
+        const passwordFieldName = createFieldName('customer', FieldNameToFieldId.password);
         const password = new FormData(e.target.form ?? undefined).get(passwordFieldName);
 
         return setPassswordValid((prevState) => ({
@@ -209,7 +209,7 @@ export const RegisterCustomerForm = ({
     setReCaptchaValid(true);
   };
 
-  const onSubmit = async (formData: FormData) => {
+  const onSubmit = async (formData: FormData) => {    
     if (formData.get('customer-password') !== formData.get('customer-confirmPassword')) {
       setFormStatus({
         status: 'error',
@@ -258,7 +258,7 @@ export const RegisterCustomerForm = ({
   return (
     <>
       {formStatus && (
-        <Message className="mx-auto lg:w-[830px]" variant={formStatus.status}>
+        <Message className="mb-8" variant={formStatus.status}>
           <p>{formStatus.message}</p>
         </Message>
       )}
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/page-data.ts b/core/app/[locale]/(default)/login/register-customer/page-data.ts
similarity index 100%
rename from apps/core/app/[locale]/(default)/login/register-customer/page-data.ts
rename to core/app/[locale]/(default)/login/register-customer/page-data.ts
diff --git a/apps/core/app/[locale]/(default)/login/register-customer/page.tsx b/core/app/[locale]/(default)/login/register-customer/page.tsx
similarity index 100%
rename from apps/core/app/[locale]/(default)/login/register-customer/page.tsx
rename to core/app/[locale]/(default)/login/register-customer/page.tsx
diff --git a/core/messages/en.json b/core/messages/en.json
index 28f050211..edc96cc29 100644
--- a/core/messages/en.json
+++ b/core/messages/en.json
@@ -221,8 +221,8 @@
         "heading": "New account",
         "emptyTextValidatoinMessage": "This field can not be empty",
         "emailValidationMessage": "Enter a valid email such as name@domain.com",
-        "emptyPasswordValidatoinMessage": "Password field can not be empty",
-        "equalPasswordValidatoinMessage": "Confirm password field must be equal with password",
+        "emptyPasswordValidatoinMessage": "Enter a password",
+        "equalPasswordValidatoinMessage": "Passwords don't match",
         "submit": "Create account",
         "submitting": "Creating account...", 
         "recaptchaText": "Pass ReCAPTCHA check",