Commit 8be97017 authored by cartcrom's avatar cartcrom Committed by GitHub

fix: token selector contract address search (#4987)

* fixed contract address search not working after importing token
* fixed unsupported asset bug
parent d66002dc
...@@ -71,7 +71,8 @@ export function CurrencySearch({ ...@@ -71,7 +71,8 @@ export function CurrencySearch({
const [searchQuery, setSearchQuery] = useState<string>('') const [searchQuery, setSearchQuery] = useState<string>('')
const debouncedQuery = useDebounce(searchQuery, 200) const debouncedQuery = useDebounce(searchQuery, 200)
const allTokens = useActiveTokens() // Only display 'imported' tokens when the search filter has input
const defaultTokens = useActiveTokens(debouncedQuery.length > 0)
// if they input an address, use it // if they input an address, use it
const isAddressSearch = isAddress(debouncedQuery) const isAddressSearch = isAddress(debouncedQuery)
...@@ -91,8 +92,8 @@ export function CurrencySearch({ ...@@ -91,8 +92,8 @@ export function CurrencySearch({
}, [isAddressSearch]) }, [isAddressSearch])
const filteredTokens: Token[] = useMemo(() => { const filteredTokens: Token[] = useMemo(() => {
return Object.values(allTokens).filter(getTokenFilter(debouncedQuery)) return Object.values(defaultTokens).filter(getTokenFilter(debouncedQuery))
}, [allTokens, debouncedQuery]) }, [defaultTokens, debouncedQuery])
const [balances, balancesAreLoading] = useAllTokenBalances() const [balances, balancesAreLoading] = useAllTokenBalances()
const sortedTokens: Token[] = useMemo( const sortedTokens: Token[] = useMemo(
......
...@@ -55,9 +55,9 @@ export function useAllTokens(): { [address: string]: Token } { ...@@ -55,9 +55,9 @@ export function useAllTokens(): { [address: string]: Token } {
return useTokensFromMap(allTokens, true) return useTokensFromMap(allTokens, true)
} }
export function useActiveTokens(): { [address: string]: Token } { export function useActiveTokens(includeUserAdded: boolean): { [address: string]: Token } {
const allTokens = useCombinedActiveList() const allTokens = useCombinedActiveList()
return useTokensFromMap(allTokens, false) return useTokensFromMap(allTokens, includeUserAdded)
} }
type BridgeInfo = Record< type BridgeInfo = Record<
......
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