fix(suite): swap accounts sort

trezor · Jan 8, 2025 · 9230c39 · 9230c39
1 parent b3c19a7
commit 9230c39
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/suite-common/wallet-utils/src/filterReceiveAccounts.ts b/suite-common/wallet-utils/src/filterReceiveAccounts.ts
@@ -15,6 +15,16 @@ export const isDebugOnlyAccountType = (
     return !!accountTypeInfo?.isDebugOnlyAccountType;
 };
 
+const accountTypeOrder: Record<AccountType, number> = {
+    normal: 0,
+    ledger: 1,
+    legacy: 2,
+    imported: 3,
+    segwit: 4,
+    coinjoin: 5,
+    taproot: 6,
+};
+
 type FilterReceiveAccountsProps = {
     accounts: Account[];
     deviceState?: StaticSessionId;
@@ -38,14 +48,21 @@ export const filterReceiveAccounts = ({
         account.accountType === 'normal' && account.index === 0;
     const isCoinjoinAccount = (account: Account) => account.accountType === 'coinjoin';
 
-    return accounts.filter(
-        account =>
+    const isRelevantAccount = (account: Account) => {
+        return (
             isSameDevice(account) &&
             isSameNetwork(account) &&
             !isCoinjoinAccount(account) &&
             shouldDisplayDebugOnly(account) &&
             (isNotEmptyAccount(account) ||
                 isVisibleAccount(account) ||
-                isFirstNormalAccount(account)),
-    );
+                isFirstNormalAccount(account))
+        );
+    };
+
+    return accounts.filter(isRelevantAccount).sort((a, b) => {
+        return (
+            accountTypeOrder[a.accountType] - accountTypeOrder[b.accountType] || a.index - b.index
+        );
+    });
 };