From aa169aa63dce12aac657ef16f4749f72c5c2fd57 Mon Sep 17 00:00:00 2001 From: Albina Nikiforova Date: Thu, 19 Dec 2024 18:58:35 +0100 Subject: [PATCH] feat(suite): no search results screen for nfts and hidden tokens --- .../src/views/wallet/nfts/NftsTablesSection.tsx | 17 ++++++++++++++--- .../tokens/common/TokensTable/TokensTable.tsx | 16 +++++++++++++--- .../tokens/hidden-tokens/HiddenTokensTable.tsx | 10 ++++++++-- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/packages/suite/src/views/wallet/nfts/NftsTablesSection.tsx b/packages/suite/src/views/wallet/nfts/NftsTablesSection.tsx index 1bc3331afce..344eb14c719 100644 --- a/packages/suite/src/views/wallet/nfts/NftsTablesSection.tsx +++ b/packages/suite/src/views/wallet/nfts/NftsTablesSection.tsx @@ -9,6 +9,7 @@ import { getTokens } from 'src/utils/wallet/tokenUtils'; import { NoTokens } from '../tokens/common/NoTokens'; import NftsTable from './NftsTable/NftsTable'; +import { NoSearchResultsWrapped } from '../tokens/common/TokensTable/TokensTable'; type EvmNftsTablesProps = { selectedAccount: SelectedAccountLoaded; @@ -73,14 +74,24 @@ export const NftsTablesSection = ({ }; if (isShown) { - return areNoShownNfts ? ( - } /> - ) : ( + if (areNoShownNfts) { + if (searchQuery) { + return ; + } + + return } />; + } + + return ( ); } if (areNoHiddenNfts && areNoUnverifiedNfts) { + if (searchQuery) { + return ; + } + return } />; } diff --git a/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx b/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx index 56b440d9a1d..91b86ef927f 100644 --- a/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx +++ b/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx @@ -12,6 +12,18 @@ import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarket import { TokenRow } from './TokenRow'; import { DropdownRow } from '../../DropdownRow'; +const NoSearchResults = () => ( + + + +); + +export const NoSearchResultsWrapped = () => ( + + + +); + interface TokensTableProps { account: Account; tokensWithBalance: EnhancedTokenInfo[]; @@ -39,9 +51,7 @@ export const TokensTable = ({ return ( {tokensWithBalance.length === 0 && tokensWithoutBalance.length === 0 && searchQuery ? ( - - - + ) : ( {hiddenTokensCount === 0 && unverifiedTokensCount === 0 && ( - } /> + <> + {searchQuery ? ( + + ) : ( + } /> + )} + )} {hiddenTokensCount > 0 && (