Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
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
LuckySwap
interface
Commits
aa6c4690
Unverified
Commit
aa6c4690
authored
Jan 05, 2023
by
eddie
Committed by
GitHub
Jan 05, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: remove manual redirects on token page (#5752)
parent
dc478ce3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
30 deletions
+31
-30
token.test.ts
cypress/e2e/token.test.ts
+21
-0
ChainSelector.tsx
src/components/NavBar/ChainSelector.tsx
+1
-0
ChainSelectorRow.tsx
src/components/NavBar/ChainSelectorRow.tsx
+1
-1
NetworkFilter.tsx
src/components/Tokens/TokenTable/NetworkFilter.tsx
+7
-1
util.tsx
src/graphql/data/util.tsx
+0
-8
index.tsx
src/pages/Tokens/index.tsx
+1
-20
No files found.
cypress/e2e/token.test.ts
View file @
aa6c4690
...
@@ -10,6 +10,27 @@ describe('Testing tokens on uniswap page', () => {
...
@@ -10,6 +10,27 @@ describe('Testing tokens on uniswap page', () => {
cy
.
get
(
getTestSelectorStartsWith
(
'
token-table
'
)).
its
(
'
length
'
).
should
(
'
be.gte
'
,
25
)
cy
.
get
(
getTestSelectorStartsWith
(
'
token-table
'
)).
its
(
'
length
'
).
should
(
'
be.gte
'
,
25
)
})
})
it
(
'
should keep the same configuration when reloaded: ETH global, OP local
'
,
()
=>
{
cy
.
visit
(
'
/tokens/ethereum
'
)
cy
.
get
(
getTestSelector
(
'
tokens-network-filter-selected
'
)).
click
()
cy
.
get
(
getTestSelector
(
'
tokens-network-filter-option-optimism
'
)).
click
()
cy
.
reload
()
cy
.
get
(
getTestSelector
(
'
tokens-network-filter-selected
'
)).
should
(
'
contain
'
,
'
Optimism
'
)
})
it
(
'
should have the correct network configuration when reloaded: OP global, Polygon local
'
,
()
=>
{
cy
.
get
(
getTestSelector
(
'
chain-selector
'
)).
last
().
click
()
cy
.
get
(
getTestSelector
(
'
chain-selector-option-optimism
'
)).
click
()
cy
.
visit
(
'
/tokens/ethereum
'
)
cy
.
get
(
getTestSelector
(
'
tokens-network-filter-selected
'
)).
click
()
cy
.
get
(
getTestSelector
(
'
tokens-network-filter-option-polygon
'
)).
click
()
cy
.
reload
()
cy
.
get
(
getTestSelector
(
'
tokens-network-filter-selected
'
)).
should
(
'
contain
'
,
'
Polygon
'
)
// With no wallet connected, reloading the page resets the global network.
cy
.
get
(
getTestSelector
(
'
chain-selector
'
)).
last
().
should
(
'
contain
'
,
'
Ethereum
'
)
})
it
(
'
should load go to ethereum token and return to token list page
'
,
()
=>
{
it
(
'
should load go to ethereum token and return to token list page
'
,
()
=>
{
cy
.
visit
(
'
/tokens/ethereum
'
)
cy
.
visit
(
'
/tokens/ethereum
'
)
cy
.
get
(
getTestSelector
(
'
token-table-row-Ether
'
)).
click
()
cy
.
get
(
getTestSelector
(
'
token-table-row-Ether
'
)).
click
()
...
...
src/components/NavBar/ChainSelector.tsx
View file @
aa6c4690
...
@@ -93,6 +93,7 @@ export const ChainSelector = ({ leftAlign }: ChainSelectorProps) => {
...
@@ -93,6 +93,7 @@ export const ChainSelector = ({ leftAlign }: ChainSelectorProps) => {
gap=
"8"
gap=
"8"
className=
{
styles
.
ChainSelector
}
className=
{
styles
.
ChainSelector
}
background=
{
isOpen
?
'
accentActiveSoft
'
:
'
none
'
}
background=
{
isOpen
?
'
accentActiveSoft
'
:
'
none
'
}
data
-
testid=
"chain-selector"
onClick=
{
()
=>
setIsOpen
(
!
isOpen
)
}
onClick=
{
()
=>
setIsOpen
(
!
isOpen
)
}
>
>
{
!
isSupported
?
(
{
!
isSupported
?
(
...
...
src/components/NavBar/ChainSelectorRow.tsx
View file @
aa6c4690
...
@@ -76,7 +76,7 @@ export default function ChainSelectorRow({
...
@@ -76,7 +76,7 @@ export default function ChainSelectorRow({
const
theme
=
useTheme
()
const
theme
=
useTheme
()
return
(
return
(
<
Container
onClick=
{
()
=>
onSelectChain
(
targetChain
)
}
>
<
Container
onClick=
{
()
=>
onSelectChain
(
targetChain
)
}
data
-
testid=
{
`chain-selector-option-${label.toLowerCase()}`
}
>
<
Logo
src=
{
logoUrl
}
alt=
{
label
}
/>
<
Logo
src=
{
logoUrl
}
alt=
{
label
}
/>
<
Label
>
{
label
}
</
Label
>
<
Label
>
{
label
}
</
Label
>
{
isPending
&&
<
ApproveText
>
Approve in wallet
</
ApproveText
>
}
{
isPending
&&
<
ApproveText
>
Approve in wallet
</
ApproveText
>
}
...
...
src/components/Tokens/TokenTable/NetworkFilter.tsx
View file @
aa6c4690
...
@@ -103,7 +103,12 @@ export default function NetworkFilter() {
...
@@ -103,7 +103,12 @@ export default function NetworkFilter() {
return
(
return
(
<
StyledMenu
ref=
{
node
}
>
<
StyledMenu
ref=
{
node
}
>
<
NetworkFilterOption
onClick=
{
toggleMenu
}
aria
-
label=
"networkFilter"
active=
{
open
}
>
<
NetworkFilterOption
onClick=
{
toggleMenu
}
aria
-
label=
"networkFilter"
active=
{
open
}
data
-
testid=
"tokens-network-filter-selected"
>
<
StyledMenuContent
>
<
StyledMenuContent
>
<
NetworkLabel
>
<
NetworkLabel
>
<
Logo
src=
{
chainInfo
?.
logoUrl
}
/>
{
chainInfo
?.
label
}
<
Logo
src=
{
chainInfo
?.
logoUrl
}
/>
{
chainInfo
?.
label
}
...
@@ -125,6 +130,7 @@ export default function NetworkFilter() {
...
@@ -125,6 +130,7 @@ export default function NetworkFilter() {
return
(
return
(
<
InternalLinkMenuItem
<
InternalLinkMenuItem
key=
{
network
}
key=
{
network
}
data
-
testid=
{
`tokens-network-filter-option-${network.toLowerCase()}`
}
onClick=
{
()
=>
{
onClick=
{
()
=>
{
navigate
(
`/tokens/${network.toLowerCase()}`
)
navigate
(
`/tokens/${network.toLowerCase()}`
)
toggleMenu
()
toggleMenu
()
...
...
src/graphql/data/util.tsx
View file @
aa6c4690
...
@@ -74,14 +74,6 @@ export const CHAIN_NAME_TO_CHAIN_ID: { [key: string]: SupportedChainId } = {
...
@@ -74,14 +74,6 @@ export const CHAIN_NAME_TO_CHAIN_ID: { [key: string]: SupportedChainId } = {
export
const
BACKEND_CHAIN_NAMES
:
Chain
[]
=
[
Chain
.
Ethereum
,
Chain
.
Polygon
,
Chain
.
Optimism
,
Chain
.
Arbitrum
,
Chain
.
Celo
]
export
const
BACKEND_CHAIN_NAMES
:
Chain
[]
=
[
Chain
.
Ethereum
,
Chain
.
Polygon
,
Chain
.
Optimism
,
Chain
.
Arbitrum
,
Chain
.
Celo
]
export
function
isValidBackendChainName
(
chainName
:
string
|
undefined
):
chainName
is
Chain
{
if
(
!
chainName
)
return
false
for
(
let
i
=
0
;
i
<
BACKEND_CHAIN_NAMES
.
length
;
i
++
)
{
if
(
chainName
===
BACKEND_CHAIN_NAMES
[
i
])
return
true
}
return
false
}
export
function
getTokenDetailsURL
(
address
:
string
,
chainName
?:
Chain
,
chainId
?:
number
)
{
export
function
getTokenDetailsURL
(
address
:
string
,
chainName
?:
Chain
,
chainId
?:
number
)
{
if
(
address
===
ZERO_ADDRESS
&&
chainId
&&
chainId
===
SupportedChainId
.
MAINNET
)
{
if
(
address
===
ZERO_ADDRESS
&&
chainId
&&
chainId
===
SupportedChainId
.
MAINNET
)
{
return
`/tokens/
${
CHAIN_ID_TO_BACKEND_NAME
[
chainId
].
toLowerCase
()}
/
${
NATIVE_CHAIN_ID
}
`
return
`/tokens/
${
CHAIN_ID_TO_BACKEND_NAME
[
chainId
].
toLowerCase
()}
/
${
NATIVE_CHAIN_ID
}
`
...
...
src/pages/Tokens/index.tsx
View file @
aa6c4690
import
{
Trans
}
from
'
@lingui/macro
'
import
{
Trans
}
from
'
@lingui/macro
'
import
{
Trace
}
from
'
@uniswap/analytics
'
import
{
Trace
}
from
'
@uniswap/analytics
'
import
{
InterfacePageName
}
from
'
@uniswap/analytics-events
'
import
{
InterfacePageName
}
from
'
@uniswap/analytics-events
'
import
{
useWeb3React
}
from
'
@web3-react/core
'
import
{
MAX_WIDTH_MEDIA_BREAKPOINT
,
MEDIUM_MEDIA_BREAKPOINT
}
from
'
components/Tokens/constants
'
import
{
MAX_WIDTH_MEDIA_BREAKPOINT
,
MEDIUM_MEDIA_BREAKPOINT
}
from
'
components/Tokens/constants
'
import
{
filterStringAtom
}
from
'
components/Tokens/state
'
import
{
filterStringAtom
}
from
'
components/Tokens/state
'
import
NetworkFilter
from
'
components/Tokens/TokenTable/NetworkFilter
'
import
NetworkFilter
from
'
components/Tokens/TokenTable/NetworkFilter
'
...
@@ -9,11 +8,9 @@ import SearchBar from 'components/Tokens/TokenTable/SearchBar'
...
@@ -9,11 +8,9 @@ import SearchBar from 'components/Tokens/TokenTable/SearchBar'
import
TimeSelector
from
'
components/Tokens/TokenTable/TimeSelector
'
import
TimeSelector
from
'
components/Tokens/TokenTable/TimeSelector
'
import
TokenTable
from
'
components/Tokens/TokenTable/TokenTable
'
import
TokenTable
from
'
components/Tokens/TokenTable/TokenTable
'
import
{
MouseoverTooltip
}
from
'
components/Tooltip
'
import
{
MouseoverTooltip
}
from
'
components/Tooltip
'
import
{
chainIdToBackendName
,
isValidBackendChainName
}
from
'
graphql/data/util
'
import
{
useOnGlobalChainSwitch
}
from
'
hooks/useGlobalChainSwitch
'
import
{
useResetAtom
}
from
'
jotai/utils
'
import
{
useResetAtom
}
from
'
jotai/utils
'
import
{
useEffect
}
from
'
react
'
import
{
useEffect
}
from
'
react
'
import
{
useLocation
,
useNavigate
,
useParams
}
from
'
react-router-dom
'
import
{
useLocation
}
from
'
react-router-dom
'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
import
{
ThemedText
}
from
'
theme
'
import
{
ThemedText
}
from
'
theme
'
...
@@ -72,27 +69,11 @@ const FiltersWrapper = styled.div`
...
@@ -72,27 +69,11 @@ const FiltersWrapper = styled.div`
const
Tokens
=
()
=>
{
const
Tokens
=
()
=>
{
const
resetFilterString
=
useResetAtom
(
filterStringAtom
)
const
resetFilterString
=
useResetAtom
(
filterStringAtom
)
const
location
=
useLocation
()
const
location
=
useLocation
()
const
navigate
=
useNavigate
()
const
{
chainName
:
chainNameParam
}
=
useParams
<
{
chainName
?:
string
}
>
()
const
{
chainId
:
connectedChainId
}
=
useWeb3React
()
const
connectedChainName
=
chainIdToBackendName
(
connectedChainId
)
useEffect
(()
=>
{
useEffect
(()
=>
{
resetFilterString
()
resetFilterString
()
},
[
location
,
resetFilterString
])
},
[
location
,
resetFilterString
])
useEffect
(()
=>
{
if
(
!
chainNameParam
)
{
navigate
(
`/tokens/
${
connectedChainName
.
toLowerCase
()}
`
,
{
replace
:
true
})
}
},
[
chainNameParam
,
connectedChainName
,
navigate
])
useOnGlobalChainSwitch
((
chain
)
=>
{
if
(
isValidBackendChainName
(
chain
))
{
navigate
(
`/tokens/
${
chain
.
toLowerCase
()}
`
,
{
replace
:
true
})
}
})
return
(
return
(
<
Trace
page=
{
InterfacePageName
.
TOKENS_PAGE
}
shouldLogImpression
>
<
Trace
page=
{
InterfacePageName
.
TOKENS_PAGE
}
shouldLogImpression
>
<
ExploreContainer
>
<
ExploreContainer
>
...
...
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