From 7fca519fd9a5c62458a88b77cf2dd3b1c84025ab Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Wed, 19 Feb 2025 22:53:52 +0800
Subject: [PATCH] fix the incorrect order in account list when there are more
 than one accounts with multiple sub-accounts in one category

---
 src/models/account.ts | 37 +++++++++++++++++++++++++++++++++++--
 src/stores/account.ts |  4 ++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/models/account.ts b/src/models/account.ts
index 76fa28c0..6b44fe45 100644
--- a/src/models/account.ts
+++ b/src/models/account.ts
@@ -346,7 +346,7 @@ export class Account implements AccountInfoResponse {
         return clonedAccounts;
     }
 
-    public static sortAccounts(accounts: Account[]): Account[] {
+    public static sortAccounts(accounts: Account[], allAccountsMap?: Record<string, Account>): Account[] {
         if (!accounts || !accounts.length) {
             return accounts;
         }
@@ -367,7 +367,40 @@ export class Account implements AccountInfoResponse {
                 return account1Category.displayOrder - account2Category.displayOrder;
             }
 
-            return account1.displayOrder - account2.displayOrder;
+            if (account1.parentId === account2.parentId) {
+                return account1.displayOrder - account2.displayOrder;
+            }
+
+            if (account1.id === account2.parentId) {
+                return -1;
+            } else if (account2.id === account1.parentId) {
+                return 1;
+            }
+
+            let account1DisplayOrder: number | null = account1.displayOrder;
+            let account2DisplayOrder: number | null = account2.displayOrder;
+
+            if (account1.parentId && account1.parentId !== '0') {
+                if (allAccountsMap && allAccountsMap[account1.parentId]) {
+                    account1DisplayOrder = allAccountsMap[account1.parentId].displayOrder;
+                } else {
+                    account1DisplayOrder = null;
+                }
+            }
+
+            if (account2.parentId && account2.parentId !== '0') {
+                if (allAccountsMap && allAccountsMap[account2.parentId]) {
+                    account2DisplayOrder = allAccountsMap[account2.parentId].displayOrder;
+                } else {
+                    account2DisplayOrder = null;
+                }
+            }
+
+            if (account1DisplayOrder !== null && account2DisplayOrder !== null) {
+                return account1DisplayOrder - account2DisplayOrder;
+            } else {
+                return account1.id.localeCompare(account2.id);
+            }
         });
     }
 }
diff --git a/src/stores/account.ts b/src/stores/account.ts
index 66b0e8c6..c98365a6 100644
--- a/src/stores/account.ts
+++ b/src/stores/account.ts
@@ -47,7 +47,7 @@ export const useAccountsStore = defineStore('accounts', () => {
             }
         }
 
-        return Account.sortAccounts(allAccountsList);
+        return Account.sortAccounts(allAccountsList, allAccountsMap.value);
     });
 
     const allVisiblePlainAccounts = computed<Account[]>(() => {
@@ -72,7 +72,7 @@ export const useAccountsStore = defineStore('accounts', () => {
             }
         }
 
-        return Account.sortAccounts(allVisibleAccounts);
+        return Account.sortAccounts(allVisibleAccounts, allAccountsMap.value);
     });
 
     const allAvailableAccountsCount = computed<number>(() => {