fix: best effort global search unrug (#8641)

src/state/slices/assetsSlice/selectors.ts

@@ -2,12 +2,11 @@ import { createSelector } from '@reduxjs/toolkit'
 import type { AssetId, ChainId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
 import { isSome } from '@shapeshiftoss/utils'
-import { matchSorter } from 'match-sorter'
 import createCachedSelector from 're-reselect'
 import { getChainAdapterManager } from 'context/PluginProvider/chainAdapterSingleton'
 import type { ReduxState } from 'state/reducer'
 import { createDeepEqualOutputSelector } from 'state/selector-utils'
-import { selectAssetIdParamFromFilter, selectSearchQueryFromFilter } from 'state/selectors'
+import { selectAssetIdParamFromFilter } from 'state/selectors'
 
 import { getFeeAssetByAssetId, getFeeAssetByChainId } from './utils'
 
@@ -67,15 +66,3 @@ export const selectFeeAssetById = createCachedSelector(
   state: ReduxState,
   assetId: AssetId,
 ) => ReturnType<typeof getFeeAssetByAssetId>
-
-export const selectAssetsBySearchQuery = createCachedSelector(
-  selectAssetsSortedByMarketCap,
-  selectSearchQueryFromFilter,
-  (sortedAssets: Asset[], searchQuery?: string): Asset[] => {
-    if (!searchQuery) return sortedAssets
-    return matchSorter(sortedAssets, searchQuery ?? '', {
-      keys: ['name', 'symbol', 'assetId'],
-      threshold: matchSorter.rankings.CONTAINS,
-    })
-  },
-)((_state: ReduxState, filter) => filter?.searchQuery ?? 'assetsBySearchQuery')

src/state/slices/common-selectors.ts

@@ -4,16 +4,21 @@ import { isEvmChainId } from '@shapeshiftoss/chain-adapters'
 import type { Asset, PartialRecord } from '@shapeshiftoss/types'
 import orderBy from 'lodash/orderBy'
 import pickBy from 'lodash/pickBy'
+import { matchSorter } from 'match-sorter'
 import createCachedSelector from 're-reselect'
 import { createSelector } from 'reselect'
 import { bn, bnOrZero } from 'lib/bignumber/bignumber'
 import { fromBaseUnit } from 'lib/math'
 import { isSome } from 'lib/utils'
 import type { ReduxState } from 'state/reducer'
 import { createDeepEqualOutputSelector } from 'state/selector-utils'
-import { selectAccountIdParamFromFilter, selectAssetIdParamFromFilter } from 'state/selectors'
+import {
+  selectAccountIdParamFromFilter,
+  selectAssetIdParamFromFilter,
+  selectSearchQueryFromFilter,
+} from 'state/selectors'
 
-import { selectAssets } from './assetsSlice/selectors'
+import { selectAssets, selectAssetsSortedByMarketCap } from './assetsSlice/selectors'
 import { getFeeAssetByChainId } from './assetsSlice/utils'
 import {
   selectMarketDataByAssetIdUserCurrency,
@@ -281,3 +286,48 @@ export const selectIsAssetWithoutMarketData = createSelector(
     return !marketData || marketData.price === '0'
   },
 )
+
+export const selectAssetsBySearchQuery = createCachedSelector(
+  selectAssetsSortedByMarketCap,
+  selectPortfolioAssetBalancesBaseUnit,
+  selectPortfolioUserCurrencyBalances,
+  selectMarketDataUsd,
+  selectSearchQueryFromFilter,
+  (
+    sortedAssets: Asset[],
+    portfolioBalancesCryptoBaseUnit,
+    portfolioBalancesUserCurrency,
+    marketDataUsd,
+    searchQuery?: string,
+  ): Asset[] => {
+    if (!searchQuery) return sortedAssets
+
+    const matchedAssets = matchSorter(sortedAssets, searchQuery ?? '', {
+      keys: ['name', 'symbol', 'assetId'],
+      threshold: matchSorter.rankings.CONTAINS,
+    })
+
+    const getAssetBalanceCryptoPrecision = (asset: Asset) =>
+      fromBaseUnit(bnOrZero(portfolioBalancesCryptoBaseUnit[asset.assetId]), asset.precision)
+
+    const getAssetUserCurrencyBalance = (asset: Asset) =>
+      bnOrZero(portfolioBalancesUserCurrency[asset.assetId]).toNumber()
+
+    // This looks weird but isn't - looks like we could use the sorted selectAssetsByMarketCap instead of selectAssets
+    // but we actually can't - this would rug the quadruple-sorting
+    const getAssetMarketCap = (asset: Asset) =>
+      bnOrZero(marketDataUsd[asset.assetId]?.marketCap).toNumber()
+    const getAssetName = (asset: Asset) => asset.name
+
+    return orderBy(
+      Object.values(matchedAssets).filter(isSome),
+      [
+        getAssetUserCurrencyBalance,
+        getAssetMarketCap,
+        getAssetBalanceCryptoPrecision,
+        getAssetName,
+      ],
+      ['desc', 'desc', 'desc', 'asc'],
+    )
+  },
+)((_state: ReduxState, filter) => filter?.searchQuery ?? 'assetsBySearchQuery')

src/state/slices/search-selectors.ts

@@ -3,7 +3,8 @@ import type { Asset } from '@shapeshiftoss/types'
 import { createDeepEqualOutputSelector } from 'state/selector-utils'
 
 import { selectSearchQueryFromFilter } from '../selectors'
-import { selectAssetsBySearchQuery, selectTxsByQuery } from './selectors'
+import { selectAssetsBySearchQuery } from './common-selectors'
+import { selectTxsByQuery } from './txHistorySlice/selectors'
 import type { TxId } from './txHistorySlice/txHistorySlice'
 
 export enum GlobalSearchResultType {