@actual-app/api 6.4.0 → 6.5.0

package/dist/app/bundle.api.js

@@ -26821,7 +26821,7 @@
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */q)
+                /* harmony export */ q: () => ( /* binding */q)
                 /* harmony export */ 
             });
             function _array_like_to_array(arr, len) {
@@ -27108,9 +27108,9 @@
             }
             /***/ 
         }),
-        /***/ "./packages/api/methods.js": 
+        /***/ "./packages/api/methods.ts": 
         /*!*********************************!*\
-          !*** ./packages/api/methods.js ***!
+          !*** ./packages/api/methods.ts ***!
           \*********************************/
         /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
             "use strict";
@@ -27129,7 +27129,6 @@
                 /* harmony export */ deletePayee: () => ( /* binding */deletePayee),
                 /* harmony export */ deleteTransaction: () => ( /* binding */deleteTransaction),
                 /* harmony export */ downloadBudget: () => ( /* binding */downloadBudget),
-                /* harmony export */ filterTransactions: () => ( /* binding */filterTransactions),
                 /* harmony export */ getAccounts: () => ( /* binding */getAccounts),
                 /* harmony export */ getBudgetMonth: () => ( /* binding */getBudgetMonth),
                 /* harmony export */ getBudgetMonths: () => ( /* binding */getBudgetMonths),
@@ -27138,7 +27137,7 @@
                 /* harmony export */ getTransactions: () => ( /* binding */getTransactions),
                 /* harmony export */ importTransactions: () => ( /* binding */importTransactions),
                 /* harmony export */ loadBudget: () => ( /* binding */loadBudget),
-                /* harmony export */ q: () => ( /* reexport safe */_app_query__WEBPACK_IMPORTED_MODULE_1__["default"]),
+                /* harmony export */ q: () => ( /* reexport safe */_app_query__WEBPACK_IMPORTED_MODULE_1__.q),
                 /* harmony export */ reopenAccount: () => ( /* binding */reopenAccount),
                 /* harmony export */ runImport: () => ( /* binding */runImport),
                 /* harmony export */ runQuery: () => ( /* binding */runQuery),
@@ -27154,6 +27153,7 @@
             });
             /* harmony import */ var _injected__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./injected */ "./packages/api/injected.js");
             /* harmony import */ var _app_query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./app/query */ "./packages/api/app/query.js");
+            // @ts-strict-ignore
             function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
                 try {
                     var info = gen[key](arg);
@@ -27501,12 +27501,6 @@
                     endDate: endDate
                 });
             }
-            function filterTransactions(accountId, text) {
-                return send("api/transactions-filter", {
-                    accountId: accountId,
-                    text: text
-                });
-            }
             function updateTransaction(id, fields) {
                 return send("api/transaction-update", {
                     id: id,
@@ -29453,7 +29447,7 @@
                 /* harmony export */ "default": () => ( /* binding */runMigration)
                 /* harmony export */ 
             });
-            async function runMigration(db, uuid) {
+            async function runMigration(db) {
                 function getValue(node) {
                     return node.expr != null ? node.expr : node.cachedValue;
                 }
@@ -29610,11 +29604,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.ts");
             /* harmony import */ var _random__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./random */ "./packages/loot-core/src/mocks/random.ts");
+            // @ts-strict-ignore
             function pickRandom(list) {
-                return list[Math.floor((0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])() * list.length) % list.length];
+                return list[Math.floor((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() * list.length) % list.length];
             }
             function number(start, end) {
-                return start + (end - start) * (0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])();
+                return start + (end - start) * (0, _random__WEBPACK_IMPORTED_MODULE_11__.random)();
             }
             function integer(start, end) {
                 return Math.round(number(start, end));
@@ -29660,7 +29655,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactions = [];
                 for (let i = 0; i < numTransactions; i++) {
                     let payee;
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])() < 0.09) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.09) {
                         payee = incomePayee;
                     }
                     else {
@@ -29678,7 +29673,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount = integer(50000, 70000);
                     }
                     else {
-                        amount = integer(0, (0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])() < 0.05 ? -8000 : -700);
+                        amount = integer(0, (0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.05 ? -8000 : -700);
                     }
                     const transaction = {
                         amount,
@@ -29688,7 +29683,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         category: category.id
                     };
                     transactions.push(transaction);
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])() < 0.2) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.2) {
                         const a = Math.round(transaction.amount / 3);
                         const pick = () => payee === incomePayee ? incomeGroup.categories.find((c) => c.name === 'Income').id : pickRandom(expenseCategories).id;
                         transaction.subtransactions = [
@@ -29784,7 +29779,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactions = [];
                 for (let i = 0; i < numTransactions; i++) {
                     let payee;
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])() < 0.04) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.04) {
                         payee = incomePayee;
                     }
                     else {
@@ -29854,7 +29849,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactions = [];
                 for (let i = 0; i < numTransactions; i++) {
                     let payee;
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__["default"])() < 0.3) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.3) {
                         payee = incomePayee;
                     }
                     else {
@@ -30067,26 +30062,26 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     },
                     {
                         name: 'Vanguard 401k',
-                        offBudget: 1
+                        offBudget: true
                     },
                     {
                         name: 'Mortgage',
-                        offBudget: 1
+                        offBudget: true
                     },
                     {
                         name: 'House Asset',
-                        offBudget: 1
+                        offBudget: true
                     },
                     {
                         name: 'Roth IRA',
-                        offBudget: 1
+                        offBudget: true
                     }
                 ];
-                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
                     for (const account of accounts) {
                         account.id = await handlers['account-create'](account);
                     }
-                }));
+                });
                 const payees = [
                     {
                         name: 'Starting Balance'
@@ -30210,7 +30205,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     for (const group of categoryGroups) {
                         group.id = await handlers['category-group-create']({
                             name: group.name,
-                            isIncome: group.is_income ? 1 : 0
+                            isIncome: group.is_income
                         });
                         for (const category of group.categories) {
                             category.id = await handlers['category-create']({
@@ -30255,13 +30250,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // don't want to show that as it'd be weird. We modify the latest
                 // deposit transaction to force it to be positive
                 const primaryAccount = accounts.find((a) => a.name = 'Bank of America');
-                const { data: primaryBalance } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_10__["default"])('transactions').filter({
+                const { data: primaryBalance } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_10__.q)('transactions').filter({
                     account: primaryAccount.id
                 }).calculate({
                     $sum: '$amount'
                 }).serialize());
                 if (primaryBalance < 0) {
-                    const { data: results } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_10__["default"])('transactions').filter({
+                    const { data: results } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_10__.q)('transactions').filter({
                         account: primaryAccount.id,
                         amount: {
                             $gt: 0
@@ -30416,7 +30411,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ random: () => ( /* binding */random)
                 /* harmony export */ 
             });
             /* harmony import */ var _client_platform__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../client/platform */ "./packages/loot-core/src/client/platform.electron.ts");
@@ -30431,7 +30426,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return pseudoRandomIterator;
             }
             const random = _client_platform__WEBPACK_IMPORTED_MODULE_0__.isPlaywright ? pseudoRandom : Math.random;
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (random);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/platform/exceptions/index.electron.ts": 
@@ -30449,7 +30443,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             const captureException = function (exc) {
                 console.log('[Exception]', exc);
             };
-            const captureBreadcrumb = function (breadcrumb) { };
+            const captureBreadcrumb = function () { };
             /***/ 
         }),
         /***/ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts": 
@@ -30474,6 +30468,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! path */ "path");
             /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
             /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
+            // @ts-strict-ignore
             const getStorePath = () => (0, path__WEBPACK_IMPORTED_MODULE_1__.join)(_fs__WEBPACK_IMPORTED_MODULE_2__.getDataDir(), 'global-store.json');
             let store;
             let persisted = true;
@@ -30551,7 +30546,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             const init = function () { };
-            const send = function (type, args) {
+            const send = function () {
                 // Nothing
             };
             const getNumClients = function () {
@@ -30609,6 +30604,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! path */ "path");
             /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
             /* harmony import */ var _shared__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./shared */ "./packages/loot-core/src/platform/server/fs/shared.ts");
+            // @ts-strict-ignore
             let rootPath = path__WEBPACK_IMPORTED_MODULE_1__.join(__dirname, '..', '..', '..', '..');
             if (__filename.match('bundle')) {
                 // The file name is not our filename and indicates that we're in the
@@ -30751,12 +30747,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ join: () => ( /* reexport safe */path__WEBPACK_IMPORTED_MODULE_0__.join)
                 /* harmony export */ 
             });
             /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! path */ "path");
             /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (path__WEBPACK_IMPORTED_MODULE_0__.join);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/platform/server/fs/shared.ts": 
@@ -30773,6 +30768,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _path_join__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./path-join */ "./packages/loot-core/src/platform/server/fs/path-join.electron.ts");
+            // @ts-strict-ignore
             let documentDir;
             const _setDocumentDir = (dir) => documentDir = dir;
             const getDocumentDir = () => {
@@ -30795,7 +30791,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (id.match(/[^A-Za-z0-9\-_]/)) {
                     throw new Error(`Invalid budget id “${id}”. Check the id of your budget in the Advanced section of the settings page.`);
                 }
-                return (0, _path_join__WEBPACK_IMPORTED_MODULE_0__["default"])(getDocumentDir(), id);
+                return (0, _path_join__WEBPACK_IMPORTED_MODULE_0__.join)(getDocumentDir(), id);
             };
             /***/ 
         }),
