From b26b6a4c12ef9f71f62fa12b120fc558d9fe974e Mon Sep 17 00:00:00 2001 From: Max Alekseenko Date: Wed, 30 Oct 2024 16:59:41 +0100 Subject: [PATCH] post merge fixes --- ui/myProfile/fields/MyProfileFieldsName.tsx | 4 ++-- ui/rewards/ReadOnlyInputWithCopy.tsx | 4 ++-- ui/rewards/login/steps/LoginStepContent.tsx | 4 ++-- ui/snippets/auth/fields/AuthModalFieldEmail.tsx | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/myProfile/fields/MyProfileFieldsName.tsx b/ui/myProfile/fields/MyProfileFieldsName.tsx index 389eecb2ee..833f112acf 100644 --- a/ui/myProfile/fields/MyProfileFieldsName.tsx +++ b/ui/myProfile/fields/MyProfileFieldsName.tsx @@ -4,7 +4,7 @@ import { useController, useFormContext } from 'react-hook-form'; import type { FormFields } from '../types'; -import InputPlaceholder from 'ui/shared/InputPlaceholder'; +import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder'; const MyProfileFieldsName = () => { const { control } = useFormContext(); @@ -24,7 +24,7 @@ const MyProfileFieldsName = () => { isReadOnly={ true } autoComplete="off" /> - + ); }; diff --git a/ui/rewards/ReadOnlyInputWithCopy.tsx b/ui/rewards/ReadOnlyInputWithCopy.tsx index 0fc8cf49b6..0298c02a46 100644 --- a/ui/rewards/ReadOnlyInputWithCopy.tsx +++ b/ui/rewards/ReadOnlyInputWithCopy.tsx @@ -2,7 +2,7 @@ import { FormControl, Input, InputGroup, InputRightElement, Skeleton, chakra } f import React from 'react'; import CopyToClipboard from 'ui/shared/CopyToClipboard'; -import InputPlaceholder from 'ui/shared/InputPlaceholder'; +import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder'; type Props = { label: string; @@ -27,7 +27,7 @@ const ReadOnlyInputWithCopy = ({ label, value, className, isLoading }: Props) => }, }} /> - + diff --git a/ui/rewards/login/steps/LoginStepContent.tsx b/ui/rewards/login/steps/LoginStepContent.tsx index 43d0df7d48..f99e64597b 100644 --- a/ui/rewards/login/steps/LoginStepContent.tsx +++ b/ui/rewards/login/steps/LoginStepContent.tsx @@ -7,7 +7,7 @@ import { useRewardsContext } from 'lib/contexts/rewards'; import * as cookies from 'lib/cookies'; import { apos } from 'lib/html-entities'; import useWallet from 'lib/web3/useWallet'; -import InputPlaceholder from 'ui/shared/InputPlaceholder'; +import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder'; import LinkExternal from 'ui/shared/links/LinkExternal'; import useProfileQuery from 'ui/snippets/auth/useProfileQuery'; import useSignInWithWallet from 'ui/snippets/auth/useSignInWithWallet'; @@ -115,7 +115,7 @@ const LoginStepContent = ({ goNext, closeModal }: Props) => { onChange={ handleRefCodeChange } isInvalid={ refCodeError } /> - + { refCodeError ? 'Incorrect code or format' : 'The code should be in format XXXXXX' } diff --git a/ui/snippets/auth/fields/AuthModalFieldEmail.tsx b/ui/snippets/auth/fields/AuthModalFieldEmail.tsx index dc900b8a93..28976f22bb 100644 --- a/ui/snippets/auth/fields/AuthModalFieldEmail.tsx +++ b/ui/snippets/auth/fields/AuthModalFieldEmail.tsx @@ -4,8 +4,8 @@ import { useController, useFormContext } from 'react-hook-form'; import type { EmailFormFields } from '../types'; -import { EMAIL_REGEXP } from 'lib/validations/email'; -import InputPlaceholder from 'ui/shared/InputPlaceholder'; +import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder'; +import { EMAIL_REGEXP } from 'ui/shared/forms/validators/email'; interface Props { className?: string; @@ -31,7 +31,7 @@ const AuthModalFieldEmail = ({ className }: Props) => { autoComplete="off" bgColor="dialog_bg" /> - + ); };