Merge branch 'develop' into yomo-759

Emurgo · Sep 14, 2023 · a2d0982 · a2d0982
2 parents b5af097 + 0a15ace
commit a2d0982
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 29 deletions.
diff --git a/apps/wallet-mobile/src/features/Swap/common/PoolIcon/PoolIcon.tsx b/apps/wallet-mobile/src/features/Swap/common/PoolIcon/PoolIcon.tsx
@@ -4,7 +4,7 @@ import React, {FunctionComponent} from 'react'
 import {Icon} from '../../../../components'
 
 export const PoolIcon = ({providerId, size}: {providerId: Pool['provider']; size: number}) => {
-  const IconVariant = icons[providerId]
+  const IconVariant = icons[providerId] ?? Icon.Swap
   return <IconVariant size={size} />
 }
 

diff --git a/apps/wallet-mobile/src/features/Swap/common/filterBySearch.ts b/apps/wallet-mobile/src/features/Swap/common/filterBySearch.ts
@@ -1,21 +1,14 @@
-import {Balance} from '@yoroi/types'
-
 export const filterBySearch = (searchTerm: string) => {
-  const searchTermLowerCase = searchTerm.toLocaleLowerCase()
-  if (searchTermLowerCase.length === 0) return () => true
+  const search = normalizeString(searchTerm)
+  if (search.length === 0) return () => true
 
-  return (tokenInfo: Balance.TokenInfo) => {
-    if (tokenInfo.kind === 'ft') {
-      return (
-        (tokenInfo.ticker?.toLocaleLowerCase()?.includes(searchTermLowerCase) ||
-          tokenInfo.name?.toLocaleLowerCase()?.includes(searchTermLowerCase)) ??
-        false
-      )
-    }
+  return (asset: {ticker?: string; name?: string; symbol?: string}) => {
+    const name = normalizeString(asset.name ?? '')
+    const ticker = normalizeString(asset.ticker ?? '')
+    const symbol = normalizeString(asset.symbol ?? '')
 
-    if (tokenInfo.kind === 'nft') {
-      return tokenInfo.name?.toLocaleLowerCase().includes(searchTermLowerCase) ?? false
-    }
-    return false
+    return ticker.includes(search) || name.includes(search) || symbol.includes(search)
   }
 }
+
+const normalizeString = (str: string) => str.toLocaleLowerCase().replace(/\s/g, '')
diff --git a/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -16,6 +16,7 @@ import {useAllTokenInfos, useBalance} from '../../../../../../../yoroi-wallets/h
 import {Quantities} from '../../../../../../../yoroi-wallets/utils'
 import {filterByFungibility} from '../../../../../../Send/common/filterByFungibility'
 import {NoAssetFoundImage} from '../../../../../../Send/common/NoAssetFoundImage'
+import {filterBySearch} from '../../../../../common/filterBySearch'
 import {useNavigateTo} from '../../../../../common/navigation'
 import {useStrings} from '../../../../../common/strings'
 import {useSwapTouched} from '../../../../../common/SwapFormProvider'
@@ -131,7 +132,7 @@ const TokenList = () => {
   )
 
   const filteredTransformedList = React.useMemo(() => {
-    return transformedArray.filter(filterTokensPairBySearch(assetSearchTerm))
+    return transformedArray.filter(filterBySearch(assetSearchTerm))
   }, [transformedArray, assetSearchTerm])
 
   return (
@@ -268,17 +269,6 @@ const EmptySearchResult = ({assetSearchTerm}: {assetSearchTerm: string}) => {
   )
 }
 
-export const filterTokensPairBySearch = (searchTerm: string) => {
-  const searchTermLowerCase = searchTerm.toLocaleLowerCase()
-  if (searchTermLowerCase.length === 0) return () => true
-
-  return (tokenInfo: TransformedObject) => {
-    return (
-      tokenInfo.name?.toLocaleLowerCase().replace(/\s/g, '').includes(searchTermLowerCase.replace(/\s/g, '')) ?? false
-    )
-  }
-}
-
 const styles = StyleSheet.create({
   container: {
     flex: 1,