From 7baf4aa84b5ab7dc64f8ed3266d6f06105514d35 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 18 May 2022 13:20:58 +0800 Subject: [PATCH] fix: wrong call order of localeCompare --- .../mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx | 4 ++-- packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx | 2 +- packages/shared/src/UI/components/ERC20TokenList/index.tsx | 2 +- .../evm/hooks/useERC20TokensDetailedFromTokenLists.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx index f2755ef39927..130a27b8411c 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx @@ -91,8 +91,8 @@ export function ExchangeTokenPanel(props: ExchangeTokenPanelProps) { isSell, dataIndex, exchangeToken?.address, - excludeTokensAddress.sort((a, b) => a.localeCompare('en-US', b)).join(), - selectedTokensAddress.sort((a, b) => a.localeCompare('en-US', b)).join(), + excludeTokensAddress.sort((a, b) => a.localeCompare(b, 'en-US')).join(), + selectedTokensAddress.sort((a, b) => a.localeCompare(b, 'en-US')).join(), ]) // #endregion diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx index e9ce38bd599b..279a7d27f868 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx @@ -159,7 +159,7 @@ export function SwapDialog(props: SwapDialogProps) { pickToken, exchangeTokens .map((x) => x.address) - .sort((a, b) => a.localeCompare('en-US', b)) + .sort((a, b) => a.localeCompare(b, 'en-US')) .join(), ]) // #endregion diff --git a/packages/shared/src/UI/components/ERC20TokenList/index.tsx b/packages/shared/src/UI/components/ERC20TokenList/index.tsx index 6d216633cbc4..1e68efe335c7 100644 --- a/packages/shared/src/UI/components/ERC20TokenList/index.tsx +++ b/packages/shared/src/UI/components/ERC20TokenList/index.tsx @@ -115,7 +115,7 @@ export const ERC20TokenList = memo((props) => { assetsLoading, assets .map((x) => x.token.address) - .sort((a, b) => a.localeCompare('en-US', b)) + .sort((a, b) => a.localeCompare(b, 'en-US')) .join(), ]) diff --git a/packages/web3-shared/evm/hooks/useERC20TokensDetailedFromTokenLists.ts b/packages/web3-shared/evm/hooks/useERC20TokensDetailedFromTokenLists.ts index d9eaf14e3ca6..d3c38f381bfd 100644 --- a/packages/web3-shared/evm/hooks/useERC20TokensDetailedFromTokenLists.ts +++ b/packages/web3-shared/evm/hooks/useERC20TokensDetailedFromTokenLists.ts @@ -21,7 +21,7 @@ export function useERC20TokensDetailedFromTokenLists( const { fetchERC20TokensFromTokenLists } = useWeb3Context() const { value: tokensFromList = EMPTY_LIST, ...asyncResult } = useAsyncRetry( async () => (!lists || lists.length === 0 ? [] : fetchERC20TokensFromTokenLists(lists, chainId)), - [chainId, lists?.sort((a, b) => a.localeCompare('en-US', b)).join()], + [chainId, lists?.sort((a, b) => a.localeCompare(b, 'en-US')).join()], ) // #endregion // #region fuse