TW-913: NFT update. Tokens Manage dropdown. Fix QA. Leading assets

madfish-solutions · Jul 27, 2023 · 592334a · 592334a
1 parent 645a011
commit 592334a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/app/pages/Home/OtherComponents/Tokens/Tokens.tsx b/src/app/pages/Home/OtherComponents/Tokens/Tokens.tsx
@@ -60,8 +60,7 @@ export const TokensTab: FC = () => {
   const { filteredAssets, searchValue, setSearchValue } = useFilteredAssetsSlugs(
     slugs,
     isZeroBalancesHidden,
-    LEADING_ASSETS,
-    true
+    LEADING_ASSETS
   );
 
   const isEnabledAdsBanner = useIsEnabledAdsBannerSelector();

diff --git a/src/app/templates/SwapForm/SwapFormInput/SwapFormInput.tsx b/src/app/templates/SwapForm/SwapFormInput/SwapFormInput.tsx
@@ -53,8 +53,7 @@ export const SwapFormInput: FC<SwapFormInputProps> = ({
   const { filteredAssets, searchValue, setSearchValue, tokenId, setTokenId } = useFilteredAssetsSlugs(
     route3tokensSlugs,
     name === 'input',
-    LEADING_ASSETS,
-    false
+    LEADING_ASSETS
   );
 
   const showTokenIdInput = useSwapFormTokenIdInput(searchValue);

diff --git a/src/lib/assets/use-filtered.ts b/src/lib/assets/use-filtered.ts
@@ -16,7 +16,7 @@ export function useFilteredAssetsSlugs(
   assetsSlugs: string[],
   filterZeroBalances = false,
   leadingAssets?: string[],
-  leadingAssetsAreFilterable = true
+  leadingAssetsAreFilterable = false
 ) {
   const allTokensMetadata = useTokensMetadataWithPresenceCheck(assetsSlugs);
 
@@ -56,7 +56,8 @@ export function useFilteredAssetsSlugs(
   const filteredAssets = useMemo(() => {
     if (!isDefined(leadingAssets) || !leadingAssets.length) return searchedSlugs;
 
-    const filteredLeadingSlugs = leadingAssetsAreFilterable ? leadingAssets.filter(isNonZeroBalance) : leadingAssets;
+    const filteredLeadingSlugs =
+      leadingAssetsAreFilterable && filterZeroBalances ? leadingAssets.filter(isNonZeroBalance) : leadingAssets;
 
     const searchedLeadingSlugs = searchAssetsWithNoMeta(
       searchValueDebounced,
@@ -69,6 +70,7 @@ export function useFilteredAssetsSlugs(
   }, [
     leadingAssets,
     leadingAssetsAreFilterable,
+    filterZeroBalances,
     isNonZeroBalance,
     searchedSlugs,
     searchValueDebounced,