Commit 581c0982 authored by Jordan Frankfurt's avatar Jordan Frankfurt Committed by GitHub

fix: add url name filtering to mini-portfolio (#6231)

* fix: add url name filtering to mini-portfolio

* Update src/components/WalletDropdown/MiniPortfolio/Pools/index.tsx
Co-authored-by: default avatarcartcrom <39385577+cartcrom@users.noreply.github.com>

* fix: remove unused deps (#6227)

* init

* remove one more useless dep

* bump up test size

* bump up test size

* up size

* fix lint and add str == undefined case to hasURL

---------
Co-authored-by: default avatarcartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: default avatarlynn <41491154+lynnshaoyu@users.noreply.github.com>
parent 478a05a3
......@@ -215,11 +215,7 @@ export default function PositionListItem({
const removed = liquidity?.eq(0)
const containsURL = useMemo(
() =>
[token0?.name, token0?.symbol, token1?.name, token1?.symbol].reduce(
(acc, testString) => acc || Boolean(testString && hasURL(testString)),
false
),
() => [token0?.name, token0?.symbol, token1?.name, token1?.symbol].some((testString) => hasURL(testString)),
[token0?.name, token0?.symbol, token1?.name, token1?.symbol]
)
......
......@@ -11,6 +11,7 @@ import { useNavigate } from 'react-router-dom'
import styled from 'styled-components/macro'
import { ThemedText } from 'theme'
import { switchChain } from 'utils/switchChain'
import { hasURL } from 'utils/urlChecks'
import { ExpandoRow } from '../ExpandoRow'
import { PortfolioLogo } from '../PortfolioLogo'
......@@ -98,6 +99,18 @@ function PositionListItem({ positionInfo }: { positionInfo: PositionInfo }) {
navigate('/pool/' + details.tokenId)
}, [walletChainId, chainId, connector, toggleWalletDrawer, navigate, details.tokenId])
const containsURL = useMemo(
() =>
[pool.token0.name, pool.token0.symbol, pool.token1.name, pool.token1.symbol].some((testString) =>
hasURL(testString)
),
[pool]
)
if (containsURL) {
return null
}
return (
<PortfolioRow
onClick={onClick}
......
export function hasURL(str: string): boolean {
export function hasURL(str?: string): boolean {
if (!str) return false
const pattern = new RegExp(
'([a-zA-Z0-9]+://)?' + // optional protocol
'([a-zA-Z0-9_]+:[a-zA-Z0-9_]+@)?' + // optional username:password
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment