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
e2a73e42
Commit
e2a73e42
authored
Mar 14, 2024
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contract method: format all args to string
parent
354193e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
useFormatFieldValue.tsx
ui/address/contract/methodForm/useFormatFieldValue.tsx
+3
-3
useValidateField.tsx
ui/address/contract/methodForm/useValidateField.tsx
+7
-7
No files found.
ui/address/contract/methodForm/useFormatFieldValue.tsx
View file @
e2a73e42
...
@@ -18,7 +18,7 @@ export default function useFormatFieldValue({ argType, argTypeMatchInt }: Params
...
@@ -18,7 +18,7 @@ export default function useFormatFieldValue({ argType, argTypeMatchInt }: Params
if
(
argTypeMatchInt
)
{
if
(
argTypeMatchInt
)
{
const
formattedString
=
value
.
replace
(
/
\s
/g
,
''
);
const
formattedString
=
value
.
replace
(
/
\s
/g
,
''
);
return
parseInt
(
formattedString
)
;
return
formattedString
;
}
}
if
(
argType
===
'
bool
'
)
{
if
(
argType
===
'
bool
'
)
{
...
@@ -26,11 +26,11 @@ export default function useFormatFieldValue({ argType, argTypeMatchInt }: Params
...
@@ -26,11 +26,11 @@ export default function useFormatFieldValue({ argType, argTypeMatchInt }: Params
switch
(
formattedValue
)
{
switch
(
formattedValue
)
{
case
'
true
'
:
{
case
'
true
'
:
{
return
true
;
return
'
true
'
;
}
}
case
'
false
'
:{
case
'
false
'
:{
return
false
;
return
'
false
'
;
}
}
default
:
default
:
...
...
ui/address/contract/methodForm/useValidateField.tsx
View file @
e2a73e42
...
@@ -18,15 +18,13 @@ export default function useValidateField({ isOptional, argType, argTypeMatchInt
...
@@ -18,15 +18,13 @@ export default function useValidateField({ isOptional, argType, argTypeMatchInt
return
argType
.
match
(
BYTES_REGEXP
);
return
argType
.
match
(
BYTES_REGEXP
);
},
[
argType
]);
},
[
argType
]);
// some values are formatted before they are sent to the validator
return
React
.
useCallback
((
value
:
string
|
undefined
)
=>
{
// see ./useFormatFieldValue.tsx hook
return
React
.
useCallback
((
value
:
string
|
number
|
boolean
|
undefined
)
=>
{
if
(
value
===
undefined
||
value
===
''
)
{
if
(
value
===
undefined
||
value
===
''
)
{
return
isOptional
?
true
:
'
Field is required
'
;
return
isOptional
?
true
:
'
Field is required
'
;
}
}
if
(
argType
===
'
address
'
)
{
if
(
argType
===
'
address
'
)
{
if
(
typeof
value
!==
'
string
'
||
!
isAddress
(
value
))
{
if
(
!
isAddress
(
value
))
{
return
'
Invalid address format
'
;
return
'
Invalid address format
'
;
}
}
...
@@ -41,11 +39,13 @@ export default function useValidateField({ isOptional, argType, argTypeMatchInt
...
@@ -41,11 +39,13 @@ export default function useValidateField({ isOptional, argType, argTypeMatchInt
}
}
if
(
argTypeMatchInt
)
{
if
(
argTypeMatchInt
)
{
if
(
typeof
value
!==
'
number
'
||
Object
.
is
(
value
,
NaN
))
{
const
formattedValue
=
Number
(
value
);
if
(
Object
.
is
(
formattedValue
,
NaN
))
{
return
'
Invalid integer format
'
;
return
'
Invalid integer format
'
;
}
}
if
(
value
>
argTypeMatchInt
.
max
||
v
alue
<
argTypeMatchInt
.
min
)
{
if
(
formattedValue
>
argTypeMatchInt
.
max
||
formattedV
alue
<
argTypeMatchInt
.
min
)
{
const
lowerBoundary
=
argTypeMatchInt
.
isUnsigned
?
'
0
'
:
`-1 * 2 ^
${
Number
(
argTypeMatchInt
.
power
)
-
1
}
`
;
const
lowerBoundary
=
argTypeMatchInt
.
isUnsigned
?
'
0
'
:
`-1 * 2 ^
${
Number
(
argTypeMatchInt
.
power
)
-
1
}
`
;
const
upperBoundary
=
argTypeMatchInt
.
isUnsigned
?
`2 ^
${
argTypeMatchInt
.
power
}
- 1`
:
`2 ^
${
Number
(
argTypeMatchInt
.
power
)
-
1
}
- 1`
;
const
upperBoundary
=
argTypeMatchInt
.
isUnsigned
?
`2 ^
${
argTypeMatchInt
.
power
}
- 1`
:
`2 ^
${
Number
(
argTypeMatchInt
.
power
)
-
1
}
- 1`
;
return
`Value should be in range from "
${
lowerBoundary
}
" to "
${
upperBoundary
}
" inclusively`
;
return
`Value should be in range from "
${
lowerBoundary
}
" to "
${
upperBoundary
}
" inclusively`
;
...
@@ -55,7 +55,7 @@ export default function useValidateField({ isOptional, argType, argTypeMatchInt
...
@@ -55,7 +55,7 @@ export default function useValidateField({ isOptional, argType, argTypeMatchInt
}
}
if
(
argType
===
'
bool
'
)
{
if
(
argType
===
'
bool
'
)
{
if
(
typeof
value
!==
'
boolean
'
)
{
if
(
value
!==
'
true
'
&&
value
!==
'
false
'
)
{
return
'
Invalid boolean format. Allowed values: true, false
'
;
return
'
Invalid boolean format. Allowed values: true, false
'
;
}
}
}
}
...
...
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