m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fix missing conversion rates in swaps token drop down (#12420)

Browse Source 
* fix missing conversion rates in swaps token drop down

* make defaultToken appear at the top of the owned section of the dropdown with full renderable data regardless of whether swaps tokens are available

* revert change to filter non-native tokens with symbol ETH
This commit is contained in:
Alex Donesky 2021-10-25 10:03:21 -05:00 committed by GitHub
parent b7b21ed20b
commit 385e0f2ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/hooks/useTokensToSearch.js
View File

@ -16,6 +16,7 @@ import { getConversionRate } from '../ducks/metamask/metamask';
import { getSwapsTokens } from '../ducks/swaps/swaps'; import { getSwapsTokens } from '../ducks/swaps/swaps';
import { isSwapsDefaultTokenSymbol } from '../../shared/modules/swaps.utils'; import { isSwapsDefaultTokenSymbol } from '../../shared/modules/swaps.utils';
import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
import { useEqualityCheck } from './useEqualityCheck'; import { useEqualityCheck } from './useEqualityCheck';
const shuffledContractMap = shuffle( const shuffledContractMap = shuffle(
@ -45,7 +46,7 @@ export function getRenderableTokenData(
getTokenFiatAmount( getTokenFiatAmount(
isSwapsDefaultTokenSymbol(symbol, chainId) isSwapsDefaultTokenSymbol(symbol, chainId)
? 1 ? 1
: contractExchangeRates[address], : contractExchangeRates[toChecksumHexAddress(address)],
conversionRate, conversionRate,
currentCurrency, currentCurrency,
string, string,
@ -56,7 +57,7 @@ export function getRenderableTokenData(
getTokenFiatAmount( getTokenFiatAmount(
isSwapsDefaultTokenSymbol(symbol, chainId) isSwapsDefaultTokenSymbol(symbol, chainId)
? 1 ? 1
: contractExchangeRates[address], : contractExchangeRates[toChecksumHexAddress(address)],
conversionRate, conversionRate,
currentCurrency, currentCurrency,
string, string,
@ -139,7 +140,7 @@ export function useTokensToSearch({
}; };
const memoizedSwapsAndUserTokensWithoutDuplicities = uniqBy( const memoizedSwapsAndUserTokensWithoutDuplicities = uniqBy(
[...memoizedTokensToSearch, ...memoizedUsersToken], [memoizedDefaultToken, ...memoizedTokensToSearch, ...memoizedUsersToken],
(token) => token.address.toLowerCase(), (token) => token.address.toLowerCase(),
); );
@ -185,6 +186,7 @@ export function useTokensToSearch({
conversionRate, conversionRate,
currentCurrency, currentCurrency,
memoizedTopTokens, memoizedTopTokens,
memoizedDefaultToken,
chainId, chainId,
tokenList, tokenList,
useTokenDetection, useTokenDetection,