Commit 8eeb1690 authored by Ian Lapham's avatar Ian Lapham Committed by Noah Zinsmeister

update search on token input (#596)

* update search on token input

* remove comments
parent a6b9de3e
...@@ -543,14 +543,23 @@ function CurrencySelectModal({ isOpen, onDismiss, onTokenSelect }) { ...@@ -543,14 +543,23 @@ function CurrencySelectModal({ isOpen, onDismiss, onTokenSelect }) {
const filteredTokenList = useMemo(() => { const filteredTokenList = useMemo(() => {
return tokenList.filter(tokenEntry => { return tokenList.filter(tokenEntry => {
const inputIsAddress = searchQuery.slice(0, 2) === '0x'
// check the regex for each field // check the regex for each field
const regexMatches = Object.keys(tokenEntry).map(tokenEntryKey => { const regexMatches = Object.keys(tokenEntry).map(tokenEntryKey => {
// if address field only search if input starts with 0x
if (tokenEntryKey === 'address') {
return (
inputIsAddress &&
typeof tokenEntry[tokenEntryKey] === 'string' &&
!!tokenEntry[tokenEntryKey].match(new RegExp(escapeStringRegex(searchQuery), 'i'))
)
}
return ( return (
typeof tokenEntry[tokenEntryKey] === 'string' && typeof tokenEntry[tokenEntryKey] === 'string' &&
!!tokenEntry[tokenEntryKey].match(new RegExp(escapeStringRegex(searchQuery), 'i')) !!tokenEntry[tokenEntryKey].match(new RegExp(escapeStringRegex(searchQuery), 'i'))
) )
}) })
return regexMatches.some(m => m) return regexMatches.some(m => m)
}) })
}, [tokenList, searchQuery]) }, [tokenList, searchQuery])
......
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