Move tokens above contracts in search results

Author: lukaw3d

src/app/pages/SearchResultsPage/SearchResultsList.tsx

@@ -105,6 +105,14 @@ export const SearchResultsList: FC<{
           linkLabel={t('search.results.transactions.viewLink')}
         />
 
+        <ResultsGroupByType
+          title={t('search.results.tokens.title')}
+          results={searchResults.filter((item): item is TokenResult => item.resultType === 'token')}
+          resultComponent={item => <TokenDetails token={item} highlightedPartOfName={searchTerm} showLayer />}
+          link={token => RouteUtils.getTokenRoute(token, token.eth_contract_addr ?? token.contract_addr)}
+          linkLabel={t('search.results.tokens.viewLink')}
+        />
+
         <ResultsGroupByType
           title={t('search.results.accounts.title')}
           results={searchResults.filter((item): item is AccountResult => item.resultType === 'account')}
@@ -159,14 +167,6 @@ export const SearchResultsList: FC<{
           linkLabel={t('search.results.roflApps.viewLink')}
         />
 
-        <ResultsGroupByType
-          title={t('search.results.tokens.title')}
-          results={searchResults.filter((item): item is TokenResult => item.resultType === 'token')}
-          resultComponent={item => <TokenDetails token={item} highlightedPartOfName={searchTerm} showLayer />}
-          link={token => RouteUtils.getTokenRoute(token, token.eth_contract_addr ?? token.contract_addr)}
-          linkLabel={t('search.results.tokens.viewLink')}
-        />
-
         <ResultsGroupByType
           title={t('search.results.proposals.title')}
           results={searchResults.filter((item): item is ProposalResult => item.resultType === 'proposal')}

src/app/pages/SearchResultsPage/hooks.ts

@@ -411,6 +411,7 @@ export const useSearch = (currentScope: SearchScope | undefined, q: SearchParams
     : [
         ...blocks.map((block): BlockResult => ({ ...block, resultType: 'block' })),
         ...transactions.map((tx): TransactionResult => ({ ...tx, resultType: 'transaction' })),
+        ...tokens.map((token): TokenResult => ({ ...token, resultType: 'token' })),
         ...accounts
           .filter(account => !(account as RuntimeAccount).evm_contract)
           .map((account): AccountResult => ({ ...account, resultType: 'account' })),
@@ -419,7 +420,6 @@ export const useSearch = (currentScope: SearchScope | undefined, q: SearchParams
           .filter(account => account.evm_contract)
           .map((account): ContractResult => ({ ...account, resultType: 'contract' })),
         ...roflApps.map((roflApp): RoflAppResult => ({ ...roflApp, resultType: 'roflApp' })),
-        ...tokens.map((token): TokenResult => ({ ...token, resultType: 'token' })),
         ...proposals.map((proposal): ProposalResult => ({ ...proposal, resultType: 'proposal' })),
       ]
   return {