A local-first personal finance app
fix: maintain the sort order of the server sync (#3748)
Koen van Staveren29fc22a17125
diff --git a/packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snap b/packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snapindex ac23fd9bab..316320ba97 100644--- a/packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snap+++ b/packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snap@@ -50,7 +50,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456788,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -75,7 +75,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456787,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -103,7 +103,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456786,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -128,7 +128,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456785,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -153,7 +153,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456784,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -178,7 +178,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456783,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -233,7 +233,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456788,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -348,7 +348,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456788,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -373,7 +373,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456787,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -398,7 +398,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456786,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -423,7 +423,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456785,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -448,7 +448,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456784,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -473,7 +473,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456783,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -498,7 +498,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456782,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -523,7 +523,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456781,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -548,7 +548,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456780,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -603,7 +603,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456788,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -628,7 +628,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456787,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -653,7 +653,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456786,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -678,7 +678,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456785,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -703,7 +703,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456784,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -728,7 +728,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456783,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -753,7 +753,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456782,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -778,7 +778,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456781,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -803,7 +803,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456780,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -858,7 +858,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456788,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -883,7 +883,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456787,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -908,7 +908,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456786,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -933,7 +933,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456785,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -958,7 +958,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456784,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -983,7 +983,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456783,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1008,7 +1008,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456782,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1033,7 +1033,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456781,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1058,7 +1058,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456780,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1083,7 +1083,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456779,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1108,7 +1108,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456778,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1133,7 +1133,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456777,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1158,7 +1158,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456776,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1183,7 +1183,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456775,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1208,7 +1208,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456774,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1233,7 +1233,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456773,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,@@ -1258,7 +1258,7 @@ Array ["pending": 0,"reconciled": 0,"schedule": null,- "sort_order": 123456789,+ "sort_order": 123456772,"starting_balance_flag": 0,"tombstone": 0,"transferred_id": null,diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.tsindex 80def5788c..adf9a2fdfc 100644--- a/packages/loot-core/src/server/accounts/sync.ts+++ b/packages/loot-core/src/server/accounts/sync.ts@@ -472,6 +472,12 @@ export async function reconcileTransactions(}}+ // Maintain the sort order of the server+ const now = Date.now();+ added.forEach((t, index) => {+ t.sort_order ??= now - index;+ });+if (!isPreview) {await createNewPayees(payeesToCreate, [...added, ...updated]);await batchUpdateTransactions({ added, updated });diff --git a/upcoming-release-notes/3748.md b/upcoming-release-notes/3748.mdnew file mode 100644index 0000000000..836ac2d65a--- /dev/null+++ b/upcoming-release-notes/3748.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [UnderKoen]+---++Keep the order of imported transactions when syncing from server.