Commit b26b6a4c authored by Max Alekseenko's avatar Max Alekseenko

post merge fixes

parent dfc33b4b
...@@ -4,7 +4,7 @@ import { useController, useFormContext } from 'react-hook-form'; ...@@ -4,7 +4,7 @@ import { useController, useFormContext } from 'react-hook-form';
import type { FormFields } from '../types'; import type { FormFields } from '../types';
import InputPlaceholder from 'ui/shared/InputPlaceholder'; import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder';
const MyProfileFieldsName = () => { const MyProfileFieldsName = () => {
const { control } = useFormContext<FormFields>(); const { control } = useFormContext<FormFields>();
...@@ -24,7 +24,7 @@ const MyProfileFieldsName = () => { ...@@ -24,7 +24,7 @@ const MyProfileFieldsName = () => {
isReadOnly={ true } isReadOnly={ true }
autoComplete="off" autoComplete="off"
/> />
<InputPlaceholder text="Name" error={ fieldState.error }/> <FormInputPlaceholder text="Name" error={ fieldState.error }/>
</FormControl> </FormControl>
); );
}; };
......
...@@ -2,7 +2,7 @@ import { FormControl, Input, InputGroup, InputRightElement, Skeleton, chakra } f ...@@ -2,7 +2,7 @@ import { FormControl, Input, InputGroup, InputRightElement, Skeleton, chakra } f
import React from 'react'; import React from 'react';
import CopyToClipboard from 'ui/shared/CopyToClipboard'; import CopyToClipboard from 'ui/shared/CopyToClipboard';
import InputPlaceholder from 'ui/shared/InputPlaceholder'; import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder';
type Props = { type Props = {
label: string; label: string;
...@@ -27,7 +27,7 @@ const ReadOnlyInputWithCopy = ({ label, value, className, isLoading }: Props) => ...@@ -27,7 +27,7 @@ const ReadOnlyInputWithCopy = ({ label, value, className, isLoading }: Props) =>
}, },
}} }}
/> />
<InputPlaceholder text={ label }/> <FormInputPlaceholder text={ label }/>
<InputRightElement w="40px" display="flex" justifyContent="flex-end" pr={ 2 }> <InputRightElement w="40px" display="flex" justifyContent="flex-end" pr={ 2 }>
<CopyToClipboard text={ value }/> <CopyToClipboard text={ value }/>
</InputRightElement> </InputRightElement>
......
...@@ -7,7 +7,7 @@ import { useRewardsContext } from 'lib/contexts/rewards'; ...@@ -7,7 +7,7 @@ import { useRewardsContext } from 'lib/contexts/rewards';
import * as cookies from 'lib/cookies'; import * as cookies from 'lib/cookies';
import { apos } from 'lib/html-entities'; import { apos } from 'lib/html-entities';
import useWallet from 'lib/web3/useWallet'; 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 LinkExternal from 'ui/shared/links/LinkExternal';
import useProfileQuery from 'ui/snippets/auth/useProfileQuery'; import useProfileQuery from 'ui/snippets/auth/useProfileQuery';
import useSignInWithWallet from 'ui/snippets/auth/useSignInWithWallet'; import useSignInWithWallet from 'ui/snippets/auth/useSignInWithWallet';
...@@ -115,7 +115,7 @@ const LoginStepContent = ({ goNext, closeModal }: Props) => { ...@@ -115,7 +115,7 @@ const LoginStepContent = ({ goNext, closeModal }: Props) => {
onChange={ handleRefCodeChange } onChange={ handleRefCodeChange }
isInvalid={ refCodeError } isInvalid={ refCodeError }
/> />
<InputPlaceholder text="Code"/> <FormInputPlaceholder text="Code"/>
</FormControl> </FormControl>
<Text fontSize="sm" variant="secondary" mt={ 1 } color={ refCodeError ? 'red.500' : undefined }> <Text fontSize="sm" variant="secondary" mt={ 1 } color={ refCodeError ? 'red.500' : undefined }>
{ refCodeError ? 'Incorrect code or format' : 'The code should be in format XXXXXX' } { refCodeError ? 'Incorrect code or format' : 'The code should be in format XXXXXX' }
......
...@@ -4,8 +4,8 @@ import { useController, useFormContext } from 'react-hook-form'; ...@@ -4,8 +4,8 @@ import { useController, useFormContext } from 'react-hook-form';
import type { EmailFormFields } from '../types'; import type { EmailFormFields } from '../types';
import { EMAIL_REGEXP } from 'lib/validations/email'; import FormInputPlaceholder from 'ui/shared/forms/inputs/FormInputPlaceholder';
import InputPlaceholder from 'ui/shared/InputPlaceholder'; import { EMAIL_REGEXP } from 'ui/shared/forms/validators/email';
interface Props { interface Props {
className?: string; className?: string;
...@@ -31,7 +31,7 @@ const AuthModalFieldEmail = ({ className }: Props) => { ...@@ -31,7 +31,7 @@ const AuthModalFieldEmail = ({ className }: Props) => {
autoComplete="off" autoComplete="off"
bgColor="dialog_bg" bgColor="dialog_bg"
/> />
<InputPlaceholder text="Email" error={ fieldState.error }/> <FormInputPlaceholder text="Email" error={ fieldState.error }/>
</FormControl> </FormControl>
); );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment