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
12689343
Commit
12689343
authored
Feb 16, 2023
by
tom
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'main' of github.com:blockscout/frontend into no-link
parents
cc381104
41d9034a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
20 deletions
+24
-20
values.yaml
deploy/values/main/values.yaml
+1
-1
AddressCsvExportLink.tsx
ui/address/AddressCsvExportLink.tsx
+1
-0
AddressTokenTransfers.tsx
ui/address/AddressTokenTransfers.tsx
+21
-18
AddressTokenTransfers.pw.tsx_mobile_with-token-filter-and-no-pagination-mobile-1.png
...x_mobile_with-token-filter-and-no-pagination-mobile-1.png
+0
-0
TokenTransferTable.tsx
ui/shared/TokenTransfer/TokenTransferTable.tsx
+1
-1
No files found.
deploy/values/main/values.yaml
View file @
12689343
...
...
@@ -157,7 +157,7 @@ blockscout:
DISABLE_EXCHANGE_RATES
:
_default
:
'
true'
DISABLE_INDEXER
:
_default
:
'
tru
e'
_default
:
'
fals
e'
FIRST_BLOCK
:
_default
:
'
8446041'
LAST_BLOCK
:
...
...
ui/address/AddressCsvExportLink.tsx
View file @
12689343
...
...
@@ -20,6 +20,7 @@ const AddressCsvExportLink = ({ className, address, type }: Props) => {
className=
{
className
}
display=
"inline-flex"
alignItems=
"center"
whiteSpace=
"nowrap"
href=
{
route
({
pathname
:
'
/csv-export
'
,
query
:
{
type
,
address
}
})
}
flexShrink=
{
0
}
>
...
...
ui/address/AddressTokenTransfers.tsx
View file @
12689343
...
...
@@ -23,6 +23,7 @@ import TOKEN_TYPE from 'lib/token/tokenTypes';
import
EmptySearchResult
from
'
ui/apps/EmptySearchResult
'
;
import
ActionBar
from
'
ui/shared/ActionBar
'
;
import
DataFetchAlert
from
'
ui/shared/DataFetchAlert
'
;
import
HashStringShorten
from
'
ui/shared/HashStringShorten
'
;
import
Pagination
from
'
ui/shared/Pagination
'
;
import
SkeletonList
from
'
ui/shared/skeletons/SkeletonList
'
;
import
SkeletonTable
from
'
ui/shared/skeletons/SkeletonTable
'
;
...
...
@@ -161,7 +162,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
});
const
numActiveFilters
=
(
filters
.
type
?.
length
||
0
)
+
(
filters
.
filter
?
1
:
0
);
const
isActionBarHidden
=
!
tokenFilter
&&
!
numActiveFilters
&&
!
data
?.
items
.
length
;
const
isActionBarHidden
=
!
tokenFilter
&&
!
numActiveFilters
&&
!
data
?.
items
.
length
&&
!
currentAddress
;
const
content
=
(()
=>
{
if
(
isLoading
)
{
...
...
@@ -226,23 +227,25 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
})();
const
tokenFilterComponent
=
tokenFilter
&&
(
<
Flex
alignItems=
"center"
py=
{
1
}
flexWrap=
"wrap"
mb=
{
{
base
:
isPaginationVisible
?
6
:
3
,
lg
:
0
}
}
>
Filtered by token
<
TokenLogo
hash=
{
tokenFilter
}
boxSize=
{
6
}
mx=
{
2
}
/>
{
isMobile
?
tokenFilter
.
slice
(
0
,
4
)
+
'
...
'
+
tokenFilter
.
slice
(
-
4
)
:
tokenFilter
}
<
Tooltip
label=
"Reset filter"
>
<
Flex
>
<
Icon
as=
{
crossIcon
}
boxSize=
{
6
}
ml=
{
1
}
color=
{
resetTokenIconColor
}
cursor=
"pointer"
_hover=
{
{
color
:
resetTokenIconHoverColor
}
}
onClick=
{
resetTokenFilter
}
/>
</
Flex
>
</
Tooltip
>
<
Flex
alignItems=
"center"
flexWrap=
"wrap"
mb=
{
{
base
:
isActionBarHidden
?
3
:
6
,
lg
:
0
}
}
mr=
{
4
}
>
<
Text
whiteSpace=
"nowrap"
mr=
{
2
}
py=
{
1
}
>
Filtered by token
</
Text
>
<
Flex
alignItems=
"center"
py=
{
1
}
>
<
TokenLogo
hash=
{
tokenFilter
}
boxSize=
{
6
}
mr=
{
2
}
/>
{
isMobile
?
<
HashStringShorten
hash=
{
tokenFilter
}
/>
:
tokenFilter
}
<
Tooltip
label=
"Reset filter"
>
<
Flex
>
<
Icon
as=
{
crossIcon
}
boxSize=
{
6
}
ml=
{
1
}
color=
{
resetTokenIconColor
}
cursor=
"pointer"
_hover=
{
{
color
:
resetTokenIconHoverColor
}
}
onClick=
{
resetTokenFilter
}
/>
</
Flex
>
</
Tooltip
>
</
Flex
>
</
Flex
>
);
...
...
ui/address/__screenshots__/AddressTokenTransfers.pw.tsx_mobile_with-token-filter-and-no-pagination-mobile-1.png
View replaced file @
cc381104
View file @
12689343
19.9 KB
|
W:
|
H:
20.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
ui/shared/TokenTransfer/TokenTransferTable.tsx
View file @
12689343
...
...
@@ -30,7 +30,7 @@ const TokenTransferTable = ({
}:
Props
)
=>
{
return
(
<
Table
variant=
"simple"
size=
"sm"
>
<
Table
variant=
"simple"
size=
"sm"
minW=
"950px"
>
<
Thead
top=
{
top
}
>
<
Tr
>
{
showTxInfo
&&
<
Th
width=
"44px"
></
Th
>
}
...
...
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