fixes

actualbudget · Nov 4, 2024 · 7297816 · 7297816
1 parent bd9db8b
commit 7297816
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.ts
@@ -178,7 +178,10 @@ async function downloadGoCardlessTransactions(
   }
 }
 
-async function downloadSimpleFinTransactions(acctId, since) {
+async function downloadSimpleFinTransactions(
+  acctId: AccountEntity['id'] | AccountEntity['id'][],
+  since: string | string[],
+) {
   const userToken = await asyncStorage.getItem('user-token');
   if (!userToken) return;
 
@@ -808,6 +811,7 @@ export async function syncAccount(
       userKey,
       acctId,
       bankId,
+      syncStartDate,
       newAccount,
     );
   } else {
@@ -835,12 +839,13 @@ export async function SimpleFinBatchSync(
   );
 
   const promises = [];
-  for (let i = 0; i < startDates.length; i++) {
-    const startDate = startDates[i];
+  for (let i = 0; i < accounts.length; i++) {
     const account = accounts[i];
     const download = res[account.accountId];
 
     const acctRow = await db.select('accounts', account.id);
+    const oldestTransaction = await getAccountOldestTransaction(account.id);
+    const newAccount = oldestTransaction == null;
 
     if (download.error_code) {
       promises.push(
@@ -854,15 +859,12 @@ export async function SimpleFinBatchSync(
     }
 
     promises.push(
-      processBankSyncDownload(
-        download,
-        account.id,
-        acctRow,
-        startDate === null,
-      ).then(res => ({
-        accountId: account.id,
-        res,
-      })),
+      processBankSyncDownload(download, account.id, acctRow, newAccount).then(
+        res => ({
+          accountId: account.id,
+          res,
+        }),
+      ),
     );
   }
 

diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
@@ -1160,7 +1160,7 @@ handlers['accounts-bank-sync'] = async function ({ id }) {
   return { errors, newTransactions, matchedTransactions, updatedAccounts };
 };
 
-handlers['simplefin-batch-sync'] = async function ({ ids }) {
+handlers['simplefin-batch-sync'] = async function ({ ids = [] }) {
   const accounts = await db.runQuery(
     `SELECT a.*, b.bank_id as bankId FROM accounts a
          LEFT JOIN banks b ON a.bank = b.id

diff --git a/packages/loot-core/src/types/models/gocardless.d.ts b/packages/loot-core/src/types/models/gocardless.d.ts
@@ -37,7 +37,10 @@ export type GoCardlessAmount = {
 export type GoCardlessTransaction = {
   additionalInformation?: string;
   bookingStatus?: string;
-  balanceAfterTransaction?: Pick<Balance, 'balanceType' | 'balanceAmount'>;
+  balanceAfterTransaction?: Pick<
+    GoCardlessBalance,
+    'balanceType' | 'balanceAmount'
+  >;
   bankTransactionCode?: string;
   bookingDate?: string;
   bookingDateTime?: string;