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
698f5c2e
Commit
698f5c2e
authored
Jan 18, 2023
by
isstuev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
address + token
parent
fe554059
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
18 deletions
+56
-18
resources.ts
lib/api/resources.ts
+1
-1
address.ts
types/api/address.ts
+3
-2
AddressTokenTransfers.tsx
ui/address/AddressTokenTransfers.tsx
+52
-15
No files found.
lib/api/resources.ts
View file @
698f5c2e
...
@@ -151,7 +151,7 @@ export const RESOURCES = {
...
@@ -151,7 +151,7 @@ export const RESOURCES = {
address_token_transfers
:
{
address_token_transfers
:
{
path
:
'
/api/v2/addresses/:id/token-transfers
'
,
path
:
'
/api/v2/addresses/:id/token-transfers
'
,
paginationFields
:
[
'
block_number
'
as
const
,
'
items_count
'
as
const
,
'
index
'
as
const
,
'
transaction_index
'
as
const
],
paginationFields
:
[
'
block_number
'
as
const
,
'
items_count
'
as
const
,
'
index
'
as
const
,
'
transaction_index
'
as
const
],
filterFields
:
[
'
filter
'
as
const
,
'
type
'
as
const
],
filterFields
:
[
'
filter
'
as
const
,
'
type
'
as
const
,
'
token
'
as
const
],
},
},
address_blocks_validated
:
{
address_blocks_validated
:
{
path
:
'
/api/v2/addresses/:id/blocks-validated
'
,
path
:
'
/api/v2/addresses/:id/blocks-validated
'
,
...
...
types/api/address.ts
View file @
698f5c2e
...
@@ -81,8 +81,9 @@ export interface AddressTokenTransferResponse {
...
@@ -81,8 +81,9 @@ export interface AddressTokenTransferResponse {
}
}
export
type
AddressTokenTransferFilters
=
{
export
type
AddressTokenTransferFilters
=
{
filter
:
AddressFromToFilter
;
filter
?:
AddressFromToFilter
;
type
:
Array
<
TokenType
>
;
type
?:
Array
<
TokenType
>
;
token
?:
string
;
}
}
export
type
AddressTokensFilter
=
{
export
type
AddressTokensFilter
=
{
...
...
ui/address/AddressTokenTransfers.tsx
View file @
698f5c2e
import
{
Hide
,
Show
,
Text
}
from
'
@chakra-ui/react
'
;
import
{
Flex
,
Hide
,
Icon
,
Show
,
Text
,
Tooltip
,
useColorModeValue
}
from
'
@chakra-ui/react
'
;
import
{
useQueryClient
}
from
'
@tanstack/react-query
'
;
import
{
useQueryClient
}
from
'
@tanstack/react-query
'
;
import
{
useRouter
}
from
'
next/router
'
;
import
{
useRouter
}
from
'
next/router
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
...
@@ -9,6 +9,7 @@ import type { AddressFromToFilter, AddressTokenTransferResponse } from 'types/ap
...
@@ -9,6 +9,7 @@ import type { AddressFromToFilter, AddressTokenTransferResponse } from 'types/ap
import
type
{
TokenType
}
from
'
types/api/tokenInfo
'
;
import
type
{
TokenType
}
from
'
types/api/tokenInfo
'
;
import
type
{
TokenTransfer
}
from
'
types/api/tokenTransfer
'
;
import
type
{
TokenTransfer
}
from
'
types/api/tokenTransfer
'
;
import
crossIcon
from
'
icons/cross.svg
'
;
import
{
getResourceKey
}
from
'
lib/api/useApiQuery
'
;
import
{
getResourceKey
}
from
'
lib/api/useApiQuery
'
;
import
getFilterValueFromQuery
from
'
lib/getFilterValueFromQuery
'
;
import
getFilterValueFromQuery
from
'
lib/getFilterValueFromQuery
'
;
import
getFilterValuesFromQuery
from
'
lib/getFilterValuesFromQuery
'
;
import
getFilterValuesFromQuery
from
'
lib/getFilterValuesFromQuery
'
;
...
@@ -24,6 +25,7 @@ import Pagination from 'ui/shared/Pagination';
...
@@ -24,6 +25,7 @@ import Pagination from 'ui/shared/Pagination';
import
SkeletonList
from
'
ui/shared/skeletons/SkeletonList
'
;
import
SkeletonList
from
'
ui/shared/skeletons/SkeletonList
'
;
import
SkeletonTable
from
'
ui/shared/skeletons/SkeletonTable
'
;
import
SkeletonTable
from
'
ui/shared/skeletons/SkeletonTable
'
;
import
SocketNewItemsNotice
from
'
ui/shared/SocketNewItemsNotice
'
;
import
SocketNewItemsNotice
from
'
ui/shared/SocketNewItemsNotice
'
;
import
TokenLogo
from
'
ui/shared/TokenLogo
'
;
import
{
flattenTotal
}
from
'
ui/shared/TokenTransfer/helpers
'
;
import
{
flattenTotal
}
from
'
ui/shared/TokenTransfer/helpers
'
;
import
TokenTransferFilter
from
'
ui/shared/TokenTransfer/TokenTransferFilter
'
;
import
TokenTransferFilter
from
'
ui/shared/TokenTransfer/TokenTransferFilter
'
;
import
TokenTransferList
from
'
ui/shared/TokenTransfer/TokenTransferList
'
;
import
TokenTransferList
from
'
ui/shared/TokenTransfer/TokenTransferList
'
;
...
@@ -68,14 +70,19 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
...
@@ -68,14 +70,19 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
const
[
socketAlert
,
setSocketAlert
]
=
React
.
useState
(
''
);
const
[
socketAlert
,
setSocketAlert
]
=
React
.
useState
(
''
);
const
[
newItemsCount
,
setNewItemsCount
]
=
React
.
useState
(
0
);
const
[
newItemsCount
,
setNewItemsCount
]
=
React
.
useState
(
0
);
const
tokenFilter
=
router
.
query
.
token
?
router
.
query
.
token
.
toString
()
:
undefined
;
const
[
filters
,
setFilters
]
=
React
.
useState
<
Filters
>
(
const
[
filters
,
setFilters
]
=
React
.
useState
<
Filters
>
(
{
type
:
getTokenFilterValue
(
router
.
query
.
type
)
||
[],
filter
:
getAddressFilterValue
(
router
.
query
.
filter
)
},
{
type
:
getTokenFilterValue
(
router
.
query
.
type
)
||
[],
filter
:
getAddressFilterValue
(
router
.
query
.
filter
),
},
);
);
const
{
isError
,
isLoading
,
data
,
pagination
,
onFilterChange
,
isPaginationVisible
}
=
useQueryWithPages
({
const
{
isError
,
isLoading
,
data
,
pagination
,
onFilterChange
,
isPaginationVisible
}
=
useQueryWithPages
({
resourceName
:
'
address_token_transfers
'
,
resourceName
:
'
address_token_transfers
'
,
pathParams
:
{
id
:
currentAddress
},
pathParams
:
{
id
:
currentAddress
},
filters
:
filters
,
filters
:
tokenFilter
?
{
token
:
tokenFilter
}
:
filters
,
scrollRef
,
scrollRef
,
});
});
...
@@ -90,6 +97,13 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
...
@@ -90,6 +97,13 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
setFilters
((
prevState
)
=>
({
...
prevState
,
filter
:
filterVal
}));
setFilters
((
prevState
)
=>
({
...
prevState
,
filter
:
filterVal
}));
},
[
filters
,
onFilterChange
]);
},
[
filters
,
onFilterChange
]);
const
resetTokenFilter
=
React
.
useCallback
(()
=>
{
onFilterChange
({});
},
[
onFilterChange
]);
const
resetTokenIconColor
=
useColorModeValue
(
'
blue.600
'
,
'
blue.300
'
);
const
resetTokenIconHoverColor
=
useColorModeValue
(
'
blue.400
'
,
'
blue.200
'
);
const
handleNewSocketMessage
:
SocketMessage
.
AddressTokenTransfer
[
'
handler
'
]
=
(
payload
)
=>
{
const
handleNewSocketMessage
:
SocketMessage
.
AddressTokenTransfer
[
'
handler
'
]
=
(
payload
)
=>
{
setSocketAlert
(
''
);
setSocketAlert
(
''
);
...
@@ -132,7 +146,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
...
@@ -132,7 +146,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
topic
:
`addresses:
${
(
router
.
query
.
id
as
string
).
toLowerCase
()
}
`
,
topic
:
`addresses:
${
(
router
.
query
.
id
as
string
).
toLowerCase
()
}
`
,
onSocketClose
:
handleSocketClose
,
onSocketClose
:
handleSocketClose
,
onSocketError
:
handleSocketError
,
onSocketError
:
handleSocketError
,
isDisabled
:
pagination
.
page
!==
1
,
isDisabled
:
pagination
.
page
!==
1
||
Boolean
(
tokenFilter
)
,
});
});
useSocketMessage
({
useSocketMessage
({
...
@@ -142,7 +156,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
...
@@ -142,7 +156,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
});
});
const
numActiveFilters
=
(
filters
.
type
?.
length
||
0
)
+
(
filters
.
filter
?
1
:
0
);
const
numActiveFilters
=
(
filters
.
type
?.
length
||
0
)
+
(
filters
.
filter
?
1
:
0
);
const
isActionBarHidden
=
!
numActiveFilters
&&
!
data
?.
items
.
length
;
const
isActionBarHidden
=
!
tokenFilter
&&
!
numActiveFilters
&&
!
data
?.
items
.
length
;
const
content
=
(()
=>
{
const
content
=
(()
=>
{
if
(
isLoading
)
{
if
(
isLoading
)
{
...
@@ -180,13 +194,13 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
...
@@ -180,13 +194,13 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
showTxInfo
showTxInfo
top=
{
80
}
top=
{
80
}
enableTimeIncrement
enableTimeIncrement
showSocketInfo=
{
pagination
.
page
===
1
}
showSocketInfo=
{
pagination
.
page
===
1
&&
!
tokenFilter
}
socketInfoAlert=
{
socketAlert
}
socketInfoAlert=
{
socketAlert
}
socketInfoNum=
{
newItemsCount
}
socketInfoNum=
{
newItemsCount
}
/>
/>
</
Hide
>
</
Hide
>
<
Show
below=
"lg"
>
<
Show
below=
"lg"
>
{
pagination
.
page
===
1
&&
(
{
pagination
.
page
===
1
&&
!
tokenFilter
&&
(
<
SocketNewItemsNotice
<
SocketNewItemsNotice
url=
{
window
.
location
.
href
}
url=
{
window
.
location
.
href
}
num=
{
newItemsCount
}
num=
{
newItemsCount
}
...
@@ -210,14 +224,37 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
...
@@ -210,14 +224,37 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
<>
<>
{
!
isActionBarHidden
&&
(
{
!
isActionBarHidden
&&
(
<
ActionBar
mt=
{
-
6
}
>
<
ActionBar
mt=
{
-
6
}
>
<
TokenTransferFilter
{
tokenFilter
&&
(
defaultTypeFilters=
{
filters
.
type
}
<
Flex
alignItems=
"center"
py=
{
1
}
>
onTypeFilterChange=
{
handleTypeFilterChange
}
Filtered by token
appliedFiltersNum=
{
numActiveFilters
}
<
TokenLogo
hash=
{
tokenFilter
}
boxSize=
{
6
}
mx=
{
2
}
/>
withAddressFilter
{
tokenFilter
}
onAddressFilterChange=
{
handleAddressFilterChange
}
{
data
?.
items
?.[
0
].
token
.
name
&&
` (${ data?.items?.[0].token.name }) `
}
defaultAddressFilter=
{
filters
.
filter
}
<
Tooltip
label=
"Reset filter"
>
/>
<
Flex
>
<
Icon
as=
{
crossIcon
}
boxSize=
{
6
}
ml=
{
1
}
color=
{
resetTokenIconColor
}
cursor=
"pointer"
_hover=
{
{
color
:
resetTokenIconHoverColor
}
}
onClick=
{
resetTokenFilter
}
/>
</
Flex
>
</
Tooltip
>
</
Flex
>
)
}
{
!
tokenFilter
&&
(
<
TokenTransferFilter
defaultTypeFilters=
{
filters
.
type
}
onTypeFilterChange=
{
handleTypeFilterChange
}
appliedFiltersNum=
{
numActiveFilters
}
withAddressFilter
onAddressFilterChange=
{
handleAddressFilterChange
}
defaultAddressFilter=
{
filters
.
filter
}
/>
)
}
{
isPaginationVisible
&&
<
Pagination
ml=
"auto"
{
...
pagination
}
/>
}
{
isPaginationVisible
&&
<
Pagination
ml=
"auto"
{
...
pagination
}
/>
}
</
ActionBar
>
</
ActionBar
>
)
}
)
}
...
...
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