Skip to content

Commit

Permalink
post merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
maxaleks committed Oct 30, 2024
1 parent dfc33b4 commit b26b6a4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ui/myProfile/fields/MyProfileFieldsName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<FormFields>();
Expand All @@ -24,7 +24,7 @@ const MyProfileFieldsName = () => {
isReadOnly={ true }
autoComplete="off"
/>
<InputPlaceholder text="Name" error={ fieldState.error }/>
<FormInputPlaceholder text="Name" error={ fieldState.error }/>
</FormControl>
);
};
Expand Down
4 changes: 2 additions & 2 deletions ui/rewards/ReadOnlyInputWithCopy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 }>
<CopyToClipboard text={ value }/>
</InputRightElement>
Expand Down
4 changes: 2 additions & 2 deletions ui/rewards/login/steps/LoginStepContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -115,7 +115,7 @@ const LoginStepContent = ({ goNext, closeModal }: Props) => {
onChange={ handleRefCodeChange }
isInvalid={ refCodeError }
/>
<InputPlaceholder text="Code"/>
<FormInputPlaceholder text="Code"/>
</FormControl>
<Text fontSize="sm" variant="secondary" mt={ 1 } color={ refCodeError ? 'red.500' : undefined }>
{ refCodeError ? 'Incorrect code or format' : 'The code should be in format XXXXXX' }
Expand Down
6 changes: 3 additions & 3 deletions ui/snippets/auth/fields/AuthModalFieldEmail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,7 +31,7 @@ const AuthModalFieldEmail = ({ className }: Props) => {
autoComplete="off"
bgColor="dialog_bg"
/>
<InputPlaceholder text="Email" error={ fieldState.error }/>
<FormInputPlaceholder text="Email" error={ fieldState.error }/>
</FormControl>
);
};
Expand Down

0 comments on commit b26b6a4

Please sign in to comment.