@@ -30807,7 +30803,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ logger: () => ( /* binding */logger)
                 /* harmony export */ 
             });
             const logger = {
@@ -30818,7 +30814,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     console.warn(...args);
                 }
             };
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (logger);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/platform/server/sqlite/index.electron.ts": 
@@ -30844,6 +30839,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var better_sqlite3__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(better_sqlite3__WEBPACK_IMPORTED_MODULE_0__);
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
+            // @ts-strict-ignore
             function verifyParamTypes(sql, arr) {
                 arr.forEach((val) => {
                     if (typeof val !== 'string' && typeof val !== 'number' && val !== null) {
@@ -30929,9 +30925,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const db = new (better_sqlite3__WEBPACK_IMPORTED_MODULE_0___default())(pathOrBuffer);
                 // Define Unicode-aware LOWER and UPPER implementation.
                 // This is necessary because better-sqlite3 uses SQLite build without ICU support.
+                // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
                 db.function('UNICODE_LOWER', {
                     deterministic: true
                 }, (arg) => arg?.toLowerCase());
+                // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
                 db.function('UNICODE_UPPER', {
                     deterministic: true
                 }, (arg) => arg?.toUpperCase());
@@ -30967,6 +30965,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var csv_stringify_lib_sync__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(csv_stringify_lib_sync__WEBPACK_IMPORTED_MODULE_0__);
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../aql */ "./packages/loot-core/src/server/aql/index.ts");
+            // @ts-strict-ignore
             async function exportToCSV(transactions, accounts, categoryGroups, payees) {
                 const accountNamesById = accounts.reduce((reduced, { id, name }) => {
                     reduced[id] = name;
@@ -30980,13 +30979,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     reduced[id] = name;
                     return reduced;
                 }, {});
-                const transactionsForExport = transactions.map(({ account, date, payee, notes, category, amount }) => ({
+                const transactionsForExport = transactions.map(({ account, date, payee, notes, category, amount, cleared, reconciled }) => ({
                     Account: accountNamesById[account],
                     Date: date,
                     Payee: payeeNamesById[payee],
                     Notes: notes,
                     Category: categoryNamesById[category],
-                    Amount: amount == null ? 0 : (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(amount)
+                    Amount: amount == null ? 0 : (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(amount),
+                    Cleared: cleared,
+                    Reconciled: reconciled
                 }));
                 return csv_stringify_lib_sync__WEBPACK_IMPORTED_MODULE_0___default()(transactionsForExport, {
                     header: true
@@ -31020,6 +31021,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     },
                     {
                         Amount: 'amount'
+                    },
+                    {
+                        Cleared: 'cleared'
+                    },
+                    {
+                        Reconciled: 'reconciled'
                     }
                 ]).options({
                     splits: 'all'
@@ -31040,7 +31047,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         Payee: trans.ParentId ? parentsPayees.get(trans.ParentId) : trans.Payee,
                         Notes: trans.Notes,
                         Category: trans.Category,
-                        Amount: trans.Amount == null ? 0 : (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(trans.Amount)
+                        Amount: trans.Amount == null ? 0 : (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(trans.Amount),
+                        Cleared: trans.Reconciled === true ? 'Reconciled' : trans.Cleared === true ? 'Cleared' : 'Not cleared'
                     };
                 });
                 return csv_stringify_lib_sync__WEBPACK_IMPORTED_MODULE_0___default()(transactionsForExport, {
@@ -31071,6 +31079,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../post */ "./packages/loot-core/src/server/post.ts");
             /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../server-config */ "./packages/loot-core/src/server/server-config.ts");
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/accounts/sync.ts");
+            // @ts-strict-ignore
             async function handoffPublicToken(institution, publicToken) {
                 const [[, userId], [, key]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.multiGet([
                     'user-id',
@@ -31170,7 +31179,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return id;
                     });
                     // Do an initial sync
-                    await _sync__WEBPACK_IMPORTED_MODULE_6__.syncGoCardlessAccount(userId, userKey, id, acct.account_id, bankId);
+                    await _sync__WEBPACK_IMPORTED_MODULE_6__.syncExternalAccount(userId, userKey, id, acct.account_id, bankId);
                     return id;
                 }));
             }
@@ -31184,12 +31193,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */parse)
+                /* harmony export */ ofx2json: () => ( /* binding */ofx2json)
                 /* harmony export */ 
             });
             /* harmony import */ var xml2js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! xml2js */ "./node_modules/xml2js/lib/xml2js.js");
             /* harmony import */ var xml2js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(xml2js__WEBPACK_IMPORTED_MODULE_0__);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
+            // @ts-strict-ignore
             function sgml2Xml(sgml) {
                 return sgml.replace(/&/g, '&#038;') // Replace ampersands
                     .replace(/&amp;/g, '&#038;').replace(/>\s+</g, '><') // remove whitespace inbetween tag close/open
@@ -31273,7 +31283,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     memo: stmtTrn['MEMO']
                 };
             }
-            async function parse(ofx) {
+            async function ofx2json(ofx) {
                 // firstly, split into the header attributes and the footer sgml
                 const contents = ofx.split('<OFX>', 2);
                 // firstly, parse the headers
@@ -31318,11 +31328,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var csv_parse_lib_sync__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! csv-parse/lib/sync */ "./node_modules/csv-parse/lib/sync.js");
             /* harmony import */ var csv_parse_lib_sync__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(csv_parse_lib_sync__WEBPACK_IMPORTED_MODULE_0__);
             /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
-            /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
-            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
-            /* harmony import */ var _ofx2json__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ofx2json */ "./packages/loot-core/src/server/accounts/ofx2json.ts");
-            /* harmony import */ var _qif2json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./qif2json */ "./packages/loot-core/src/server/accounts/qif2json.ts");
-            async function parseFile(filepath, options) {
+            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            /* harmony import */ var _ofx2json__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ofx2json */ "./packages/loot-core/src/server/accounts/ofx2json.ts");
+            /* harmony import */ var _qif2json__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./qif2json */ "./packages/loot-core/src/server/accounts/qif2json.ts");
+            // @ts-strict-ignore
+            async function parseFile(filepath, options = {}) {
                 const errors = Array();
                 const m = filepath.match(/\.[^.]*$/);
                 if (m) {
@@ -31384,7 +31394,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1__.readFile(filepath);
                 let data;
                 try {
-                    data = (0, _qif2json__WEBPACK_IMPORTED_MODULE_5__["default"])(contents);
+                    data = (0, _qif2json__WEBPACK_IMPORTED_MODULE_4__.qif2json)(contents);
                 }
                 catch (err) {
                     errors.push({
@@ -31399,7 +31409,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {
                     errors: [],
                     transactions: data.transactions.map((trans) => ({
-                        amount: trans.amount != null ? (0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.looselyParseAmount)(trans.amount) : null,
+                        amount: trans.amount != null ? (0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.looselyParseAmount)(trans.amount) : null,
                         date: trans.date,
                         payee_name: trans.payee,
                         imported_payee: trans.payee,
@@ -31408,14 +31418,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             }
             async function parseOFX(filepath, options) {
-                if (!options?.enableExperimentalOfxParser) {
-                    return parseOFXNodeLibOFX(filepath, options);
-                }
                 const errors = Array();
                 const contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1__.readFile(filepath);
                 let data;
                 try {
-                    data = await (0, _ofx2json__WEBPACK_IMPORTED_MODULE_4__["default"])(contents);
+                    data = await (0, _ofx2json__WEBPACK_IMPORTED_MODULE_3__.ofx2json)(contents);
                 }
                 catch (err) {
                     errors.push({
@@ -31443,39 +31450,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     })
                 };
             }
-            async function parseOFXNodeLibOFX(filepath, options) {
-                const { getOFXTransactions, initModule } = await Promise.resolve( /*! import() */).then(__webpack_require__.t.bind(__webpack_require__, /*! node-libofx */ "node-libofx", 23));
-                await initModule();
-                const errors = Array();
-                const contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1__.readFile(filepath, 'binary');
-                let data;
-                try {
-                    data = getOFXTransactions(contents);
-                }
-                catch (err) {
-                    errors.push({
-                        message: 'Failed importing file',
-                        internal: err.stack
-                    });
-                    return {
-                        errors
-                    };
-                }
-                // Banks don't always implement the OFX standard properly
-                // If no payee is available try and fallback to memo
-                const useMemoFallback = options.fallbackMissingPayeeToMemo;
-                return {
-                    errors,
-                    transactions: data.map((trans) => ({
-                        amount: trans.amount,
-                        imported_id: trans.fi_id,
-                        date: trans.date ? (0, _shared_months__WEBPACK_IMPORTED_MODULE_2__.dayFromDate)(new Date(trans.date * 1000)) : null,
-                        payee_name: trans.name || (useMemoFallback ? trans.memo : null),
-                        imported_payee: trans.name || (useMemoFallback ? trans.memo : null),
-                        notes: !!trans.name || !useMemoFallback ? trans.memo || null : null
-                    }))
-                };
-            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/accounts/payees.ts": 
@@ -31491,6 +31465,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            // @ts-strict-ignore
             /* eslint-disable import/no-unused-modules */ async function createPayee(description) {
                 // Check to make sure no payee already exists with exactly the same
                 // name
@@ -31532,10 +31507,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */parse)
+                /* harmony export */ qif2json: () => ( /* binding */qif2json)
                 /* harmony export */ 
             });
-            function parse(qif, options = {}) {
+            // @ts-strict-ignore
+            function qif2json(qif, options = {}) {
                 const lines = qif.split('\n');
                 let line = lines.shift();
                 const type = /!Type:([^$]*)$/.exec(line.trim());
@@ -31643,6 +31619,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
             /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
+            // @ts-strict-ignore
             function assert(test, type, msg) {
                 if (!test) {
                     throw new _errors__WEBPACK_IMPORTED_MODULE_4__.RuleError(type, msg);
@@ -32051,14 +32028,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return condition.eval(object);
                     });
                 }
-                execActions(object) {
+                execActions() {
                     const changes = {};
                     this.actions.forEach((action) => action.exec(changes));
                     return changes;
                 }
                 exec(object) {
                     if (this.evalConditions(object)) {
-                        return this.execActions(object);
+                        return this.execActions();
                     }
                     return null;
                 }
@@ -32338,7 +32315,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ reconcileGoCardlessTransactions: () => ( /* binding */reconcileGoCardlessTransactions),
                 /* harmony export */ reconcileTransactions: () => ( /* binding */reconcileTransactions),
                 /* harmony export */ syncAccount: () => ( /* binding */syncAccount),
-                /* harmony export */ syncGoCardlessAccount: () => ( /* binding */syncGoCardlessAccount)
+                /* harmony export */ syncExternalAccount: () => ( /* binding */syncExternalAccount)
                 /* harmony export */ 
             });
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/max/index.js");
@@ -32358,6 +32335,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _title__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./title */ "./packages/loot-core/src/server/accounts/title/index.ts");
             /* harmony import */ var _transaction_rules__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
             /* harmony import */ var _transactions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
+            // @ts-strict-ignore
             // Plaid article about API options:
             // https://support.plaid.com/customer/en/portal/articles/2612155-transactions-returned-per-request
             function BankSyncError(type, code) {
@@ -32499,6 +32477,26 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     startingBalance
                 };
             }
+            async function downloadSimpleFinTransactions(acctId, since) {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
+                if (!userToken)
+                    return;
+                const res = await (0, _post__WEBPACK_IMPORTED_MODULE_6__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_7__.getServer)().SIMPLEFIN_SERVER + '/transactions', {
+                    accountId: acctId,
+                    startDate: since
+                }, {
+                    'X-ACTUAL-TOKEN': userToken
+                });
+                if (res.error_code) {
+                    throw BankSyncError(res.error_type, res.error_code);
+                }
+                const { transactions: { all }, balances, startingBalance } = res;
+                return {
+                    transactions: all,
+                    accountBalance: balances,
+                    startingBalance
+                };
+            }
             async function resolvePayee(trans, payeeName, payeesToCreate) {
                 if (trans.payee == null && payeeName) {
                     // First check our registry of new payees (to avoid a db access)
@@ -32539,7 +32537,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             payee_name = null;
                         }
                         else {
-                            payee_name = rawPayeeName ? trimmed : (0, _title__WEBPACK_IMPORTED_MODULE_10__["default"])(trimmed);
+                            payee_name = rawPayeeName ? trimmed : (0, _title__WEBPACK_IMPORTED_MODULE_10__.title)(trimmed);
                         }
                     }
                     trans.imported_payee = trans.imported_payee || payee_name;
@@ -32583,7 +32581,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // that it matters whether the amount is a positive or negative zero.
                     if (trans.amount > 0 || Object.is(Number(trans.amount), 0)) {
                         const nameParts = [];
-                        nameParts.push((0, _title__WEBPACK_IMPORTED_MODULE_10__["default"])(trans.debtorName || trans.remittanceInformationUnstructured || (trans.remittanceInformationUnstructuredArray || []).join(', ')));
+                        const name = trans.debtorName || trans.remittanceInformationUnstructured || (trans.remittanceInformationUnstructuredArray || []).join(', ') || trans.additionalInformation;
+                        if (name) {
+                            nameParts.push((0, _title__WEBPACK_IMPORTED_MODULE_10__.title)(name));
+                        }
                         if (trans.debtorAccount && trans.debtorAccount.iban) {
                             nameParts.push('(' + trans.debtorAccount.iban.slice(0, 4) + ' XXX ' + trans.debtorAccount.iban.slice(-4) + ')');
                         }
@@ -32591,7 +32592,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     else {
                         const nameParts = [];
-                        nameParts.push((0, _title__WEBPACK_IMPORTED_MODULE_10__["default"])(trans.creditorName || trans.remittanceInformationUnstructured || (trans.remittanceInformationUnstructuredArray || []).join(', ')));
+                        const name = trans.creditorName || trans.remittanceInformationUnstructured || (trans.remittanceInformationUnstructuredArray || []).join(', ') || trans.additionalInformation;
+                        if (name) {
+                            nameParts.push((0, _title__WEBPACK_IMPORTED_MODULE_10__.title)(name));
+                        }
                         if (trans.creditorAccount && trans.creditorAccount.iban) {
                             nameParts.push('(' + trans.creditorAccount.iban.slice(0, 4) + ' XXX ' + trans.creditorAccount.iban.slice(-4) + ')');
                         }
@@ -32981,7 +32985,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return newTransactions;
             }
-            async function syncGoCardlessAccount(userId, userKey, id, acctId, bankId) {
+            async function syncExternalAccount(userId, userKey, id, acctId, bankId) {
                 // TODO: Handle the case where transactions exist in the future
                 // (that will make start date after end date)
                 const latestTransaction = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT * FROM v_transactions WHERE account = ? ORDER BY date DESC LIMIT 1', [
@@ -33000,7 +33004,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         // Never download transactions before the starting date.
                         startingDate
                     ]));
-                    const { transactions: originalTransactions, accountBalance } = await downloadGoCardlessTransactions(userId, userKey, acctId, bankId, startDate);
+                    let download;
+                    if (acctRow.account_sync_source === 'simpleFin') {
+                        download = await downloadSimpleFinTransactions(acctId, startDate);
+                    }
+                    else if (acctRow.account_sync_source === 'goCardless') {
+                        download = await downloadGoCardlessTransactions(userId, userKey, acctId, bankId, startDate);
+                    }
+                    const { transactions: originalTransactions, accountBalance } = download;
                     if (originalTransactions.length === 0) {
                         return {
                             added: [],
@@ -33020,19 +33031,29 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 else {
                     // Otherwise, download transaction for the past 90 days
                     const startingDay = _shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay(), 90);
-                    const { transactions, startingBalance } = await downloadGoCardlessTransactions(userId, userKey, acctId, bankId, startingDay);
-                    // We need to add a transaction that represents the starting
-                    // balance for everything to balance out. In order to get balance
-                    // before the first imported transaction, we need to get the
-                    // current balance from the accounts table and subtract all the
-                    // imported transactions.
+                    let download;
+                    if (acctRow.account_sync_source === 'simpleFin') {
+                        download = await downloadSimpleFinTransactions(acctId, startingDay);
+                    }
+                    else if (acctRow.account_sync_source === 'goCardless') {
+                        download = await downloadGoCardlessTransactions(userId, userKey, acctId, bankId, startingDay);
+                    }
+                    const { transactions, startingBalance } = download;
+                    let balanceToUse = startingBalance;
+                    if (acctRow.account_sync_source === 'simpleFin') {
+                        const currentBalance = startingBalance;
+                        const previousBalance = transactions.reduce((total, trans) => {
+                            return total - parseInt(trans.transactionAmount.amount.replace('.', ''));
+                        }, currentBalance);
+                        balanceToUse = previousBalance;
+                    }
                     const oldestTransaction = transactions[transactions.length - 1];
                     const oldestDate = transactions.length > 0 ? oldestTransaction.date : _shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay();
                     const payee = await (0, _payees__WEBPACK_IMPORTED_MODULE_9__.getStartingBalancePayee)();
                     return (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
                         const initialId = await _db__WEBPACK_IMPORTED_MODULE_4__.insertTransaction({
                             account: id,
-                            amount: startingBalance,
+                            amount: balanceToUse,
                             category: acctRow.offbudget === 0 ? payee.category : null,
                             payee: payee.id,
                             date: oldestDate,
@@ -33139,11 +33160,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */title)
+                /* harmony export */ title: () => ( /* binding */title)
                 /* harmony export */ 
             });
             /* harmony import */ var _lower_case__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./lower-case */ "./packages/loot-core/src/server/accounts/title/lower-case.ts");
             /* harmony import */ var _specials__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./specials */ "./packages/loot-core/src/server/accounts/title/specials.ts");
+            // @ts-strict-ignore
             // Utilities
             const character = '[0-9\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376-\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0621-\u064A\u066E-\u066F\u0671-\u06D3\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4-\u07F5\u07FA\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0972\u097B-\u097F\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0-\u0AE1\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B35-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58-\u0C59\u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D3D\u0D60-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32-\u0E33\u0E40-\u0E46\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDD\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8B\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065-\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10D0-\u10FA\u10FC\u1100-\u1159\u115F-\u11A2\u11A8-\u11F9\u1200-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u1676\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19A9\u19C1-\u19C7\u1A00-\u1A16\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE-\u1BAF\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u2094\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2C6F\u2C71-\u2C7D\u2C80-\u2CE4\u2D00-\u2D25\u2D30-\u2D65\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31B7\u31F0-\u31FF\u3400\u4DB5\u4E00\u9FC3\uA000-\uA48C\uA500-\uA60C\uA610-\uA61F\uA62A-\uA62B\uA640-\uA65F\uA662-\uA66E\uA67F-\uA697\uA717-\uA71F\uA722-\uA788\uA78B-\uA78C\uA7FB-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA90A-\uA925\uA930-\uA946\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAC00\uD7A3\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40-\uFB41\uFB43-\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]';
             const regex = new RegExp(`(?:(?:(\\s?(?:^|[.\\(\\)!?;:"-])\\s*)(${character}))|(${character}))(${character}*[’']*${character}*)`, 'g');
@@ -33174,7 +33196,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     if (!forced) {
                         const fullLower = lower + rest;
-                        if (_lower_case__WEBPACK_IMPORTED_MODULE_0__["default"].has(fullLower)) {
+                        if (_lower_case__WEBPACK_IMPORTED_MODULE_0__.lowerCaseSet.has(fullLower)) {
                             return parsedMatch;
                         }
                     }
@@ -33182,7 +33204,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 const customSpecials = options.special || [];
                 const replace = [
-                    ..._specials__WEBPACK_IMPORTED_MODULE_1__["default"],
+                    ..._specials__WEBPACK_IMPORTED_MODULE_1__.specials,
                     ...customSpecials
                 ];
                 const replaceRegExp = convertToRegExp(replace);
@@ -33201,7 +33223,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ lowerCaseSet: () => ( /* binding */lowerCaseSet)
                 /* harmony export */ 
             });
             const conjunctions = [
@@ -33289,12 +33311,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 'within',
                 'without'
             ];
-            const dictionary = new Set([
+            const lowerCaseSet = new Set([
                 ...conjunctions,
                 ...articles,
                 ...prepositions
             ]);
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (dictionary);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/accounts/title/specials.ts": 
@@ -33305,10 +33326,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ specials: () => ( /* binding */specials)
                 /* harmony export */ 
             });
-            const intended = [
+            const specials = [
                 'CLI',
                 'API',
                 'HTTP',
@@ -33329,7 +33350,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 'Next.js',
                 'Node.js'
             ];
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (intended);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/accounts/transaction-rules.ts": 
@@ -33371,6 +33391,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _rules__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./rules */ "./packages/loot-core/src/server/accounts/rules.ts");
             /* harmony import */ var _transactions__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
+            // @ts-strict-ignore
             // TODO: Detect if it looks like the user is creating a rename rule
             // and prompt to create it in the pre phase instead
             // * We could also make the "create rule" button a dropdown that
@@ -34129,6 +34150,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _transaction_rules__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
             /* harmony import */ var _transfer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./transfer */ "./packages/loot-core/src/server/accounts/transfer.ts");
+            // @ts-strict-ignore
             async function idsWithChildren(ids) {
                 const whereIds = (0, _db_util__WEBPACK_IMPORTED_MODULE_2__.whereIn)(ids, 'parent_id');
                 const rows = await _db__WEBPACK_IMPORTED_MODULE_1__.all(`SELECT id FROM v_transactions_internal WHERE ${whereIds}`);
@@ -34268,6 +34290,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            // @ts-strict-ignore
             async function getPayee(acct) {
                 return _db__WEBPACK_IMPORTED_MODULE_0__.first('SELECT * FROM payees WHERE transfer_acct = ?', [
                     acct
@@ -34455,6 +34478,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./models */ "./packages/loot-core/src/server/models.ts");
+            // @ts-strict-ignore
             const accountModel = {
                 ..._models__WEBPACK_IMPORTED_MODULE_0__.accountModel,
                 toExternal(account) {
@@ -34555,7 +34579,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */installAPI)
+                /* harmony export */ installAPI: () => ( /* binding */installAPI)
                 /* harmony export */ 
             });
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/crdt */ "./packages/crdt/index.ts");
@@ -34570,26 +34594,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.ts");
             /* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.ts");
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.ts");
-            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.ts");
-            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
-            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./errors */ "./packages/loot-core/src/server/errors.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
+            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            // @ts-strict-ignore
             let IMPORT_MODE = false;
-            // This is duplicate from main.js...
-            function APIError(msg, meta) {
-                return {
-                    type: 'APIError',
-                    message: msg,
-                    meta
-                };
-            }
             // The API is different in two ways: we never want undo enabled, and
             // we also need to notify the UI manually if stuff has changed (if
             // they are connecting to an already running instance, the UI should
             // update). The wrapper handles that.
             function withMutation(handler) {
                 return (args) => {
-                    return (0, _mutators__WEBPACK_IMPORTED_MODULE_12__.runMutator)(async () => {
+                    return (0, _mutators__WEBPACK_IMPORTED_MODULE_13__.runMutator)(async () => {
                         const latestTimestamp = (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.toString();
                         const result = await handler(args);
                         const rows = await _db__WEBPACK_IMPORTED_MODULE_11__.all('SELECT DISTINCT dataset FROM messages_crdt WHERE timestamp > ?', [
@@ -34611,39 +34629,39 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             let handlers = {};
             async function validateMonth(month) {
                 if (!month.match(/^\d{4}-\d{2}$/)) {
-                    throw APIError('Invalid month format, use YYYY-MM: ' + month);
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)('Invalid month format, use YYYY-MM: ' + month);
                 }
                 if (!IMPORT_MODE) {
                     const { start, end } = await handlers['get-budget-bounds']();
                     const range = _shared_months__WEBPACK_IMPORTED_MODULE_3__.range(start, end);
                     if (!range.includes(month)) {
-                        throw APIError('No budget exists for month: ' + month);
+                        throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)('No budget exists for month: ' + month);
                     }
                 }
             }
             async function validateExpenseCategory(debug, id) {
                 if (id == null) {
-                    throw APIError(`${debug}: category id is required`);
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)(`${debug}: category id is required`);
                 }
                 const row = await _db__WEBPACK_IMPORTED_MODULE_11__.first('SELECT is_income FROM categories WHERE id = ?', [
                     id
                 ]);
                 if (!row) {
-                    throw APIError(`${debug}: category “${id}” does not exist`);
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)(`${debug}: category “${id}” does not exist`);
                 }
                 if (row.is_income !== 0) {
-                    throw APIError(`${debug}: category “${id}” is not an expense category`);
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)(`${debug}: category “${id}” is not an expense category`);
                 }
             }
             function checkFileOpen() {
-                if (!(_prefs__WEBPACK_IMPORTED_MODULE_13__.getPrefs() || {}).id) {
-                    throw APIError('No budget file is open');
+                if (!(_prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs() || {}).id) {
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)('No budget file is open');
                 }
             }
             let batchPromise = null;
             handlers['api/batch-budget-start'] = async function () {
                 if (batchPromise) {
-                    throw APIError('Cannot start a batch process: batch already started');
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)('Cannot start a batch process: batch already started');
                 }
                 // If we are importing, all we need to do is start a raw database
                 // transaction. Updating spreadsheet cells doesn't go through the
@@ -34659,7 +34677,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 else {
-                    (0, _sync__WEBPACK_IMPORTED_MODULE_15__.batchMessages)(() => {
+                    (0, _sync__WEBPACK_IMPORTED_MODULE_16__.batchMessages)(() => {
                         return new Promise((resolve, reject) => {
                             batchPromise = {
                                 resolve,
@@ -34671,13 +34689,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             handlers['api/batch-budget-end'] = async function () {
                 if (!batchPromise) {
-                    throw APIError('Cannot end a batch process: no batch started');
+                    throw (0, _errors__WEBPACK_IMPORTED_MODULE_12__.APIError)('Cannot end a batch process: no batch started');
                 }
                 batchPromise.resolve();
                 batchPromise = null;
             };
             handlers['api/load-budget'] = async function ({ id }) {
-                const { id: currentId } = _prefs__WEBPACK_IMPORTED_MODULE_13__.getPrefs() || {};
+                const { id: currentId } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs() || {};
                 if (currentId !== id) {
                     _platform_server_connection__WEBPACK_IMPORTED_MODULE_1__.send('start-load');
                     const { error } = await handlers['load-budget']({
@@ -34693,7 +34711,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             };
             handlers['api/download-budget'] = async function ({ syncId, password }) {
-                const { id: currentId } = _prefs__WEBPACK_IMPORTED_MODULE_13__.getPrefs() || {};
+                const { id: currentId } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs() || {};
                 if (currentId) {
                     await handlers['close-budget']();
                 }
@@ -34741,7 +34759,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             };
             handlers['api/sync'] = async function () {
-                const { id } = _prefs__WEBPACK_IMPORTED_MODULE_13__.getPrefs();
+                const { id } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs();
                 const result = await handlers['sync-budget']();
                 if (result.error) {
                     throw new Error((0, _shared_errors__WEBPACK_IMPORTED_MODULE_2__.getSyncError)(result.error, id));
@@ -34759,31 +34777,31 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 await _db__WEBPACK_IMPORTED_MODULE_11__.runQuery('DELETE FROM categories WHERE is_income = 0');
                 await _db__WEBPACK_IMPORTED_MODULE_11__.runQuery('DELETE FROM category_groups WHERE is_income = 0');
                 // Turn syncing off
-                (0, _sync__WEBPACK_IMPORTED_MODULE_15__.setSyncingMode)('import');
+                (0, _sync__WEBPACK_IMPORTED_MODULE_16__.setSyncingMode)('import');
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_1__.send('start-import');
                 IMPORT_MODE = true;
             };
             handlers['api/finish-import'] = async function () {
                 checkFileOpen();
-                _sheet__WEBPACK_IMPORTED_MODULE_14__.get().markCacheDirty();
+                _sheet__WEBPACK_IMPORTED_MODULE_15__.get().markCacheDirty();
                 // We always need to fully reload the app. Importing doesn't touch
                 // the spreadsheet, but we can't just recreate the spreadsheet
                 // either; there is other internal state that isn't created
-                const { id } = _prefs__WEBPACK_IMPORTED_MODULE_13__.getPrefs();
+                const { id } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs();
                 await handlers['close-budget']();
                 await handlers['load-budget']({
                     id
                 });
                 await handlers['get-budget-bounds']();
-                await _sheet__WEBPACK_IMPORTED_MODULE_14__.waitOnSpreadsheet();
-                await _cloud_storage__WEBPACK_IMPORTED_MODULE_10__.upload().catch((err) => { });
+                await _sheet__WEBPACK_IMPORTED_MODULE_15__.waitOnSpreadsheet();
+                await _cloud_storage__WEBPACK_IMPORTED_MODULE_10__.upload().catch(() => { });
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_1__.send('finish-import');
                 IMPORT_MODE = false;
             };
             handlers['api/abort-import'] = async function () {
                 if (IMPORT_MODE) {
                     checkFileOpen();
-                    const { id } = _prefs__WEBPACK_IMPORTED_MODULE_13__.getPrefs();
+                    const { id } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs();
                     await handlers['close-budget']();
                     await handlers['delete-budget']({
                         id
@@ -34807,7 +34825,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const groups = await _db__WEBPACK_IMPORTED_MODULE_11__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_3__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_14__.get().getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_15__.get().getCellValue(sheetName, name);
                     return v === '' ? 0 : v;
                 }
                 // This is duplicated from main.js because the return format is
@@ -34893,7 +34911,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             handlers['api/transactions-get'] = async function ({ accountId, startDate, endDate }) {
                 checkFileOpen();
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_9__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('transactions').filter({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_9__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('transactions').filter({
                     $and: [
                         accountId && {
                             account: accountId
@@ -34914,12 +34932,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }));
                 return data;
             };
-            handlers['api/transactions-filter'] = async function ({ text, accountId }) {
-                throw new Error('`filterTransactions` is deprecated, use `runQuery` instead');
-            };
             handlers['api/transaction-update'] = withMutation(async function ({ id, fields }) {
                 checkFileOpen();
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_9__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('transactions').filter({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_9__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('transactions').filter({
                     id
                 }).select('*').options({
                     splits: 'grouped'
@@ -34936,7 +34951,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             handlers['api/transaction-delete'] = withMutation(async function ({ id }) {
                 checkFileOpen();
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_9__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('transactions').filter({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_9__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('transactions').filter({
                     id
                 }).select('*').options({
                     splits: 'grouped'
@@ -35092,6 +35107,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var mitt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! mitt */ "./node_modules/mitt/dist/mitt.mjs");
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
+            // @ts-strict-ignore
             // This is a simple helper abstraction for defining methods exposed to
             // the client. It doesn't do much, but checks for naming conflicts and
             // makes it cleaner to combine methods. We call a group of related
@@ -35162,6 +35178,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ quoteAlias: () => ( /* binding */quoteAlias)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             let _uid = 0;
             function resetUid() {
                 _uid = 0;
@@ -36143,7 +36160,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             function compileQuery(queryState, schema, schemaConfig = {}) {
                 const { withDead, validateRefs = true, tableOptions, rawMode } = queryState;
-                const { tableViews = {}, tableFilters = (name) => [], customizeQuery = (queryState) => queryState } = schemaConfig;
+                const { tableViews = {}, tableFilters = () => [], customizeQuery = (queryState) => queryState } = schemaConfig;
                 const internalTableFilters = (name) => {
                     const filters = tableFilters(name);
                     // These filters cannot join tables and must be simple strings
@@ -36273,6 +36290,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _compiler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./compiler */ "./packages/loot-core/src/server/aql/compiler.ts");
             /* harmony import */ var _schema_helpers__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./schema-helpers */ "./packages/loot-core/src/server/aql/schema-helpers.ts");
+            // @ts-strict-ignore
             // TODO (compiler):
             // * Properly safeguard all inputs against SQL injection
             // * Functions for incr/decr dates
@@ -36382,6 +36400,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
+            // @ts-strict-ignore
             function isRequired(name, fieldDesc) {
                 return fieldDesc.required || name === 'id';
             }
@@ -36567,6 +36586,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _compiler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../compiler */ "./packages/loot-core/src/server/aql/compiler.ts");
             /* harmony import */ var _exec__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../exec */ "./packages/loot-core/src/server/aql/exec.ts");
             /* harmony import */ var _schema_helpers__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../schema-helpers */ "./packages/loot-core/src/server/aql/schema-helpers.ts");
+            // @ts-strict-ignore
             // Transactions executor
             function toGroup(parents, children, mapper = (x) => x) {
                 return parents.reduce((list, parent) => {
@@ -36757,6 +36777,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ schemaConfig: () => ( /* binding */schemaConfig)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             function f(type, opts) {
                 return {
                     type,
@@ -36849,7 +36870,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     offbudget: f('boolean'),
                     closed: f('boolean'),
                     sort_order: f('float'),
-                    tombstone: f('boolean')
+                    tombstone: f('boolean'),
+                    account_sync_source: f('string')
                 },
                 categories: {
                     id: f('id'),
@@ -36914,6 +36936,46 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     conditions: f('json'),
                     tombstone: f('boolean')
                 },
+                custom_reports: {
+                    id: f('id'),
+                    name: f('string'),
+                    start_date: f('string', {
+                        default: '2023-06'
+                    }),
+                    end_date: f('string', {
+                        default: '2023-09'
+                    }),
+                    mode: f('string', {
+                        default: 'total'
+                    }),
+                    group_by: f('string', {
+                        default: 'Category'
+                    }),
+                    balance_type: f('string', {
+                        default: 'Expense'
+                    }),
+                    interval: f('string', {
+                        default: 'Monthly'
+                    }),
+                    show_empty: f('integer', {
+                        default: 0
+                    }),
+                    show_offbudgethidden: f('integer', {
+                        default: 0
+                    }),
+                    show_uncategorized: f('integer', {
+                        default: 0
+                    }),
+                    selected_categories: f('json'),
+                    graph_type: f('string', {
+                        default: 'BarGraph'
+                    }),
+                    conditions: f('json'),
+                    conditions_op: f('string'),
+                    metadata: f('json'),
+                    color_scheme: f('json'),
+                    tombstone: f('boolean')
+                },
                 reflect_budgets: {
                     id: f('id'),
                     month: f('integer'),
@@ -37150,6 +37212,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _exec__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../exec */ "./packages/loot-core/src/server/aql/exec.ts");
             /* harmony import */ var _executors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./executors */ "./packages/loot-core/src/server/aql/schema/executors.ts");
             /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./index */ "./packages/loot-core/src/server/aql/schema/index.ts");
+            // @ts-strict-ignore
             function runCompiledQuery(query, sqlPieces, state, params) {
                 return (0, _exec__WEBPACK_IMPORTED_MODULE_1__.runCompiledQuery)(query, sqlPieces, state, {
                     params,
@@ -37179,6 +37242,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _compiler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./compiler */ "./packages/loot-core/src/server/aql/compiler.ts");
+            // @ts-strict-ignore
             function selectFields(fields) {
                 return Object.keys(fields).map((as) => {
                     let field = fields[as];
@@ -37261,6 +37325,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.ts");
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
+            // @ts-strict-ignore
             // A special backup that represents the latest version of the db that
             // can be reverted to after loading a backup
             const LATEST_BACKUP_FILENAME = 'db.latest.sqlite';
@@ -37458,13 +37523,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
             /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../sheet */ "./packages/loot-core/src/server/sheet.ts");
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
+            // @ts-strict-ignore
             async function getSheetValue(sheetName, cell) {
                 const node = await _sheet__WEBPACK_IMPORTED_MODULE_4__.getCell(sheetName, cell);
                 return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)(typeof node.value === 'number' ? node.value : 0);
             }
             // We want to only allow the positive movement of money back and
             // forth. buffered should never be allowed to go into the negative,
-            // and you shouldn't be allowed to pull non-existant money from
+            // and you shouldn't be allowed to pull non-existent money from
             // leftover.
             function calcBufferedAmount(toBudget, buffered, amount) {
                 amount = Math.min(Math.max(amount, -buffered), Math.max(toBudget, 0));
@@ -37542,7 +37608,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 return _db__WEBPACK_IMPORTED_MODULE_2__.insert(table, {
-                    id: month,
+                    id: `${dbMonth(month)}-${category}`,
+                    month: dbMonth(month),
+                    category,
                     goal
                 });
             }
@@ -37750,7 +37818,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
             /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
@@ -37777,7 +37845,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('budget/transfer-available', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.transferAvailable)));
             app.method('budget/transfer-category', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.transferCategory)));
             app.method('budget/set-carryover', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.setCategoryCarryover)));
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/budget/base.ts": 
@@ -37806,6 +37873,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _report__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./report */ "./packages/loot-core/src/server/budget/report.ts");
             /* harmony import */ var _rollover__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./rollover */ "./packages/loot-core/src/server/budget/rollover.ts");
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/server/budget/util.ts");
+            // @ts-strict-ignore
             function getBudgetType() {
                 const meta = _sheet__WEBPACK_IMPORTED_MODULE_3__.get().meta();
                 return meta.budgetType || 'rollover';
@@ -38190,6 +38258,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./actions */ "./packages/loot-core/src/server/budget/actions.ts");
             /* harmony import */ var _cleanup_template_pegjs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./cleanup-template.pegjs */ "./packages/loot-core/src/server/budget/cleanup-template.pegjs");
             /* harmony import */ var _cleanup_template_pegjs__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/ __webpack_require__.n(_cleanup_template_pegjs__WEBPACK_IMPORTED_MODULE_3__);
+            // @ts-strict-ignore
             function cleanupTemplate({ month }) {
                 return processCleanup(month);
             }
@@ -38209,11 +38278,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (template.filter((t) => t.type === 'source').length > 0) {
                             const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `leftover-${category.id}`);
                             const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${category.id}`);
+                            const spent = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `sum-amount-${category.id}`);
                             await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
                                 category: category.id,
                                 month,
                                 amount: budgeted - balance
                             });
+                            await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setGoal)({
+                                category: category.id,
+                                month,
+                                goal: -spent
+                            });
                             num_sources += 1;
                         }
                         if (template.filter((t) => t.type === 'sink').length > 0) {
@@ -38352,6 +38427,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../actions */ "./packages/loot-core/src/server/budget/actions.ts");
+            // @ts-strict-ignore
             async function goalsBy(template_lines, current_month, template, l, remainder, last_month_balance, to_budget, errors) {
                 // by has 'amount' and 'month' params
                 if (!(0, _actions__WEBPACK_IMPORTED_MODULE_2__.isReflectBudget)()) {
@@ -38402,6 +38478,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../actions */ "./packages/loot-core/src/server/budget/actions.ts");
+            // @ts-strict-ignore
             async function goalsPercentage(template, month, available_start, sheetName, to_budget, errors) {
                 const percent = template.percent;
                 let monthlyIncome = 0;
@@ -38455,6 +38532,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ goalsRemainder: () => ( /* binding */goalsRemainder)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             async function goalsRemainder(template, budgetAvailable, remainder_scale, to_budget) {
                 if (remainder_scale >= 0) {
                     to_budget += remainder_scale === 0 ? Math.round(template.weight) : Math.round(remainder_scale * template.weight);
@@ -38513,43 +38591,45 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../actions */ "./packages/loot-core/src/server/budget/actions.ts");
-            async function goalsSchedule(scheduleFlag, template_lines, current_month, balance, remainder, last_month_balance, to_budget, errors, category) {
-                if (!scheduleFlag) {
-                    scheduleFlag = true;
-                    const template = template_lines.filter((t) => t.type === 'schedule');
-                    //in the case of multiple templates per category, schedules may have wrong priority level
-                    let t = [];
-                    let totalScheduledGoal = 0;
-                    for (let ll = 0; ll < template.length; ll++) {
-                        const { id: sid, completed: complete } = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT * FROM schedules WHERE name = ?', [
-                            template[ll].name
-                        ]);
-                        const rule = await (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getRuleForSchedule)(sid);
-                        const conditions = rule.serialize().conditions;
-                        const { date: dateConditions, amount: amountCondition } = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.extractScheduleConds)(conditions);
-                        const sign = category.is_income ? 1 : -1;
-                        const target = amountCondition.op === 'isbetween' ? sign * Math.round(amountCondition.value.num1 + amountCondition.value.num2) / 2 : sign * amountCondition.value;
-                        const next_date_string = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
-                        const target_interval = dateConditions.value.interval ? dateConditions.value.interval : 1;
-                        const target_frequency = dateConditions.value.frequency;
-                        const isRepeating = Object(dateConditions.value) === dateConditions.value && 'frequency' in dateConditions.value;
-                        const num_months = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(next_date_string, current_month);
-                        const startDate = dateConditions.value.start ?? dateConditions.value;
-                        const started = startDate <= _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(current_month, 1);
+            // @ts-strict-ignore
+            async function createScheduleList(template, current_month, category) {
+                const t = [];
+                const errors = [];
+                for (let ll = 0; ll < template.length; ll++) {
+                    const { id: sid, completed: complete } = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT * FROM schedules WHERE name = ? AND tombstone = 0', [
+                        template[ll].name
+                    ]);
+                    const rule = await (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getRuleForSchedule)(sid);
+                    const conditions = rule.serialize().conditions;
+                    const { date: dateConditions, amount: amountCondition } = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.extractScheduleConds)(conditions);
+                    const sign = category.is_income ? 1 : -1;
+                    const target = amountCondition.op === 'isbetween' ? sign * Math.round(amountCondition.value.num1 + amountCondition.value.num2) / 2 : sign * amountCondition.value;
+                    const next_date_string = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
+                    const target_interval = dateConditions.value.interval ? dateConditions.value.interval : 1;
+                    const target_frequency = dateConditions.value.frequency;
+                    const isRepeating = Object(dateConditions.value) === dateConditions.value && 'frequency' in dateConditions.value;
+                    const num_months = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(next_date_string, current_month);
+                    if (num_months < 0) {
+                        //non-repeating schedules could be negative
+                        errors.push(`Schedule ${template[ll].name} is in the Past.`);
+                    }
+                    else {
                         t.push({
-                            template: template[ll],
                             target,
                             next_date_string,
                             target_interval,
                             target_frequency,
                             num_months,
                             completed: complete,
-                            started
+                            //started,
+                            full: template[ll].full === null ? false : template[ll].full,
+                            repeat: isRepeating,
+                            name: template[ll].name
                         });
-                        if (!complete && started) {
+                        if (!complete) {
                             if (isRepeating) {
                                 let monthlyTarget = 0;
-                                const nextMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(current_month, t[ll].num_months + 1);
+                                const nextMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(current_month, t[t.length - 1].num_months + 1);
                                 let nextBaseDate = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month), true);
                                 let nextDate = dateConditions.value.skipWeekend ? _shared_months__WEBPACK_IMPORTED_MODULE_0__.dayFromDate((0, _schedules_app__WEBPACK_IMPORTED_MODULE_3__.getDateWithSkippedWeekend)(_shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(nextBaseDate), dateConditions.value.weekendSolveMode)) : nextBaseDate;
                                 while (nextDate < nextMonth) {
@@ -38563,82 +38643,81 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                         break;
                                     }
                                 }
-                                t[ll].target = -monthlyTarget;
-                                totalScheduledGoal += target;
+                                t[t.length - 1].target = -monthlyTarget;
                             }
                         }
                         else {
-                            errors.push(`Schedule ${t[ll].template.name} is not active during the month in question.`);
+                            errors.push(`Schedule ${t[ll].name} is not active during the month in question.`);
                         }
                     }
-                    t = t.filter((t) => t.completed === 0 && t.started);
-                    t = t.sort((a, b) => b.target - a.target);
-                    let increment = 0;
-                    if (balance >= totalScheduledGoal) {
-                        for (let ll = 0; ll < t.length; ll++) {
-                            if (t[ll].num_months < 0) {
-                                errors.push(`Non-repeating schedule ${t[ll].template.name} was due on ${t[ll].next_date_string}, which is in the past.`);
-                                break;
-                            }
-                            if (t[ll].template.full && t[ll].num_months === 0 || t[ll].target_frequency === 'weekly' || t[ll].target_frequency === 'daily') {
-                                increment += t[ll].target;
-                            }
-                            else if (t[ll].template.full && t[ll].num_months > 0) {
-                                increment += 0;
-                            }
-                            else {
-                                increment += t[ll].target / t[ll].target_interval;
-                            }
-                        }
+                }
+                return {
+                    t: t.filter((c) => c.completed === 0),
+                    errors
+                };
+            }
+            async function getPayMonthOfTotal(t) {
+                //return the contribution amounts of full or every month type schedules
+                let total = 0;
+                const schedules = t.filter((c) => c.num_months === 0);
+                for (let ll = 0; ll < schedules.length; ll++) {
+                    total += schedules[ll].target;
+                }
+                return total;
+            }
+            async function getSinkingContributionTotal(t, remainder, last_month_balance) {
+                //return the contribution amount if there is a balance carried in the category
+                let total = 0;
+                for (let ll = 0; ll < t.length; ll++) {
+                    remainder = ll === 0 ? t[ll].target - last_month_balance : t[ll].target - remainder;
+                    let tg = 0;
+                    if (remainder >= 0) {
+                        tg = remainder;
+                        remainder = 0;
                     }
-                    else if (balance < totalScheduledGoal) {
-                        for (let ll = 0; ll < t.length; ll++) {
-                            if ((0, _actions__WEBPACK_IMPORTED_MODULE_4__.isReflectBudget)()) {
-                                if (!t[ll].template.full) {
-                                    errors.push(`Report budgets require the full option for Schedules.`);
-                                    break;
-                                }
-                                if (t[ll].template.full && t[ll].num_months === 0) {
-                                    to_budget += t[ll].target;
-                                }
-                            }
-                            if (!(0, _actions__WEBPACK_IMPORTED_MODULE_4__.isReflectBudget)()) {
-                                if (t[ll].num_months < 0) {
-                                    errors.push(`Non-repeating schedule ${t[ll].template.name} was due on ${t[ll].next_date_string}, which is in the past.`);
-                                    break;
-                                }
-                                if (t[ll].template.full && t[ll].num_months > 0) {
-                                    remainder = 0;
-                                }
-                                else if (ll === 0 && !t[ll].template.full) {
-                                    remainder = t[ll].target - last_month_balance;
-                                }
-                                else {
-                                    remainder = t[ll].target - remainder;
-                                }
-                                let tg = 0;
-                                if (remainder >= 0) {
-                                    tg = remainder;
-                                    remainder = 0;
-                                }
-                                else {
-                                    tg = 0;
-                                    remainder = Math.abs(remainder);
-                                }
-                                if (t[ll].template.full || t[ll].num_months === 0 || t[ll].target_frequency === 'weekly' || t[ll].target_frequency === 'daily') {
-                                    increment += tg;
-                                }
-                                else if (t[ll].template.full && t[ll].num_months > 0) {
-                                    increment += 0;
-                                }
-                                else {
-                                    increment += tg / (t[ll].num_months + 1);
-                                }
-                            }
-                        }
+                    else {
+                        tg = 0;
+                        remainder = Math.abs(remainder);
+                    }
+                    total += tg / (t[ll].num_months + 1);
+                }
+                return total;
+            }
+            async function getSinkingBaseContributionTotal(t) {
+                //return only the base contribution of each schedule
+                let total = 0;
+                for (let ll = 0; ll < t.length; ll++) {
+                    total += t[ll].target / t[ll].target_interval;
+                }
+                return total;
+            }
+            async function getSinkingTotal(t) {
+                //sum the total of all upcoming schedules
+                let total = 0;
+                for (let ll = 0; ll < t.length; ll++) {
+                    total += t[ll].target;
+                }
+                return total;
+            }
+            async function goalsSchedule(scheduleFlag, template_lines, current_month, balance, remainder, last_month_balance, to_budget, errors, category) {
+                if (!scheduleFlag) {
+                    scheduleFlag = true;
+                    const template = template_lines.filter((t) => t.type === 'schedule');
+                    //in the case of multiple templates per category, schedules may have wrong priority level
+                    const t = await createScheduleList(template, current_month, category);
+                    errors = errors.concat(t.errors);
+                    const t_payMonthOf = t.t.filter((c) => c.full || c.target_frequency === 'monthly' && c.target_interval === 1 && c.num_months === 0 || c.target_frequency === 'weekly' && c.target_interval >= 0 && c.num_months === 0 || c.target_frequency === 'daily' || (0, _actions__WEBPACK_IMPORTED_MODULE_4__.isReflectBudget)());
+                    const t_sinking = t.t.filter((c) => !c.full && c.target_frequency === 'monthly' && c.target_interval > 1 || !c.full && c.target_frequency === 'monthly' && c.num_months > 0 && c.target_interval === 1 || !c.full && c.target_frequency === 'yearly' || !c.full && c.target_frequency === undefined).sort((a, b) => a.next_date_string.localeCompare(b.next_date_string));
+                    const totalPayMonthOf = await getPayMonthOfTotal(t_payMonthOf);
+                    const totalSinking = await getSinkingTotal(t_sinking);
+                    const totalSinkingBaseContribution = await getSinkingBaseContributionTotal(t_sinking);
+                    if (balance >= totalSinking + totalPayMonthOf) {
+                        to_budget += Math.round(totalPayMonthOf + totalSinkingBaseContribution);
+                    }
+                    else {
+                        const totalSinkingContribution = await getSinkingContributionTotal(t_sinking, remainder, last_month_balance);
+                        to_budget += Math.round(totalPayMonthOf + totalSinkingContribution);
                     }
-                    increment = Math.round(increment);
-                    to_budget += increment;
                 }
                 return {
                     to_budget,
@@ -38661,6 +38740,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            // @ts-strict-ignore
             async function goalsSimple(template, limitCheck, errors, limit, hold, to_budget) {
                 // simple has 'monthly' and/or 'limit' params
                 if (template.limit != null) {
@@ -38713,6 +38793,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../actions */ "./packages/loot-core/src/server/budget/actions.ts");
+            // @ts-strict-ignore
             async function goalsSpend(template, last_month_balance, current_month, to_budget, errors, category) {
                 // spend has 'amount' and 'from' and 'month' params
                 const from_month = `${template.from}-01`;
@@ -38769,6 +38850,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            // @ts-strict-ignore
             async function goalsWeek(template, limit, limitCheck, hold, current_month, to_budget, errors) {
                 // week has 'amount', 'starting', 'weeks' and optional 'limit' params
                 const amount = (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.amountToInteger)(template.amount);
@@ -38836,6 +38918,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _goals_goalsSimple__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./goals/goalsSimple */ "./packages/loot-core/src/server/budget/goals/goalsSimple.ts");
             /* harmony import */ var _goals_goalsSpend__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./goals/goalsSpend */ "./packages/loot-core/src/server/budget/goals/goalsSpend.ts");
             /* harmony import */ var _goals_goalsWeek__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./goals/goalsWeek */ "./packages/loot-core/src/server/budget/goals/goalsWeek.ts");
+            // @ts-strict-ignore
             async function applyTemplate({ month }) {
                 await storeTemplates();
                 const category_templates = await getTemplates(null);
@@ -39379,6 +39462,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../sheet */ "./packages/loot-core/src/server/sheet.ts");
             /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/server/budget/util.ts");
+            // @ts-strict-ignore
             async function createCategory(cat, sheetName, prevSheetName) {
                 _sheet__WEBPACK_IMPORTED_MODULE_1__.get().createStatic(sheetName, `budget-${cat.id}`, 0);
                 // This makes the app more robust by "fixing up" null budget values.
@@ -39497,6 +39581,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../sheet */ "./packages/loot-core/src/server/sheet.ts");
             /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/server/budget/util.ts");
+            // @ts-strict-ignore
             function getBlankSheet(months) {
                 const blankMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(months[0]);
                 return _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(blankMonth);
@@ -39658,6 +39743,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _spreadsheet_globals__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../spreadsheet/globals */ "./packages/loot-core/src/server/spreadsheet/globals.ts");
+            // @ts-strict-ignore
             function sumAmounts(...amounts) {
                 return (0, _shared_util__WEBPACK_IMPORTED_MODULE_0__.safeNumber)(amounts.reduce((total, amount) => {
                     return total + (0, _spreadsheet_globals__WEBPACK_IMPORTED_MODULE_1__.number)(amount);
@@ -39711,6 +39797,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./post */ "./packages/loot-core/src/server/post.ts");
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
             /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
+            // @ts-strict-ignore
             const UPLOAD_FREQUENCY_IN_DAYS = 7;
             async function checkHTTPStatus(res) {
                 if (res.status !== 200) {
@@ -39977,7 +40064,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return;
                 }
                 // Don't block on uploading
-                upload().catch((err) => { });
+                upload().catch(() => { });
             }
             async function removeFile(fileId) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_1__.getItem('user-token');
@@ -40105,7 +40192,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ getPayees: () => ( /* binding */getPayees),
                 /* harmony export */ getTransaction: () => ( /* binding */getTransaction),
                 /* harmony export */ getTransactions: () => ( /* binding */getTransactions),
-                /* harmony export */ getTransactionsByDate: () => ( /* binding */getTransactionsByDate),
                 /* harmony export */ insert: () => ( /* binding */insert),
                 /* harmony export */ insertAccount: () => ( /* binding */insertAccount),
                 /* harmony export */ insertCategory: () => ( /* binding */insertCategory),
@@ -40150,6 +40236,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _sort__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./sort */ "./packages/loot-core/src/server/db/sort.ts");
+            // @ts-strict-ignore
             let dbPath;
             let db;
             // Util
@@ -40532,7 +40619,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             async function mergePayees(target, ids) {
                 // Load in payees so we can check some stuff
-                const payees = (0, _shared_util__WEBPACK_IMPORTED_MODULE_4__.groupById)(await all('SELECT * FROM payees'));
+                const dbPayees = await all('SELECT * FROM payees');
+                const payees = (0, _shared_util__WEBPACK_IMPORTED_MODULE_4__.groupById)(dbPayees);
                 // Filter out any transfer payees
                 if (payees[target].transfer_acct != null) {
                     return;
@@ -40644,9 +40732,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
                 return rows[0];
             }
-            async function getTransactionsByDate(accountId, startDate, endDate, options = {}) {
-                throw new Error('`getTransactionsByDate` is deprecated');
-            }
             async function getTransactions(accountId) {
                 if (arguments.length > 1) {
                     throw new Error('`getTransactions` was given a second argument, it now only takes a single argument `accountId`');
@@ -40681,6 +40766,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _sync_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../sync/index */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index */ "./packages/loot-core/src/server/db/index.ts");
+            // @ts-strict-ignore
             // This file keeps all the mappings in memory so we can access it
             // synchronously. This is primarily used in the rules system, but
             // there may be other uses in the future. You don't need to worry
@@ -40817,6 +40903,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ whereIn: () => ( /* binding */whereIn)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             async function incrFetch(runQuery, terms, compare, makeQuery, params = []) {
                 const pageCount = 500;
                 let results = [];
@@ -40864,6 +40951,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! crypto */ "crypto");
             /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_0__);
+            // @ts-strict-ignore
             const ENCRYPTION_ALGORITHM = 'aes-256-gcm';
             async function sha256String(str) {
                 return crypto__WEBPACK_IMPORTED_MODULE_0___default().createHash('sha256').update(str).digest('base64');
@@ -40952,6 +41040,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _encryption_internals__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./encryption-internals */ "./packages/loot-core/src/server/encryption-internals.ts");
+            // @ts-strict-ignore
             // A map of all possible master encryption keys to use, keyed by
             // unique id
             let keys = {};
@@ -41079,11 +41168,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     this.type = name;
                 }
             }
-            function APIError(msg, meta) {
+            function APIError(msg) {
                 return {
                     type: 'APIError',
-                    message: msg,
-                    meta
+                    message: msg
                 };
             }
             function FileDownloadError(reason, meta) {
@@ -41110,7 +41198,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
@@ -41120,6 +41208,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
             /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
             /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
+            // @ts-strict-ignore
             const filterModel = {
                 validate(filter, { update } = {}) {
                     (0, _models__WEBPACK_IMPORTED_MODULE_3__.requiredFields)('transaction_filters', filter, [
@@ -41253,7 +41342,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('filter-create', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(createFilter));
             app.method('filter-update', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(updateFilter));
             app.method('filter-delete', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(deleteFilter)));
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/importers/actual.ts": 
@@ -41264,7 +41352,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */importActual)
+                /* harmony export */ importActual: () => ( /* binding */importActual)
                 /* harmony export */ 
             });
             /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
@@ -41272,6 +41360,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../cloud-storage */ "./packages/loot-core/src/server/cloud-storage.ts");
             /* harmony import */ var _main__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../main */ "./packages/loot-core/src/server/main.ts");
             /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../sheet */ "./packages/loot-core/src/server/sheet.ts");
+            // @ts-strict-ignore
             async function importActual(_filepath, buffer) {
                 // Importing Actual files is a special case because we can directly
                 // write down the files, but because it doesn't go through the API
@@ -41307,7 +41396,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 await _main__WEBPACK_IMPORTED_MODULE_3__.handlers['get-budget-bounds']();
                 await (0, _sheet__WEBPACK_IMPORTED_MODULE_4__.waitOnSpreadsheet)();
-                await _cloud_storage__WEBPACK_IMPORTED_MODULE_2__.upload().catch((err) => { });
+                await _cloud_storage__WEBPACK_IMPORTED_MODULE_2__.upload().catch(() => { });
             }
             /***/ 
         }),
@@ -41326,13 +41415,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _actual__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./actual */ "./packages/loot-core/src/server/importers/actual.ts");
             /* harmony import */ var _ynab4__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./ynab4 */ "./packages/loot-core/src/server/importers/ynab4.ts");
             /* harmony import */ var _ynab5__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ynab5 */ "./packages/loot-core/src/server/importers/ynab5.ts");
+            // @ts-strict-ignore
             const importers = {
                 ynab4: _ynab4__WEBPACK_IMPORTED_MODULE_2__,
                 ynab5: _ynab5__WEBPACK_IMPORTED_MODULE_3__
             };
             async function handleBudgetImport(type, filepath, buffer) {
                 if (type === 'actual') {
-                    return (0, _actual__WEBPACK_IMPORTED_MODULE_1__["default"])(filepath, buffer);
+                    return (0, _actual__WEBPACK_IMPORTED_MODULE_1__.importActual)(filepath, buffer);
                 }
                 const importer = importers[type];
                 try {
@@ -41388,7 +41478,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/api/injected */ "./packages/api/injected.js");
-            /* harmony import */ var _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @actual-app/api/methods */ "./packages/api/methods.js");
+            /* harmony import */ var _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @actual-app/api/methods */ "./packages/api/methods.ts");
             /* harmony import */ var _actual_app_api_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @actual-app/api/utils */ "./packages/api/utils.js");
             /* harmony import */ var adm_zip__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! adm-zip */ "./node_modules/adm-zip/adm-zip.js");
             /* harmony import */ var adm_zip__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/ __webpack_require__.n(adm_zip__WEBPACK_IMPORTED_MODULE_3__);
@@ -41397,6 +41487,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            // @ts-strict-ignore
             // This is a special usage of the API because this package is embedded
             // into Actual itself. We only want to pull in the methods in that
             // case and ignore everything else; otherwise we'd be pulling in the
@@ -41533,7 +41624,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             notes: transaction.memo || null,
                             cleared: transaction.cleared === 'Cleared',
                             ...transferProperties(transaction),
-                            subtransactions: transaction.subTransactions && transaction.subTransactions.map((t, i) => {
+                            subtransactions: transaction.subTransactions && transaction.subTransactions.map((t) => {
                                 return {
                                     id: entityIdMap.get(t.entityId),
                                     amount: (0, _actual_app_api_utils__WEBPACK_IMPORTED_MODULE_2__.amountToInteger)(t.amount),
@@ -41643,7 +41734,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 await importBudgets(data, entityIdMap);
                 console.log('Setting up...');
             }
-            function getBudgetName(filepath, _data) {
+            function getBudgetName(filepath) {
                 let unixFilepath = slash__WEBPACK_IMPORTED_MODULE_4___default()(filepath);
                 if (!/\.zip/.test(unixFilepath)) {
                     return null;
@@ -41717,10 +41808,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ parseFile: () => ( /* binding */parseFile)
                 /* harmony export */ 
             });
-            /* harmony import */ var _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/api/methods */ "./packages/api/methods.js");
+            /* harmony import */ var _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/api/methods */ "./packages/api/methods.ts");
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            // @ts-strict-ignore
             // This is a special usage of the API because this package is embedded
             // into Actual itself. We only want to pull in the methods in that
             // case and ignore everything else; otherwise we'd be pulling in the
@@ -41746,21 +41838,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Hidden categories are put in its own group by YNAB,
                 // so it's already handled.
                 const categories = await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.getCategories();
-                const incomeCatId = categories.find((cat) => cat.name === 'Income').id;
+                const incomeCatId = findIdByName(categories, 'Income');
                 const ynabIncomeCategories = [
                     'To be Budgeted',
                     'Inflow: Ready to Assign'
                 ];
                 function checkSpecialCat(cat) {
-                    if (cat.category_group_id === data.category_groups.find((group) => group.name === 'Internal Master Category').id) {
-                        if (ynabIncomeCategories.includes(cat.name)) {
+                    if (cat.category_group_id === findIdByName(data.category_groups, 'Internal Master Category')) {
+                        if (ynabIncomeCategories.some((ynabIncomeCategory) => equalsIgnoreCase(cat.name, ynabIncomeCategory))) {
                             return 'income';
                         }
                         else {
                             return 'internal';
                         }
                     }
-                    else if (cat.category_group_id === data.category_groups.find((group) => group.name === 'Credit Card Payments').id) {
+                    else if (cat.category_group_id === findIdByName(data.category_groups, 'Credit Card Payments')) {
                         return 'creditCard';
                     }
                 }
@@ -41770,7 +41862,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (!group.deleted) {
                         let groupId;
                         // Ignores internal category and credit cards
-                        if (group.name !== 'Internal Master Category' && group.name !== 'Credit Card Payments') {
+                        if (!equalsIgnoreCase(group.name, 'Internal Master Category') && !equalsIgnoreCase(group.name, 'Credit Card Payments')) {
                             groupId = await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.createCategoryGroup({
                                 name: group.name,
                                 is_income: false
@@ -41821,9 +41913,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             async function importTransactions(data, entityIdMap) {
                 const payees = await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.getPayees();
                 const categories = await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.getCategories();
-                const incomeCatId = categories.find((cat) => cat.name === 'Income').id;
-                const startingBalanceCatId = categories.find((cat) => cat.name === 'Starting Balances').id; //better way to do it?
-                const startingPayeeYNAB = data.payees.find((payee) => payee.name === 'Starting Balance').id;
+                const incomeCatId = findIdByName(categories, 'Income');
+                const startingBalanceCatId = findIdByName(categories, 'Starting Balances'); //better way to do it?
+                const startingPayeeYNAB = findIdByName(data.payees, 'Starting Balance');
                 const transactionsGrouped = (0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.groupBy)(data.transactions, 'account_id');
                 const subtransactionsGrouped = (0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.groupBy)(data.subtransactions, 'transaction_id');
                 const payeesByTransferAcct = payees.filter((payee) => payee?.transfer_acct).map((payee) => [
@@ -41908,8 +42000,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Also, there could be a way to set rollover using
                 // Deferred Income Subcat and Immediate Income Subcat
                 const budgets = (0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.sortByKey)(data.months, 'month');
-                const internalCatIdYnab = data.category_groups.find((group) => group.name === 'Internal Master Category').id;
-                const creditcardCatIdYnab = data.category_groups.find((group) => group.name === 'Credit Card Payments').id;
+                const internalCatIdYnab = findIdByName(data.category_groups, 'Internal Master Category');
+                const creditcardCatIdYnab = findIdByName(data.category_groups, 'Credit Card Payments');
                 await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.batchBudgetUpdates(async () => {
                     for (const budget of budgets) {
                         const month = _shared_months__WEBPACK_IMPORTED_MODULE_1__.monthFromDate(budget.month);
@@ -41952,6 +42044,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function getBudgetName(_filepath, data) {
                 return data.budget_name || data.name;
             }
+            function equalsIgnoreCase(stringa, stringb) {
+                return stringa.localeCompare(stringb, undefined, {
+                    sensitivity: 'base'
+                }) === 0;
+            }
+            function findByNameIgnoreCase(categories, name) {
+                return categories.find((cat) => equalsIgnoreCase(cat.name, name));
+            }
+            function findIdByName(categories, name) {
+                return findByNameIgnoreCase(categories, name)?.id;
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/main-app.ts": 
@@ -41962,7 +42065,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
             /* harmony import */ var _platform_server_connection__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../platform/server/connection */ "./packages/loot-core/src/platform/server/connection/index.api.ts");
@@ -41972,7 +42075,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.events.on('sync', (info) => {
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_0__.send('sync-event', info);
             });
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/main.ts": 
@@ -41993,7 +42095,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _polyfills__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(_polyfills__WEBPACK_IMPORTED_MODULE_0__);
             /* harmony import */ var _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @actual-app/api/injected */ "./packages/api/injected.js");
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @actual-app/crdt */ "./packages/crdt/index.ts");
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _mocks_budget__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../mocks/budget */ "./packages/loot-core/src/mocks/budget.ts");
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
             /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
@@ -42030,23 +42132,25 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _platform__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ./platform */ "./packages/loot-core/src/server/platform.ts");
             /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ./post */ "./packages/loot-core/src/server/post.ts");
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _rules_app__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./rules/app */ "./packages/loot-core/src/server/rules/app.ts");
-            /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
-            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
-            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
-            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
-            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
-            /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.ts");
-            /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.ts");
-            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.ts");
-            /* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.ts");
-            /* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.ts");
+            /* harmony import */ var _reports_app__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./reports/app */ "./packages/loot-core/src/server/reports/app.ts");
+            /* harmony import */ var _rules_app__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./rules/app */ "./packages/loot-core/src/server/rules/app.ts");
+            /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
+            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
+            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
+            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.ts");
+            /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.ts");
+            /* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.ts");
+            /* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.ts");
+            // @ts-strict-ignore
             const DEMO_BUDGET_ID = '_demo-budget';
             const TEST_BUDGET_ID = '_test-budget';
             // util
             function onSheetChange({ names }) {
                 const nodes = names.map((name) => {
-                    const node = _sheet__WEBPACK_IMPORTED_MODULE_42__.get()._getNode(name);
+                    const node = _sheet__WEBPACK_IMPORTED_MODULE_43__.get()._getNode(name);
                     return {
                         name: node.name,
                         value: node.value
@@ -42059,13 +42163,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             // is /currently/ empty but we promise to fill it in later
             let handlers = {};
             handlers['undo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function () {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.undo)();
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.undo)();
             });
             handlers['redo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(function () {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.redo)();
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.redo)();
             });
             handlers['transactions-batch-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ added, deleted, updated, learnCategories }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     const result = await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_20__.batchUpdateTransactions)({
                         added,
                         updated,
@@ -42116,7 +42220,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['get-earliest-transaction'] = async function () {
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_12__["default"])('transactions').options({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_12__.q)('transactions').options({
                     splits: 'none'
                 }).orderBy({
                     date: 'asc'
@@ -42130,10 +42234,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const groups = await _db__WEBPACK_IMPORTED_MODULE_27__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_11__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_42__.getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_43__.getCellValue(sheetName, name);
                     return {
                         value: v === '' ? 0 : v,
-                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_43__.resolveName)(sheetName, name)
+                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_44__.resolveName)(sheetName, name)
                     };
                 }
                 let values = [
@@ -42176,10 +42280,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const groups = await _db__WEBPACK_IMPORTED_MODULE_27__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_11__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_42__.getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_43__.getCellValue(sheetName, name);
                     return {
                         value: v === '' ? 0 : v,
-                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_43__.resolveName)(sheetName, name)
+                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_44__.resolveName)(sheetName, name)
                     };
                 }
                 let values = [
@@ -42224,7 +42328,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             };
             handlers['category-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ name, groupId, isIncome, hidden }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     if (!groupId) {
                         throw (0, _errors__WEBPACK_IMPORTED_MODULE_30__.APIError)('Creating a category: groupId is required');
                     }
@@ -42237,7 +42341,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function (category) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     try {
                         await _db__WEBPACK_IMPORTED_MODULE_27__.updateCategory(category);
                     }
@@ -42255,17 +42359,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, groupId, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.batchMessages)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.batchMessages)(async () => {
                         await _db__WEBPACK_IMPORTED_MODULE_27__.moveCategory(id, groupId, targetId);
                     });
                     return 'ok';
                 });
             });
             handlers['category-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, transferId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     let result = {};
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.batchMessages)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.batchMessages)(async () => {
                         const row = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT is_income FROM categories WHERE id = ?', [
                             id
                         ]);
@@ -42307,7 +42411,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-group-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ name, isIncome }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_27__.insertCategoryGroup({
                         name,
                         is_income: isIncome ? 1 : 0
@@ -42315,24 +42419,24 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-group-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function (group) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_27__.updateCategoryGroup(group);
                 });
             });
             handlers['category-group-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.batchMessages)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.batchMessages)(async () => {
                         await _db__WEBPACK_IMPORTED_MODULE_27__.moveCategoryGroup(id, targetId);
                     });
                     return 'ok';
                 });
             });
             handlers['category-group-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, transferId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     const groupCategories = await _db__WEBPACK_IMPORTED_MODULE_27__.all('SELECT id FROM categories WHERE cat_group = ? AND tombstone = 0', [
                         id
                     ]);
-                    return (0, _sync__WEBPACK_IMPORTED_MODULE_44__.batchMessages)(async () => {
+                    return (0, _sync__WEBPACK_IMPORTED_MODULE_45__.batchMessages)(async () => {
                         if (transferId) {
                             await _budget_base__WEBPACK_IMPORTED_MODULE_25__.doTransfer(groupCategories.map((c) => c.id), transferId);
                         }
@@ -42356,15 +42460,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // If there are any non-zero budget values, also force the user to
                 // transfer the category.
                 return [
-                    ..._sheet__WEBPACK_IMPORTED_MODULE_42__.get().meta().createdMonths
+                    ..._sheet__WEBPACK_IMPORTED_MODULE_43__.get().meta().createdMonths
                 ].some((month) => {
                     const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_11__.sheetForMonth(month);
-                    const value = _sheet__WEBPACK_IMPORTED_MODULE_42__.get().getCellValue(sheetName, 'budget-' + id);
+                    const value = _sheet__WEBPACK_IMPORTED_MODULE_43__.get().getCellValue(sheetName, 'budget-' + id);
                     return value != null && value !== 0;
                 });
             };
             handlers['payee-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ name }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_27__.insertPayee({
                         name
                     });
@@ -42387,7 +42491,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return payeeCounts;
             };
             handlers['payees-merge'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ targetId, mergeIds }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_27__.mergePayees(targetId, mergeIds);
                 }, {
                     targetId,
@@ -42395,8 +42499,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['payees-batch-change'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ added, deleted, updated }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
-                    return (0, _sync__WEBPACK_IMPORTED_MODULE_44__.batchMessages)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
+                    return (0, _sync__WEBPACK_IMPORTED_MODULE_45__.batchMessages)(async () => {
                         if (deleted) {
                             await Promise.all(deleted.map((p) => _db__WEBPACK_IMPORTED_MODULE_27__.deletePayee(p)));
                         }
@@ -42425,7 +42529,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     'name',
                     'value'
                 ];
-                const node = _sheet__WEBPACK_IMPORTED_MODULE_42__.get()._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_43__.resolveName)(sheetName, name));
+                const node = _sheet__WEBPACK_IMPORTED_MODULE_43__.get()._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_44__.resolveName)(sheetName, name));
                 if (fields) {
                     const res = {};
                     fields.forEach((field) => {
@@ -42444,13 +42548,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             handlers['getCells'] = async function ({ names }) {
                 return names.map((name) => ({
-                    value: _sheet__WEBPACK_IMPORTED_MODULE_42__.get()._getNode(name).value
+                    value: _sheet__WEBPACK_IMPORTED_MODULE_43__.get()._getNode(name).value
                 }));
             };
             handlers['getCellNamesInSheet'] = async function ({ sheetName }) {
                 const names = [];
-                for (const name of _sheet__WEBPACK_IMPORTED_MODULE_42__.get().getNodes().keys()) {
-                    const { sheet: nodeSheet, name: nodeName } = (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_43__.unresolveName)(name);
+                for (const name of _sheet__WEBPACK_IMPORTED_MODULE_43__.get().getNodes().keys()) {
+                    const { sheet: nodeSheet, name: nodeName } = (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_44__.unresolveName)(name);
                     if (nodeSheet === sheetName) {
                         names.push(nodeName);
                     }
@@ -42458,7 +42562,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return names;
             };
             handlers['debugCell'] = async function ({ sheetName, name }) {
-                const node = _sheet__WEBPACK_IMPORTED_MODULE_42__.get().getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_43__.resolveName)(sheetName, name));
+                const node = _sheet__WEBPACK_IMPORTED_MODULE_43__.get().getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_44__.resolveName)(sheetName, name));
                 return {
                     ...node,
                     _run: node._run && node._run.toString()
@@ -42467,7 +42571,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['create-query'] = async function ({ sheetName, name, query }) {
                 // Always run it regardless of cache. We don't know anything has changed
                 // between the cache value being saved and now
-                _sheet__WEBPACK_IMPORTED_MODULE_42__.get().createQuery(sheetName, name, query);
+                _sheet__WEBPACK_IMPORTED_MODULE_43__.get().createQuery(sheetName, name, query);
                 return 'ok';
             };
             handlers['query'] = async function (query) {
@@ -42492,7 +42596,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return 'ok';
             };
             handlers['account-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, name }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_27__.update('accounts', {
                         id,
                         name
@@ -42554,25 +42658,27 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     await _db__WEBPACK_IMPORTED_MODULE_27__.update('accounts', {
                         id,
                         account_id: account.account_id,
-                        bank: bank.id
+                        bank: bank.id,
+                        account_sync_source: 'goCardless'
                     });
                 }
                 else {
-                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_50__["default"])();
+                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_51__["default"])();
                     await _db__WEBPACK_IMPORTED_MODULE_27__.insertWithUUID('accounts', {
                         id,
                         account_id: account.account_id,
                         mask: account.mask,
                         name: account.name,
                         official_name: account.official_name,
-                        bank: bank.id
+                        bank: bank.id,
+                        account_sync_source: 'goCardless'
                     });
                     await _db__WEBPACK_IMPORTED_MODULE_27__.insertPayee({
                         name: '',
                         transfer_acct: id
                     });
                 }
-                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncGoCardlessAccount(undefined, undefined, id, account.account_id, bank.bank_id);
+                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(undefined, undefined, id, account.account_id, bank.bank_id);
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
                     type: 'success',
                     tables: [
@@ -42581,6 +42687,48 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return 'ok';
             };
+            handlers['simplefin-accounts-link'] = async function ({ externalAccount, upgradingId }) {
+                let id;
+                const institution = {
+                    name: externalAccount.institution ?? 'Unknown'
+                };
+                const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(institution, externalAccount.orgDomain);
+                if (upgradingId) {
+                    const accRow = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT * FROM accounts WHERE id = ?', [
+                        upgradingId
+                    ]);
+                    id = accRow.id;
+                    await _db__WEBPACK_IMPORTED_MODULE_27__.update('accounts', {
+                        id,
+                        account_id: externalAccount.account_id,
+                        bank: bank.id,
+                        account_sync_source: 'simpleFin'
+                    });
+                }
+                else {
+                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_51__["default"])();
+                    await _db__WEBPACK_IMPORTED_MODULE_27__.insertWithUUID('accounts', {
+                        id,
+                        account_id: externalAccount.account_id,
+                        name: externalAccount.name,
+                        official_name: externalAccount.name,
+                        bank: bank.id,
+                        account_sync_source: 'simpleFin'
+                    });
+                    await _db__WEBPACK_IMPORTED_MODULE_27__.insertPayee({
+                        name: '',
+                        transfer_acct: id
+                    });
+                }
+                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(undefined, undefined, id, externalAccount.account_id, bank.bank_id);
+                await _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
+                    type: 'success',
+                    tables: [
+                        'transactions'
+                    ]
+                });
+                return 'ok';
+            };
             handlers['accounts-connect'] = async function ({ institution, publicToken, accountIds, offbudgetIds }) {
                 const bankId = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.handoffPublicToken(institution, publicToken);
                 const ids = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.addAccounts(bankId, accountIds, offbudgetIds);
@@ -42592,7 +42740,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return ids;
             };
             handlers['account-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ name, balance, offBudget, closed }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     const id = await _db__WEBPACK_IMPORTED_MODULE_27__.insertAccount({
                         name,
                         offbudget: offBudget ? 1 : 0,
@@ -42624,7 +42772,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 await handlers['account-unlink']({
                     id
                 });
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     const account = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT * FROM accounts WHERE id = ? AND tombstone = 0', [
                         id
                     ]);
@@ -42649,7 +42797,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         const { id: payeeId } = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
                             id
                         ]);
-                        await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.batchMessages)(async () => {
+                        await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.batchMessages)(async () => {
                             // TODO: what this should really do is send a special message that
                             // automatically marks the tombstone value for all transactions
                             // within an account... or something? This is problematic
@@ -42690,7 +42838,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 transferAccountId
                             ]);
                             await handlers['transaction-add']({
-                                id: (0, uuid__WEBPACK_IMPORTED_MODULE_50__["default"])(),
+                                id: (0, uuid__WEBPACK_IMPORTED_MODULE_51__["default"])(),
                                 payee: payeeId,
                                 amount: -balance,
                                 account: id,
@@ -42703,7 +42851,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['account-reopen'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_27__.update('accounts', {
                         id,
                         closed: 0
@@ -42711,7 +42859,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['account-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_27__.moveAccount(id, targetId);
                 });
             });
@@ -42731,7 +42879,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         cb('timeout');
                         return;
                     }
-                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().PLAID_SERVER + '/get-web-token-contents', {
+                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().PLAID_SERVER + '/get-web-token-contents', {
                         userId,
                         key,
                         token
@@ -42845,7 +42993,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().BASE_SERVER + '/secret', {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().BASE_SERVER + '/secret', {
                         name,
                         value
                     }, {
@@ -42867,7 +43015,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().BASE_SERVER + '/secret/' + name, {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().BASE_SERVER + '/secret/' + name, {
                         'X-ACTUAL-TOKEN': userToken
                     });
                 }
@@ -42894,7 +43042,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         cb('timeout');
                         return;
                     }
-                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().GOCARDLESS_SERVER + '/get-accounts', {
+                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().GOCARDLESS_SERVER + '/get-accounts', {
                         upgradingAccountId,
                         requisitionId
                     }, {
@@ -42934,7 +43082,29 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().GOCARDLESS_SERVER + '/status', {}, {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().GOCARDLESS_SERVER + '/status', {}, {
+                    'X-ACTUAL-TOKEN': userToken
+                });
+            };
+            handlers['simplefin-status'] = async function () {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
+                if (!userToken) {
+                    return {
+                        error: 'unauthorized'
+                    };
+                }
+                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIMPLEFIN_SERVER + '/status', {}, {
+                    'X-ACTUAL-TOKEN': userToken
+                });
+            };
+            handlers['simplefin-accounts'] = async function () {
+                const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
+                if (!userToken) {
+                    return {
+                        error: 'unauthorized'
+                    };
+                }
+                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
                     'X-ACTUAL-TOKEN': userToken
                 });
             };
@@ -42945,7 +43115,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().GOCARDLESS_SERVER + '/get-banks', {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().GOCARDLESS_SERVER + '/get-banks', {
                     country,
                     showDemo: (0, _shared_environment__WEBPACK_IMPORTED_MODULE_10__.isNonProductionEnvironment)()
                 }, {
@@ -42964,7 +43134,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().GOCARDLESS_SERVER + '/create-web-token', {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().GOCARDLESS_SERVER + '/create-web-token', {
                         upgradingAccountId,
                         institutionId,
                         accessValidForDays
@@ -42998,7 +43168,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const acct = accounts[i];
                     if (acct.bankId) {
                         try {
-                            const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncGoCardlessAccount(userId, userKey, acct.id, acct.account_id, acct.bankId);
+                            const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(userId, userKey, acct.id, acct.account_id, acct.bankId);
                             const { added, updated } = res;
                             newTransactions = newTransactions.concat(added);
                             matchedTransactions = matchedTransactions.concat(updated);
@@ -43050,7 +43220,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(function ({ accountId, transactions }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_47__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     if (typeof accountId !== 'string') {
                         throw (0, _errors__WEBPACK_IMPORTED_MODULE_30__.APIError)('transactions-import: accountId must be an id');
                     }
@@ -43080,14 +43250,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (!bankId) {
                     return 'ok';
                 }
+                const accRow = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT * FROM accounts WHERE id = ?', [
+                    id
+                ]);
+                const isGoCardless = accRow.account_sync_source === 'goCardless';
                 await _db__WEBPACK_IMPORTED_MODULE_27__.updateAccount({
                     id,
                     account_id: null,
                     bank: null,
                     balance_current: null,
                     balance_available: null,
-                    balance_limit: null
+                    balance_limit: null,
+                    account_sync_source: null
                 });
+                if (isGoCardless === false) {
+                    return;
+                }
                 const { count } = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT COUNT(*) as count FROM accounts WHERE bank = ?', [
                     bankId
                 ]);
@@ -43102,7 +43280,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         bankId
                     ]);
                     try {
-                        await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().GOCARDLESS_SERVER + '/remove-account', {
+                        await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().GOCARDLESS_SERVER + '/remove-account', {
                             requisitionId
                         }, {
                             'X-ACTUAL-TOKEN': userToken
@@ -43121,7 +43299,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     'user-id',
                     'user-key'
                 ]);
-                const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().PLAID_SERVER + '/make-public-token', {
+                const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().PLAID_SERVER + '/make-public-token', {
                     userId,
                     key: userKey,
                     item_id: '' + bankId
@@ -43143,7 +43321,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 if ('autoUpdate' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('auto-update', '' + prefs.autoUpdate);
-                    process.send({
+                    process.parentPort.postMessage({
                         type: 'shouldAutoUpdate',
                         flag: prefs.autoUpdate
                     });
@@ -43184,7 +43362,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Need to sync the budget name on the server as well
                 if (prefsToSet.budgetName && cloudFileId) {
                     const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
-                    await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().SYNC_SERVER + '/update-user-filename', {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SYNC_SERVER + '/update-user-filename', {
                         token: userToken,
                         fileId: cloudFileId,
                         name: prefsToSet.budgetName
@@ -43197,10 +43375,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return _prefs__WEBPACK_IMPORTED_MODULE_38__.getPrefs();
             };
             handlers['sync-reset'] = async function () {
-                return await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.resetSync)();
+                return await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.resetSync)();
             };
             handlers['sync-repair'] = async function () {
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.repairSync)();
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.repairSync)();
             };
             // A user can only enable/change their key with the file loaded. This
             // will change in the future: during onboarding the user should be
@@ -43211,7 +43389,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     throw new Error('user-set-key must be called with file loaded');
                 }
                 const salt = _encryption__WEBPACK_IMPORTED_MODULE_29__.randomBytes(32).toString('base64');
-                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_50__["default"])();
+                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_51__["default"])();
                 const key = await _encryption__WEBPACK_IMPORTED_MODULE_29__.createKey({
                     id,
                     password,
@@ -43220,11 +43398,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Load the key
                 await _encryption__WEBPACK_IMPORTED_MODULE_29__.loadKey(key);
                 // Make some test data to use if the key is valid or not
-                const testContent = await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.makeTestMessage)(key.getId());
+                const testContent = await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.makeTestMessage)(key.getId());
                 // Changing your key necessitates a sync reset as well. This will
                 // clear all existing encrypted data from the server so you won't
                 // have a mix of data encrypted with different keys.
-                return await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.resetSync)({
+                return await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.resetSync)({
                     key,
                     salt,
                     testContent: JSON.stringify({
@@ -43242,7 +43420,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().SYNC_SERVER + '/user-get-key', {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SYNC_SERVER + '/user-get-key', {
                         token: userToken,
                         fileId
                     });
@@ -43303,7 +43481,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             handlers['subscribe-needs-bootstrap'] = async function ({ url } = {}) {
                 try {
-                    if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)(url)) {
+                    if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)(url)) {
                         return {
                             bootstrapped: true,
                             hasServer: false
@@ -43317,7 +43495,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)(url).SIGNUP_SERVER + '/needs-bootstrap');
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)(url).SIGNUP_SERVER + '/needs-bootstrap');
                 }
                 catch (err) {
                     return {
@@ -43345,7 +43523,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['subscribe-bootstrap'] = async function ({ password }) {
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().SIGNUP_SERVER + '/bootstrap', {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIGNUP_SERVER + '/bootstrap', {
                         password
                     });
                 }
@@ -43363,7 +43541,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['subscribe-get-user'] = async function () {
-                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)()) {
+                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)()) {
                     if (!await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('did-bootstrap')) {
                         return null;
                     }
@@ -43376,7 +43554,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return null;
                 }
                 try {
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().SIGNUP_SERVER + '/validate', {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIGNUP_SERVER + '/validate', {
                         headers: {
                             'X-ACTUAL-TOKEN': userToken
                         }
@@ -43409,7 +43587,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().SIGNUP_SERVER + '/change-password', {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIGNUP_SERVER + '/change-password', {
                         token: userToken,
                         password
                     });
@@ -43422,7 +43600,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {};
             };
             handlers['subscribe-sign-in'] = async function ({ password }) {
-                const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().SIGNUP_SERVER + '/login', {
+                const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIGNUP_SERVER + '/login', {
                     password
                 });
                 if (res.token) {
@@ -43444,14 +43622,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return 'ok';
             };
             handlers['get-server-version'] = async function () {
-                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)()) {
+                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)()) {
                     return {
                         error: 'no-server'
                     };
                 }
                 let version;
                 try {
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().BASE_SERVER + '/info');
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().BASE_SERVER + '/info');
                     const info = JSON.parse(res);
                     version = info.build.version;
                 }
@@ -43465,7 +43643,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['get-server-url'] = async function () {
-                return (0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)() && (0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)().BASE_SERVER;
+                return (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)() && (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().BASE_SERVER;
             };
             handlers['set-server-url'] = async function ({ url, validate = true }) {
                 if (url == null) {
@@ -43475,23 +43653,23 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     url = url.replace(/\/+$/, '');
                     if (validate) {
                         // Validate the server is running
-                        const { error } = await (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(handlers['subscribe-needs-bootstrap'], {
+                        const result = await (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(handlers['subscribe-needs-bootstrap'], {
                             url
                         });
-                        if (error) {
+                        if ('error' in result) {
                             return {
-                                error
+                                error: result.error
                             };
                         }
                     }
                 }
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('server-url', url);
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('did-bootstrap', true);
-                (0, _server_config__WEBPACK_IMPORTED_MODULE_41__.setServer)(url);
+                (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.setServer)(url);
                 return {};
             };
             handlers['sync'] = async function () {
-                return (0, _sync__WEBPACK_IMPORTED_MODULE_44__.fullSync)();
+                return (0, _sync__WEBPACK_IMPORTED_MODULE_45__.fullSync)();
             };
             handlers['get-budgets'] = async function () {
                 const paths = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.listDir(_platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getDocumentDir());
@@ -43528,9 +43706,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             handlers['reset-budget-cache'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function () {
                 // Recomputing everything will update the cache
-                await _sheet__WEBPACK_IMPORTED_MODULE_42__.loadUserBudgets(_db__WEBPACK_IMPORTED_MODULE_27__);
-                _sheet__WEBPACK_IMPORTED_MODULE_42__.get().recomputeAll();
-                await _sheet__WEBPACK_IMPORTED_MODULE_42__.waitOnSpreadsheet();
+                await _sheet__WEBPACK_IMPORTED_MODULE_43__.loadUserBudgets(_db__WEBPACK_IMPORTED_MODULE_27__);
+                _sheet__WEBPACK_IMPORTED_MODULE_43__.get().recomputeAll();
+                await _sheet__WEBPACK_IMPORTED_MODULE_43__.waitOnSpreadsheet();
             });
             handlers['upload-budget'] = async function ({ id } = {}) {
                 if (id) {
@@ -43607,8 +43785,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             // open and sync, but don’t close
             handlers['sync-budget'] = async function () {
-                (0, _sync__WEBPACK_IMPORTED_MODULE_44__.setSyncingMode)('enabled');
-                const result = await (0, _sync__WEBPACK_IMPORTED_MODULE_44__.initialFullSync)();
+                (0, _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode)('enabled');
+                const result = await (0, _sync__WEBPACK_IMPORTED_MODULE_45__.initialFullSync)();
                 return result;
             };
             handlers['load-budget'] = async function ({ id }) {
@@ -43642,10 +43820,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     message: 'Closing budget'
                 });
                 // The spreadsheet may be running, wait for it to complete
-                await _sheet__WEBPACK_IMPORTED_MODULE_42__.waitOnSpreadsheet();
-                _sheet__WEBPACK_IMPORTED_MODULE_42__.unloadSpreadsheet();
-                (0, _sync__WEBPACK_IMPORTED_MODULE_44__.clearFullSyncTimeout)();
-                await _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].stopServices();
+                await _sheet__WEBPACK_IMPORTED_MODULE_43__.waitOnSpreadsheet();
+                _sheet__WEBPACK_IMPORTED_MODULE_43__.unloadSpreadsheet();
+                (0, _sync__WEBPACK_IMPORTED_MODULE_45__.clearFullSyncTimeout)();
+                await _main_app__WEBPACK_IMPORTED_MODULE_33__.app.stopServices();
                 await _db__WEBPACK_IMPORTED_MODULE_27__.closeDatabase();
                 try {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('lastBudget', '');
@@ -43663,7 +43841,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // If it's a cloud file, you can delete it from the server by
                 // passing its cloud id
                 if (cloudFileId) {
-                    await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.removeFile(cloudFileId).catch((err) => { });
+                    await _cloud_storage__WEBPACK_IMPORTED_MODULE_26__.removeFile(cloudFileId).catch(() => { });
                 }
                 // If a local file exists, you can delete it by passing its local id
                 if (id) {
@@ -43687,9 +43865,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         // Unfortunately we need to load all of the existing files first
                         // so we can detect conflicting names.
                         const files = await handlers['get-budgets']();
-                        budgetName = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_49__.uniqueFileName)(files);
+                        budgetName = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_50__.uniqueFileName)(files);
                     }
-                    id = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_49__.idFromFileName)(budgetName);
+                    id = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_50__.idFromFileName)(budgetName);
                 }
                 const budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getBudgetDir(id);
                 await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.mkdir(budgetDir);
@@ -43793,7 +43971,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 try {
-                    await (0, _update__WEBPACK_IMPORTED_MODULE_48__.updateVersion)();
+                    await (0, _update__WEBPACK_IMPORTED_MODULE_49__.updateVersion)();
                 }
                 catch (e) {
                     console.warn('Error updating', e);
@@ -43810,7 +43988,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     else {
                         (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__.captureException)(e);
-                        _platform_server_log__WEBPACK_IMPORTED_MODULE_8__["default"].info('Error updating budget ' + id, e);
+                        _platform_server_log__WEBPACK_IMPORTED_MODULE_8__.logger.info('Error updating budget ' + id, e);
                         console.log('Error updating budget', e);
                         result = {
                             error: 'loading-budget'
@@ -43839,7 +44017,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     (0, _backups__WEBPACK_IMPORTED_MODULE_23__.startBackupService)(id);
                 }
                 try {
-                    await _sheet__WEBPACK_IMPORTED_MODULE_42__.loadSpreadsheet(_db__WEBPACK_IMPORTED_MODULE_27__, onSheetChange);
+                    await _sheet__WEBPACK_IMPORTED_MODULE_43__.loadSpreadsheet(_db__WEBPACK_IMPORTED_MODULE_27__, onSheetChange);
                 }
                 catch (e) {
                     (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__.captureException)(e);
@@ -43849,25 +44027,25 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 // This is a bit leaky, but we need to set the initial budget type
-                _sheet__WEBPACK_IMPORTED_MODULE_42__.get().meta().budgetType = _prefs__WEBPACK_IMPORTED_MODULE_38__.getPrefs().budgetType;
+                _sheet__WEBPACK_IMPORTED_MODULE_43__.get().meta().budgetType = _prefs__WEBPACK_IMPORTED_MODULE_38__.getPrefs().budgetType;
                 await _budget_base__WEBPACK_IMPORTED_MODULE_25__.createAllBudgets();
                 // Load all the in-memory state
                 await _db_mappings__WEBPACK_IMPORTED_MODULE_28__.loadMappings();
                 await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_19__.loadRules();
-                await _sync_migrate__WEBPACK_IMPORTED_MODULE_45__.listen();
-                await _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].startServices();
-                (0, _undo__WEBPACK_IMPORTED_MODULE_47__.clearUndo)();
+                await _sync_migrate__WEBPACK_IMPORTED_MODULE_46__.listen();
+                await _main_app__WEBPACK_IMPORTED_MODULE_33__.app.startServices();
+                (0, _undo__WEBPACK_IMPORTED_MODULE_48__.clearUndo)();
                 // Ensure that syncing is enabled
                 if (true) {
                     if (id === DEMO_BUDGET_ID) {
-                        (0, _sync__WEBPACK_IMPORTED_MODULE_44__.setSyncingMode)('disabled');
+                        (0, _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode)('disabled');
                     }
                     else {
-                        if ((0, _server_config__WEBPACK_IMPORTED_MODULE_41__.getServer)()) {
-                            (0, _sync__WEBPACK_IMPORTED_MODULE_44__.setSyncingMode)('enabled');
+                        if ((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)()) {
+                            (0, _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode)('enabled');
                         }
                         else {
-                            (0, _sync__WEBPACK_IMPORTED_MODULE_44__.setSyncingMode)('disabled');
+                            (0, _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode)('disabled');
                         }
                         await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('lastBudget', id);
                         // Only upload periodically on desktop
@@ -43876,7 +44054,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     }
                 }
-                _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].events.emit('load-budget', {
+                _main_app__WEBPACK_IMPORTED_MODULE_33__.app.events.emit('load-budget', {
                     id
                 });
                 return {};
@@ -43912,14 +44090,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['app-focused'] = async function () {
                 if (_prefs__WEBPACK_IMPORTED_MODULE_38__.getPrefs() && _prefs__WEBPACK_IMPORTED_MODULE_38__.getPrefs().id) {
                     // First we sync
-                    (0, _sync__WEBPACK_IMPORTED_MODULE_44__.fullSync)();
+                    (0, _sync__WEBPACK_IMPORTED_MODULE_45__.fullSync)();
                 }
             };
-            handlers = (0, _api__WEBPACK_IMPORTED_MODULE_21__["default"])(handlers);
-            _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1__.override((name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__["default"].handlers[name], args));
+            handlers = (0, _api__WEBPACK_IMPORTED_MODULE_21__.installAPI)(handlers);
+            _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_1__.override((name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers[name], args));
             // A hack for now until we clean up everything
-            _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].handlers = handlers;
-            _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].combine(_schedules_app__WEBPACK_IMPORTED_MODULE_40__["default"], _budget_app__WEBPACK_IMPORTED_MODULE_24__["default"], _notes_app__WEBPACK_IMPORTED_MODULE_35__["default"], _tools_app__WEBPACK_IMPORTED_MODULE_46__["default"], _filters_app__WEBPACK_IMPORTED_MODULE_31__["default"], _rules_app__WEBPACK_IMPORTED_MODULE_39__["default"]);
+            _main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers = handlers;
+            _main_app__WEBPACK_IMPORTED_MODULE_33__.app.combine(_schedules_app__WEBPACK_IMPORTED_MODULE_41__.app, _budget_app__WEBPACK_IMPORTED_MODULE_24__.app, _notes_app__WEBPACK_IMPORTED_MODULE_35__.app, _tools_app__WEBPACK_IMPORTED_MODULE_47__.app, _filters_app__WEBPACK_IMPORTED_MODULE_31__.app, _reports_app__WEBPACK_IMPORTED_MODULE_39__.app, _rules_app__WEBPACK_IMPORTED_MODULE_40__.app);
             function getDefaultDocumentDir() {
                 if (_platform__WEBPACK_IMPORTED_MODULE_36__.isMobile) {
                     // On mobile, unfortunately we need to be backwards compatible
@@ -43992,21 +44170,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (!url) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.removeItem('user-token');
                 }
-                (0, _server_config__WEBPACK_IMPORTED_MODULE_41__.setServer)(url);
-                _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].handlers);
+                (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.setServer)(url);
+                _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers);
                 if (!isDev && !_platform__WEBPACK_IMPORTED_MODULE_36__.isMobile && !_platform__WEBPACK_IMPORTED_MODULE_36__.isWeb) {
                     const autoUpdate = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('auto-update');
-                    process.send({
+                    process.parentPort.postMessage({
                         type: 'shouldAutoUpdate',
                         flag: autoUpdate == null || autoUpdate === 'true'
                     });
                 }
                 if (isDev) {
-                    global.$send = (name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__["default"].handlers[name], args);
+                    global.$send = (name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers[name], args);
                     global.$query = _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery;
-                    global.$q = _shared_query__WEBPACK_IMPORTED_MODULE_12__["default"];
+                    global.$q = _shared_query__WEBPACK_IMPORTED_MODULE_12__.q;
                     global.$db = _db__WEBPACK_IMPORTED_MODULE_27__;
-                    global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_44__.setSyncingMode;
+                    global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode;
                 }
             }
             // eslint-disable-next-line import/no-unused-modules
@@ -44030,7 +44208,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
                 _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__._setDocumentDir(dataDir || process.cwd());
                 if (serverURL) {
-                    (0, _server_config__WEBPACK_IMPORTED_MODULE_41__.setServer)(serverURL);
+                    (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.setServer)(serverURL);
                     if (config.password) {
                         await (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(handlers['subscribe-sign-in'], {
                             password: config.password
@@ -44040,9 +44218,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 else {
                     // This turns off all server URLs. In this mode we don't want any
                     // access to the server, we are doing things locally
-                    (0, _server_config__WEBPACK_IMPORTED_MODULE_41__.setServer)(null);
-                    _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].events.on('load-budget', () => {
-                        (0, _sync__WEBPACK_IMPORTED_MODULE_44__.setSyncingMode)('offline');
+                    (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.setServer)(null);
+                    _main_app__WEBPACK_IMPORTED_MODULE_33__.app.events.on('load-budget', () => {
+                        (0, _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode)('offline');
                     });
                 }
                 return lib;
@@ -44053,11 +44231,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 getDataDir: _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.getDataDir,
                 sendMessage: (msg, args) => _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send(msg, args),
                 send: async (name, args) => {
-                    const res = await (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__["default"].handlers[name], args);
+                    const res = await (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers[name], args);
                     return res;
                 },
-                on: (name, func) => _main_app__WEBPACK_IMPORTED_MODULE_33__["default"].events.on(name, func),
-                q: _shared_query__WEBPACK_IMPORTED_MODULE_12__["default"],
+                on: (name, func) => _main_app__WEBPACK_IMPORTED_MODULE_33__.app.events.on(name, func),
+                q: _shared_query__WEBPACK_IMPORTED_MODULE_12__.q,
                 db: _db__WEBPACK_IMPORTED_MODULE_27__
             };
             /***/ 
@@ -44084,6 +44262,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _migrations_1632571489012_remove_cache__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../migrations/1632571489012_remove_cache */ "./packages/loot-core/migrations/1632571489012_remove_cache.js");
             /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
             /* harmony import */ var _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../platform/server/sqlite */ "./packages/loot-core/src/platform/server/sqlite/index.electron.ts");
+            // @ts-strict-ignore
             // We have to bundle in JS migrations manually to avoid having to `eval`
             // them which doesn't play well with CSP. There isn't great, and eventually
             // we can remove this migration.
@@ -44218,20 +44397,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ fromDateRepr: () => ( /* binding */fromDateRepr),
                 /* harmony export */ payeeModel: () => ( /* binding */payeeModel),
                 /* harmony export */ requiredFields: () => ( /* binding */requiredFields),
-                /* harmony export */ toDateRepr: () => ( /* binding */toDateRepr),
-                /* harmony export */ transactionModel: () => ( /* binding */transactionModel)
+                /* harmony export */ toDateRepr: () => ( /* binding */toDateRepr)
                 /* harmony export */ 
             });
             function requiredFields(name, row, fields, update) {
                 fields.forEach((field) => {
                     if (update) {
                         if (row.hasOwnProperty(field) && row[field] == null) {
-                            throw new Error(`${name} is missing field ${field}`);
+                            throw new Error(`${name} is missing field ${String(field)}`);
                         }
                     }
                     else {
                         if (!row.hasOwnProperty(field) || row[field] == null) {
-                            throw new Error(`${name} is missing field ${field}`);
+                            throw new Error(`${name} is missing field ${String(field)}`);
                         }
                     }
                 });
@@ -44301,69 +44479,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return payee;
                 }
             };
-            const transactionModel = {
-                validate(trans, { update } = {}) {
-                    requiredFields('transaction', trans, [
-                        'date',
-                        'acct'
-                    ], update);
-                    if ('date' in trans) {
-                        // Make sure it's the right format, and also do a sanity check.
-                        // Really old dates can mess up the system and can happen by
-                        // accident
-                        if (trans.date.match(/^\d{4}-\d{2}-\d{2}$/) == null || trans.date < '2000-01-01') {
-                            throw new Error('Invalid transaction date: ' + trans.date);
-                        }
-                    }
-                    return trans;
-                },
-                toJS(row) {
-                    // Check a non-important field that typically wouldn't be passed in
-                    // manually, and use it as a smoke test to see if this is a
-                    // fully-formed transaction or not.
-                    if (!('location' in row)) {
-                        throw new Error('A full transaction is required to be passed to `toJS`. Instead got: ' + JSON.stringify(row));
-                    }
-                    const trans = {
-                        ...row
-                    };
-                    trans.error = row.error ? JSON.parse(row.error) : null;
-                    trans.isParent = row.isParent === 1 ? true : false;
-                    trans.isChild = row.isChild === 1 ? true : false;
-                    trans.starting_balance_flag = row.starting_balance_flag === 1 ? true : false;
-                    trans.cleared = row.cleared === 1 ? true : false;
-                    trans.pending = row.pending === 1 ? true : false;
-                    trans.date = trans.date && fromDateRepr(trans.date);
-                    return trans;
-                },
-                fromJS(trans) {
-                    const row = {
-                        ...trans
-                    };
-                    if ('error' in row) {
-                        row.error = trans.error ? JSON.stringify(trans.error) : null;
-                    }
-                    if ('isParent' in row) {
-                        row.isParent = trans.isParent ? 1 : 0;
-                    }
-                    if ('isChild' in row) {
-                        row.isChild = trans.isChild ? 1 : 0;
-                    }
-                    if ('cleared' in row) {
-                        row.cleared = trans.cleared ? 1 : 0;
-                    }
-                    if ('pending' in row) {
-                        row.pending = trans.pending ? 1 : 0;
-                    }
-                    if ('starting_balance_flag' in row) {
-                        row.starting_balance_flag = trans.starting_balance_flag ? 1 : 0;
-                    }
-                    if ('date' in row) {
-                        row.date = toDateRepr(trans.date);
-                    }
-                    return row;
-                }
-            };
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/mutators.ts": 
@@ -44386,6 +44501,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
             /* harmony import */ var _shared_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../shared/async */ "./packages/loot-core/src/shared/async.ts");
+            // @ts-strict-ignore
             const runningMethods = new Set();
             let currentContext = null;
             const mutatingMethods = new WeakMap();
@@ -44500,7 +44616,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
             /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
@@ -44512,7 +44628,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     note
                 });
             });
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/platform.ts": 
@@ -44557,6 +44672,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _platform_server_fetch__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../platform/server/fetch */ "./packages/loot-core/src/platform/server/fetch/index.api.ts");
             /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./errors */ "./packages/loot-core/src/server/errors.ts");
             /* harmony import */ var _platform__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./platform */ "./packages/loot-core/src/server/platform.ts");
+            // @ts-strict-ignore
             function throwIfNot200(res, text) {
                 if (res.status !== 200) {
                     if (res.status === 500) {
@@ -44653,6 +44769,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/crdt */ "./packages/crdt/index.ts");
             /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            // @ts-strict-ignore
             const BUDGET_TYPES = [
                 'report',
                 'rollover'
@@ -44730,6 +44847,94 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/server/reports/app.ts": 
+        /*!******************************************************!*\
+          !*** ./packages/loot-core/src/server/reports/app.ts ***!
+          \******************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ app: () => ( /* binding */app)
+                /* harmony export */ 
+            });
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../accounts/transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
+            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
+            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
+            const reportModel = {
+                validate(report, { update } = {}) {
+                    (0, _models__WEBPACK_IMPORTED_MODULE_3__.requiredFields)('reports', report, [
+                        'conditionsOp'
+                    ], update);
+                    if (!update || 'conditionsOp' in report) {
+                        if (![
+                            'and',
+                            'or'
+                        ].includes(report.conditionsOp)) {
+                            throw new Error('Invalid filter conditionsOp: ' + report.conditionsOp);
+                        }
+                    }
+                    return report;
+                },
+                toJS(row) {
+                    return {
+                        ...row,
+                        conditionsOp: row.conditions_op,
+                        filters: (0, _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_0__.parseConditionsOrActions)(row.conditions)
+                    };
+                },
+                fromJS(report) {
+                    const { filters, conditionsOp, ...row } = report;
+                    if (conditionsOp) {
+                        row.conditions_op = conditionsOp;
+                        row.conditions = filters;
+                    }
+                    return row;
+                }
+            };
+            async function reportNameExists(name, reportId, newItem) {
+                if (!name) {
+                    throw new Error('Report name is required');
+                }
+                if (!reportId) {
+                    throw new Error('Report recall error');
+                }
+                const idForName = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT id from reports WHERE tombstone = 0 AND name = ?', [
+                    name
+                ]);
+                if (!newItem && idForName.id !== reportId) {
+                    throw new Error('There is already a report named ' + name);
+                }
+            }
+            async function createReport(report) {
+                const reportId = (0, uuid__WEBPACK_IMPORTED_MODULE_6__["default"])();
+                const item = {
+                    ...report,
+                    id: reportId
+                };
+                reportNameExists(item.name, item.id, true);
+                // Create the report here based on the info
+                await _db__WEBPACK_IMPORTED_MODULE_2__.insertWithSchema('reports', reportModel.fromJS(item));
+                return reportId;
+            }
+            async function updateReport(item) {
+                reportNameExists(item.name, item.id, false);
+                await _db__WEBPACK_IMPORTED_MODULE_2__.insertWithSchema('reports', reportModel.fromJS(item));
+            }
+            async function deleteReport(id) {
+                await _db__WEBPACK_IMPORTED_MODULE_2__.delete_('reports', id);
+            }
+            // Expose functions to the client
+            const app = (0, _app__WEBPACK_IMPORTED_MODULE_1__.createApp)();
+            app.method('report/create', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(createReport)));
+            app.method('report/update', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(updateReport)));
+            app.method('report/delete', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(deleteReport)));
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/server/rules/app.ts": 
         /*!****************************************************!*\
           !*** ./packages/loot-core/src/server/rules/app.ts ***!
@@ -44738,7 +44943,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
             /* harmony import */ var _shared_rules__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/rules */ "./packages/loot-core/src/shared/rules.ts");
@@ -44749,6 +44954,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
+            // @ts-strict-ignore
             function validateRule(rule) {
                 // Returns an array of errors, the array is the same link as the
                 // passed-in `array`, or null if there are no errors
@@ -44843,7 +45049,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('rules-run', async function ({ transaction }) {
                 return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.runRules(transaction);
             });
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/schedules/app.ts": 
@@ -44854,8 +45059,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ app: () => ( /* binding */app),
                 /* harmony export */ createSchedule: () => ( /* binding */createSchedule),
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__),
                 /* harmony export */ deleteSchedule: () => ( /* binding */deleteSchedule),
                 /* harmony export */ getDateWithSkippedWeekend: () => ( /* binding */getDateWithSkippedWeekend),
                 /* harmony export */ getNextDate: () => ( /* binding */getNextDate),
@@ -44891,6 +45096,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
             /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
             /* harmony import */ var _find_schedules__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./find-schedules */ "./packages/loot-core/src/server/schedules/find-schedules.ts");
+            // @ts-strict-ignore
             // Utilities
             function zip(arr1, arr2) {
                 const result = [];
@@ -44949,13 +45155,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (id == null) {
                     throw new Error('Schedule not attached to a rule');
                 }
-                const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('schedules').filter({
+                const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
                     id
                 }).calculate('rule'));
                 return (0, _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_8__.getRules)().find((rule) => rule.id === ruleId);
             }
             async function fixRuleForSchedule(id) {
-                const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('schedules').filter({
+                const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
                     id
                 }).calculate('rule'));
                 if (ruleId) {
@@ -45000,7 +45206,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     conditions = rule.serialize().conditions;
                 }
                 const { date: dateCond } = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.extractScheduleConds)(conditions);
-                const { data: nextDate } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('schedules').filter({
+                const { data: nextDate } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
                     id
                 }).calculate('next_date'));
                 // Only do this if a date condition exists
@@ -45141,7 +45347,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             }
             async function deleteSchedule({ id }) {
-                const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('schedules').filter({
+                const { data: ruleId } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
                     id
                 }).calculate('rule'));
                 await (0, _sync__WEBPACK_IMPORTED_MODULE_15__.batchMessages)(async () => {
@@ -45218,7 +45424,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             // This is the service that move schedules forward automatically and
             // posts transactions
             async function postTransactionForSchedule({ id }) {
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('schedules').filter({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
                     id
                 }).select('*'));
                 const schedule = data[0];
@@ -45242,7 +45448,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             // TODO: make this sequential
             async function advanceSchedulesService(syncSuccess) {
                 // Move all paid schedules
-                const { data: schedules } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__["default"])('schedules').filter({
+                const { data: schedules } = await (0, _aql__WEBPACK_IMPORTED_MODULE_10__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_4__.q)('schedules').filter({
                     completed: false,
                     '_account.closed': false
                 }).select('*'));
@@ -45322,7 +45528,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('schedule/discover', discoverSchedules);
             app.method('schedule/get-upcoming-dates', getUpcomingDates);
             app.service(trackJSONPaths);
-            app.events.on('sync', ({ type, subtype }) => {
+            app.events.on('sync', ({ type }) => {
                 const completeEvent = type === 'success' || type === 'error' || type === 'unauthorized';
                 if (completeEvent && _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs()) {
                     const { lastScheduleRun } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs();
@@ -45348,7 +45554,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return date;
             }
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/schedules/find-schedules.ts": 
@@ -45381,6 +45586,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
             /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
+            // @ts-strict-ignore
             function takeDates(config) {
                 const schedule = new _util_rschedule__WEBPACK_IMPORTED_MODULE_9__.Schedule({
                     rrules: (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_3__.recurConfigToRSchedule)(config)
@@ -45390,7 +45596,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }).toArray().map((d) => d.date);
             }
             async function getTransactions(date, account) {
-                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_6__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+                const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_6__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_1__.q)('transactions').filter({
                     account,
                     schedule: null,
                     // Don't match transfers
@@ -45419,7 +45625,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // best start date that matches all the dates the closest
                 return 1 / (dayDiff + 1);
             }
-            function matchSchedules(allOccurs, config, partialMatchRank = 0.5) {
+            function matchSchedules(allOccurs, config) {
                 allOccurs = [
                     ...allOccurs
                 ].reverse();
@@ -45459,7 +45665,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return schedules;
             }
-            async function schedulesForPattern(baseStart, numDays, baseConfig, accountId, partialMatchRank) {
+            async function schedulesForPattern(baseStart, numDays, baseConfig, accountId) {
                 let schedules = [];
                 for (let i = 0; i < numDays; i++) {
                     const start = date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](baseStart, i);
@@ -45486,7 +45692,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             transactions: await getTransactions(date, accountId)
                         });
                     }
-                    schedules = schedules.concat(matchSchedules(data, config, partialMatchRank));
+                    schedules = schedules.concat(matchSchedules(data, config));
                 }
                 return schedules;
             }
@@ -45530,9 +45736,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             value: -1
                         }
                     ]
-                }, accountId, // Last day patterns should win over day-specific ones that just
-                // happen to match
-                0.75);
+                }, accountId);
                 const s2 = await schedulesForPattern(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"]((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.parseDate)(startDate), 4), 1, {
                     frequency: 'monthly',
                     patterns: [
@@ -45541,7 +45745,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             value: -1
                         }
                     ]
-                }, accountId, 0.75);
+                }, accountId);
                 return s1.concat(s2);
             }
             async function monthly1stor3rd(startDate, accountId) {
@@ -45619,7 +45823,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         currentConfig = null;
                         break;
                     }
-                    const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_6__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+                    const { data } = await (0, _aql__WEBPACK_IMPORTED_MODULE_6__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_1__.q)('transactions').filter({
                         $and: filters
                     }).select('*'));
                     if (data.length === 0) {
@@ -45650,7 +45854,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 //
                 // Search for them approx (+- 2 days) but track which transactions
                 // and find the best one...
-                const { data: accounts } = await (0, _aql__WEBPACK_IMPORTED_MODULE_6__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('accounts').filter({
+                const { data: accounts } = await (0, _aql__WEBPACK_IMPORTED_MODULE_6__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_1__.q)('accounts').filter({
                     closed: false
                 }).select('*'));
                 let allSchedules = [];
@@ -45666,7 +45870,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 const schedules = [
                     ...(0, _shared_util__WEBPACK_IMPORTED_MODULE_4__.groupBy)(allSchedules, 'payee').entries()
-                ].map(([payeeId, schedules]) => {
+                ].map(([, schedules]) => {
                     schedules.sort((s1, s2) => s2.rank - s1.rank);
                     const winner = schedules[0];
                     // Convert to schedule and return it
@@ -45743,7 +45947,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         SYNC_SERVER: joinURL(url, '/sync'),
                         SIGNUP_SERVER: joinURL(url, '/account'),
                         PLAID_SERVER: joinURL(url, '/plaid'),
-                        GOCARDLESS_SERVER: joinURL(url, '/gocardless')
+                        GOCARDLESS_SERVER: joinURL(url, '/gocardless'),
+                        SIMPLEFIN_SERVER: joinURL(url, '/simplefin')
                     };
                 }
                 return config;
@@ -45777,6 +45982,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
             /* harmony import */ var _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./spreadsheet/spreadsheet */ "./packages/loot-core/src/server/spreadsheet/spreadsheet.ts");
             /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
+            // @ts-strict-ignore
             let globalSheet;
             let globalOnChange;
             let globalCacheDb;
@@ -45853,10 +46059,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let sheet;
                 if (cacheEnabled) {
-                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__["default"](updateSpreadsheetCache.bind(null, cacheDb), setCacheStatus.bind(null, mainDb, cacheDb));
+                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__.Spreadsheet(updateSpreadsheetCache.bind(null, cacheDb), setCacheStatus.bind(null, mainDb, cacheDb));
                 }
                 else {
-                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__["default"]();
+                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__.Spreadsheet();
                 }
                 (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_0__.captureBreadcrumb)({
                     message: 'loading spreaadsheet',
@@ -45995,9 +46201,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ Graph: () => ( /* binding */Graph)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             function Graph() {
                 const graph = {
                     addNode,
@@ -46104,7 +46311,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return graph;
             }
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Graph);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/spreadsheet/spreadsheet.ts": 
@@ -46115,17 +46321,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */Spreadsheet)
+                /* harmony export */ Spreadsheet: () => ( /* binding */Spreadsheet)
                 /* harmony export */ 
             });
             /* harmony import */ var mitt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! mitt */ "./node_modules/mitt/dist/mitt.mjs");
             /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../aql */ "./packages/loot-core/src/server/aql/index.ts");
             /* harmony import */ var _graph_data_structure__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./graph-data-structure */ "./packages/loot-core/src/server/spreadsheet/graph-data-structure.ts");
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
+            // @ts-strict-ignore
             class Spreadsheet {
                 constructor(saveCache, setCacheStatus) {
                     // @ts-expect-error Graph should be converted to class
-                    this.graph = new _graph_data_structure__WEBPACK_IMPORTED_MODULE_2__["default"]();
+                    this.graph = new _graph_data_structure__WEBPACK_IMPORTED_MODULE_2__.Graph();
                     this.nodes = new Map();
                     this.transactionDepth = 0;
                     this.saveCache = saveCache;
@@ -46162,7 +46369,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 hasCell(name) {
                     return this.nodes.has(name);
                 }
-                add(name, expr, value) {
+                add(name, expr) {
                     this.set(name, expr);
                 }
                 getNodes() {
@@ -46518,6 +46725,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ unresolveName: () => ( /* binding */unresolveName)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             function unresolveName(name) {
                 const idx = name.indexOf('!');
                 if (idx !== -1) {
@@ -46552,6 +46760,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _encryption__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../encryption */ "./packages/loot-core/src/server/encryption.ts");
             /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
+            // @ts-strict-ignore
             function coerceBuffer(value) {
                 // The web encryption APIs give us back raw Uint8Array... but our
                 // encryption code assumes we can work with it as a buffer. This is
@@ -46668,10 +46877,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ fullSync: () => ( /* binding */fullSync),
                 /* harmony export */ getMessagesSince: () => ( /* binding */getMessagesSince),
                 /* harmony export */ initialFullSync: () => ( /* binding */initialFullSync),
-                /* harmony export */ makeTestMessage: () => ( /* reexport safe */_make_test_message__WEBPACK_IMPORTED_MODULE_20__["default"]),
+                /* harmony export */ makeTestMessage: () => ( /* reexport safe */_make_test_message__WEBPACK_IMPORTED_MODULE_20__.makeTestMessage),
                 /* harmony export */ receiveMessages: () => ( /* binding */receiveMessages),
-                /* harmony export */ repairSync: () => ( /* reexport safe */_repair__WEBPACK_IMPORTED_MODULE_18__["default"]),
-                /* harmony export */ resetSync: () => ( /* reexport safe */_reset__WEBPACK_IMPORTED_MODULE_21__["default"]),
+                /* harmony export */ repairSync: () => ( /* reexport safe */_repair__WEBPACK_IMPORTED_MODULE_18__.repairSync),
+                /* harmony export */ resetSync: () => ( /* reexport safe */_reset__WEBPACK_IMPORTED_MODULE_21__.resetSync),
                 /* harmony export */ scheduleFullSync: () => ( /* binding */scheduleFullSync),
                 /* harmony export */ sendMessages: () => ( /* binding */sendMessages),
                 /* harmony export */ serializeValue: () => ( /* binding */serializeValue),
@@ -46700,6 +46909,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./utils */ "./packages/loot-core/src/server/sync/utils.ts");
             /* harmony import */ var _make_test_message__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./make-test-message */ "./packages/loot-core/src/server/sync/make-test-message.ts");
             /* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./reset */ "./packages/loot-core/src/server/sync/reset.ts");
+            // @ts-strict-ignore
             const FULL_SYNC_DELAY = 1000;
             let SYNCING_MODE = 'enabled';
             function setSyncingMode(mode) {
@@ -46800,7 +47010,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         sql = `SELECT * FROM ${table}`;
                     }
                     sql += ` WHERE `;
-                    sql += partIds.map((id) => `${column} = ?`).join(' OR ');
+                    sql += partIds.map(() => `${column} = ?`).join(' OR ');
                     try {
                         const rows = await _db__WEBPACK_IMPORTED_MODULE_8__.runQuery(sql, partIds, true);
                         results = results.concat(rows);
@@ -46811,8 +47021,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 message: error.message,
                                 stack: error.stack
                             },
-                            sql,
-                            params: partIds
+                            query: {
+                                sql,
+                                params: partIds
+                            }
                         });
                     }
                 }
@@ -47045,7 +47257,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 _syncListeners.forEach((func) => func(oldData, newData));
                 const tables = getTablesFromMessages(messages.filter((msg) => !msg.old));
-                _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                     type: 'applied',
                     tables,
                     data: newData,
@@ -47070,14 +47282,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             // couldn't apply, which doesn't make any sense. Must be a bug
                             // in the code. Send a specific error type for it for a custom
                             // message.
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 subtype: 'apply-failure',
                                 meta: e.meta
                             });
                         }
                         else {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 meta: e.meta
                             });
@@ -47161,7 +47373,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {};
             }
             const fullSync = (0, _shared_async__WEBPACK_IMPORTED_MODULE_5__.once)(async function () {
-                _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                     type: 'start'
                 });
                 let messages;
@@ -47173,28 +47385,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_9__.SyncError) {
                         if (e.reason === 'out-of-sync') {
                             (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_1__.captureException)(e);
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 subtype: 'out-of-sync',
                                 meta: e.meta
                             });
                         }
                         else if (e.reason === 'invalid-schema') {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 subtype: 'invalid-schema',
                                 meta: e.meta
                             });
                         }
                         else if (e.reason === 'decrypt-failure' || e.reason === 'encrypt-failure') {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 subtype: e.reason,
                                 meta: e.meta
                             });
                         }
                         else {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 meta: e.meta
                             });
@@ -47203,20 +47415,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_9__.PostError) {
                         console.log(e);
                         if (e.reason === 'unauthorized') {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'unauthorized'
                             });
                             // Set the user into read-only mode
                             _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_2__.setItem('readOnly', 'true');
                         }
                         else if (e.reason === 'network-failure') {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 subtype: 'network'
                             });
                         }
                         else {
-                            _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                            _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                                 type: 'error',
                                 subtype: e.reason
                             });
@@ -47225,7 +47437,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else {
                         (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_1__.captureException)(e);
                         // TODO: Send the message to the client and allow them to expand & view it
-                        _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                        _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                             type: 'error'
                         });
                     }
@@ -47238,7 +47450,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 const tables = getTablesFromMessages(messages);
-                _main_app__WEBPACK_IMPORTED_MODULE_10__["default"].events.emit('sync', {
+                _main_app__WEBPACK_IMPORTED_MODULE_10__.app.events.emit('sync', {
                     type: 'success',
                     tables,
                     syncDisabled: checkSyncingMode('disabled')
@@ -47259,7 +47471,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     new _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.Timestamp(Date.now() - 5 * 60 * 1000, 0, '0').toString();
                 const messages = getMessagesSince(since);
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_2__.getItem('user-token');
-                _platform_server_log__WEBPACK_IMPORTED_MODULE_4__["default"].info('Syncing since', since, messages.length, '(attempt: ' + count + ')');
+                _platform_server_log__WEBPACK_IMPORTED_MODULE_4__.logger.info('Syncing since', since, messages.length, '(attempt: ' + count + ')');
                 const buffer = await _encoder__WEBPACK_IMPORTED_MODULE_17__.encode(groupId, cloudFileId, since, messages);
                 // TODO: There a limit on how many messages we can send because of
                 // the payload size. Right now it's at 20MB on the server. We should
@@ -47274,7 +47486,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return [];
                 }
                 const res = await _encoder__WEBPACK_IMPORTED_MODULE_17__.decode(resBuffer);
-                _platform_server_log__WEBPACK_IMPORTED_MODULE_4__["default"].info('Got messages from server', res.messages.length);
+                _platform_server_log__WEBPACK_IMPORTED_MODULE_4__.logger.info('Got messages from server', res.messages.length);
                 const localTimeChanged = (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.toString() !== currentTime;
                 // Apply the new messages
                 let receivedMessages = [];
@@ -47300,10 +47512,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // false. In that case, we don't reset the counter but it should be
                     // very unlikely that this happens enough to hit the loop limit.
                     if (count >= 10 && diffTime === prevDiffTime || count >= 100) {
-                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__["default"].info('SENT -------');
-                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__["default"].info(JSON.stringify(messages));
-                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__["default"].info('RECEIVED -------');
-                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__["default"].info(JSON.stringify(res.messages));
+                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__.logger.info('SENT -------');
+                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__.logger.info(JSON.stringify(messages));
+                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__.logger.info('RECEIVED -------');
+                        _platform_server_log__WEBPACK_IMPORTED_MODULE_4__.logger.info(JSON.stringify(res.messages));
                         const rebuiltMerkle = (0, _repair__WEBPACK_IMPORTED_MODULE_18__.rebuildMerkleHash)();
                         console.log(count, 'messages:', messages.length, messages.length > 0 ? messages[0] : null, 'res.messages:', res.messages.length, res.messages.length > 0 ? res.messages[0] : null, 'clientId', (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.node(), 'groupId', groupId, 'diffTime:', diffTime, diffTime === prevDiffTime, 'local clock:', (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.toString(), (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().merkle.hash, 'rebuilt hash:', rebuiltMerkle.numMessages, rebuiltMerkle.trie.hash, 'server hash:', res.merkle.hash, 'localTimeChanged:', localTimeChanged);
                         if (rebuiltMerkle.trie.hash === res.merkle.hash) {
@@ -47343,11 +47555,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */makeTestMessage)
+                /* harmony export */ makeTestMessage: () => ( /* binding */makeTestMessage)
                 /* harmony export */ 
             });
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/crdt */ "./packages/crdt/index.ts");
             /* harmony import */ var _encryption__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../encryption */ "./packages/loot-core/src/server/encryption.ts");
+            // @ts-strict-ignore
             async function randomString() {
                 return (await _encryption__WEBPACK_IMPORTED_MODULE_1__.randomBytes(12)).toString();
             }
@@ -47376,6 +47589,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/crdt */ "./packages/crdt/index.ts");
             /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index */ "./packages/loot-core/src/server/sync/index.ts");
+            // @ts-strict-ignore
             function migrateParentIds(_oldValues, newValues) {
                 newValues.forEach((items, table) => {
                     if (table === 'transactions') {
@@ -47419,12 +47633,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */repairSync),
-                /* harmony export */ rebuildMerkleHash: () => ( /* binding */rebuildMerkleHash)
+                /* harmony export */ rebuildMerkleHash: () => ( /* binding */rebuildMerkleHash),
+                /* harmony export */ repairSync: () => ( /* binding */repairSync)
                 /* harmony export */ 
             });
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @actual-app/crdt */ "./packages/crdt/index.ts");
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            // @ts-strict-ignore
             function rebuildMerkleHash() {
                 const rows = _db__WEBPACK_IMPORTED_MODULE_1__.runQuery('SELECT timestamp FROM messages_crdt', [], true);
                 let trie = _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.merkle.emptyTrie();
@@ -47456,7 +47671,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */resetSync)
+                /* harmony export */ resetSync: () => ( /* binding */resetSync)
                 /* harmony export */ 
             });
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
@@ -47466,6 +47681,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
             /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
+            // @ts-strict-ignore
             async function resetSync(keyState) {
                 if (!keyState) {
                     // If we aren't resetting the key, make sure our key is up-to-date
@@ -47580,13 +47796,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+                /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
             /* harmony import */ var _accounts_transactions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../accounts/transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
             /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
+            // @ts-strict-ignore
             const app = (0, _app__WEBPACK_IMPORTED_MODULE_1__.createApp)();
             app.method('tools/fix-split-transactions', async () => {
                 // 1. Check for child transactions that have a blank payee, and set
@@ -47643,7 +47860,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     numDeleted: deletedRows.length
                 };
             });
-            /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (app);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/undo.ts": 
@@ -47667,6 +47883,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.ts");
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            // @ts-strict-ignore
             let MESSAGE_HISTORY = [
                 {
                     type: 'marker'
@@ -47903,6 +48120,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.ts");
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _migrate_migrations__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./migrate/migrations */ "./packages/loot-core/src/server/migrate/migrations.ts");
+            // @ts-strict-ignore
             // Managing the init/update process
             async function runMigrations() {
                 await _migrate_migrations__WEBPACK_IMPORTED_MODULE_3__.migrate(_db__WEBPACK_IMPORTED_MODULE_2__.getDatabase());
@@ -47943,6 +48161,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
+            // @ts-strict-ignore
             async function uniqueFileName(existingFiles) {
                 const initialName = 'My Finances';
                 let idx = 1;
@@ -48056,14 +48275,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ sequential: () => ( /* binding */sequential)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             function sequential(fn) {
                 const sequenceState = {
                     running: null,
                     queue: []
                 };
                 function pump() {
-                    if (sequenceState.queue.length > 0) {
-                        const next = sequenceState.queue.shift();
+                    const next = sequenceState.queue.shift();
+                    if (next !== undefined) {
                         run(next.args, next.resolve, next.reject);
                     }
                     else {
@@ -48071,8 +48291,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
                 function run(args, resolve, reject) {
-                    sequenceState.running = fn.apply(null, args);
-                    sequenceState.running.then((val) => {
+                    sequenceState.running = fn.apply(null, args).then((val) => {
                         pump();
                         resolve(val);
                     }, (err) => {
@@ -48157,6 +48376,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ getUploadError: () => ( /* binding */getUploadError)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             function getUploadError({ reason, meta }) {
                 switch (reason) {
                     case 'unauthorized':
@@ -48293,6 +48513,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfMonth/index.js");
             /* harmony import */ var memoize_one__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! memoize-one */ "./node_modules/memoize-one/dist/memoize-one.esm.js");
             /* harmony import */ var _client_platform__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../client/platform */ "./packages/loot-core/src/client/platform.electron.ts");
+            // @ts-strict-ignore
             function _parse(value) {
                 if (typeof value === 'string') {
                     // Dates are hard. We just want to deal with months in the format
@@ -48462,11 +48683,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const days = [];
                 let day = start;
                 while (date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(day), _parse(end))) {
-                    days.push(day);
+                    days.push(dayFromDate(day));
                     day = addDays(day, 1);
                 }
                 if (inclusive) {
-                    days.push(day);
+                    days.push(dayFromDate(day));
                 }
                 return days;
             }
@@ -48540,10 +48761,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ Query: () => ( /* binding */Query),
-                /* harmony export */ "default": () => ( /* binding */q),
-                /* harmony export */ getPrimaryOrderBy: () => ( /* binding */getPrimaryOrderBy)
+                /* harmony export */ getPrimaryOrderBy: () => ( /* binding */getPrimaryOrderBy),
+                /* harmony export */ q: () => ( /* binding */q)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             class Query {
                 constructor(state) {
                     this.state = {
@@ -48718,6 +48940,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/shared/util.ts");
+            // @ts-strict-ignore
             // For now, this info is duplicated from the backend. Figure out how
             // to share it later.
             const TYPE_INFO = {
@@ -48788,6 +49011,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 category: 'id',
                 account: 'id',
                 cleared: 'boolean',
+                reconciled: 'boolean',
                 saved: 'saved'
             }));
             function mapField(field, opts) {
@@ -49030,6 +49254,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./query */ "./packages/loot-core/src/shared/query.ts");
+            // @ts-strict-ignore
             function getStatus(nextDate, completed, hasTrans) {
                 const today = _months__WEBPACK_IMPORTED_MODULE_0__.currentDay();
                 if (completed) {
@@ -49063,7 +49288,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     };
                 });
-                return (0, _query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+                return (0, _query__WEBPACK_IMPORTED_MODULE_1__.q)('transactions').filter({
                     $or: filters
                 }).orderBy({
                     date: 'desc'
@@ -49199,12 +49424,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function recurConfigToRSchedule(config) {
                 const base = {
                     start: _months__WEBPACK_IMPORTED_MODULE_0__.parseDate(config.start),
+                    // @ts-ignore: issues with https://gitlab.com/john.carroll.p/rschedule/-/issues/86
                     frequency: config.frequency.toUpperCase(),
                     byHourOfDay: [
                         12
                     ]
                 };
                 if (config.interval) {
+                    // @ts-ignore: issues with https://gitlab.com/john.carroll.p/rschedule/-/issues/86
                     base.interval = config.interval;
                 }
                 switch (config.endMode) {
@@ -49307,6 +49534,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/shared/util.ts");
+            // @ts-strict-ignore
             function isPreviewId(id) {
                 return id.indexOf('preview/') !== -1;
             }
@@ -49397,7 +49625,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
             }
             function applyTransactionDiff(groupedTrans, diff) {
-                return groupTransaction((0, _util__WEBPACK_IMPORTED_MODULE_0__.applyChanges)(diff, ungroupTransaction(groupedTrans)));
+                return groupTransaction((0, _util__WEBPACK_IMPORTED_MODULE_0__.applyChanges)(diff, ungroupTransaction(groupedTrans) || []));
             }
             function replaceTransactions(transactions, id, func) {
                 const idx = transactions.findIndex((t) => t.id === id);
@@ -49413,6 +49641,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (parentIndex == null) {
                         console.log('Cannot find parent index');
                         return {
+                            data: [],
                             diff: {
                                 deleted: [],
                                 updated: []
@@ -49474,8 +49703,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (!trans.is_parent) {
                         return trans;
                     }
-                    const prevSub = (0, _util__WEBPACK_IMPORTED_MODULE_0__.last)(trans.subtransactions);
-                    trans.subtransactions.push(makeChild(trans, {
+                    const prevSub = (0, _util__WEBPACK_IMPORTED_MODULE_0__.last)(trans.subtransactions || []);
+                    trans.subtransactions?.push(makeChild(trans, {
                         amount: 0,
                         sort_order: num(prevSub && prevSub.sort_order) - 1
                     }));
@@ -49486,7 +49715,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return replaceTransactions(transactions, transaction.id, (trans) => {
                     if (trans.is_parent) {
                         const parent = trans.id === transaction.id ? transaction : trans;
-                        const sub = trans.subtransactions.map((t) => {
+                        const sub = trans.subtransactions?.map((t) => {
                             // Make sure to update the children to reflect the updated
                             // properties (if the parent updated)
                             let child = t;
@@ -49517,7 +49746,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (trans.id === id) {
                             return null;
                         }
-                        else if (trans.subtransactions.length === 1) {
+                        else if (trans.subtransactions?.length === 1) {
                             return {
                                 ...trans,
                                 subtransactions: null,
@@ -49526,7 +49755,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             };
                         }
                         else {
-                            const sub = trans.subtransactions.filter((t) => t.id !== id);
+                            const sub = trans.subtransactions?.filter((t) => t.id !== id);
                             return recalculateSplit({
                                 ...trans,
                                 subtransactions: sub
@@ -49583,6 +49812,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ amountToCurrency: () => ( /* binding */amountToCurrency),
+                /* harmony export */ amountToCurrencyNoDecimal: () => ( /* binding */amountToCurrencyNoDecimal),
                 /* harmony export */ amountToInteger: () => ( /* binding */amountToInteger),
                 /* harmony export */ applyChanges: () => ( /* binding */applyChanges),
                 /* harmony export */ currencyToAmount: () => ( /* binding */currencyToAmount),
@@ -49610,17 +49840,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ toRelaxedNumber: () => ( /* binding */toRelaxedNumber)
                 /* harmony export */ 
             });
+            // @ts-strict-ignore
             function last(arr) {
                 return arr[arr.length - 1];
             }
             function getChangedValues(obj1, obj2) {
-                // Keep the id field because this is mostly used to diff database
-                // objects
-                const diff = obj1.id ? {
-                    id: obj1.id
-                } : {};
+                const diff = {};
                 const keys = Object.keys(obj2);
                 let hasChanged = false;
+                // Keep the id field because this is mostly used to diff database
+                // objects
+                if (obj1.id) {
+                    diff.id = obj1.id;
+                }
                 for (let i = 0; i < keys.length; i++) {
                     const key = keys[i];
                     if (obj1[key] !== obj2[key]) {
@@ -49876,6 +50108,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function amountToCurrency(n) {
                 return getNumberFormat().formatter.format(n);
             }
+            function amountToCurrencyNoDecimal(n) {
+                return getNumberFormat({
+                    hideFraction: true
+                }).formatter.format(n);
+            }
             function currencyToAmount(str) {
                 const amount = parseFloat(str.replace(getNumberFormat().regex, '').replace(getNumberFormat().separator, '.'));
                 return isNaN(amount) ? null : amount;
@@ -49912,7 +50149,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     amount = amount.replace('(', '-').replace(')', '');
                 }
                 const m = amount.match(/[.,][^.,]*$/);
-                if (!m || m.index === 0) {
+                if (!m || m.index === undefined || m.index === 0) {
                     return safeNumber(parseFloat(extractNumbers(amount)));
                 }
                 const left = extractNumbers(amount.slice(0, m.index));
@@ -57159,24 +57396,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             module.exports = require("better-sqlite3");
             /***/ 
         }),
-        /***/ "fs": 
-        /*!*********************!*\
-          !*** external "fs" ***!
-          \*********************/
-        /***/ ((module) => {
-            "use strict";
-            module.exports = require("fs");
-            /***/ 
-        }),
-        /***/ "node-libofx": 
-        /*!******************************!*\
-          !*** external "node-libofx" ***!
-          \******************************/
-        /***/ ((module) => {
-            "use strict";
-            module.exports = require("node-libofx");
-            /***/ 
-        }),
         /***/ "crypto": 
         /*!*************************!*\
           !*** external "crypto" ***!
@@ -57195,6 +57414,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             module.exports = require("events");
             /***/ 
         }),
+        /***/ "fs": 
+        /*!*********************!*\
+          !*** external "fs" ***!
+          \*********************/
+        /***/ ((module) => {
+            "use strict";
+            module.exports = require("fs");
+            /***/ 
+        }),
         /***/ "os": 
         /*!*********************!*\
           !*** external "os" ***!
@@ -57827,42 +58055,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
         /******/ 
     })();
     /******/
-    /******/ /* webpack/runtime/create fake namespace object */
-    /******/ (() => {
-        /******/ var getProto = Object.getPrototypeOf ? (obj) => (Object.getPrototypeOf(obj)) : (obj) => (obj.__proto__);
-        /******/ var leafPrototypes;
-        /******/ // create a fake namespace object
-        /******/ // mode & 1: value is a module id, require it
-        /******/ // mode & 2: merge all properties of value into the ns
-        /******/ // mode & 4: return value when already ns object
-        /******/ // mode & 16: return value when it's Promise-like
-        /******/ // mode & 8|1: behave like require
-        /******/ __webpack_require__.t = function (value, mode) {
-            /******/ if (mode & 1)
-                value = this(value);
-            /******/ if (mode & 8)
-                return value;
-            /******/ if (typeof value === 'object' && value) {
-                /******/ if ((mode & 4) && value.__esModule)
-                    return value;
-                /******/ if ((mode & 16) && typeof value.then === 'function')
-                    return value;
-                /******/ }
-            /******/ var ns = Object.create(null);
-            /******/ __webpack_require__.r(ns);
-            /******/ var def = {};
-            /******/ leafPrototypes = leafPrototypes || [null, getProto({}), getProto([]), getProto(getProto)];
-            /******/ for (var current = mode & 2 && value; typeof current == 'object' && !~leafPrototypes.indexOf(current); current = getProto(current)) {
-                /******/ Object.getOwnPropertyNames(current).forEach((key) => (def[key] = () => (value[key])));
-                /******/ }
-            /******/ def['default'] = () => (value);
-            /******/ __webpack_require__.d(ns, def);
-            /******/ return ns;
-            /******/ 
-        };
-        /******/ 
-    })();
-    /******/
     /******/ /* webpack/runtime/define property getters */
     /******/ (() => {
         /******/ // define getter functions for harmony exports