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
712a4b13
Unverified
Commit
712a4b13
authored
Nov 25, 2024
by
tom goriunov
Committed by
GitHub
Nov 25, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add custom block ordering on address transaction page (#2387)
Fixes #2366
parent
bb745fea
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
transaction.ts
types/api/transaction.ts
+1
-1
TxsContent.tsx
ui/txs/TxsContent.tsx
+1
-0
TxsTable.tsx
ui/txs/TxsTable.tsx
+11
-3
TxsTable.pw.tsx_dark-color-mode_base-view-dark-mode-1.png
...TxsTable.pw.tsx_dark-color-mode_base-view-dark-mode-1.png
+0
-0
No files found.
types/api/transaction.ts
View file @
712a4b13
...
@@ -183,7 +183,7 @@ export type TransactionType = 'rootstock_remasc' |
...
@@ -183,7 +183,7 @@ export type TransactionType = 'rootstock_remasc' |
export
type
TxsResponse
=
TransactionsResponseValidated
|
TransactionsResponsePending
|
BlockTransactionsResponse
;
export
type
TxsResponse
=
TransactionsResponseValidated
|
TransactionsResponsePending
|
BlockTransactionsResponse
;
export
interface
TransactionsSorting
{
export
interface
TransactionsSorting
{
sort
:
'
value
'
|
'
fee
'
;
sort
:
'
value
'
|
'
fee
'
|
'
block_number
'
;
order
:
'
asc
'
|
'
desc
'
;
order
:
'
asc
'
|
'
desc
'
;
}
}
...
...
ui/txs/TxsContent.tsx
View file @
712a4b13
...
@@ -19,6 +19,7 @@ import TxsTable from './TxsTable';
...
@@ -19,6 +19,7 @@ import TxsTable from './TxsTable';
const
SORT_SEQUENCE
:
Record
<
TransactionsSortingField
,
Array
<
TransactionsSortingValue
|
undefined
>>
=
{
const
SORT_SEQUENCE
:
Record
<
TransactionsSortingField
,
Array
<
TransactionsSortingValue
|
undefined
>>
=
{
value
:
[
'
value-desc
'
,
'
value-asc
'
,
undefined
],
value
:
[
'
value-desc
'
,
'
value-asc
'
,
undefined
],
fee
:
[
'
fee-desc
'
,
'
fee-asc
'
,
undefined
],
fee
:
[
'
fee-desc
'
,
'
fee-asc
'
,
undefined
],
block_number
:
[
'
block_number-asc
'
,
undefined
],
};
};
type
Props
=
{
type
Props
=
{
...
...
ui/txs/TxsTable.tsx
View file @
712a4b13
...
@@ -56,11 +56,19 @@ const TxsTable = ({
...
@@ -56,11 +56,19 @@ const TxsTable = ({
<
Th
width=
"180px"
>
Txn hash
</
Th
>
<
Th
width=
"180px"
>
Txn hash
</
Th
>
<
Th
width=
"160px"
>
Type
</
Th
>
<
Th
width=
"160px"
>
Type
</
Th
>
<
Th
width=
"20%"
>
Method
</
Th
>
<
Th
width=
"20%"
>
Method
</
Th
>
{
showBlockInfo
&&
<
Th
width=
"18%"
>
Block
</
Th
>
}
{
showBlockInfo
&&
(
<
Th
width=
"18%"
>
<
Link
onClick=
{
isLoading
?
undefined
:
sort
(
'
block_number
'
)
}
display=
"flex"
alignItems=
"center"
>
{
sorting
===
'
block_number-asc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(-90deg)"
/>
}
{
sorting
===
'
block_number-desc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(90deg)"
/>
}
Block
</
Link
>
</
Th
>
)
}
<
Th
width=
"224px"
>
From/To
</
Th
>
<
Th
width=
"224px"
>
From/To
</
Th
>
{
!
config
.
UI
.
views
.
tx
.
hiddenFields
?.
value
&&
(
{
!
config
.
UI
.
views
.
tx
.
hiddenFields
?.
value
&&
(
<
Th
width=
"20%"
isNumeric
>
<
Th
width=
"20%"
isNumeric
>
<
Link
onClick=
{
sort
(
'
value
'
)
}
display=
"flex
"
justifyContent=
"end"
>
<
Link
onClick=
{
isLoading
?
undefined
:
sort
(
'
value
'
)
}
display=
"flex"
alignItems=
"center
"
justifyContent=
"end"
>
{
sorting
===
'
value-asc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(-90deg)"
/>
}
{
sorting
===
'
value-asc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(-90deg)"
/>
}
{
sorting
===
'
value-desc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(90deg)"
/>
}
{
sorting
===
'
value-desc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(90deg)"
/>
}
{
`Value ${ currencyUnits.ether }`
}
{
`Value ${ currencyUnits.ether }`
}
...
@@ -69,7 +77,7 @@ const TxsTable = ({
...
@@ -69,7 +77,7 @@ const TxsTable = ({
)
}
)
}
{
!
config
.
UI
.
views
.
tx
.
hiddenFields
?.
tx_fee
&&
(
{
!
config
.
UI
.
views
.
tx
.
hiddenFields
?.
tx_fee
&&
(
<
Th
width=
"20%"
isNumeric
pr=
{
5
}
>
<
Th
width=
"20%"
isNumeric
pr=
{
5
}
>
<
Link
onClick=
{
sort
(
'
fee
'
)
}
display=
"flex
"
justifyContent=
"end"
>
<
Link
onClick=
{
isLoading
?
undefined
:
sort
(
'
fee
'
)
}
display=
"flex"
alignItems=
"center
"
justifyContent=
"end"
>
{
sorting
===
'
fee-asc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(-90deg)"
/>
}
{
sorting
===
'
fee-asc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(-90deg)"
/>
}
{
sorting
===
'
fee-desc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(90deg)"
/>
}
{
sorting
===
'
fee-desc
'
&&
<
IconSvg
boxSize=
{
5
}
name=
"arrows/east"
transform=
"rotate(90deg)"
/>
}
{
`Fee${ feeCurrency }`
}
{
`Fee${ feeCurrency }`
}
...
...
ui/txs/__screenshots__/TxsTable.pw.tsx_dark-color-mode_base-view-dark-mode-1.png
View replaced file @
bb745fea
View file @
712a4b13
48.2 KB
|
W:
|
H:
48.3 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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