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
04fd0313
Commit
04fd0313
authored
Oct 20, 2022
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gas limit for internal transactions
parent
4ba45ecf
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
28 deletions
+31
-28
internalTransaction.ts
types/api/internalTransaction.ts
+2
-1
TxInternals.tsx
ui/tx/TxInternals.tsx
+9
-10
TxInternalsListItem.tsx
ui/tx/internals/TxInternalsListItem.tsx
+5
-5
TxInternalsSkeletonDesktop.tsx
ui/tx/internals/TxInternalsSkeletonDesktop.tsx
+1
-1
TxInternalsSkeletonMobile.tsx
ui/tx/internals/TxInternalsSkeletonMobile.tsx
+4
-0
TxInternalsTable.tsx
ui/tx/internals/TxInternalsTable.tsx
+5
-6
TxInternalsTableItem.tsx
ui/tx/internals/TxInternalsTableItem.tsx
+5
-5
No files found.
types/api/internalTransaction.ts
View file @
04fd0313
...
@@ -10,10 +10,11 @@ export interface InternalTransaction {
...
@@ -10,10 +10,11 @@ export interface InternalTransaction {
from
:
AddressParam
;
from
:
AddressParam
;
to
:
AddressParam
;
to
:
AddressParam
;
created_contract
:
AddressParam
;
created_contract
:
AddressParam
;
value
:
number
;
value
:
string
;
index
:
number
;
index
:
number
;
block
:
number
;
block
:
number
;
timestamp
:
string
;
timestamp
:
string
;
gas_limit
:
string
;
}
}
export
interface
InternalTransactionsResponse
{
export
interface
InternalTransactionsResponse
{
...
...
ui/tx/TxInternals.tsx
View file @
04fd0313
...
@@ -42,16 +42,15 @@ const sortFn = (sort: Sort | undefined) => (a: InternalTransaction, b: InternalT
...
@@ -42,16 +42,15 @@ const sortFn = (sort: Sort | undefined) => (a: InternalTransaction, b: InternalT
return
a
.
value
===
b
.
value
?
0
:
result
;
return
a
.
value
===
b
.
value
?
0
:
result
;
}
}
// no gas limit in api yet
case
'
gas-limit-desc
'
:
{
// case 'gas-limit-desc': {
const
result
=
a
.
gas_limit
>
b
.
gas_limit
?
-
1
:
1
;
// const result = a.gasLimit > b.gasLimit ? -1 : 1;
return
a
.
gas_limit
===
b
.
gas_limit
?
0
:
result
;
// return a.gasLimit === b.gasLimit ? 0 : result;
}
// }
case
'
gas-limit-asc
'
:
{
// case 'gas-limit-asc': {
const
result
=
a
.
gas_limit
>
b
.
gas_limit
?
1
:
-
1
;
// const result = a.gasLimit > b.gasLimit ? 1 : -1;
return
a
.
gas_limit
===
b
.
gas_limit
?
0
:
result
;
// return a.gasLimit === b.gasLimit ? 0 : result;
}
// }
default
:
default
:
return
0
;
return
0
;
...
...
ui/tx/internals/TxInternalsListItem.tsx
View file @
04fd0313
import
{
Flex
,
Tag
,
Icon
,
Box
,
HStack
,
Text
}
from
'
@chakra-ui/react
'
;
import
{
Flex
,
Tag
,
Icon
,
Box
,
HStack
,
Text
}
from
'
@chakra-ui/react
'
;
import
BigNumber
from
'
bignumber.js
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
type
{
InternalTransaction
}
from
'
types/api/internalTransaction
'
;
import
type
{
InternalTransaction
}
from
'
types/api/internalTransaction
'
;
...
@@ -14,7 +15,7 @@ import { TX_INTERNALS_ITEMS } from 'ui/tx/internals/utils';
...
@@ -14,7 +15,7 @@ import { TX_INTERNALS_ITEMS } from 'ui/tx/internals/utils';
type
Props
=
InternalTransaction
;
type
Props
=
InternalTransaction
;
const
TxInternalsListItem
=
({
type
,
from
,
to
,
value
,
success
,
error
}:
Props
)
=>
{
const
TxInternalsListItem
=
({
type
,
from
,
to
,
value
,
success
,
error
,
gas_limit
:
gasLimit
}:
Props
)
=>
{
const
typeTitle
=
TX_INTERNALS_ITEMS
.
find
(({
id
})
=>
id
===
type
)?.
title
;
const
typeTitle
=
TX_INTERNALS_ITEMS
.
find
(({
id
})
=>
id
===
type
)?.
title
;
return
(
return
(
...
@@ -38,11 +39,10 @@ const TxInternalsListItem = ({ type, from, to, value, success, error }: Props) =
...
@@ -38,11 +39,10 @@ const TxInternalsListItem = ({ type, from, to, value, success, error }: Props) =
<
Text
fontSize=
"sm"
fontWeight=
{
500
}
>
Value
{
appConfig
.
network
.
currency
}
</
Text
>
<
Text
fontSize=
"sm"
fontWeight=
{
500
}
>
Value
{
appConfig
.
network
.
currency
}
</
Text
>
<
Text
fontSize=
"sm"
variant=
"secondary"
>
{
value
}
</
Text
>
<
Text
fontSize=
"sm"
variant=
"secondary"
>
{
value
}
</
Text
>
</
HStack
>
</
HStack
>
{
/* no gas limit in api yet */
}
<
HStack
spacing=
{
3
}
>
{
/* <HStack spacing={ 3 }>
<
Text
fontSize=
"sm"
fontWeight=
{
500
}
>
Gas limit
</
Text
>
<
Text
fontSize=
"sm"
fontWeight=
{
500
}
>
Gas limit
</
Text
>
<Text fontSize="sm" variant="secondary">{
gasLimit.toLocaleString('en'
) }</Text>
<
Text
fontSize=
"sm"
variant=
"secondary"
>
{
BigNumber
(
gasLimit
).
toFormat
(
)
}
</
Text
>
</HStack>
*/
}
</
HStack
>
</
AccountListItemMobile
>
</
AccountListItemMobile
>
);
);
};
};
...
...
ui/tx/internals/TxInternalsSkeletonDesktop.tsx
View file @
04fd0313
...
@@ -10,7 +10,7 @@ const TxInternalsSkeletonDesktop = () => {
...
@@ -10,7 +10,7 @@ const TxInternalsSkeletonDesktop = () => {
<
Skeleton
w=
"78px"
/>
<
Skeleton
w=
"78px"
/>
<
Skeleton
w=
"360px"
/>
<
Skeleton
w=
"360px"
/>
</
Flex
>
</
Flex
>
<
SkeletonTable
columns=
{
[
'
28%
'
,
'
2
8%
'
,
'
24px
'
,
'
28
%
'
,
'
16%
'
]
}
/>
<
SkeletonTable
columns=
{
[
'
28%
'
,
'
2
0%
'
,
'
24px
'
,
'
20%
'
,
'
16
%
'
,
'
16%
'
]
}
/>
</>
</>
);
);
};
};
...
...
ui/tx/internals/TxInternalsSkeletonMobile.tsx
View file @
04fd0313
...
@@ -38,6 +38,10 @@ const TxInternalsSkeletonMobile = () => {
...
@@ -38,6 +38,10 @@ const TxInternalsSkeletonMobile = () => {
<
Skeleton
w=
"70px"
mr=
{
2
}
/>
<
Skeleton
w=
"70px"
mr=
{
2
}
/>
<
Skeleton
w=
"30px"
/>
<
Skeleton
w=
"30px"
/>
</
Flex
>
</
Flex
>
<
Flex
h=
{
6
}
>
<
Skeleton
w=
"70px"
mr=
{
2
}
/>
<
Skeleton
w=
"60px"
/>
</
Flex
>
</
Flex
>
</
Flex
>
))
}
))
}
</
Box
>
</
Box
>
...
...
ui/tx/internals/TxInternalsTable.tsx
View file @
04fd0313
...
@@ -23,22 +23,21 @@ const TxInternalsTable = ({ data, sort, onSortToggle }: Props) => {
...
@@ -23,22 +23,21 @@ const TxInternalsTable = ({ data, sort, onSortToggle }: Props) => {
<
Thead
>
<
Thead
>
<
Tr
>
<
Tr
>
<
Th
width=
"28%"
>
Type
</
Th
>
<
Th
width=
"28%"
>
Type
</
Th
>
<
Th
width=
"2
8
%"
>
From
</
Th
>
<
Th
width=
"2
0
%"
>
From
</
Th
>
<
Th
width=
"24px"
px=
{
0
}
/>
<
Th
width=
"24px"
px=
{
0
}
/>
<
Th
width=
"2
8
%"
>
To
</
Th
>
<
Th
width=
"2
0
%"
>
To
</
Th
>
<
Th
width=
"16%"
isNumeric
>
<
Th
width=
"16%"
isNumeric
>
<
Link
display=
"flex"
alignItems=
"center"
justifyContent=
"flex-end"
onClick=
{
onSortToggle
(
'
value
'
)
}
columnGap=
{
1
}
>
<
Link
display=
"flex"
alignItems=
"center"
justifyContent=
"flex-end"
onClick=
{
onSortToggle
(
'
value
'
)
}
columnGap=
{
1
}
>
{
sort
?.
includes
(
'
value
'
)
&&
<
Icon
as=
{
arrowIcon
}
boxSize=
{
4
}
transform=
{
sortIconTransform
}
/>
}
{
sort
?.
includes
(
'
value
'
)
&&
<
Icon
as=
{
arrowIcon
}
boxSize=
{
4
}
transform=
{
sortIconTransform
}
/>
}
Value
{
appConfig
.
network
.
currency
}
Value
{
appConfig
.
network
.
currency
}
</
Link
>
</
Link
>
</
Th
>
</
Th
>
{
/* no gas limit in api yet */
}
<
Th
width=
"16%"
isNumeric
>
{
/* <Th width="16%" isNumeric>
<
Link
display=
"flex"
alignItems=
"center"
justifyContent=
"flex-end"
onClick=
{
onSortToggle
(
'
gas-limit
'
)
}
columnGap=
{
1
}
>
<
Link
display=
"flex"
alignItems=
"center"
justifyContent=
"flex-end"
onClick=
{
onSortToggle
(
'
gas-limit
'
)
}
columnGap=
{
1
}
>
{
sort
?.
includes
(
'
gas-limit
'
)
&&
<
Icon
as=
{
arrowIcon
}
boxSize=
{
4
}
transform=
{
sortIconTransform
}
/>
}
{
sort
?.
includes
(
'
gas-limit
'
)
&&
<
Icon
as=
{
arrowIcon
}
boxSize=
{
4
}
transform=
{
sortIconTransform
}
/>
}
Gas limit
Gas limit
{
appConfig
.
network
.
currency
}
</
Link
>
</
Link
>
</Th>
*/
}
</
Th
>
</
Tr
>
</
Tr
>
</
Thead
>
</
Thead
>
<
Tbody
>
<
Tbody
>
...
...
ui/tx/internals/TxInternalsTableItem.tsx
View file @
04fd0313
import
{
Tr
,
Td
,
Tag
,
Icon
,
Box
}
from
'
@chakra-ui/react
'
;
import
{
Tr
,
Td
,
Tag
,
Icon
,
Box
}
from
'
@chakra-ui/react
'
;
import
BigNumber
from
'
bignumber.js
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
type
{
InternalTransaction
}
from
'
types/api/internalTransaction
'
;
import
type
{
InternalTransaction
}
from
'
types/api/internalTransaction
'
;
...
@@ -12,7 +13,7 @@ import { TX_INTERNALS_ITEMS } from 'ui/tx/internals/utils';
...
@@ -12,7 +13,7 @@ import { TX_INTERNALS_ITEMS } from 'ui/tx/internals/utils';
type
Props
=
InternalTransaction
type
Props
=
InternalTransaction
const
TxInternalTableItem
=
({
type
,
from
,
to
,
value
,
success
,
error
}:
Props
)
=>
{
const
TxInternalTableItem
=
({
type
,
from
,
to
,
value
,
success
,
error
,
gas_limit
:
gasLimit
}:
Props
)
=>
{
const
typeTitle
=
TX_INTERNALS_ITEMS
.
find
(({
id
})
=>
id
===
type
)?.
title
;
const
typeTitle
=
TX_INTERNALS_ITEMS
.
find
(({
id
})
=>
id
===
type
)?.
title
;
return
(
return
(
...
@@ -43,10 +44,9 @@ const TxInternalTableItem = ({ type, from, to, value, success, error }: Props) =
...
@@ -43,10 +44,9 @@ const TxInternalTableItem = ({ type, from, to, value, success, error }: Props) =
<
Td
isNumeric
verticalAlign=
"middle"
>
<
Td
isNumeric
verticalAlign=
"middle"
>
{
value
}
{
value
}
</
Td
>
</
Td
>
{
/* no gas limit in api yet */
}
<
Td
isNumeric
verticalAlign=
"middle"
>
{
/* <Td isNumeric verticalAlign='middle'>
{
BigNumber
(
gasLimit
).
toFormat
()
}
{ gasLimit.toLocaleString('en') }
</
Td
>
</Td> */
}
</
Tr
>
</
Tr
>
);
);
};
};
...
...
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