Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
b26b6a4c
Commit
b26b6a4c
authored
Oct 30, 2024
by
Max Alekseenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
post merge fixes
parent
dfc33b4b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
MyProfileFieldsName.tsx
ui/myProfile/fields/MyProfileFieldsName.tsx
+2
-2
ReadOnlyInputWithCopy.tsx
ui/rewards/ReadOnlyInputWithCopy.tsx
+2
-2
LoginStepContent.tsx
ui/rewards/login/steps/LoginStepContent.tsx
+2
-2
AuthModalFieldEmail.tsx
ui/snippets/auth/fields/AuthModalFieldEmail.tsx
+3
-3
No files found.
ui/myProfile/fields/MyProfileFieldsName.tsx
View file @
b26b6a4c
...
...
@@ -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/Form
InputPlaceholder
'
;
const
MyProfileFieldsName
=
()
=>
{
const
{
control
}
=
useFormContext
<
FormFields
>
();
...
...
@@ -24,7 +24,7 @@ const MyProfileFieldsName = () => {
isReadOnly=
{
true
}
autoComplete=
"off"
/>
<
InputPlaceholder
text=
"Name"
error=
{
fieldState
.
error
}
/>
<
Form
InputPlaceholder
text=
"Name"
error=
{
fieldState
.
error
}
/>
</
FormControl
>
);
};
...
...
ui/rewards/ReadOnlyInputWithCopy.tsx
View file @
b26b6a4c
...
...
@@ -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/Form
InputPlaceholder
'
;
type
Props
=
{
label
:
string
;
...
...
@@ -27,7 +27,7 @@ const ReadOnlyInputWithCopy = ({ label, value, className, isLoading }: Props) =>
},
}
}
/>
<
InputPlaceholder
text=
{
label
}
/>
<
Form
InputPlaceholder
text=
{
label
}
/>
<
InputRightElement
w=
"40px"
display=
"flex"
justifyContent=
"flex-end"
pr=
{
2
}
>
<
CopyToClipboard
text=
{
value
}
/>
</
InputRightElement
>
...
...
ui/rewards/login/steps/LoginStepContent.tsx
View file @
b26b6a4c
...
...
@@ -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/Form
InputPlaceholder
'
;
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
}
/>
<
InputPlaceholder
text=
"Code"
/>
<
Form
InputPlaceholder
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
'
}
...
...
ui/snippets/auth/fields/AuthModalFieldEmail.tsx
View file @
b26b6a4c
...
...
@@ -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"
/>
<
InputPlaceholder
text=
"Email"
error=
{
fieldState
.
error
}
/>
<
Form
InputPlaceholder
text=
"Email"
error=
{
fieldState
.
error
}
/>
</
FormControl
>
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment