Sort addresses by index

Closes #1120
alephium · Feb 27, 2025 · a31dbb4 · a31dbb4
1 parent a24e657
commit a31dbb4
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/apps/desktop-wallet/locales/en-US/translation.json b/apps/desktop-wallet/locales/en-US/translation.json
@@ -6,6 +6,7 @@
   "Address details": "Address details",
   "Address group": "Address group",
   "Address label": "Address label",
+  "Address index": "Address index",
   "Address NFTs": "Address NFTs",
   "Address options": "Address options",
   "Address tokens": "Address tokens",

diff --git a/apps/desktop-wallet/src/features/settings/settingsConstants.ts b/apps/desktop-wallet/src/features/settings/settingsConstants.ts
@@ -20,7 +20,8 @@ export const LockTimes = {
 export enum AddressOrder {
   LastUse = 'lastUse',
   AlphBalance = 'alphBalance',
-  Label = 'label'
+  Label = 'label',
+  Index = 'index'
 }
 
 export const locktimeInMinutes = Object.values(LockTimes)

diff --git a/apps/desktop-wallet/src/hooks/useAddresses.ts b/apps/desktop-wallet/src/hooks/useAddresses.ts
@@ -16,6 +16,7 @@ import { TokenId } from '@/types/tokens'
 export const useFetchAddressesHashesSortedByPreference = () => {
   const orderPreference = useAppSelector((s) => s.settings.addressOrderPreference)
   const addressesSortedByLabel = useAddressesHashesSortedByLabel()
+  const addressesSortedByIndex = useAddressesHashesSortedByIndex()
   const { data: addressesSortedByLastUse, isLoading: isLoadingLastUse } = useFetchAddressesHashesSortedByLastUse()
   const { data: addressesSortedByAlphBalance, isLoading: isLoadingAlphBalance } =
     useFetchAddressesHashesSortedByAlphBalance({
@@ -33,6 +34,11 @@ export const useFetchAddressesHashesSortedByPreference = () => {
         data: addressesSortedByAlphBalance,
         isLoading: isLoadingAlphBalance
       }
+    case AddressOrder.Index:
+      return {
+        data: addressesSortedByIndex,
+        isLoading: false
+      }
     default:
       return {
         data: addressesSortedByLastUse,
@@ -153,3 +159,30 @@ export const useAddressesHashesSortedByLabel = (): AddressHash[] => {
     [allAddressHashes, addressEntities, defaultAddressHash]
   )
 }
+
+export const useAddressesHashesSortedByIndex = (): AddressHash[] => {
+  const allAddressHashes = useUnsortedAddressesHashes()
+  const defaultAddressHash = useAppSelector((s) => selectDefaultAddress(s).hash)
+  const addressEntities = useAppSelector((s) => s.addresses.entities)
+
+  return useMemo(
+    () =>
+      [...allAddressHashes].sort((a, b) => {
+        if (a === defaultAddressHash) return -1
+        if (b === defaultAddressHash) return 1
+
+        const indexA = addressEntities[a]?.index
+        const indexB = addressEntities[b]?.index
+
+        if (indexA && !indexB) return -1
+        if (!indexA && indexB) return 1
+
+        if (indexA && indexB) {
+          return indexA > indexB ? 1 : -1
+        }
+
+        return a.localeCompare(b)
+      }),
+    [allAddressHashes, addressEntities, defaultAddressHash]
+  )
+}
diff --git a/apps/desktop-wallet/src/pages/unlockedWallet/addressesPage/AddressSortingSelect.tsx b/apps/desktop-wallet/src/pages/unlockedWallet/addressesPage/AddressSortingSelect.tsx
@@ -16,7 +16,8 @@ const AddressSortingSelect = () => {
   const orderOptions: SelectOption<AddressOrder>[] = [
     { value: AddressOrder.LastUse, label: t('Last used') },
     { value: AddressOrder.AlphBalance, label: t('ALPH balance') },
-    { value: AddressOrder.Label, label: t('Address label') }
+    { value: AddressOrder.Label, label: t('Address label') },
+    { value: AddressOrder.Index, label: t('Address index') }
   ]
 
   const onSelect = (value: AddressOrder) => {