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
e176fd03
Commit
e176fd03
authored
Dec 25, 2022
by
tom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tests
parent
d675c90c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
10 deletions
+14
-10
getFilterValuesFromQuery.ts
lib/getFilterValuesFromQuery.ts
+4
-0
LatestBlocks.pw.tsx
ui/home/LatestBlocks.pw.tsx
+1
-1
TokenTransfer.pw.tsx
ui/shared/TokenTransfer/TokenTransfer.pw.tsx
+0
-4
TokenTransfer.tsx
ui/shared/TokenTransfer/TokenTransfer.tsx
+8
-4
TokenTransferFilter.tsx
ui/shared/TokenTransfer/TokenTransferFilter.tsx
+1
-1
No files found.
lib/getFilterValuesFromQuery.ts
View file @
e176fd03
export
default
function
getFilterValue
<
FilterType
>
(
filterValues
:
ReadonlyArray
<
FilterType
>
,
val
:
string
|
Array
<
string
>
|
undefined
)
{
export
default
function
getFilterValue
<
FilterType
>
(
filterValues
:
ReadonlyArray
<
FilterType
>
,
val
:
string
|
Array
<
string
>
|
undefined
)
{
if
(
val
===
undefined
)
{
return
;
}
const
valArray
=
[];
const
valArray
=
[];
if
(
typeof
val
===
'
string
'
)
{
if
(
typeof
val
===
'
string
'
)
{
valArray
.
push
(...
val
.
split
(
'
,
'
));
valArray
.
push
(...
val
.
split
(
'
,
'
));
...
...
ui/home/LatestBlocks.pw.tsx
View file @
e176fd03
...
@@ -10,7 +10,7 @@ import buildApiUrl from 'playwright/utils/buildApiUrl';
...
@@ -10,7 +10,7 @@ import buildApiUrl from 'playwright/utils/buildApiUrl';
import
LatestBlocks
from
'
./LatestBlocks
'
;
import
LatestBlocks
from
'
./LatestBlocks
'
;
const
STATS_API_URL
=
buildApiUrl
(
'
homepage_stats
'
);
const
STATS_API_URL
=
buildApiUrl
(
'
homepage_stats
'
);
const
BLOCKS_API_URL
=
buildApiUrl
(
'
blocks
'
);
const
BLOCKS_API_URL
=
buildApiUrl
(
'
homepage_
blocks
'
);
export
const
test
=
base
.
extend
<
socketServer
.
SocketServerFixture
>
({
export
const
test
=
base
.
extend
<
socketServer
.
SocketServerFixture
>
({
createSocket
:
socketServer
.
createSocket
,
createSocket
:
socketServer
.
createSocket
,
...
...
ui/shared/TokenTransfer/TokenTransfer.pw.tsx
View file @
e176fd03
...
@@ -27,8 +27,6 @@ test('without tx info +@mobile', async({ mount, page }) => {
...
@@ -27,8 +27,6 @@ test('without tx info +@mobile', async({ mount, page }) => {
</
TestApp
>,
</
TestApp
>,
);
);
await
page
.
waitForResponse
(
API_URL
),
await
expect
(
component
).
toHaveScreenshot
();
await
expect
(
component
).
toHaveScreenshot
();
});
});
...
@@ -49,7 +47,5 @@ test('with tx info +@mobile', async({ mount, page }) => {
...
@@ -49,7 +47,5 @@ test('with tx info +@mobile', async({ mount, page }) => {
</
TestApp
>,
</
TestApp
>,
);
);
await
page
.
waitForResponse
(
API_URL
),
await
expect
(
component
).
toHaveScreenshot
();
await
expect
(
component
).
toHaveScreenshot
();
});
});
ui/shared/TokenTransfer/TokenTransfer.tsx
View file @
e176fd03
...
@@ -3,10 +3,9 @@ import { useRouter } from 'next/router';
...
@@ -3,10 +3,9 @@ import { useRouter } from 'next/router';
import
React
from
'
react
'
;
import
React
from
'
react
'
;
import
{
Element
}
from
'
react-scroll
'
;
import
{
Element
}
from
'
react-scroll
'
;
import
type
{
Address
TokenTransferFilters
,
Address
FromToFilter
}
from
'
types/api/address
'
;
import
type
{
AddressFromToFilter
}
from
'
types/api/address
'
;
import
{
AddressFromToFilterValues
}
from
'
types/api/address
'
;
import
{
AddressFromToFilterValues
}
from
'
types/api/address
'
;
import
type
{
TokenType
}
from
'
types/api/tokenInfo
'
;
import
type
{
TokenType
}
from
'
types/api/tokenInfo
'
;
import
type
{
TokenTransferFilters
}
from
'
types/api/tokenTransfer
'
;
import
type
{
PaginationFilters
}
from
'
lib/api/resources
'
;
import
type
{
PaginationFilters
}
from
'
lib/api/resources
'
;
import
type
{
Params
as
UseApiQueryParams
}
from
'
lib/api/useApiQuery
'
;
import
type
{
Params
as
UseApiQueryParams
}
from
'
lib/api/useApiQuery
'
;
...
@@ -46,6 +45,11 @@ interface Props<Resource extends 'tx_token_transfers' | 'address_token_transfers
...
@@ -46,6 +45,11 @@ interface Props<Resource extends 'tx_token_transfers' | 'address_token_transfers
pathParams
?:
UseApiQueryParams
<
Resource
>
[
'
pathParams
'
];
pathParams
?:
UseApiQueryParams
<
Resource
>
[
'
pathParams
'
];
}
}
type
State
=
{
type
:
Array
<
TokenType
>
|
undefined
;
filter
:
AddressFromToFilter
;
}
const
TokenTransfer
=
<
Resource
extends
'
tx_token_transfers
'
|
'
address_token_transfers
'
>
(
{
const
TokenTransfer
=
<
Resource
extends
'
tx_token_transfers
'
|
'
address_token_transfers
'
>
(
{
isLoading
:
isLoadingProp
,
isLoading
:
isLoadingProp
,
isDisabled
,
isDisabled
,
...
@@ -56,7 +60,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
...
@@ -56,7 +60,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
pathParams
,
pathParams
,
}
: Props
<
Resource
>
) =
>
{
}
: Props
<
Resource
>
) =
>
{
const
router
=
useRouter
();
const
router
=
useRouter
();
const
[
filters
,
setFilters
]
=
React
.
useState
<
AddressTokenTransferFilters
&
TokenTransferFilters
>
(
const
[
filters
,
setFilters
]
=
React
.
useState
<
State
>
(
{
type
:
getTokenFilterValue
(
router
.
query
.
type
),
filter
:
getAddressFilterValue
(
router
.
query
.
filter
)
},
{
type
:
getTokenFilterValue
(
router
.
query
.
type
),
filter
:
getAddressFilterValue
(
router
.
query
.
filter
)
},
);
);
...
@@ -79,7 +83,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
...
@@ -79,7 +83,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
setFilters
((
prevState
)
=>
({
...
prevState
,
filter
:
filterVal
}));
setFilters
((
prevState
)
=>
({
...
prevState
,
filter
:
filterVal
}));
},
[
filters
,
onFilterChange
]);
},
[
filters
,
onFilterChange
]);
const
numActiveFilters
=
filters
.
type
.
length
+
(
filters
.
filter
?
1
:
0
);
const
numActiveFilters
=
(
filters
.
type
?.
length
||
0
)
+
(
filters
.
filter
?
1
:
0
);
const
isActionBarHidden
=
!
numActiveFilters
&&
!
data
?.
items
.
length
;
const
isActionBarHidden
=
!
numActiveFilters
&&
!
data
?.
items
.
length
;
const
content
=
(()
=>
{
const
content
=
(()
=>
{
...
...
ui/shared/TokenTransfer/TokenTransferFilter.tsx
View file @
e176fd03
...
@@ -23,7 +23,7 @@ import { TOKEN_TYPE } from './helpers';
...
@@ -23,7 +23,7 @@ import { TOKEN_TYPE } from './helpers';
interface
Props
{
interface
Props
{
appliedFiltersNum
?:
number
;
appliedFiltersNum
?:
number
;
defaultTypeFilters
:
Array
<
TokenType
>
;
defaultTypeFilters
:
Array
<
TokenType
>
|
undefined
;
onTypeFilterChange
:
(
nextValue
:
Array
<
TokenType
>
)
=>
void
;
onTypeFilterChange
:
(
nextValue
:
Array
<
TokenType
>
)
=>
void
;
withAddressFilter
?:
boolean
;
withAddressFilter
?:
boolean
;
onAddressFilterChange
?:
(
nextValue
:
string
)
=>
void
;
onAddressFilterChange
?:
(
nextValue
:
string
)
=>
void
;
...
...
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