Skip to content

Commit

Permalink
TW-641 The swap section is not sorted by dollar value (#892)
Browse files Browse the repository at this point in the history
* sorting fixed

* useMemo update

Co-authored-by: Innokentiy Mazhara <keshan3262@gmail.com>

---------

Co-authored-by: Innokentiy Mazhara <keshan3262@gmail.com>
  • Loading branch information
lendihop and keshan3262 committed May 9, 2023
1 parent db08f31 commit 7dca277
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/lib/temple/front/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ export const useAvailableRoute3Tokens = () => {
route3tokensSlugs
};
};

function makeAssetsSortPredicate(balances: Record<string, BigNumber>, fiatToTokenRates: Record<string, string>) {
return (tokenASlug: string, tokenBSlug: string) => {
if (tokenASlug === TEZ_TOKEN_SLUG) {
Expand Down Expand Up @@ -380,8 +381,10 @@ export function useFilteredAssets(assetSlugs: string[]) {
setTokenId
};
}

export function useFilteredSwapAssets(inputName: string = 'input') {
const allTokensBaseMetadata = useAllTokensBaseMetadata();
const assetsSortPredicate = useAssetsSortPredicate();
const { route3tokensSlugs } = useAvailableRoute3Tokens();
const { publicKeyHash } = useAccount();
const chainId = useChainId(true)!;
Expand Down Expand Up @@ -410,8 +413,11 @@ export function useFilteredSwapAssets(inputName: string = 'input') {
const [searchValueDebounced] = useDebounce(tokenId ? toTokenSlug(searchValue, tokenId) : searchValue, 300);

const filteredAssets = useMemo(
() => searchAssetsWithNoMeta(searchValueDebounced, assetSlugs, allTokensBaseMetadata, slug => slug),
[searchValueDebounced, assetSlugs, allTokensBaseMetadata]
() =>
searchAssetsWithNoMeta(searchValueDebounced, assetSlugs, allTokensBaseMetadata, slug => slug).sort(
assetsSortPredicate
),
[searchValueDebounced, assetSlugs, allTokensBaseMetadata, assetsSortPredicate]
);

return {
Expand Down

0 comments on commit 7dca277

Please sign in to comment.