sort tokens to buy

Emurgo · Oct 25, 2023 · fe70ec9 · fe70ec9
1 parent bbd5783
commit fe70ec9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/apps/wallet-mobile/src/features/Swap/common/helpers.ts b/apps/wallet-mobile/src/features/Swap/common/helpers.ts
@@ -1,4 +1,5 @@
 import {createTypeGuardFromSchema, parseSafe} from '@yoroi/common'
+import {Balance} from '@yoroi/types'
 import {SwapApi} from '@yoroi/types/src/swap/api'
 import {useMutation, UseMutationOptions} from 'react-query'
 import {z} from 'zod'
@@ -65,3 +66,28 @@ export const parseOrderTxMetadata = (metadataJson: string): OrderTxMetadata | nu
   const parsedMetadata = parseSafe(metadataJson)
   return isOrderTxMetadata(parsedMetadata) ? parsedMetadata : null
 }
+
+function containsOnlyValidChars(str?: string): boolean {
+  const validCharsRegex = /^[a-zA-Z0]*$/
+  return typeof str === 'string' && validCharsRegex.test(str)
+}
+
+export const sortTokensByName = (a: Balance.Token, b: Balance.Token) => {
+  const isValidNameA = containsOnlyValidChars(a.info.name) && containsOnlyValidChars(a.info.ticker)
+  const isValidNameB = containsOnlyValidChars(b.info.name) && containsOnlyValidChars(b.info.ticker)
+  const nameA = isValidNameA ? a.info.name.toLowerCase() : (a.info.ticker ?? '').toLowerCase()
+  const nameB = isValidNameB ? b.info.name.toLowerCase() : (b.info.ticker ?? '').toLowerCase()
+
+  // Move invalid names to the end.
+  if (!isValidNameA) {
+    return 1
+  }
+
+  if (nameA < nameB) {
+    return -1
+  }
+  if (nameA > nameB) {
+    return 1
+  }
+  return 0
+}
diff --git a/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -17,6 +17,7 @@ import {Amounts, asQuantity, Quantities} from '../../../../../../../yoroi-wallet
 import {NoAssetFoundImage} from '../../../../../../Send/common/NoAssetFoundImage'
 import {Counter} from '../../../../../common/Counter/Counter'
 import {filterBySearch} from '../../../../../common/filterBySearch'
+import {sortTokensByName} from '../../../../../common/helpers'
 import {useNavigateTo} from '../../../../../common/navigation'
 import {useStrings} from '../../../../../common/strings'
 import {useSwapForm} from '../../../../../common/SwapFormProvider'
@@ -71,7 +72,7 @@ const TokenList = () => {
 
   const filteredTokenList = React.useMemo(() => {
     const filter = filterBySearch(assetSearchTerm)
-    return tokens.filter((token) => filter(token.info))
+    return tokens.filter((token) => filter(token.info)).sort(sortTokensByName)
   }, [tokens, assetSearchTerm])
 
   return (