@actual-app/api 6.10.0 → 24.10.0

package/dist/app/bundle.api.js

@@ -4619,145 +4619,6 @@
             ];
             /***/ 
         }),
-        /***/ "./node_modules/@rschedule/json-tools/es2015/Schedule.js": 
-        /*!***************************************************************!*\
-          !*** ./node_modules/@rschedule/json-tools/es2015/Schedule.js ***!
-          \***************************************************************/
-        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-            "use strict";
-            __webpack_require__.r(__webpack_exports__);
-            /* harmony import */ var _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @rschedule/core/generators */ "./node_modules/@rschedule/core/es2015/generators.js");
-            /* harmony import */ var _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @rschedule/json-tools */ "./node_modules/@rschedule/json-tools/es2015/main.js");
-            /* harmony import */ var _rschedule_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @rschedule/core */ "./node_modules/@rschedule/core/es2015/main.js");
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Dates.prototype.toJSON = function serialize(opts = {}) {
-                const json = {
-                    type: 'Dates',
-                    dates: this.adapters.map(adapter => adapter.toJSON()),
-                };
-                if (!opts.nested)
-                    json.timezone = this.timezone;
-                (0, _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.serializeDataToJSON)(this, json, opts);
-                return json;
-            };
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Dates.fromJSON = function parse(json, options = {}) {
-                if (json.type !== 'Dates') {
-                    throw new _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.ParseJSONError('Invalid Dates JSON');
-                }
-                return new _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Dates({
-                    dates: json.dates.map(date => _rschedule_core__WEBPACK_IMPORTED_MODULE_2__.DateAdapterBase.adapter.fromJSON(date)),
-                    data: typeof options.data === 'function' ? options.data(json) : json.data,
-                    timezone: options.timezone || json.timezone,
-                });
-            };
-            (0, _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.registerJSONSerializerFn)('Dates', _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Dates.fromJSON);
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Rule.prototype.toJSON = function serialize(opts = {}) {
-                const json = {
-                    type: 'Rule',
-                    config: Object.assign(Object.assign({}, (0, _rschedule_core__WEBPACK_IMPORTED_MODULE_2__.cloneJSON)(this.options)), {
-                        start: this.normalizeDateInput(this.options.start).toJSON(),
-                    }),
-                };
-                if (this.options.end) {
-                    json.config.end = this.normalizeDateInput(this.options.end).toJSON();
-                }
-                if (!opts.nested)
-                    json.timezone = this.timezone;
-                (0, _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.serializeDataToJSON)(this, json, opts);
-                return json;
-            };
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Rule.fromJSON = function fromJSON(json, options = {}) {
-                const config = Object.assign(Object.assign({}, json.config), {
-                    start: _rschedule_core__WEBPACK_IMPORTED_MODULE_2__.DateAdapterBase.adapter.fromJSON(json.config.start),
-                    end: json.config.end && _rschedule_core__WEBPACK_IMPORTED_MODULE_2__.DateAdapterBase.adapter.fromJSON(json.config.end),
-                });
-                return new _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Rule(config, {
-                    data: typeof options.data === 'function' ? options.data(json) : json.data,
-                    timezone: options.timezone || json.timezone,
-                });
-            };
-            (0, _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.registerJSONSerializerFn)('Rule', _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Rule.fromJSON);
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Schedule.prototype.toJSON = function serialize(opts = {}) {
-                const json = {
-                    type: 'Schedule',
-                    rrules: this.rrules.map(rule => rule.toJSON(Object.assign(Object.assign({}, opts), { nested: true }))),
-                    exrules: this.exrules.map(rule => rule.toJSON(Object.assign(Object.assign({}, opts), { nested: true }))),
-                    rdates: this.rdates.toJSON(Object.assign(Object.assign({}, opts), { nested: true })),
-                    exdates: this.exdates.toJSON(Object.assign(Object.assign({}, opts), { nested: true })),
-                };
-                if (!opts.nested)
-                    json.timezone = this.timezone;
-                (0, _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.serializeDataToJSON)(this, json, opts);
-                return json;
-            };
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Schedule.fromJSON = function parse(json, options = {}) {
-                if (json.type !== 'Schedule') {
-                    throw new _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.ParseJSONError('Invalid Schedule JSON');
-                }
-                return new _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Schedule({
-                    rrules: json.rrules.map(rule => _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Rule.fromJSON(rule, Object.assign({ timezone: json.timezone }, options))),
-                    exrules: json.exrules.map(rule => _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Rule.fromJSON(rule, Object.assign({ timezone: json.timezone }, options))),
-                    rdates: _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Dates.fromJSON(json.rdates, Object.assign({ timezone: json.timezone }, options)),
-                    exdates: _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Dates.fromJSON(json.exdates, Object.assign({ timezone: json.timezone }, options)),
-                    data: typeof options.data === 'function' ? options.data(json) : json.data,
-                    timezone: options.timezone || json.timezone,
-                });
-            };
-            (0, _rschedule_json_tools__WEBPACK_IMPORTED_MODULE_0__.registerJSONSerializerFn)('Schedule', _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_1__.Schedule.fromJSON);
-            /***/ 
-        }),
-        /***/ "./node_modules/@rschedule/json-tools/es2015/main.js": 
-        /*!***********************************************************!*\
-          !*** ./node_modules/@rschedule/json-tools/es2015/main.js ***!
-          \***********************************************************/
-        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-            "use strict";
-            __webpack_require__.r(__webpack_exports__);
-            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ ParseJSONError: () => ( /* binding */ParseJSONError),
-                /* harmony export */ SerializeJSONError: () => ( /* binding */SerializeJSONError),
-                /* harmony export */ registerJSONSerializerFn: () => ( /* binding */registerJSONSerializerFn),
-                /* harmony export */ serializeDataToJSON: () => ( /* binding */serializeDataToJSON)
-                /* harmony export */ 
-            });
-            /* harmony import */ var _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @rschedule/core/generators */ "./node_modules/@rschedule/core/es2015/generators.js");
-            class ParseJSONError extends Error {
-            }
-            class SerializeJSONError extends Error {
-            }
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_0__.OccurrenceGenerator.JSON_FN_MAP = new Map();
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_0__.OccurrenceGenerator.prototype.toJSON = function serialize(opts) {
-                throw new SerializeJSONError(`To support smaller bundles, ${this.constructor.name}#toJSON() ` +
-                    `must be manually added. See "@rschedule/json-tools" in the rSchedule docs.`);
-            };
-            _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_0__.OccurrenceGenerator.fromJSON = function parse(json, options) {
-                if (typeof json !== 'object' || json === null) {
-                    throw new ParseJSONError(`Invalid json "${json}"`);
-                }
-                const fn = _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_0__.OccurrenceGenerator.JSON_FN_MAP.get(json.type);
-                if (!fn) {
-                    throw new ParseJSONError(`Unknown rSchedule object type "${json.type}". Have you added a json serializer ` +
-                        `for "${json.type}"? ` +
-                        `See "@rschedule/json-tools" in the rSchedule docs.`);
-                }
-                return fn(json, options);
-            };
-            function serializeDataToJSON(gen, json, opt) {
-                if (!opt.data)
-                    return;
-                if (opt.data === true) {
-                    json.data = gen.data;
-                }
-                else {
-                    json.data = opt.data(gen);
-                }
-                if (json.data === undefined)
-                    delete json.data;
-            }
-            function registerJSONSerializerFn(name, fn) {
-                _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_0__.OccurrenceGenerator.JSON_FN_MAP.set(name, fn);
-            }
-            /***/ 
-        }),
         /***/ "./node_modules/@rschedule/standard-date-adapter/es2015/main.js": 
         /*!**********************************************************************!*\
           !*** ./node_modules/@rschedule/standard-date-adapter/es2015/main.js ***!
@@ -18249,6 +18110,50 @@
             module.exports = defineProperties;
             /***/ 
         }),
+        /***/ "./node_modules/err-code/index.js": 
+        /*!****************************************!*\
+          !*** ./node_modules/err-code/index.js ***!
+          \****************************************/
+        /***/ ((module) => {
+            "use strict";
+            function assign(obj, props) {
+                for (const key in props) {
+                    Object.defineProperty(obj, key, {
+                        value: props[key],
+                        enumerable: true,
+                        configurable: true,
+                    });
+                }
+                return obj;
+            }
+            function createError(err, code, props) {
+                if (!err || typeof err === 'string') {
+                    throw new TypeError('Please pass an Error to err-code');
+                }
+                if (!props) {
+                    props = {};
+                }
+                if (typeof code === 'object') {
+                    props = code;
+                    code = undefined;
+                }
+                if (code != null) {
+                    props.code = code;
+                }
+                try {
+                    return assign(err, props);
+                }
+                catch (_) {
+                    props.message = err.message;
+                    props.stack = err.stack;
+                    const ErrClass = function () { };
+                    ErrClass.prototype = Object.create(Object.getPrototypeOf(err));
+                    return assign(new ErrClass(), props);
+                }
+            }
+            module.exports = createError;
+            /***/ 
+        }),
         /***/ "./node_modules/es-define-property/index.js": 
         /*!**************************************************!*\
           !*** ./node_modules/es-define-property/index.js ***!
@@ -24213,6 +24118,54 @@
             ];
             /***/ 
         }),
+        /***/ "./node_modules/promise-retry/index.js": 
+        /*!*********************************************!*\
+          !*** ./node_modules/promise-retry/index.js ***!
+          \*********************************************/
+        /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+            "use strict";
+            var errcode = __webpack_require__(/*! err-code */ "./node_modules/err-code/index.js");
+            var retry = __webpack_require__(/*! retry */ "./node_modules/retry/index.js");
+            var hasOwn = Object.prototype.hasOwnProperty;
+            function isRetryError(err) {
+                return err && err.code === 'EPROMISERETRY' && hasOwn.call(err, 'retried');
+            }
+            function promiseRetry(fn, options) {
+                var temp;
+                var operation;
+                if (typeof fn === 'object' && typeof options === 'function') {
+                    // Swap options and fn when using alternate signature (options, fn)
+                    temp = options;
+                    options = fn;
+                    fn = temp;
+                }
+                operation = retry.operation(options);
+                return new Promise(function (resolve, reject) {
+                    operation.attempt(function (number) {
+                        Promise.resolve()
+                            .then(function () {
+                            return fn(function (err) {
+                                if (isRetryError(err)) {
+                                    err = err.retried;
+                                }
+                                throw errcode(new Error('Retrying'), 'EPROMISERETRY', { retried: err });
+                            }, number);
+                        })
+                            .then(resolve, function (err) {
+                            if (isRetryError(err)) {
+                                err = err.retried;
+                                if (operation.retry(err || new Error())) {
+                                    return;
+                                }
+                            }
+                            reject(err);
+                        });
+                    });
+                });
+            }
+            module.exports = promiseRetry;
+            /***/ 
+        }),
         /***/ "./node_modules/regexp.prototype.flags/implementation.js": 
         /*!***************************************************************!*\
           !*** ./node_modules/regexp.prototype.flags/implementation.js ***!
@@ -24344,6 +24297,239 @@
             };
             /***/ 
         }),
+        /***/ "./node_modules/retry/index.js": 
+        /*!*************************************!*\
+          !*** ./node_modules/retry/index.js ***!
+          \*************************************/
+        /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+            module.exports = __webpack_require__(/*! ./lib/retry */ "./node_modules/retry/lib/retry.js");
+            /***/ 
+        }),
+        /***/ "./node_modules/retry/lib/retry.js": 
+        /*!*****************************************!*\
+          !*** ./node_modules/retry/lib/retry.js ***!
+          \*****************************************/
+        /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+            var RetryOperation = __webpack_require__(/*! ./retry_operation */ "./node_modules/retry/lib/retry_operation.js");
+            exports.operation = function (options) {
+                var timeouts = exports.timeouts(options);
+                return new RetryOperation(timeouts, {
+                    forever: options && options.forever,
+                    unref: options && options.unref,
+                    maxRetryTime: options && options.maxRetryTime
+                });
+            };
+            exports.timeouts = function (options) {
+                if (options instanceof Array) {
+                    return [].concat(options);
+                }
+                var opts = {
+                    retries: 10,
+                    factor: 2,
+                    minTimeout: 1 * 1000,
+                    maxTimeout: Infinity,
+                    randomize: false
+                };
+                for (var key in options) {
+                    opts[key] = options[key];
+                }
+                if (opts.minTimeout > opts.maxTimeout) {
+                    throw new Error('minTimeout is greater than maxTimeout');
+                }
+                var timeouts = [];
+                for (var i = 0; i < opts.retries; i++) {
+                    timeouts.push(this.createTimeout(i, opts));
+                }
+                if (options && options.forever && !timeouts.length) {
+                    timeouts.push(this.createTimeout(i, opts));
+                }
+                // sort the array numerically ascending
+                timeouts.sort(function (a, b) {
+                    return a - b;
+                });
+                return timeouts;
+            };
+            exports.createTimeout = function (attempt, opts) {
+                var random = (opts.randomize)
+                    ? (Math.random() + 1)
+                    : 1;
+                var timeout = Math.round(random * opts.minTimeout * Math.pow(opts.factor, attempt));
+                timeout = Math.min(timeout, opts.maxTimeout);
+                return timeout;
+            };
+            exports.wrap = function (obj, options, methods) {
+                if (options instanceof Array) {
+                    methods = options;
+                    options = null;
+                }
+                if (!methods) {
+                    methods = [];
+                    for (var key in obj) {
+                        if (typeof obj[key] === 'function') {
+                            methods.push(key);
+                        }
+                    }
+                }
+                for (var i = 0; i < methods.length; i++) {
+                    var method = methods[i];
+                    var original = obj[method];
+                    obj[method] = function retryWrapper(original) {
+                        var op = exports.operation(options);
+                        var args = Array.prototype.slice.call(arguments, 1);
+                        var callback = args.pop();
+                        args.push(function (err) {
+                            if (op.retry(err)) {
+                                return;
+                            }
+                            if (err) {
+                                arguments[0] = op.mainError();
+                            }
+                            callback.apply(this, arguments);
+                        });
+                        op.attempt(function () {
+                            original.apply(obj, args);
+                        });
+                    }.bind(obj, original);
+                    obj[method].options = options;
+                }
+            };
+            /***/ 
+        }),
+        /***/ "./node_modules/retry/lib/retry_operation.js": 
+        /*!***************************************************!*\
+          !*** ./node_modules/retry/lib/retry_operation.js ***!
+          \***************************************************/
+        /***/ ((module) => {
+            function RetryOperation(timeouts, options) {
+                // Compatibility for the old (timeouts, retryForever) signature
+                if (typeof options === 'boolean') {
+                    options = { forever: options };
+                }
+                this._originalTimeouts = JSON.parse(JSON.stringify(timeouts));
+                this._timeouts = timeouts;
+                this._options = options || {};
+                this._maxRetryTime = options && options.maxRetryTime || Infinity;
+                this._fn = null;
+                this._errors = [];
+                this._attempts = 1;
+                this._operationTimeout = null;
+                this._operationTimeoutCb = null;
+                this._timeout = null;
+                this._operationStart = null;
+                if (this._options.forever) {
+                    this._cachedTimeouts = this._timeouts.slice(0);
+                }
+            }
+            module.exports = RetryOperation;
+            RetryOperation.prototype.reset = function () {
+                this._attempts = 1;
+                this._timeouts = this._originalTimeouts;
+            };
+            RetryOperation.prototype.stop = function () {
+                if (this._timeout) {
+                    clearTimeout(this._timeout);
+                }
+                this._timeouts = [];
+                this._cachedTimeouts = null;
+            };
+            RetryOperation.prototype.retry = function (err) {
+                if (this._timeout) {
+                    clearTimeout(this._timeout);
+                }
+                if (!err) {
+                    return false;
+                }
+                var currentTime = new Date().getTime();
+                if (err && currentTime - this._operationStart >= this._maxRetryTime) {
+                    this._errors.unshift(new Error('RetryOperation timeout occurred'));
+                    return false;
+                }
+                this._errors.push(err);
+                var timeout = this._timeouts.shift();
+                if (timeout === undefined) {
+                    if (this._cachedTimeouts) {
+                        // retry forever, only keep last error
+                        this._errors.splice(this._errors.length - 1, this._errors.length);
+                        this._timeouts = this._cachedTimeouts.slice(0);
+                        timeout = this._timeouts.shift();
+                    }
+                    else {
+                        return false;
+                    }
+                }
+                var self = this;
+                var timer = setTimeout(function () {
+                    self._attempts++;
+                    if (self._operationTimeoutCb) {
+                        self._timeout = setTimeout(function () {
+                            self._operationTimeoutCb(self._attempts);
+                        }, self._operationTimeout);
+                        if (self._options.unref) {
+                            self._timeout.unref();
+                        }
+                    }
+                    self._fn(self._attempts);
+                }, timeout);
+                if (this._options.unref) {
+                    timer.unref();
+                }
+                return true;
+            };
+            RetryOperation.prototype.attempt = function (fn, timeoutOps) {
+                this._fn = fn;
+                if (timeoutOps) {
+                    if (timeoutOps.timeout) {
+                        this._operationTimeout = timeoutOps.timeout;
+                    }
+                    if (timeoutOps.cb) {
+                        this._operationTimeoutCb = timeoutOps.cb;
+                    }
+                }
+                var self = this;
+                if (this._operationTimeoutCb) {
+                    this._timeout = setTimeout(function () {
+                        self._operationTimeoutCb();
+                    }, self._operationTimeout);
+                }
+                this._operationStart = new Date().getTime();
+                this._fn(this._attempts);
+            };
+            RetryOperation.prototype.try = function (fn) {
+                console.log('Using RetryOperation.try() is deprecated');
+                this.attempt(fn);
+            };
+            RetryOperation.prototype.start = function (fn) {
+                console.log('Using RetryOperation.start() is deprecated');
+                this.attempt(fn);
+            };
+            RetryOperation.prototype.start = RetryOperation.prototype.try;
+            RetryOperation.prototype.errors = function () {
+                return this._errors;
+            };
+            RetryOperation.prototype.attempts = function () {
+                return this._attempts;
+            };
+            RetryOperation.prototype.mainError = function () {
+                if (this._errors.length === 0) {
+                    return null;
+                }
+                var counts = {};
+                var mainError = null;
+                var mainErrorCount = 0;
+                for (var i = 0; i < this._errors.length; i++) {
+                    var error = this._errors[i];
+                    var message = error.message;
+                    var count = (counts[message] || 0) + 1;
+                    counts[message] = count;
+                    if (count >= mainErrorCount) {
+                        mainError = error;
+                        mainErrorCount = count;
+                    }
+                }
+                return mainError;
+            };
+            /***/ 
+        }),
         /***/ "./node_modules/sax/lib/sax.js": 
         /*!*************************************!*\
           !*** ./node_modules/sax/lib/sax.js ***!
@@ -27211,6 +27397,65 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/migrations/1723665565000_prefs.js": 
+        /*!**************************************************************!*\
+          !*** ./packages/loot-core/migrations/1723665565000_prefs.js ***!
+          \**************************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ "default": () => ( /* binding */runMigration)
+                /* harmony export */ 
+            });
+            const SYNCED_PREF_KEYS = [
+                'firstDayOfWeekIdx',
+                'dateFormat',
+                'numberFormat',
+                'hideFraction',
+                'isPrivacyEnabled',
+                /^show-extra-balances-/,
+                /^hide-cleared-/,
+                /^parse-date-/,
+                /^csv-mappings-/,
+                /^csv-delimiter-/,
+                /^csv-has-header-/,
+                /^ofx-fallback-missing-payee-/,
+                /^flip-amount-/,
+                'budgetType',
+                /^flags\./
+            ];
+            async function runMigration(db, { fs, fileId }) {
+                await db.execQuery(`
+    CREATE TABLE preferences
+       (id TEXT PRIMARY KEY,
+        value TEXT);
+  `);
+                try {
+                    const budgetDir = fs.getBudgetDir(fileId);
+                    const fullpath = fs.join(budgetDir, 'metadata.json');
+                    const prefs = JSON.parse(await fs.readFile(fullpath));
+                    if (typeof prefs !== 'object') {
+                        return;
+                    }
+                    await Promise.all(Object.keys(prefs).map(async (key) => {
+                        // Check if the current key is of synced-keys type
+                        if (!SYNCED_PREF_KEYS.find((keyMatcher) => keyMatcher instanceof RegExp ? keyMatcher.test(key) : keyMatcher === key)) {
+                            return;
+                        }
+                        // insert the synced prefs in the new table
+                        await db.runQuery('INSERT INTO preferences (id, value) VALUES (?, ?)', [
+                            key,
+                            String(prefs[key])
+                        ]);
+                    }));
+                }
+                catch (e) {
+                    // Do nothing
+                }
+            }
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/client/platform.electron.ts": 
         /*!************************************************************!*\
           !*** ./packages/loot-core/src/client/platform.electron.ts ***!
@@ -28256,15 +28501,15 @@ 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 */ _setDocumentDir: () => ( /* reexport safe */_shared__WEBPACK_IMPORTED_MODULE_2__._setDocumentDir),
+                /* harmony export */ _setDocumentDir: () => ( /* reexport safe */_shared__WEBPACK_IMPORTED_MODULE_3__._setDocumentDir),
                 /* harmony export */ basename: () => ( /* binding */basename),
                 /* harmony export */ bundledDatabasePath: () => ( /* binding */bundledDatabasePath),
                 /* harmony export */ copyFile: () => ( /* binding */copyFile),
                 /* harmony export */ demoBudgetPath: () => ( /* binding */demoBudgetPath),
                 /* harmony export */ exists: () => ( /* binding */exists),
-                /* harmony export */ getBudgetDir: () => ( /* reexport safe */_shared__WEBPACK_IMPORTED_MODULE_2__.getBudgetDir),
+                /* harmony export */ getBudgetDir: () => ( /* reexport safe */_shared__WEBPACK_IMPORTED_MODULE_3__.getBudgetDir),
                 /* harmony export */ getDataDir: () => ( /* binding */getDataDir),
-                /* harmony export */ getDocumentDir: () => ( /* reexport safe */_shared__WEBPACK_IMPORTED_MODULE_2__.getDocumentDir),
+                /* harmony export */ getDocumentDir: () => ( /* reexport safe */_shared__WEBPACK_IMPORTED_MODULE_3__.getDocumentDir),
                 /* harmony export */ getModifiedTime: () => ( /* binding */getModifiedTime),
                 /* harmony export */ init: () => ( /* binding */init),
                 /* harmony export */ join: () => ( /* binding */join),
@@ -28283,7 +28528,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
             /* 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");
+            /* harmony import */ var promise_retry__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! promise-retry */ "./node_modules/promise-retry/index.js");
+            /* harmony import */ var promise_retry__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/ __webpack_require__.n(promise_retry__WEBPACK_IMPORTED_MODULE_2__);
+            /* harmony import */ var _shared__WEBPACK_IMPORTED_MODULE_3__ = __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')) {
@@ -28369,13 +28616,36 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 });
             };
-            const writeFile = (filepath, contents) => {
-                return new Promise(function (resolve, reject) {
-                    // @ts-expect-error contents type needs refining
-                    fs__WEBPACK_IMPORTED_MODULE_0__.writeFile(filepath, contents, 'utf8', function (err) {
-                        return err ? reject(err) : resolve(undefined);
+            const writeFile = async (filepath, contents) => {
+                try {
+                    await promise_retry__WEBPACK_IMPORTED_MODULE_2___default()((retry, attempt) => {
+                        return new Promise((resolve, reject) => {
+                            // @ts-expect-error contents type needs refining
+                            fs__WEBPACK_IMPORTED_MODULE_0__.writeFile(filepath, contents, 'utf8', (err) => {
+                                if (err) {
+                                    console.error(`Failed to write to ${filepath}. Attempted ${attempt} times. Something is locking the file - potentially a virus scanner or backup software.`);
+                                    reject(err);
+                                }
+                                else {
+                                    if (attempt > 1) {
+                                        console.info(`Successfully recovered from file lock. It took ${attempt} retries`);
+                                    }
+                                    resolve(undefined);
+                                }
+                            });
+                        }).catch(retry);
+                    }, {
+                        retries: 20,
+                        minTimeout: 100,
+                        maxTimeout: 500,
+                        factor: 1.5
                     });
-                });
+                    return undefined;
+                }
+                catch (err) {
+                    console.error(`Unable to recover from file lock on file ${filepath}`);
+                    throw err;
+                }
             };
             const removeFile = (filepath) => {
                 return new Promise(function (resolve, reject) {
@@ -28604,7 +28874,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             }
             function regexp(regex, text) {
-                return new RegExp(regex).test(text) ? 1 : 0;
+                return new RegExp(regex).test(text || '') ? 1 : 0;
             }
             function openDatabase(pathOrBuffer) {
                 const db = new (better_sqlite3__WEBPACK_IMPORTED_MODULE_0___default())(pathOrBuffer);
@@ -29337,7 +29607,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const rules = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_2__.recurConfigToRSchedule)(desc);
                     return {
                         type: 'recur',
-                        // @ts-expect-error fix me
                         schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_6__.Schedule({
                             rrules: rules,
                             data: {
@@ -29458,30 +29727,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             assert(Array.isArray(value), 'no-empty-array', `oneOf must have an array value (field: ${fieldName}): ${JSON.stringify(value)}`);
                             return value.filter(Boolean).map((val) => val.toLowerCase());
                         }
+                        assert(typeof value === 'string', 'not-string', `Invalid string value (field: ${fieldName})`);
                         if (op === 'contains' || op === 'matches' || op === 'doesNotContain' || op === 'hasTags') {
-                            assert(typeof value === 'string' && value.length > 0, 'no-empty-string', `contains must have non-empty string (field: ${fieldName})`);
-                        }
-                        return value.toLowerCase();
-                    }
-                },
-                imported_payee: {
-                    ops: [
-                        'is',
-                        'contains',
-                        'matches',
-                        'oneOf',
-                        'isNot',
-                        'doesNotContain',
-                        'notOneOf'
-                    ],
-                    nullable: true,
-                    parse(op, value, fieldName) {
-                        if (op === 'oneOf' || op === 'notOneOf') {
-                            assert(Array.isArray(value), 'no-empty-array', `${op} must have an array value (field: ${fieldName}): ${JSON.stringify(value)}`);
-                            return value.filter(Boolean).map((val) => val.toLowerCase());
-                        }
-                        if (op === 'contains' || op === 'matches' || op === 'doesNotContain') {
-                            assert(typeof value === 'string' && value.length > 0, 'no-empty-string', `${op} must have non-empty string (field: ${fieldName})`);
+                            assert(value.length > 0, 'no-empty-string', `${op} must have non-empty string (field: ${fieldName})`);
                         }
                         return value.toLowerCase();
                     }
@@ -29524,14 +29772,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             };
             class Condition {
-                constructor(op, field, value, options, fieldTypes) {
-                    const typeName = fieldTypes.get(field);
+                constructor(op, field, value, options) {
+                    const typeName = _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES.get(field);
                     assert(typeName, 'internal', 'Invalid condition field: ' + field);
                     const type = CONDITION_TYPES[typeName];
                     // It's important to validate rules because a faulty rule might mess
                     // up the user's transaction (and be very confusing)
                     assert(type, 'internal', `Invalid condition type: ${typeName} (field: ${field})`);
-                    assert(type.ops.includes(op), 'internal', `Invalid condition operator: ${op} (type: ${typeName}, field: ${field})`);
+                    assert((0, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.isValidOp)(field, op), 'internal', `Invalid condition operator: ${op} (type: ${typeName}, field: ${field})`);
                     if (type.nullable !== true) {
                         assert(value != null, 'no-null', `Field cannot be empty: ${field}`);
                     }
@@ -29723,10 +29971,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 'append-notes'
             ];
             class Action {
-                constructor(op, field, value, options, fieldTypes) {
+                constructor(op, field, value, options) {
                     assert(ACTION_OPS.includes(op), 'internal', `Invalid action operation: ${op}`);
                     if (op === 'set') {
-                        const typeName = fieldTypes.get(field);
+                        const typeName = _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES.get(field);
                         assert(typeName, 'internal', `Invalid field for action: ${field}`);
                         this.field = field;
                         this.type = typeName;
@@ -29883,12 +30131,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return update;
             }
             class Rule {
-                constructor({ id, stage, conditionsOp, conditions, actions, fieldTypes }) {
+                constructor({ id, stage, conditionsOp, conditions, actions }) {
                     this.id = id;
                     this.stage = stage;
                     this.conditionsOp = conditionsOp;
-                    this.conditions = conditions.map((c) => new Condition(c.op, c.field, c.value, c.options, fieldTypes));
-                    this.actions = actions.map((a) => new Action(a.op, a.field, a.value, a.options, fieldTypes));
+                    this.conditions = conditions.map((c) => new Condition(c.op, c.field, c.value, c.options));
+                    this.actions = actions.map((a) => new Action(a.op, a.field, a.value, a.options));
                 }
                 evalConditions(object) {
                     if (this.conditions.length === 0) {
@@ -30245,6 +30493,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return account.balances.current;
                 }
             }
+            async function updateAccountBalance(id, balance) {
+                await _db__WEBPACK_IMPORTED_MODULE_4__.runQuery('UPDATE accounts SET balance_current = ? WHERE id = ?', [
+                    (0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.amountToInteger)(balance),
+                    id
+                ]);
+            }
             async function getGoCardlessAccounts(userId, userKey, id) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
                 if (!userToken)
@@ -30744,7 +30998,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else {
                         throw new Error(`Unrecognized bank-sync provider: ${acctRow.account_sync_source}`);
                     }
-                    const { transactions: originalTransactions } = download;
+                    const { transactions: originalTransactions, accountBalance } = download;
                     if (originalTransactions.length === 0) {
                         return {
                             added: [],
@@ -30757,6 +31011,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }));
                     return (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
                         const result = await reconcileTransactions(id, transactions, true, useStrictIdChecking);
+                        if (accountBalance)
+                            await updateAccountBalance(id, accountBalance);
                         return result;
                     });
                 }
@@ -31153,10 +31409,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function makeRule(data) {
                 let rule;
                 try {
-                    rule = new _rules__WEBPACK_IMPORTED_MODULE_10__.Rule({
-                        ...ruleModel.toJS(data),
-                        fieldTypes: _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES
-                    });
+                    rule = new _rules__WEBPACK_IMPORTED_MODULE_10__.Rule(ruleModel.toJS(data));
                 }
                 catch (e) {
                     console.warn('Invalid rule', e);
@@ -31282,7 +31535,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return cond;
                     }
                     try {
-                        return new _rules__WEBPACK_IMPORTED_MODULE_10__.Condition(cond.op, cond.field, cond.value, cond.options, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                        return new _rules__WEBPACK_IMPORTED_MODULE_10__.Condition(cond.op, cond.field, cond.value, cond.options);
                     }
                     catch (e) {
                         errors.push(e.type || 'internal');
@@ -31574,15 +31827,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     try {
                         if (action.op === 'set-split-amount') {
-                            return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, null, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                            return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, null, action.value, action.options);
                         }
                         else if (action.op === 'link-schedule') {
-                            return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, null, action.value, null, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                            return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, null, action.value, null);
                         }
                         else if (action.op === 'prepend-notes' || action.op === 'append-notes') {
-                            return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, null, action.value, null, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                            return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, null, action.value, null);
                         }
-                        return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, action.field, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                        return new _rules__WEBPACK_IMPORTED_MODULE_10__.Action(action.op, action.field, action.value, action.options);
                     }
                     catch (e) {
                         console.log('Action error', e);
@@ -31674,8 +31927,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 field: 'payee',
                                 value: to
                             }
-                        ],
-                        fieldTypes: _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES
+                        ]
                     });
                     return insertRule(rule.serialize());
                 }
@@ -31790,8 +32042,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                         field: 'category',
                                         value: category
                                     }
-                                ],
-                                fieldTypes: _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES
+                                ]
                             });
                             await insertRule(newRule.serialize());
                         }
@@ -34861,6 +35112,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     id: f('id'),
                     note: f('string')
                 },
+                preferences: {
+                    id: f('id'),
+                    value: f('string')
+                },
                 transaction_filters: {
                     id: f('id'),
                     name: f('string'),
@@ -35484,12 +35739,11 @@ 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 _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
-            /* 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");
+            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../sheet */ "./packages/loot-core/src/server/sheet.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_4__ = __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);
+                const node = await _sheet__WEBPACK_IMPORTED_MODULE_3__.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
@@ -35501,11 +35755,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return buffered + amount;
             }
             function getBudgetTable() {
-                const { budgetType } = _prefs__WEBPACK_IMPORTED_MODULE_3__.getPrefs() || {};
-                return budgetType === 'report' ? 'reflect_budgets' : 'zero_budgets';
+                return isReflectBudget() ? 'reflect_budgets' : 'zero_budgets';
             }
             function isReflectBudget() {
-                const { budgetType } = _prefs__WEBPACK_IMPORTED_MODULE_3__.getPrefs();
+                const budgetType = _db__WEBPACK_IMPORTED_MODULE_2__.firstSync(`SELECT value FROM preferences WHERE id = ?`, [
+                    'budgetType'
+                ]) ?? 'rollover';
                 return budgetType === 'report';
             }
             function dbMonth(month) {
@@ -35521,7 +35776,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
             }
             function getAllMonths(startMonth) {
-                const { createdMonths } = _sheet__WEBPACK_IMPORTED_MODULE_4__.get().meta();
+                const { createdMonths } = _sheet__WEBPACK_IMPORTED_MODULE_3__.get().meta();
                 let latest = null;
                 for (const month of createdMonths) {
                     if (latest == null || month > latest) {
@@ -35618,7 +35873,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const prevMonth = dbMonth(_shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(month));
                 const table = getBudgetTable();
                 const budgetData = await getBudgetData(table, prevMonth.toString());
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     budgetData.forEach((prevBudget) => {
                         if (prevBudget.is_income === 1 && !isReflectBudget()) {
                             return;
@@ -35634,7 +35889,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             async function copySinglePreviousMonth({ month, category }) {
                 const prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(month);
                 const newAmount = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth), 'budget-' + category);
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     setBudget({
                         category,
                         month,
@@ -35644,7 +35899,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             async function setZero({ month }) {
                 const categories = await _db__WEBPACK_IMPORTED_MODULE_2__.all('SELECT * FROM v_categories WHERE tombstone = 0');
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     categories.forEach((cat) => {
                         if (cat.is_income === 1 && !isReflectBudget()) {
                             return;
@@ -35662,7 +35917,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const prevMonth1 = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(month);
                 const prevMonth2 = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(prevMonth1);
                 const prevMonth3 = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(prevMonth2);
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     for (const cat of categories) {
                         if (cat.is_income === 1 && !isReflectBudget()) {
                             continue;
@@ -35692,7 +35947,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     sumAmount += await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth), 'sum-amount-' + category);
                     prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(prevMonth);
                 }
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     let avg = Math.round(sumAmount / N);
                     if (categoryFromDb.is_income === 0) {
                         avg *= -1;
@@ -35738,10 +35993,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount: fromBudgeted - amountCovered
                     });
                 }
-                await setBudget({
-                    category: to,
-                    month,
-                    amount: toBudgeted + amountCovered
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
+                    await setBudget({
+                        category: to,
+                        month,
+                        amount: toBudgeted + amountCovered
+                    });
+                    await addMovementNotes({
+                        month,
+                        amount: amountCovered,
+                        to,
+                        from
+                    });
                 });
             }
             async function transferAvailable({ month, amount, category }) {
@@ -35759,40 +36022,78 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
                 const toBudget = await getSheetValue(sheetName, 'to-budget');
                 const categoryBudget = await getSheetValue(sheetName, 'budget-' + category);
-                await setBudget({
-                    category,
-                    month,
-                    amount: categoryBudget + toBudget
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
+                    await setBudget({
+                        category,
+                        month,
+                        amount: categoryBudget + toBudget
+                    });
+                    await addMovementNotes({
+                        month,
+                        amount: -toBudget,
+                        from: category,
+                        to: 'overbudgeted'
+                    });
                 });
             }
             async function transferCategory({ month, amount, from, to }) {
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
                 const fromBudgeted = await getSheetValue(sheetName, 'budget-' + from);
-                await setBudget({
-                    category: from,
-                    month,
-                    amount: fromBudgeted - amount
-                });
-                // If we are simply moving it back into available cash to budget,
-                // don't do anything else
-                if (to !== 'to-be-budgeted') {
-                    const toBudgeted = await getSheetValue(sheetName, 'budget-' + to);
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     await setBudget({
-                        category: to,
+                        category: from,
                         month,
-                        amount: toBudgeted + amount
+                        amount: fromBudgeted - amount
+                    });
+                    // If we are simply moving it back into available cash to budget,
+                    // don't do anything else
+                    if (to !== 'to-be-budgeted') {
+                        const toBudgeted = await getSheetValue(sheetName, 'budget-' + to);
+                        await setBudget({
+                            category: to,
+                            month,
+                            amount: toBudgeted + amount
+                        });
+                    }
+                    await addMovementNotes({
+                        month,
+                        amount,
+                        to,
+                        from
                     });
-                }
+                });
             }
             async function setCategoryCarryover({ startMonth, category, flag }) {
                 const table = getBudgetTable();
                 const months = getAllMonths(startMonth);
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_4__.batchMessages)(async () => {
                     for (const month of months) {
                         setCarryover(table, category, dbMonth(month).toString(), flag);
                     }
                 });
             }
+            function addNewLine(notes) {
+                return !notes ? '' : `${notes}${notes && '\n'}`;
+            }
+            async function addMovementNotes({ month, amount, to, from }) {
+                const displayAmount = (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToCurrency)(amount);
+                const monthBudgetNotesId = `budget-${month}`;
+                const existingMonthBudgetNotes = addNewLine(_db__WEBPACK_IMPORTED_MODULE_2__.firstSync(`SELECT n.note FROM notes n WHERE n.id = ?`, [
+                    monthBudgetNotesId
+                ])?.note);
+                const displayDay = _shared_months__WEBPACK_IMPORTED_MODULE_0__.format(_shared_months__WEBPACK_IMPORTED_MODULE_0__.currentDate(), 'MMMM dd');
+                const categories = await _db__WEBPACK_IMPORTED_MODULE_2__.getCategories([
+                    from,
+                    to
+                ].filter((c) => c !== 'to-be-budgeted' && c !== 'overbudgeted'));
+                const fromCategoryName = from === 'to-be-budgeted' ? 'To Budget' : categories.find((c) => c.id === from)?.name;
+                const toCategoryName = to === 'to-be-budgeted' ? 'To Budget' : to === 'overbudgeted' ? 'Overbudgeted' : categories.find((c) => c.id === to)?.name;
+                const note = `Reassigned ${displayAmount} from ${fromCategoryName} → ${toCategoryName} on ${displayDay}`;
+                await _db__WEBPACK_IMPORTED_MODULE_2__.update('notes', {
+                    id: monthBudgetNotesId,
+                    note: `${existingMonthBudgetNotes}- ${note}`
+                });
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/budget/app.ts": 
@@ -35856,8 +36157,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../sheet */ "./packages/loot-core/src/server/sheet.ts");
             /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./actions */ "./packages/loot-core/src/server/budget/actions.ts");
-            /* 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 _envelope__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./envelope */ "./packages/loot-core/src/server/budget/envelope.ts");
+            /* harmony import */ var _report__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./report */ "./packages/loot-core/src/server/budget/report.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() {
@@ -35900,10 +36201,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
                 if (getBudgetType() === 'rollover') {
-                    _rollover__WEBPACK_IMPORTED_MODULE_7__.createCategory(cat, sheetName, prevSheetName);
+                    _envelope__WEBPACK_IMPORTED_MODULE_6__.createCategory(cat, sheetName, prevSheetName);
                 }
                 else {
-                    _report__WEBPACK_IMPORTED_MODULE_6__.createCategory(cat, sheetName, prevSheetName);
+                    _report__WEBPACK_IMPORTED_MODULE_7__.createCategory(cat, sheetName, prevSheetName);
                 }
             }
             function createCategoryGroup(group, sheetName) {
@@ -35991,7 +36292,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (newValue.tombstone === 0 && (!oldValue || oldValue.tombstone === 1)) {
                     if (budgetType === 'rollover') {
-                        _rollover__WEBPACK_IMPORTED_MODULE_7__.createBlankCategory(newValue, months);
+                        _envelope__WEBPACK_IMPORTED_MODULE_6__.createBlankCategory(newValue, months);
                     }
                     months.forEach((month) => {
                         const prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(month);
@@ -36155,7 +36456,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 meta.createdMonths = meta.createdMonths || new Set();
                 const budgetType = getBudgetType();
                 if (budgetType === 'rollover') {
-                    _rollover__WEBPACK_IMPORTED_MODULE_7__.createBudget(meta, categories, months);
+                    _envelope__WEBPACK_IMPORTED_MODULE_6__.createBudget(meta, categories, months);
                 }
                 months.forEach((month) => {
                     if (!meta.createdMonths.has(month)) {
@@ -36170,10 +36471,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             createCategoryGroup(group, sheetName);
                         });
                         if (budgetType === 'rollover') {
-                            _rollover__WEBPACK_IMPORTED_MODULE_7__.createSummary(groups, categories, prevSheetName, sheetName);
+                            _envelope__WEBPACK_IMPORTED_MODULE_6__.createSummary(groups, categories, prevSheetName, sheetName);
                         }
                         else {
-                            _report__WEBPACK_IMPORTED_MODULE_6__.createSummary(groups, categories, sheetName);
+                            _report__WEBPACK_IMPORTED_MODULE_7__.createSummary(groups, categories, sheetName);
                         }
                         meta.createdMonths.add(month);
                     }
@@ -36557,6 +36858,171 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/server/budget/envelope.ts": 
+        /*!**********************************************************!*\
+          !*** ./packages/loot-core/src/server/budget/envelope.ts ***!
+          \**********************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ createBlankCategory: () => ( /* binding */createBlankCategory),
+                /* harmony export */ createBudget: () => ( /* binding */createBudget),
+                /* harmony export */ createCategory: () => ( /* binding */createCategory),
+                /* harmony export */ createSummary: () => ( /* binding */createSummary)
+                /* harmony export */ 
+            });
+            /* 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 _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);
+            }
+            function createBlankCategory(cat, months) {
+                if (months.length > 0) {
+                    const sheetName = getBlankSheet(months);
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `carryover-${cat.id}`, false);
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `leftover-${cat.id}`, 0);
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `leftover-pos-${cat.id}`, 0);
+                }
+            }
+            function createBlankMonth(categories, sheetName, months) {
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'is-blank', true);
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'to-budget', 0);
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'buffered', 0);
+                categories.forEach((cat) => createBlankCategory(cat, months));
+            }
+            function createCategory(cat, sheetName, prevSheetName) {
+                if (!cat.is_income) {
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `budget-${cat.id}`, 0);
+                    // This makes the app more robust by "fixing up" null budget values.
+                    // Those should not be allowed, but in case somehow a null value
+                    // ends up there, we are resilient to it. Preferrably the
+                    // spreadsheet would have types and be more strict about what is
+                    // allowed to be set.
+                    if (_sheet__WEBPACK_IMPORTED_MODULE_2__.get().getCellValue(sheetName, `budget-${cat.id}`) == null) {
+                        _sheet__WEBPACK_IMPORTED_MODULE_2__.get().set((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_3__.resolveName)(sheetName, `budget-${cat.id}`), 0);
+                    }
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `carryover-${cat.id}`, false);
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, `leftover-${cat.id}`, {
+                        initialValue: 0,
+                        dependencies: [
+                            `budget-${cat.id}`,
+                            `sum-amount-${cat.id}`,
+                            `${prevSheetName}!carryover-${cat.id}`,
+                            `${prevSheetName}!leftover-${cat.id}`,
+                            `${prevSheetName}!leftover-pos-${cat.id}`
+                        ],
+                        run: (budgeted, spent, prevCarryover, prevLeftover, prevLeftoverPos) => {
+                            return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(budgeted) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(spent) + (prevCarryover ? (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(prevLeftover) : (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(prevLeftoverPos)));
+                        }
+                    });
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'leftover-pos-' + cat.id, {
+                        initialValue: 0,
+                        dependencies: [
+                            `leftover-${cat.id}`
+                        ],
+                        run: (leftover) => {
+                            return leftover < 0 ? 0 : leftover;
+                        }
+                    });
+                }
+            }
+            function createSummary(groups, categories, prevSheetName, sheetName) {
+                const incomeGroup = groups.filter((group) => group.is_income)[0];
+                const expenseCategories = categories.filter((cat) => !cat.is_income);
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'buffered', 0);
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'from-last-month', {
+                    initialValue: 0,
+                    dependencies: [
+                        `${prevSheetName}!to-budget`,
+                        `${prevSheetName}!buffered`
+                    ],
+                    run: (toBudget, buffered) => (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(toBudget) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(buffered))
+                });
+                // Alias the group income total to `total-income`
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-income', {
+                    initialValue: 0,
+                    dependencies: [
+                        `group-sum-amount-${incomeGroup.id}`
+                    ],
+                    run: (amount) => amount
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'available-funds', {
+                    initialValue: 0,
+                    dependencies: [
+                        'total-income',
+                        'from-last-month'
+                    ],
+                    run: (income, fromLastMonth) => (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(income) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(fromLastMonth))
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'last-month-overspent', {
+                    initialValue: 0,
+                    dependencies: (0, _util__WEBPACK_IMPORTED_MODULE_4__.flatten2)(expenseCategories.map((cat) => [
+                        `${prevSheetName}!leftover-${cat.id}`,
+                        `${prevSheetName}!carryover-${cat.id}`
+                    ])),
+                    run: (...data) => {
+                        data = (0, _util__WEBPACK_IMPORTED_MODULE_4__.unflatten2)(data);
+                        return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)(data.reduce((total, [leftover, carryover]) => {
+                            if (carryover) {
+                                return total;
+                            }
+                            return total + Math.min(0, (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(leftover));
+                        }, 0));
+                    }
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-budgeted', {
+                    initialValue: 0,
+                    dependencies: groups.filter((group) => !group.is_income).map((group) => `group-budget-${group.id}`),
+                    run: (...amounts) => {
+                        // Negate budgeted amount
+                        return -(0, _util__WEBPACK_IMPORTED_MODULE_4__.sumAmounts)(...amounts);
+                    }
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'buffered', {
+                    initialValue: 0
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'to-budget', {
+                    initialValue: 0,
+                    dependencies: [
+                        'available-funds',
+                        'last-month-overspent',
+                        'total-budgeted',
+                        'buffered'
+                    ],
+                    run: (available, lastOverspent, totalBudgeted, buffered) => {
+                        return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(available) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(lastOverspent) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(totalBudgeted) - (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(buffered));
+                    }
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-spent', {
+                    initialValue: 0,
+                    dependencies: groups.filter((group) => !group.is_income).map((group) => `group-sum-amount-${group.id}`),
+                    run: _util__WEBPACK_IMPORTED_MODULE_4__.sumAmounts
+                });
+                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-leftover', {
+                    initialValue: 0,
+                    dependencies: groups.filter((group) => !group.is_income).map((group) => `group-leftover-${group.id}`),
+                    run: _util__WEBPACK_IMPORTED_MODULE_4__.sumAmounts
+                });
+            }
+            function createBudget(meta, categories, months) {
+                // The spreadsheet is now strict - so we need to fill in some
+                // default values for the month before the first month. Only do this
+                // if it doesn't already exist
+                const blankSheet = getBlankSheet(months);
+                if (meta.blankSheet !== blankSheet) {
+                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().clearSheet(meta.blankSheet);
+                    createBlankMonth(categories, blankSheet, months);
+                    meta.blankSheet = blankSheet;
+                }
+            }
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/server/budget/goals/goalsAverage.ts": 
         /*!********************************************************************!*\
           !*** ./packages/loot-core/src/server/budget/goals/goalsAverage.ts ***!
@@ -37723,171 +38189,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
-        /***/ "./packages/loot-core/src/server/budget/rollover.ts": 
-        /*!**********************************************************!*\
-          !*** ./packages/loot-core/src/server/budget/rollover.ts ***!
-          \**********************************************************/
-        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-            "use strict";
-            __webpack_require__.r(__webpack_exports__);
-            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ createBlankCategory: () => ( /* binding */createBlankCategory),
-                /* harmony export */ createBudget: () => ( /* binding */createBudget),
-                /* harmony export */ createCategory: () => ( /* binding */createCategory),
-                /* harmony export */ createSummary: () => ( /* binding */createSummary)
-                /* harmony export */ 
-            });
-            /* 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 _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);
-            }
-            function createBlankCategory(cat, months) {
-                if (months.length > 0) {
-                    const sheetName = getBlankSheet(months);
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `carryover-${cat.id}`, false);
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `leftover-${cat.id}`, 0);
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `leftover-pos-${cat.id}`, 0);
-                }
-            }
-            function createBlankMonth(categories, sheetName, months) {
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'is-blank', true);
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'to-budget', 0);
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'buffered', 0);
-                categories.forEach((cat) => createBlankCategory(cat, months));
-            }
-            function createCategory(cat, sheetName, prevSheetName) {
-                if (!cat.is_income) {
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `budget-${cat.id}`, 0);
-                    // This makes the app more robust by "fixing up" null budget values.
-                    // Those should not be allowed, but in case somehow a null value
-                    // ends up there, we are resilient to it. Preferrably the
-                    // spreadsheet would have types and be more strict about what is
-                    // allowed to be set.
-                    if (_sheet__WEBPACK_IMPORTED_MODULE_2__.get().getCellValue(sheetName, `budget-${cat.id}`) == null) {
-                        _sheet__WEBPACK_IMPORTED_MODULE_2__.get().set((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_3__.resolveName)(sheetName, `budget-${cat.id}`), 0);
-                    }
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, `carryover-${cat.id}`, false);
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, `leftover-${cat.id}`, {
-                        initialValue: 0,
-                        dependencies: [
-                            `budget-${cat.id}`,
-                            `sum-amount-${cat.id}`,
-                            `${prevSheetName}!carryover-${cat.id}`,
-                            `${prevSheetName}!leftover-${cat.id}`,
-                            `${prevSheetName}!leftover-pos-${cat.id}`
-                        ],
-                        run: (budgeted, spent, prevCarryover, prevLeftover, prevLeftoverPos) => {
-                            return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(budgeted) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(spent) + (prevCarryover ? (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(prevLeftover) : (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(prevLeftoverPos)));
-                        }
-                    });
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'leftover-pos-' + cat.id, {
-                        initialValue: 0,
-                        dependencies: [
-                            `leftover-${cat.id}`
-                        ],
-                        run: (leftover) => {
-                            return leftover < 0 ? 0 : leftover;
-                        }
-                    });
-                }
-            }
-            function createSummary(groups, categories, prevSheetName, sheetName) {
-                const incomeGroup = groups.filter((group) => group.is_income)[0];
-                const expenseCategories = categories.filter((cat) => !cat.is_income);
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createStatic(sheetName, 'buffered', 0);
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'from-last-month', {
-                    initialValue: 0,
-                    dependencies: [
-                        `${prevSheetName}!to-budget`,
-                        `${prevSheetName}!buffered`
-                    ],
-                    run: (toBudget, buffered) => (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(toBudget) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(buffered))
-                });
-                // Alias the group income total to `total-income`
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-income', {
-                    initialValue: 0,
-                    dependencies: [
-                        `group-sum-amount-${incomeGroup.id}`
-                    ],
-                    run: (amount) => amount
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'available-funds', {
-                    initialValue: 0,
-                    dependencies: [
-                        'total-income',
-                        'from-last-month'
-                    ],
-                    run: (income, fromLastMonth) => (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(income) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(fromLastMonth))
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'last-month-overspent', {
-                    initialValue: 0,
-                    dependencies: (0, _util__WEBPACK_IMPORTED_MODULE_4__.flatten2)(expenseCategories.map((cat) => [
-                        `${prevSheetName}!leftover-${cat.id}`,
-                        `${prevSheetName}!carryover-${cat.id}`
-                    ])),
-                    run: (...data) => {
-                        data = (0, _util__WEBPACK_IMPORTED_MODULE_4__.unflatten2)(data);
-                        return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)(data.reduce((total, [leftover, carryover]) => {
-                            if (carryover) {
-                                return total;
-                            }
-                            return total + Math.min(0, (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(leftover));
-                        }, 0));
-                    }
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-budgeted', {
-                    initialValue: 0,
-                    dependencies: groups.filter((group) => !group.is_income).map((group) => `group-budget-${group.id}`),
-                    run: (...amounts) => {
-                        // Negate budgeted amount
-                        return -(0, _util__WEBPACK_IMPORTED_MODULE_4__.sumAmounts)(...amounts);
-                    }
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'buffered', {
-                    initialValue: 0
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'to-budget', {
-                    initialValue: 0,
-                    dependencies: [
-                        'available-funds',
-                        'last-month-overspent',
-                        'total-budgeted',
-                        'buffered'
-                    ],
-                    run: (available, lastOverspent, totalBudgeted, buffered) => {
-                        return (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.safeNumber)((0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(available) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(lastOverspent) + (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(totalBudgeted) - (0, _util__WEBPACK_IMPORTED_MODULE_4__.number)(buffered));
-                    }
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-spent', {
-                    initialValue: 0,
-                    dependencies: groups.filter((group) => !group.is_income).map((group) => `group-sum-amount-${group.id}`),
-                    run: _util__WEBPACK_IMPORTED_MODULE_4__.sumAmounts
-                });
-                _sheet__WEBPACK_IMPORTED_MODULE_2__.get().createDynamic(sheetName, 'total-leftover', {
-                    initialValue: 0,
-                    dependencies: groups.filter((group) => !group.is_income).map((group) => `group-leftover-${group.id}`),
-                    run: _util__WEBPACK_IMPORTED_MODULE_4__.sumAmounts
-                });
-            }
-            function createBudget(meta, categories, months) {
-                // The spreadsheet is now strict - so we need to fill in some
-                // default values for the month before the first month. Only do this
-                // if it doesn't already exist
-                const blankSheet = getBlankSheet(months);
-                if (meta.blankSheet !== blankSheet) {
-                    _sheet__WEBPACK_IMPORTED_MODULE_2__.get().clearSheet(meta.blankSheet);
-                    createBlankMonth(categories, blankSheet, months);
-                    meta.blankSheet = blankSheet;
-                }
-            }
-            /***/ 
-        }),
         /***/ "./packages/loot-core/src/server/budget/statements.ts": 
         /*!************************************************************!*\
           !*** ./packages/loot-core/src/server/budget/statements.ts ***!
@@ -37919,6 +38220,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
       FROM notes n
              JOIN categories c ON n.id = c.id
       WHERE c.id = n.id
+        AND c.tombstone = 0
         AND (lower(note) LIKE '%${_template_notes__WEBPACK_IMPORTED_MODULE_1__.TEMPLATE_PREFIX}%'
         OR lower(note) LIKE '%${_template_notes__WEBPACK_IMPORTED_MODULE_1__.GOAL_PREFIX}%')
     `);
@@ -38519,7 +38821,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             'net-worth-card',
                             'cash-flow-card',
                             'spending-card',
-                            'custom-report'
+                            'custom-report',
+                            'markdown-card'
                         ].includes(widget.type)) {
                             throw new _errors__WEBPACK_IMPORTED_MODULE_8__.ValidationError(`Invalid widget.${idx}.type value ${widget.type}.`);
                         }
@@ -38921,20 +39224,26 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             // Data-specific functions. Ideally this would be split up into
             // different files
-            async function getCategories() {
-                return await all(`
-    SELECT c.* FROM categories c WHERE c.tombstone = 0
-      ORDER BY c.sort_order, c.id
-  `);
-            }
-            async function getCategoriesGrouped() {
-                const groups = await all(`
-    SELECT cg.* FROM category_groups cg WHERE cg.tombstone = 0 ORDER BY cg.is_income, cg.sort_order, cg.id
-  `);
-                const categories = await all(`
-    SELECT c.* FROM categories c WHERE c.tombstone = 0
-      ORDER BY c.sort_order, c.id
-  `);
+            async function getCategories(ids) {
+                const whereIn = ids ? `c.id IN (${toSqlQueryParameters(ids)}) AND` : '';
+                const query = `SELECT c.* FROM categories c WHERE ${whereIn} c.tombstone = 0 ORDER BY c.sort_order, c.id`;
+                return ids ? await all(query, [
+                    ...ids
+                ]) : await all(query);
+            }
+            async function getCategoriesGrouped(ids) {
+                const categoryGroupWhereIn = ids ? `cg.id IN (${toSqlQueryParameters(ids)}) AND` : '';
+                const categoryGroupQuery = `SELECT cg.* FROM category_groups cg WHERE ${categoryGroupWhereIn} cg.tombstone = 0
+    ORDER BY cg.is_income, cg.sort_order, cg.id`;
+                const categoryWhereIn = ids ? `c.cat_group IN (${toSqlQueryParameters(ids)}) AND` : '';
+                const categoryQuery = `SELECT c.* FROM categories c WHERE ${categoryWhereIn} c.tombstone = 0
+    ORDER BY c.sort_order, c.id`;
+                const groups = ids ? await all(categoryGroupQuery, [
+                    ...ids
+                ]) : await all(categoryGroupQuery);
+                const categories = ids ? await all(categoryQuery, [
+                    ...ids
+                ]) : await all(categoryQuery);
                 return groups.map((group) => {
                     return {
                         ...group,
@@ -39161,7 +39470,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return all(`
     SELECT     p.id as id, p.name as name, p.favorite as favorite,
       p.category as category, TRUE as common, NULL as transfer_acct,
-    count(*) as c, 
+    count(*) as c,
     max(t.date) as latest
     FROM payees p
     LEFT JOIN v_transactions_internal_alive t on t.payee == p.id
@@ -39169,7 +39478,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
     AND p.tombstone = 0
     AND t.date > ${twelveWeeksAgo}
     GROUP BY p.id
-    ORDER BY c DESC ,p.transfer_acct IS NULL DESC, p.name 
+    ORDER BY c DESC ,p.transfer_acct IS NULL DESC, p.name
     COLLATE NOCASE
     LIMIT ${limit}
   `);
@@ -39270,6 +39579,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             async function deleteTransaction(transaction) {
                 return delete_('transactions', transaction.id);
             }
+            function toSqlQueryParameters(params) {
+                return params.map(() => '?').join(',');
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/db/mappings.ts": 
@@ -40761,7 +41073,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @actual-app/api/injected */ "./packages/api/injected.js");
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @actual-app/crdt */ "@actual-app/crdt");
             /* harmony import */ var _actual_app_crdt__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/ __webpack_require__.n(_actual_app_crdt__WEBPACK_IMPORTED_MODULE_4__);
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _mocks_budget__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../mocks/budget */ "./packages/loot-core/src/mocks/budget.ts");
             /* harmony import */ var _platform_exceptions__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../platform/exceptions */ "./packages/loot-core/src/platform/exceptions/index.electron.ts");
             /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
@@ -40798,26 +41110,27 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _notes_app__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./notes/app */ "./packages/loot-core/src/server/notes/app.ts");
             /* harmony import */ var _platform__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./platform */ "./packages/loot-core/src/server/platform.ts");
             /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./post */ "./packages/loot-core/src/server/post.ts");
-            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _reports_app__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./reports/app */ "./packages/loot-core/src/server/reports/app.ts");
-            /* harmony import */ var _rules_app__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./rules/app */ "./packages/loot-core/src/server/rules/app.ts");
-            /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
-            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
-            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
-            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
-            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
-            /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.ts");
-            /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.ts");
-            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.ts");
-            /* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.ts");
-            /* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(/*! ./util/budget-name */ "./packages/loot-core/src/server/util/budget-name.ts");
+            /* harmony import */ var _preferences_app__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./preferences/app */ "./packages/loot-core/src/server/preferences/app.ts");
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.ts");
+            /* harmony import */ var _reports_app__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./reports/app */ "./packages/loot-core/src/server/reports/app.ts");
+            /* harmony import */ var _rules_app__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./rules/app */ "./packages/loot-core/src/server/rules/app.ts");
+            /* harmony import */ var _schedules_app__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./schedules/app */ "./packages/loot-core/src/server/schedules/app.ts");
+            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./server-config */ "./packages/loot-core/src/server/server-config.ts");
+            /* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.ts");
+            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _sync_migrate__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ./sync/migrate */ "./packages/loot-core/src/server/sync/migrate.ts");
+            /* harmony import */ var _tools_app__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(/*! ./tools/app */ "./packages/loot-core/src/server/tools/app.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(/*! ./undo */ "./packages/loot-core/src/server/undo.ts");
+            /* harmony import */ var _update__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(/*! ./update */ "./packages/loot-core/src/server/update.ts");
+            /* harmony import */ var _util_budget_name__WEBPACK_IMPORTED_MODULE_54__ = __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_46__.get()._getNode(name);
+                    const node = _sheet__WEBPACK_IMPORTED_MODULE_47__.get()._getNode(name);
                     return {
                         name: node.name,
                         value: node.value
@@ -40830,13 +41143,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_37__.mutator)(async function () {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.undo)();
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.undo)();
             });
             handlers['redo'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(function () {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.redo)();
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.redo)();
             });
             handlers['transactions-batch-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ added, deleted, updated, learnCategories }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     const result = await (0, _accounts_transactions__WEBPACK_IMPORTED_MODULE_22__.batchUpdateTransactions)({
                         added,
                         updated,
@@ -40896,14 +41209,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['get-budget-bounds'] = async function () {
                 return _budget_base__WEBPACK_IMPORTED_MODULE_27__.createAllBudgets();
             };
-            handlers['rollover-budget-month'] = async function ({ month }) {
+            handlers['envelope-budget-month'] = async function ({ month }) {
                 const groups = await _db__WEBPACK_IMPORTED_MODULE_30__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_13__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_46__.getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_47__.getCellValue(sheetName, name);
                     return {
                         value: v === '' ? 0 : v,
-                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name)
+                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_48__.resolveName)(sheetName, name)
                     };
                 }
                 let values = [
@@ -40935,21 +41248,23 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 value(`budget-${cat.id}`),
                                 value(`sum-amount-${cat.id}`),
                                 value(`leftover-${cat.id}`),
-                                value(`carryover-${cat.id}`)
+                                value(`carryover-${cat.id}`),
+                                value(`goal-${cat.id}`),
+                                value(`long-goal-${cat.id}`)
                             ]);
                         }
                     }
                 }
                 return values;
             };
-            handlers['report-budget-month'] = async function ({ month }) {
+            handlers['tracking-budget-month'] = async function ({ month }) {
                 const groups = await _db__WEBPACK_IMPORTED_MODULE_30__.getCategoriesGrouped();
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_13__.sheetForMonth(month);
                 function value(name) {
-                    const v = _sheet__WEBPACK_IMPORTED_MODULE_46__.getCellValue(sheetName, name);
+                    const v = _sheet__WEBPACK_IMPORTED_MODULE_47__.getCellValue(sheetName, name);
                     return {
                         value: v === '' ? 0 : v,
-                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name)
+                        name: (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_48__.resolveName)(sheetName, name)
                     };
                 }
                 let values = [
@@ -40971,7 +41286,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         values = values.concat([
                             value(`budget-${cat.id}`),
                             value(`sum-amount-${cat.id}`),
-                            value(`leftover-${cat.id}`)
+                            value(`leftover-${cat.id}`),
+                            value(`goal-${cat.id}`),
+                            value(`long-goal-${cat.id}`)
                         ]);
                         if (!group.is_income) {
                             values.push(value(`carryover-${cat.id}`));
@@ -40980,26 +41297,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return values;
             };
-            handlers['budget-set-type'] = async function ({ type }) {
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_41__.BUDGET_TYPES.includes(type)) {
-                    throw new Error('Invalid budget type: ' + type);
-                }
-                // It's already the same; don't do anything
-                if (type === _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().budgetType) {
-                    return;
-                }
-                // Save prefs
-                return _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
-                    budgetType: type
-                });
-            };
             handlers['category-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ name, groupId, isIncome, hidden }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     if (!groupId) {
                         throw (0, _errors__WEBPACK_IMPORTED_MODULE_33__.APIError)('Creating a category: groupId is required');
                     }
                     return _db__WEBPACK_IMPORTED_MODULE_30__.insertCategory({
-                        name,
+                        name: name.trim(),
                         cat_group: groupId,
                         is_income: isIncome ? 1 : 0,
                         hidden: hidden ? 1 : 0
@@ -41007,9 +41311,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function (category) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     try {
-                        await _db__WEBPACK_IMPORTED_MODULE_30__.updateCategory(category);
+                        await _db__WEBPACK_IMPORTED_MODULE_30__.updateCategory({
+                            ...category,
+                            name: category.name.trim()
+                        });
                     }
                     catch (e) {
                         if (e.message.toLowerCase().includes('unique constraint')) {
@@ -41025,17 +41332,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id, groupId, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.batchMessages)(async () => {
                         await _db__WEBPACK_IMPORTED_MODULE_30__.moveCategory(id, groupId, targetId);
                     });
                     return 'ok';
                 });
             });
             handlers['category-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id, transferId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     let result = {};
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.batchMessages)(async () => {
                         const row = await _db__WEBPACK_IMPORTED_MODULE_30__.first('SELECT is_income FROM categories WHERE id = ?', [
                             id
                         ]);
@@ -41080,7 +41387,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return await _db__WEBPACK_IMPORTED_MODULE_30__.getCategoriesGrouped();
             };
             handlers['category-group-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ name, isIncome }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_30__.insertCategoryGroup({
                         name,
                         is_income: isIncome ? 1 : 0
@@ -41088,24 +41395,24 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['category-group-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function (group) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_30__.updateCategoryGroup(group);
                 });
             });
             handlers['category-group-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
-                    await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
+                    await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.batchMessages)(async () => {
                         await _db__WEBPACK_IMPORTED_MODULE_30__.moveCategoryGroup(id, targetId);
                     });
                     return 'ok';
                 });
             });
             handlers['category-group-delete'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id, transferId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     const groupCategories = await _db__WEBPACK_IMPORTED_MODULE_30__.all('SELECT id FROM categories WHERE cat_group = ? AND tombstone = 0', [
                         id
                     ]);
-                    return (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                    return (0, _sync__WEBPACK_IMPORTED_MODULE_49__.batchMessages)(async () => {
                         if (transferId) {
                             await _budget_base__WEBPACK_IMPORTED_MODULE_27__.doTransfer(groupCategories.map((c) => c.id), transferId);
                         }
@@ -41129,15 +41436,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_46__.get().meta().createdMonths
+                    ..._sheet__WEBPACK_IMPORTED_MODULE_47__.get().meta().createdMonths
                 ].some((month) => {
                     const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_13__.sheetForMonth(month);
-                    const value = _sheet__WEBPACK_IMPORTED_MODULE_46__.get().getCellValue(sheetName, 'budget-' + id);
+                    const value = _sheet__WEBPACK_IMPORTED_MODULE_47__.get().getCellValue(sheetName, 'budget-' + id);
                     return value != null && value !== 0;
                 });
             };
             handlers['payee-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ name }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_30__.insertPayee({
                         name
                     });
@@ -41163,7 +41470,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return payeeCounts;
             };
             handlers['payees-merge'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ targetId, mergeIds }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_30__.mergePayees(targetId, mergeIds);
                 }, {
                     targetId,
@@ -41171,8 +41478,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['payees-batch-change'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ added, deleted, updated }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
-                    return (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
+                    return (0, _sync__WEBPACK_IMPORTED_MODULE_49__.batchMessages)(async () => {
                         if (deleted) {
                             await Promise.all(deleted.map((p) => _db__WEBPACK_IMPORTED_MODULE_30__.deletePayee(p)));
                         }
@@ -41201,7 +41508,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     'name',
                     'value'
                 ];
-                const node = _sheet__WEBPACK_IMPORTED_MODULE_46__.get()._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name));
+                const node = _sheet__WEBPACK_IMPORTED_MODULE_47__.get()._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_48__.resolveName)(sheetName, name));
                 if (fields) {
                     const res = {};
                     fields.forEach((field) => {
@@ -41220,13 +41527,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_46__.get()._getNode(name).value
+                    value: _sheet__WEBPACK_IMPORTED_MODULE_47__.get()._getNode(name).value
                 }));
             };
             handlers['getCellNamesInSheet'] = async function ({ sheetName }) {
                 const names = [];
-                for (const name of _sheet__WEBPACK_IMPORTED_MODULE_46__.get().getNodes().keys()) {
-                    const { sheet: nodeSheet, name: nodeName } = (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.unresolveName)(name);
+                for (const name of _sheet__WEBPACK_IMPORTED_MODULE_47__.get().getNodes().keys()) {
+                    const { sheet: nodeSheet, name: nodeName } = (0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_48__.unresolveName)(name);
                     if (nodeSheet === sheetName) {
                         names.push(nodeName);
                     }
@@ -41234,7 +41541,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_46__.get().getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_47__.resolveName)(sheetName, name));
+                const node = _sheet__WEBPACK_IMPORTED_MODULE_47__.get().getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_48__.resolveName)(sheetName, name));
                 return {
                     ...node,
                     _run: node._run && node._run.toString()
@@ -41243,7 +41550,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_46__.get().createQuery(sheetName, name, query);
+                _sheet__WEBPACK_IMPORTED_MODULE_47__.get().createQuery(sheetName, name, query);
                 return 'ok';
             };
             handlers['query'] = async function (query) {
@@ -41253,7 +41560,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return (0, _aql__WEBPACK_IMPORTED_MODULE_24__.runQuery)(query);
             };
             handlers['account-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id, name }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_30__.update('accounts', {
                         id,
                         name
@@ -41299,7 +41606,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 else {
-                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])();
+                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_55__["default"])();
                     await _db__WEBPACK_IMPORTED_MODULE_30__.insertWithUUID('accounts', {
                         id,
                         account_id: account.account_id,
@@ -41343,7 +41650,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 else {
-                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])();
+                    id = (0, uuid__WEBPACK_IMPORTED_MODULE_55__["default"])();
                     await _db__WEBPACK_IMPORTED_MODULE_30__.insertWithUUID('accounts', {
                         id,
                         account_id: externalAccount.account_id,
@@ -41368,7 +41675,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return 'ok';
             };
             handlers['account-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ name, balance, offBudget, closed }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     const id = await _db__WEBPACK_IMPORTED_MODULE_30__.insertAccount({
                         name,
                         offbudget: offBudget ? 1 : 0,
@@ -41400,7 +41707,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 await handlers['account-unlink']({
                     id
                 });
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     const account = await _db__WEBPACK_IMPORTED_MODULE_30__.first('SELECT * FROM accounts WHERE id = ? AND tombstone = 0', [
                         id
                     ]);
@@ -41425,7 +41732,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         const { id: payeeId } = await _db__WEBPACK_IMPORTED_MODULE_30__.first('SELECT id FROM payees WHERE transfer_acct = ?', [
                             id
                         ]);
-                        await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.batchMessages)(async () => {
+                        await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.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
@@ -41466,7 +41773,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 transferAccountId
                             ]);
                             await handlers['transaction-add']({
-                                id: (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])(),
+                                id: (0, uuid__WEBPACK_IMPORTED_MODULE_55__["default"])(),
                                 payee: payeeId,
                                 amount: -balance,
                                 account: id,
@@ -41479,7 +41786,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['account-reopen'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_30__.update('accounts', {
                         id,
                         closed: 0
@@ -41487,7 +41794,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['account-move'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function ({ id, targetId }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_30__.moveAccount(id, targetId);
                 });
             });
@@ -41500,7 +41807,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/secret', {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().BASE_SERVER + '/secret', {
                         name,
                         value
                     }, {
@@ -41522,7 +41829,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/secret/' + name, {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().BASE_SERVER + '/secret/' + name, {
                         'X-ACTUAL-TOKEN': userToken
                     });
                 }
@@ -41549,7 +41856,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         cb('timeout');
                         return;
                     }
-                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/get-accounts', {
+                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().GOCARDLESS_SERVER + '/get-accounts', {
                         upgradingAccountId,
                         requisitionId
                     }, {
@@ -41589,7 +41896,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/status', {}, {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().GOCARDLESS_SERVER + '/status', {}, {
                     'X-ACTUAL-TOKEN': userToken
                 });
             };
@@ -41600,7 +41907,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIMPLEFIN_SERVER + '/status', {}, {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SIMPLEFIN_SERVER + '/status', {}, {
                     'X-ACTUAL-TOKEN': userToken
                 });
             };
@@ -41612,7 +41919,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
                         'X-ACTUAL-TOKEN': userToken
                     }, 60000);
                 }
@@ -41629,7 +41936,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/get-banks', {
+                return (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().GOCARDLESS_SERVER + '/get-banks', {
                     country,
                     showDemo: (0, _shared_environment__WEBPACK_IMPORTED_MODULE_12__.isNonProductionEnvironment)()
                 }, {
@@ -41648,7 +41955,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/create-web-token', {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().GOCARDLESS_SERVER + '/create-web-token', {
                         upgradingAccountId,
                         institutionId,
                         accessValidForDays
@@ -41738,7 +42045,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(function ({ accountId, transactions, isPreview }) {
-                return (0, _undo__WEBPACK_IMPORTED_MODULE_51__.withUndo)(async () => {
+                return (0, _undo__WEBPACK_IMPORTED_MODULE_52__.withUndo)(async () => {
                     if (typeof accountId !== 'string') {
                         throw (0, _errors__WEBPACK_IMPORTED_MODULE_33__.APIError)('transactions-import: accountId must be an id');
                     }
@@ -41799,7 +42106,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         bankId
                     ]);
                     try {
-                        await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().GOCARDLESS_SERVER + '/remove-account', {
+                        await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().GOCARDLESS_SERVER + '/remove-account', {
                             requisitionId
                         }, {
                             'X-ACTUAL-TOKEN': userToken
@@ -41828,60 +42135,65 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if ('theme' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.setItem('theme', prefs.theme);
                 }
+                if ('preferredDarkTheme' in prefs) {
+                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.setItem('preferred-dark-theme', prefs.preferredDarkTheme);
+                }
                 if ('serverSelfSignedCert' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.setItem('server-self-signed-cert', prefs.serverSelfSignedCert);
                 }
                 return 'ok';
             };
             handlers['load-global-prefs'] = async function () {
-                const [[, floatingSidebar], [, maxMonths], [, documentDir], [, encryptKey], [, theme]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.multiGet([
+                const [[, floatingSidebar], [, maxMonths], [, documentDir], [, encryptKey], [, theme], [, preferredDarkTheme]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.multiGet([
                     'floating-sidebar',
                     'max-months',
                     'document-dir',
                     'encrypt-key',
-                    'theme'
+                    'theme',
+                    'preferred-dark-theme'
                 ]);
                 return {
                     floatingSidebar: floatingSidebar === 'true' ? true : false,
                     maxMonths: (0, _shared_util__WEBPACK_IMPORTED_MODULE_15__.stringToInteger)(maxMonths || ''),
                     documentDir: documentDir || getDefaultDocumentDir(),
                     keyId: encryptKey && JSON.parse(encryptKey).id,
-                    theme: theme === 'light' || theme === 'dark' || theme === 'auto' || theme === 'development' || theme === 'midnight' ? theme : 'auto'
+                    theme: theme === 'light' || theme === 'dark' || theme === 'auto' || theme === 'development' || theme === 'midnight' ? theme : 'auto',
+                    preferredDarkTheme: preferredDarkTheme === 'dark' || preferredDarkTheme === 'midnight' ? preferredDarkTheme : 'dark'
                 };
             };
             handlers['save-prefs'] = async function (prefsToSet) {
-                const { cloudFileId } = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs();
+                const { cloudFileId } = _prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs();
                 // Need to sync the budget name on the server as well
                 if (prefsToSet.budgetName && cloudFileId) {
                     const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.getItem('user-token');
-                    await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SYNC_SERVER + '/update-user-filename', {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SYNC_SERVER + '/update-user-filename', {
                         token: userToken,
                         fileId: cloudFileId,
                         name: prefsToSet.budgetName
                     });
                 }
-                await _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs(prefsToSet);
+                await _prefs__WEBPACK_IMPORTED_MODULE_42__.savePrefs(prefsToSet);
                 return 'ok';
             };
             handlers['load-prefs'] = async function () {
-                return _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs();
+                return _prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs();
             };
             handlers['sync-reset'] = async function () {
-                return await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.resetSync)();
+                return await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.resetSync)();
             };
             handlers['sync-repair'] = async function () {
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.repairSync)();
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.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
             // able to enable encryption. (Imagine if they are importing data from
             // another source, they should be able to encrypt first)
             handlers['key-make'] = async function ({ password }) {
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs()) {
+                if (!_prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs()) {
                     throw new Error('user-set-key must be called with file loaded');
                 }
                 const salt = _encryption__WEBPACK_IMPORTED_MODULE_32__.randomBytes(32).toString('base64');
-                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_54__["default"])();
+                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_55__["default"])();
                 const key = await _encryption__WEBPACK_IMPORTED_MODULE_32__.createKey({
                     id,
                     password,
@@ -41890,11 +42202,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Load the key
                 await _encryption__WEBPACK_IMPORTED_MODULE_32__.loadKey(key);
                 // Make some test data to use if the key is valid or not
-                const testContent = await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.makeTestMessage)(key.getId());
+                const testContent = await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.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_48__.resetSync)({
+                return await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.resetSync)({
                     key,
                     salt,
                     testContent: JSON.stringify({
@@ -41908,11 +42220,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['key-test'] = async function ({ fileId, password }) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.getItem('user-token');
                 if (fileId == null) {
-                    fileId = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().cloudFileId;
+                    fileId = _prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs().cloudFileId;
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SYNC_SERVER + '/user-get-key', {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SYNC_SERVER + '/user-get-key', {
                         token: userToken,
                         fileId
                     });
@@ -41961,8 +42273,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // Save the key id in prefs if the are loaded. If they aren't, we
                 // are testing a key to download a file and when the file is
                 // actually downloaded it will update the prefs with the latest key id
-                if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs()) {
-                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
+                if (_prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs()) {
+                    await _prefs__WEBPACK_IMPORTED_MODULE_42__.savePrefs({
                         encryptKeyId: key.getId()
                     });
                 }
@@ -41973,7 +42285,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_45__.getServer)(url)) {
+                    if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)(url)) {
                         return {
                             bootstrapped: true,
                             hasServer: false
@@ -41987,7 +42299,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)(url).SIGNUP_SERVER + '/needs-bootstrap');
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)(url).SIGNUP_SERVER + '/needs-bootstrap');
                 }
                 catch (err) {
                     return {
@@ -42016,7 +42328,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_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/bootstrap', {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SIGNUP_SERVER + '/bootstrap', {
                         password
                     });
                 }
@@ -42034,7 +42346,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['subscribe-get-user'] = async function () {
-                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)()) {
+                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)()) {
                     if (!await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.getItem('did-bootstrap')) {
                         return null;
                     }
@@ -42047,7 +42359,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return null;
                 }
                 try {
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/validate', {
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SIGNUP_SERVER + '/validate', {
                         headers: {
                             'X-ACTUAL-TOKEN': userToken
                         }
@@ -42080,7 +42392,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/change-password', {
+                    await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SIGNUP_SERVER + '/change-password', {
                         token: userToken,
                         password
                     });
@@ -42098,7 +42410,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let res;
                 try {
-                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().SIGNUP_SERVER + '/login', {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().SIGNUP_SERVER + '/login', {
                         loginMethod,
                         password
                     });
@@ -42125,14 +42437,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_45__.getServer)()) {
+                if (!(0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)()) {
                     return {
                         error: 'no-server'
                     };
                 }
                 let version;
                 try {
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER + '/info');
+                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_40__.get)((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().BASE_SERVER + '/info');
                     const info = JSON.parse(res);
                     version = info.build.version;
                 }
@@ -42146,7 +42458,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             };
             handlers['get-server-url'] = async function () {
-                return (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)() && (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)().BASE_SERVER;
+                return (0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)() && (0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)().BASE_SERVER;
             };
             handlers['set-server-url'] = async function ({ url, validate = true }) {
                 if (url == null) {
@@ -42168,11 +42480,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.setItem('server-url', url);
                 await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.setItem('did-bootstrap', true);
-                (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(url);
+                (0, _server_config__WEBPACK_IMPORTED_MODULE_46__.setServer)(url);
                 return {};
             };
             handlers['sync'] = async function () {
-                return (0, _sync__WEBPACK_IMPORTED_MODULE_48__.fullSync)();
+                return (0, _sync__WEBPACK_IMPORTED_MODULE_49__.fullSync)();
             };
             handlers['get-budgets'] = async function () {
                 const paths = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.listDir(_platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.getDocumentDir());
@@ -42216,16 +42528,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             };
             handlers['reset-budget-cache'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.mutator)(async function () {
                 // Recomputing everything will update the cache
-                await _sheet__WEBPACK_IMPORTED_MODULE_46__.loadUserBudgets(_db__WEBPACK_IMPORTED_MODULE_30__);
-                _sheet__WEBPACK_IMPORTED_MODULE_46__.get().recomputeAll();
-                await _sheet__WEBPACK_IMPORTED_MODULE_46__.waitOnSpreadsheet();
+                await _sheet__WEBPACK_IMPORTED_MODULE_47__.loadUserBudgets(_db__WEBPACK_IMPORTED_MODULE_30__);
+                _sheet__WEBPACK_IMPORTED_MODULE_47__.get().recomputeAll();
+                await _sheet__WEBPACK_IMPORTED_MODULE_47__.waitOnSpreadsheet();
             });
             handlers['upload-budget'] = async function ({ id } = {}) {
                 if (id) {
-                    if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs()) {
+                    if (_prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs()) {
                         throw new Error('upload-budget: id given but prefs already loaded');
                     }
-                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.loadPrefs(id);
+                    await _prefs__WEBPACK_IMPORTED_MODULE_42__.loadPrefs(id);
                 }
                 try {
                     await _cloud_storage__WEBPACK_IMPORTED_MODULE_28__.upload();
@@ -42246,7 +42558,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 finally {
                     if (id) {
-                        _prefs__WEBPACK_IMPORTED_MODULE_41__.unloadPrefs();
+                        _prefs__WEBPACK_IMPORTED_MODULE_42__.unloadPrefs();
                     }
                 }
                 return {};
@@ -42259,9 +42571,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 catch (e) {
                     if (e.type === 'FileDownloadError') {
                         if (e.reason === 'file-exists' && e.meta.id) {
-                            await _prefs__WEBPACK_IMPORTED_MODULE_41__.loadPrefs(e.meta.id);
-                            const name = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().budgetName;
-                            _prefs__WEBPACK_IMPORTED_MODULE_41__.unloadPrefs();
+                            await _prefs__WEBPACK_IMPORTED_MODULE_42__.loadPrefs(e.meta.id);
+                            const name = _prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs().budgetName;
+                            _prefs__WEBPACK_IMPORTED_MODULE_42__.unloadPrefs();
                             e.meta = {
                                 ...e.meta,
                                 name
@@ -42295,12 +42607,12 @@ 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_48__.setSyncingMode)('enabled');
-                const result = await (0, _sync__WEBPACK_IMPORTED_MODULE_48__.initialFullSync)();
+                (0, _sync__WEBPACK_IMPORTED_MODULE_49__.setSyncingMode)('enabled');
+                const result = await (0, _sync__WEBPACK_IMPORTED_MODULE_49__.initialFullSync)();
                 return result;
             };
             handlers['load-budget'] = async function ({ id }) {
-                const currentPrefs = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs();
+                const currentPrefs = _prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs();
                 if (currentPrefs) {
                     if (currentPrefs.id === id) {
                         // If it's already loaded, do nothing
@@ -42330,9 +42642,9 @@ 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_46__.waitOnSpreadsheet();
-                _sheet__WEBPACK_IMPORTED_MODULE_46__.unloadSpreadsheet();
-                (0, _sync__WEBPACK_IMPORTED_MODULE_48__.clearFullSyncTimeout)();
+                await _sheet__WEBPACK_IMPORTED_MODULE_47__.waitOnSpreadsheet();
+                _sheet__WEBPACK_IMPORTED_MODULE_47__.unloadSpreadsheet();
+                (0, _sync__WEBPACK_IMPORTED_MODULE_49__.clearFullSyncTimeout)();
                 await _main_app__WEBPACK_IMPORTED_MODULE_36__.app.stopServices();
                 await _db__WEBPACK_IMPORTED_MODULE_30__.closeDatabase();
                 try {
@@ -42343,7 +42655,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // budget. We want to unload whatever has already been loaded but
                     // be resilient to anything failing
                 }
-                _prefs__WEBPACK_IMPORTED_MODULE_41__.unloadPrefs();
+                _prefs__WEBPACK_IMPORTED_MODULE_42__.unloadPrefs();
                 (0, _backups__WEBPACK_IMPORTED_MODULE_25__.stopBackupService)();
                 return 'ok';
             };
@@ -42375,16 +42687,16 @@ 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_53__.uniqueFileName)(files);
+                        budgetName = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_54__.uniqueFileName)(files);
                     }
-                    id = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_53__.idFromFileName)(budgetName);
+                    id = await (0, _util_budget_name__WEBPACK_IMPORTED_MODULE_54__.idFromFileName)(budgetName);
                 }
                 const budgetDir = _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.getBudgetDir(id);
                 await _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.mkdir(budgetDir);
                 // Create the initial database
                 await _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.copyFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.bundledDatabasePath, _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.join(budgetDir, 'db.sqlite'));
                 // Create the initial prefs file
-                await _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.writeFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.join(budgetDir, 'metadata.json'), JSON.stringify(_prefs__WEBPACK_IMPORTED_MODULE_41__.getDefaultPrefs(id, budgetName)));
+                await _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.writeFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_9__.join(budgetDir, 'metadata.json'), JSON.stringify(_prefs__WEBPACK_IMPORTED_MODULE_42__.getDefaultPrefs(id, budgetName)));
                 // Load it in
                 const { error } = await loadBudget(id);
                 if (error) {
@@ -42459,7 +42771,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 try {
-                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.loadPrefs(id);
+                    await _prefs__WEBPACK_IMPORTED_MODULE_42__.loadPrefs(id);
                     await _db__WEBPACK_IMPORTED_MODULE_30__.openDatabase(id);
                 }
                 catch (e) {
@@ -42474,14 +42786,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 // Older versions didn't tag the file with the current user, so do
                 // so now
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().userId) {
+                if (!_prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs().userId) {
                     const userId = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.getItem('user-token');
-                    _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
+                    _prefs__WEBPACK_IMPORTED_MODULE_42__.savePrefs({
                         userId
                     });
                 }
                 try {
-                    await (0, _update__WEBPACK_IMPORTED_MODULE_52__.updateVersion)();
+                    await (0, _update__WEBPACK_IMPORTED_MODULE_53__.updateVersion)();
                 }
                 catch (e) {
                     console.warn('Error updating', e);
@@ -42508,7 +42820,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return result;
                 }
                 await _db__WEBPACK_IMPORTED_MODULE_30__.loadClock();
-                if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().resetClock) {
+                if (_prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs().resetClock) {
                     // If we need to generate a fresh clock, we need to generate a new
                     // client id. This happens when the database is transferred to a
                     // new device.
@@ -42519,7 +42831,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     await _db__WEBPACK_IMPORTED_MODULE_30__.runQuery('INSERT OR REPLACE INTO messages_clock (id, clock) VALUES (1, ?)', [
                         _actual_app_crdt__WEBPACK_IMPORTED_MODULE_4__.serializeClock(_actual_app_crdt__WEBPACK_IMPORTED_MODULE_4__.getClock())
                     ]);
-                    await _prefs__WEBPACK_IMPORTED_MODULE_41__.savePrefs({
+                    await _prefs__WEBPACK_IMPORTED_MODULE_42__.savePrefs({
                         resetClock: false
                     });
                 }
@@ -42527,7 +42839,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     (0, _backups__WEBPACK_IMPORTED_MODULE_25__.startBackupService)(id);
                 }
                 try {
-                    await _sheet__WEBPACK_IMPORTED_MODULE_46__.loadSpreadsheet(_db__WEBPACK_IMPORTED_MODULE_30__, onSheetChange);
+                    await _sheet__WEBPACK_IMPORTED_MODULE_47__.loadSpreadsheet(_db__WEBPACK_IMPORTED_MODULE_30__, onSheetChange);
                 }
                 catch (e) {
                     (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_6__.captureException)(e);
@@ -42537,25 +42849,28 @@ 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_46__.get().meta().budgetType = _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().budgetType;
+                const { value: budgetType = 'rollover' } = await _db__WEBPACK_IMPORTED_MODULE_30__.first('SELECT value from preferences WHERE id = ?', [
+                    'budgetType'
+                ]) ?? {};
+                _sheet__WEBPACK_IMPORTED_MODULE_47__.get().meta().budgetType = budgetType;
                 await _budget_base__WEBPACK_IMPORTED_MODULE_27__.createAllBudgets();
                 // Load all the in-memory state
                 await _db_mappings__WEBPACK_IMPORTED_MODULE_31__.loadMappings();
                 await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_21__.loadRules();
-                await _sync_migrate__WEBPACK_IMPORTED_MODULE_49__.listen();
+                await _sync_migrate__WEBPACK_IMPORTED_MODULE_50__.listen();
                 await _main_app__WEBPACK_IMPORTED_MODULE_36__.app.startServices();
-                (0, _undo__WEBPACK_IMPORTED_MODULE_51__.clearUndo)();
+                (0, _undo__WEBPACK_IMPORTED_MODULE_52__.clearUndo)();
                 // Ensure that syncing is enabled
                 if (true) {
                     if (id === DEMO_BUDGET_ID) {
-                        (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('disabled');
+                        (0, _sync__WEBPACK_IMPORTED_MODULE_49__.setSyncingMode)('disabled');
                     }
                     else {
-                        if ((0, _server_config__WEBPACK_IMPORTED_MODULE_45__.getServer)()) {
-                            (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('enabled');
+                        if ((0, _server_config__WEBPACK_IMPORTED_MODULE_46__.getServer)()) {
+                            (0, _sync__WEBPACK_IMPORTED_MODULE_49__.setSyncingMode)('enabled');
                         }
                         else {
-                            (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('disabled');
+                            (0, _sync__WEBPACK_IMPORTED_MODULE_49__.setSyncingMode)('disabled');
                         }
                         await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.setItem('lastBudget', id);
                         // Only upload periodically on desktop
@@ -42598,16 +42913,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return null;
             };
             handlers['app-focused'] = async function () {
-                if (_prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs() && _prefs__WEBPACK_IMPORTED_MODULE_41__.getPrefs().id) {
+                if (_prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs() && _prefs__WEBPACK_IMPORTED_MODULE_42__.getPrefs().id) {
                     // First we sync
-                    (0, _sync__WEBPACK_IMPORTED_MODULE_48__.fullSync)();
+                    (0, _sync__WEBPACK_IMPORTED_MODULE_49__.fullSync)();
                 }
             };
             handlers = (0, _api__WEBPACK_IMPORTED_MODULE_23__.installAPI)(handlers);
             _actual_app_api_injected__WEBPACK_IMPORTED_MODULE_3__.override((name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_36__.app.handlers[name], args));
             // A hack for now until we clean up everything
             _main_app__WEBPACK_IMPORTED_MODULE_36__.app.handlers = handlers;
-            _main_app__WEBPACK_IMPORTED_MODULE_36__.app.combine(_schedules_app__WEBPACK_IMPORTED_MODULE_44__.app, _budget_app__WEBPACK_IMPORTED_MODULE_26__.app, _dashboard_app__WEBPACK_IMPORTED_MODULE_29__.app, _notes_app__WEBPACK_IMPORTED_MODULE_38__.app, _tools_app__WEBPACK_IMPORTED_MODULE_50__.app, _filters_app__WEBPACK_IMPORTED_MODULE_34__.app, _reports_app__WEBPACK_IMPORTED_MODULE_42__.app, _rules_app__WEBPACK_IMPORTED_MODULE_43__.app);
+            _main_app__WEBPACK_IMPORTED_MODULE_36__.app.combine(_schedules_app__WEBPACK_IMPORTED_MODULE_45__.app, _budget_app__WEBPACK_IMPORTED_MODULE_26__.app, _dashboard_app__WEBPACK_IMPORTED_MODULE_29__.app, _notes_app__WEBPACK_IMPORTED_MODULE_38__.app, _preferences_app__WEBPACK_IMPORTED_MODULE_41__.app, _tools_app__WEBPACK_IMPORTED_MODULE_51__.app, _filters_app__WEBPACK_IMPORTED_MODULE_34__.app, _reports_app__WEBPACK_IMPORTED_MODULE_43__.app, _rules_app__WEBPACK_IMPORTED_MODULE_44__.app);
             function getDefaultDocumentDir() {
                 if (_platform__WEBPACK_IMPORTED_MODULE_39__.isMobile) {
                     // On mobile, unfortunately we need to be backwards compatible
@@ -42682,7 +42997,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (!url) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_7__.removeItem('user-token');
                 }
-                (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(url);
+                (0, _server_config__WEBPACK_IMPORTED_MODULE_46__.setServer)(url);
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_8__.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_36__.app.handlers);
                 // Allow running DB queries locally
                 global.$query = _aql__WEBPACK_IMPORTED_MODULE_24__.runQuery;
@@ -42690,7 +43005,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (isDev) {
                     global.$send = (name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_36__.app.handlers[name], args);
                     global.$db = _db__WEBPACK_IMPORTED_MODULE_30__;
-                    global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode;
+                    global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_49__.setSyncingMode;
                 }
             }
             // eslint-disable-next-line import/no-unused-modules
@@ -42714,7 +43029,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
                 _platform_server_fs__WEBPACK_IMPORTED_MODULE_9__._setDocumentDir(dataDir || process.cwd());
                 if (serverURL) {
-                    (0, _server_config__WEBPACK_IMPORTED_MODULE_45__.setServer)(serverURL);
+                    (0, _server_config__WEBPACK_IMPORTED_MODULE_46__.setServer)(serverURL);
                     if (config.password) {
                         await (0, _mutators__WEBPACK_IMPORTED_MODULE_37__.runHandler)(handlers['subscribe-sign-in'], {
                             password: config.password
@@ -42724,9 +43039,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_45__.setServer)(null);
+                    (0, _server_config__WEBPACK_IMPORTED_MODULE_46__.setServer)(null);
                     _main_app__WEBPACK_IMPORTED_MODULE_36__.app.events.on('load-budget', () => {
-                        (0, _sync__WEBPACK_IMPORTED_MODULE_48__.setSyncingMode)('offline');
+                        (0, _sync__WEBPACK_IMPORTED_MODULE_49__.setSyncingMode)('offline');
                     });
                 }
                 return lib;
@@ -42764,21 +43079,23 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ withMigrationsDir: () => ( /* binding */withMigrationsDir)
                 /* harmony export */ 
             });
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* 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 _migrations_1722717601000_reports_move_selected_categories__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../migrations/1722717601000_reports_move_selected_categories */ "./packages/loot-core/migrations/1722717601000_reports_move_selected_categories.js");
             /* harmony import */ var _migrations_1722804019000_create_dashboard_table__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../migrations/1722804019000_create_dashboard_table */ "./packages/loot-core/migrations/1722804019000_create_dashboard_table.js");
-            /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
-            /* harmony import */ var _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../platform/server/sqlite */ "./packages/loot-core/src/platform/server/sqlite/index.electron.ts");
+            /* harmony import */ var _migrations_1723665565000_prefs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../migrations/1723665565000_prefs */ "./packages/loot-core/migrations/1723665565000_prefs.js");
+            /* harmony import */ var _platform_server_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../platform/server/fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
+            /* harmony import */ var _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../platform/server/sqlite */ "./packages/loot-core/src/platform/server/sqlite/index.electron.ts");
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.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.
-            let MIGRATIONS_DIR = _platform_server_fs__WEBPACK_IMPORTED_MODULE_3__.migrationsPath;
+            let MIGRATIONS_DIR = _platform_server_fs__WEBPACK_IMPORTED_MODULE_4__.migrationsPath;
             const javascriptMigrations = {
                 1632571489012: _migrations_1632571489012_remove_cache__WEBPACK_IMPORTED_MODULE_0__["default"],
                 1722717601000: _migrations_1722717601000_reports_move_selected_categories__WEBPACK_IMPORTED_MODULE_1__["default"],
-                1722804019000: _migrations_1722804019000_create_dashboard_table__WEBPACK_IMPORTED_MODULE_2__["default"]
+                1722804019000: _migrations_1722804019000_create_dashboard_table__WEBPACK_IMPORTED_MODULE_2__["default"],
+                1723665565000: _migrations_1723665565000_prefs__WEBPACK_IMPORTED_MODULE_3__["default"]
             };
             async function withMigrationsDir(dir, func) {
                 const oldDir = MIGRATIONS_DIR;
@@ -42804,20 +43121,20 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const newFiltersMigration = 1688749527273;
                 const appliedIds = await getAppliedMigrations(db);
                 if (appliedIds.includes(badFiltersMigration)) {
-                    await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.runQuery(db, 'DELETE FROM __migrations__ WHERE id = ?', [
+                    await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.runQuery(db, 'DELETE FROM __migrations__ WHERE id = ?', [
                         badFiltersMigration
                     ]);
-                    await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.runQuery(db, 'INSERT INTO __migrations__ (id) VALUES (?)', [
+                    await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.runQuery(db, 'INSERT INTO __migrations__ (id) VALUES (?)', [
                         newFiltersMigration
                     ]);
                 }
             }
             async function getAppliedMigrations(db) {
-                const rows = await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.runQuery(db, 'SELECT * FROM __migrations__ ORDER BY id ASC', [], true);
+                const rows = await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.runQuery(db, 'SELECT * FROM __migrations__ ORDER BY id ASC', [], true);
                 return rows.map((row) => row.id);
             }
             async function getMigrationList(migrationsDir) {
-                const files = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_3__.listDir(migrationsDir);
+                const files = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_4__.listDir(migrationsDir);
                 return files.filter((name) => name.match(/(\.sql|\.js)$/)).sort((m1, m2) => {
                     const id1 = getMigrationId(m1);
                     const id2 = getMigrationId(m2);
@@ -42838,19 +43155,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             async function applyJavaScript(db, id) {
                 const dbInterface = {
-                    runQuery: (query, params, fetchAll) => _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.runQuery(db, query, params, fetchAll),
-                    execQuery: (query) => _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.execQuery(db, query),
-                    transaction: (func) => _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.transaction(db, func)
+                    runQuery: (query, params, fetchAll) => _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.runQuery(db, query, params, fetchAll),
+                    execQuery: (query) => _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.execQuery(db, query),
+                    transaction: (func) => _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.transaction(db, func)
                 };
                 if (javascriptMigrations[id] == null) {
                     throw new Error('Could not find JS migration code to run for ' + id);
                 }
                 const run = javascriptMigrations[id];
-                return run(dbInterface, () => (0, uuid__WEBPACK_IMPORTED_MODULE_5__["default"])());
+                return run(dbInterface, {
+                    fs: _platform_server_fs__WEBPACK_IMPORTED_MODULE_4__,
+                    fileId: _prefs__WEBPACK_IMPORTED_MODULE_6__.getPrefs()?.id
+                });
             }
             async function applySql(db, sql) {
                 try {
-                    await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.execQuery(db, sql);
+                    await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.execQuery(db, sql);
                 }
                 catch (e) {
                     console.log('Error applying sql:', sql);
@@ -42858,14 +43178,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             }
             async function applyMigration(db, name, migrationsDir) {
-                const code = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_3__.readFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_3__.join(migrationsDir, name));
+                const code = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_4__.readFile(_platform_server_fs__WEBPACK_IMPORTED_MODULE_4__.join(migrationsDir, name));
                 if (name.match(/\.js$/)) {
                     await applyJavaScript(db, getMigrationId(name));
                 }
                 else {
                     await applySql(db, code);
                 }
-                await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_4__.runQuery(db, 'INSERT INTO __migrations__ (id) VALUES (?)', [
+                await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_5__.runQuery(db, 'INSERT INTO __migrations__ (id) VALUES (?)', [
                     getMigrationId(name)
                 ]);
             }
@@ -43133,12 +43453,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
             /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             const app = (0, _app__WEBPACK_IMPORTED_MODULE_0__.createApp)();
-            app.method('notes-save', async ({ id, note }) => {
+            async function updateNotes({ id, note }) {
                 await _db__WEBPACK_IMPORTED_MODULE_1__.update('notes', {
                     id,
                     note
                 });
-            });
+            }
+            app.method('notes-save', updateNotes);
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/platform.ts": 
@@ -43266,6 +43587,31 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/server/preferences/app.ts": 
+        /*!**********************************************************!*\
+          !*** ./packages/loot-core/src/server/preferences/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 _app__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
+            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
+            const app = (0, _app__WEBPACK_IMPORTED_MODULE_0__.createApp)();
+            const savePreferences = async ({ id, value }) => {
+                await _db__WEBPACK_IMPORTED_MODULE_1__.update('preferences', {
+                    id,
+                    value
+                });
+            };
+            app.method('preferences/save', (0, _mutators__WEBPACK_IMPORTED_MODULE_2__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_3__.undoable)(savePreferences)));
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/server/prefs.ts": 
         /*!************************************************!*\
           !*** ./packages/loot-core/src/server/prefs.ts ***!
@@ -43307,19 +43653,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         budgetName: id
                     };
                 }
-                // delete released feature flags
-                const releasedFeatures = [
-                    'syncAccount'
-                ];
-                for (const feature of releasedFeatures) {
-                    delete prefs[`flags.${feature}`];
-                }
-                // delete legacy notifications
-                for (const key of Object.keys(prefs)) {
-                    if (key.startsWith('notifications.')) {
-                        delete prefs[key];
-                    }
-                }
                 // No matter what is in `id` field, force it to be the current id.
                 // This makes it resilient to users moving around folders, etc
                 prefs.id = id;
@@ -43330,7 +43663,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (!avoidSync) {
                     // Sync whitelisted prefs
                     const messages = Object.keys(prefsToSet).map((key) => {
-                        if (key === 'budgetType' || key === 'budgetName') {
+                        if (key === 'budgetName') {
                             return {
                                 dataset: 'prefs',
                                 row: key,
@@ -43514,14 +43847,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* 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");
-            /* harmony import */ var _accounts_rules__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../accounts/rules */ "./packages/loot-core/src/server/accounts/rules.ts");
-            /* harmony import */ var _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../accounts/transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
-            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
-            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
-            /* 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");
+            /* harmony import */ var _accounts_rules__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../accounts/rules */ "./packages/loot-core/src/server/accounts/rules.ts");
+            /* harmony import */ var _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../accounts/transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
+            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_6__ = __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
@@ -43532,7 +43864,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             validate(item);
                         }
                         catch (e) {
-                            if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_4__.RuleError) {
+                            if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_3__.RuleError) {
                                 console.warn('Invalid rule', e);
                                 return e.type;
                             }
@@ -43542,8 +43874,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                     return result.filter((res) => typeof res === 'string').length ? result : null;
                 }
-                const conditionErrors = runValidation(rule.conditions, (cond) => new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Condition(cond.op, cond.field, cond.value, cond.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES));
-                const actionErrors = runValidation(rule.actions, (action) => action.op === 'set-split-amount' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, null, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES) : action.op === 'link-schedule' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, null, action.value, null, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES) : action.op === 'prepend-notes' || action.op === 'append-notes' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, null, action.value, null, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES) : new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, action.field, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES));
+                const conditionErrors = runValidation(rule.conditions, (cond) => new _accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Condition(cond.op, cond.field, cond.value, cond.options));
+                const actionErrors = runValidation(rule.actions, (action) => action.op === 'set-split-amount' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Action(action.op, null, action.value, action.options) : action.op === 'link-schedule' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Action(action.op, null, action.value, null) : action.op === 'prepend-notes' || action.op === 'append-notes' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Action(action.op, null, action.value, null) : new _accounts_rules__WEBPACK_IMPORTED_MODULE_0__.Action(action.op, action.field, action.value, action.options));
                 if (conditionErrors || actionErrors) {
                     return {
                         conditionErrors,
@@ -43553,44 +43885,44 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return null;
             }
             // Expose functions to the client
-            const app = (0, _app__WEBPACK_IMPORTED_MODULE_3__.createApp)();
+            const app = (0, _app__WEBPACK_IMPORTED_MODULE_2__.createApp)();
             app.method('rule-validate', async function (rule) {
                 const error = validateRule(rule);
                 return {
                     error
                 };
             });
-            app.method('rule-add', (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.mutator)(async function (rule) {
+            app.method('rule-add', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(async function (rule) {
                 const error = validateRule(rule);
                 if (error) {
                     return {
                         error
                     };
                 }
-                const id = await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.insertRule(rule);
+                const id = await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.insertRule(rule);
                 return {
                     id,
                     ...rule
                 };
             }));
-            app.method('rule-update', (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.mutator)(async function (rule) {
+            app.method('rule-update', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(async function (rule) {
                 const error = validateRule(rule);
                 if (error) {
                     return {
                         error
                     };
                 }
-                await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.updateRule(rule);
+                await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.updateRule(rule);
                 return rule;
             }));
-            app.method('rule-delete', (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.mutator)(async function (id) {
-                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.deleteRule(id);
+            app.method('rule-delete', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(async function (id) {
+                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.deleteRule(id);
             }));
-            app.method('rule-delete-all', (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.mutator)(async function (ids) {
+            app.method('rule-delete-all', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(async function (ids) {
                 let someDeletionsFailed = false;
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_6__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
                     for (const id of ids) {
-                        const res = await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.deleteRule(id);
+                        const res = await _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.deleteRule(id);
                         if (res === false) {
                             someDeletionsFailed = true;
                         }
@@ -43600,21 +43932,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     someDeletionsFailed
                 };
             }));
-            app.method('rule-apply-actions', (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_7__.undoable)(async function ({ transactions, actions }) {
-                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.applyActions(transactions, actions);
+            app.method('rule-apply-actions', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_6__.undoable)(async function ({ transactions, actions }) {
+                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.applyActions(transactions, actions);
             })));
-            app.method('rule-add-payee-rename', (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.mutator)(async function ({ fromNames, to }) {
-                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.updatePayeeRenameRule(fromNames, to);
+            app.method('rule-add-payee-rename', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)(async function ({ fromNames, to }) {
+                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.updatePayeeRenameRule(fromNames, to);
             }));
             app.method('rules-get', async function () {
-                return (0, _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.rankRules)(_accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.getRules()).map((rule) => rule.serialize());
+                return (0, _accounts_rules__WEBPACK_IMPORTED_MODULE_0__.rankRules)(_accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.getRules()).map((rule) => rule.serialize());
             });
             app.method('rule-get', async function ({ id }) {
-                const rule = _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.getRules().find((rule) => rule.id === id);
+                const rule = _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.getRules().find((rule) => rule.id === id);
                 return rule ? rule.serialize() : null;
             });
             app.method('rules-run', async function ({ transaction }) {
-                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.runRules(transaction);
+                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_1__.runRules(transaction);
             });
             /***/ 
         }),
@@ -43688,9 +44020,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             function getNextDate(dateCond, start = new Date((0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.currentDay)()), noSkipWeekend = false) {
                 start = date_fns__WEBPACK_IMPORTED_MODULE_19__["default"](start);
-                const cond = new _accounts_rules__WEBPACK_IMPORTED_MODULE_6__.Condition(dateCond.op, 'date', dateCond.value, null, new Map(Object.entries({
-                    date: 'date'
-                })));
+                const cond = new _accounts_rules__WEBPACK_IMPORTED_MODULE_6__.Condition(dateCond.op, 'date', dateCond.value, null);
                 const value = cond.getValue();
                 if (value.type === 'date') {
                     return value.date;
@@ -43936,12 +44266,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             async function getUpcomingDates({ config, count }) {
                 const rules = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_5__.recurConfigToRSchedule)(config);
                 try {
-                    // @ts-expect-error fix me
                     const schedule = new _util_rschedule__WEBPACK_IMPORTED_MODULE_17__.Schedule({
                         rrules: rules
                     });
-                    return schedule // @ts-expect-error fix me
-                        .occurrences({
+                    return schedule.occurrences({
                         start: date_fns__WEBPACK_IMPORTED_MODULE_19__["default"](new Date()),
                         take: count
                     }).toArray().map((date) => config.skipWeekend ? getDateWithSkippedWeekend(date.date, config.weekendSolveMode) : date.date).map((date) => (0, _shared_months__WEBPACK_IMPORTED_MODULE_3__.dayFromDate)(date));
@@ -44157,12 +44485,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* 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) {
-                // @ts-expect-error fix me
                 const schedule = new _util_rschedule__WEBPACK_IMPORTED_MODULE_9__.Schedule({
                     rrules: (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_3__.recurConfigToRSchedule)(config)
                 });
-                return schedule // @ts-expect-error fix me
-                    .occurrences({
+                return schedule.occurrences({
                     take: 3
                 }).toArray().map((d) => d.date);
             }
@@ -44549,9 +44875,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../platform/server/sqlite */ "./packages/loot-core/src/platform/server/sqlite/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 _platform__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./platform */ "./packages/loot-core/src/server/platform.ts");
-            /* 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");
+            /* harmony import */ var _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./spreadsheet/spreadsheet */ "./packages/loot-core/src/server/spreadsheet/spreadsheet.ts");
+            /* harmony import */ var _spreadsheet_util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./spreadsheet/util */ "./packages/loot-core/src/server/spreadsheet/util.ts");
             // @ts-strict-ignore
             let globalSheet;
             let globalOnChange;
@@ -44629,10 +44954,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 let sheet;
                 if (cacheEnabled) {
-                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__.Spreadsheet(updateSpreadsheetCache.bind(null, cacheDb), setCacheStatus.bind(null, mainDb, cacheDb));
+                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_4__.Spreadsheet(updateSpreadsheetCache.bind(null, cacheDb), setCacheStatus.bind(null, mainDb, cacheDb));
                 }
                 else {
-                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_5__.Spreadsheet();
+                    sheet = new _spreadsheet_spreadsheet__WEBPACK_IMPORTED_MODULE_4__.Spreadsheet();
                 }
                 (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_0__.captureBreadcrumb)({
                     message: 'loading spreaadsheet',
@@ -44682,7 +45007,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const sheet = globalSheet;
                 // TODO: Clear out the cache here so make sure future loads of the app
                 // don't load any extra values that aren't set here
-                const { budgetType } = _prefs__WEBPACK_IMPORTED_MODULE_4__.getPrefs() || {};
+                const { value: budgetType = 'rollover' } = await db.first('SELECT value from preferences WHERE id = ?', [
+                    'budgetType'
+                ]) ?? {};
                 const table = budgetType === 'report' ? 'reflect_budgets' : 'zero_budgets';
                 const budgets = await db.all(`
       SELECT * FROM ${table} b
@@ -44711,10 +45038,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 sheet.endTransaction();
             }
             function getCell(sheet, name) {
-                return globalSheet._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_6__.resolveName)(sheet, name));
+                return globalSheet._getNode((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_5__.resolveName)(sheet, name));
             }
             function getCellValue(sheet, name) {
-                return globalSheet.getValue((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_6__.resolveName)(sheet, name));
+                return globalSheet.getValue((0, _spreadsheet_util__WEBPACK_IMPORTED_MODULE_5__.resolveName)(sheet, name));
             }
             function startTransaction() {
                 if (globalSheet) {
@@ -45822,6 +46149,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             ]);
                             currentMerkle = _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.merkle.insert(currentMerkle, timestamp);
                         }
+                        // Special treatment for some synced prefs
+                        if (dataset === 'preferences' && row === 'budgetType') {
+                            (0, _budget_base__WEBPACK_IMPORTED_MODULE_7__.setType)(value);
+                        }
                     }
                     if (checkSyncingMode('enabled')) {
                         currentMerkle = _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.merkle.prune(currentMerkle);
@@ -45845,9 +46176,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     _prefs__WEBPACK_IMPORTED_MODULE_13__.savePrefs(prefsToSet, {
                         avoidSync: true
                     });
-                    if (prefsToSet.budgetType) {
-                        (0, _budget_base__WEBPACK_IMPORTED_MODULE_7__.setType)(prefsToSet.budgetType);
-                    }
                     _platform_server_connection__WEBPACK_IMPORTED_MODULE_3__.send('prefs-updated');
                 }
                 const newData = await fetchData();
@@ -46144,11 +46472,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     localTimeChanged ? 0 : count + 1, diffTime));
                 }
                 else {
-                    // All synced up, store the current time as a simple optimization
-                    // for the next sync
-                    await _prefs__WEBPACK_IMPORTED_MODULE_13__.savePrefs({
-                        lastSyncedTimestamp: (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.toString()
-                    });
+                    // All synced up, store the current time as a simple optimization for the next sync
+                    const requiresUpdate = (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.toString() !== lastSyncedTimestamp;
+                    if (requiresUpdate) {
+                        await _prefs__WEBPACK_IMPORTED_MODULE_13__.savePrefs({
+                            lastSyncedTimestamp: (0, _actual_app_crdt__WEBPACK_IMPORTED_MODULE_0__.getClock)().timestamp.toString()
+                        });
+                    }
                 }
                 return receivedMessages;
             }
@@ -46812,66 +47142,65 @@ 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 */ AddOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.AddOperator),
-                /* harmony export */ ArgumentError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.ArgumentError),
-                /* harmony export */ Calendar: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.Calendar),
-                /* harmony export */ Collection: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.Collection),
-                /* harmony export */ CollectionIterator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.CollectionIterator),
-                /* harmony export */ DateAdapter: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.DateAdapter),
-                /* harmony export */ DateAdapterBase: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.DateAdapterBase),
-                /* harmony export */ DateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.DateTime),
-                /* harmony export */ Dates: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.Dates),
-                /* harmony export */ InfiniteLoopError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.InfiniteLoopError),
-                /* harmony export */ IntersectionOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.IntersectionOperator),
-                /* harmony export */ InvalidDateAdapterError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.InvalidDateAdapterError),
-                /* harmony export */ InvalidDateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.InvalidDateTime),
-                /* harmony export */ InvalidDateTimeError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.InvalidDateTimeError),
-                /* harmony export */ MergeDurationOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.MergeDurationOperator),
-                /* harmony export */ MergeDurationOperatorError: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.MergeDurationOperatorError),
-                /* harmony export */ OccurrenceGenerator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.OccurrenceGenerator),
-                /* harmony export */ OccurrenceIterator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.OccurrenceIterator),
-                /* harmony export */ Operator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.Operator),
-                /* harmony export */ RecurrenceRuleError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.RecurrenceRuleError),
-                /* harmony export */ RecurrenceRulesIterator: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.RecurrenceRulesIterator),
-                /* harmony export */ Rule: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.Rule),
-                /* harmony export */ RuleBase: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.RuleBase),
-                /* harmony export */ RuleOptionError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.RuleOptionError),
-                /* harmony export */ Schedule: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.Schedule),
-                /* harmony export */ ScheduleBase: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.ScheduleBase),
-                /* harmony export */ SplitDurationOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.SplitDurationOperator),
-                /* harmony export */ SplitDurationOperatorError: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.SplitDurationOperatorError),
-                /* harmony export */ StandardDateAdapter: () => ( /* reexport safe */_rschedule_standard_date_adapter__WEBPACK_IMPORTED_MODULE_2__.StandardDateAdapter),
-                /* harmony export */ SubtractOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.SubtractOperator),
-                /* harmony export */ UniqueOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.UniqueOperator),
-                /* harmony export */ ValidDateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.ValidDateTime),
-                /* harmony export */ add: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.add),
-                /* harmony export */ cloneJSON: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.cloneJSON),
-                /* harmony export */ cloneRuleOptions: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.cloneRuleOptions),
-                /* harmony export */ dateInputToDateAdapter: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.dateInputToDateAdapter),
-                /* harmony export */ dateInputToDateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.dateInputToDateTime),
-                /* harmony export */ dateTimeSortComparer: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.dateTimeSortComparer),
-                /* harmony export */ freqToGranularity: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.freqToGranularity),
-                /* harmony export */ getDaysInYear: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.getDaysInYear),
-                /* harmony export */ getDifferenceBetweenWeekdays: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.getDifferenceBetweenWeekdays),
-                /* harmony export */ intersection: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.intersection),
-                /* harmony export */ isLeapYear: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.isLeapYear),
-                /* harmony export */ mergeDuration: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.mergeDuration),
-                /* harmony export */ normalizeDateTimeTimezone: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.normalizeDateTimeTimezone),
-                /* harmony export */ normalizeRuleOptions: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.normalizeRuleOptions),
-                /* harmony export */ numberSortComparer: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.numberSortComparer),
-                /* harmony export */ orderedWeekdays: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.orderedWeekdays),
-                /* harmony export */ recurrenceRulesReducer: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.recurrenceRulesReducer),
-                /* harmony export */ splitDuration: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.splitDuration),
-                /* harmony export */ subtract: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.subtract),
-                /* harmony export */ uniqDateTimes: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_3__.uniqDateTimes),
-                /* harmony export */ unique: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__.unique)
+                /* harmony export */ AddOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.AddOperator),
+                /* harmony export */ ArgumentError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.ArgumentError),
+                /* harmony export */ Calendar: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.Calendar),
+                /* harmony export */ Collection: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.Collection),
+                /* harmony export */ CollectionIterator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.CollectionIterator),
+                /* harmony export */ DateAdapter: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.DateAdapter),
+                /* harmony export */ DateAdapterBase: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.DateAdapterBase),
+                /* harmony export */ DateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.DateTime),
+                /* harmony export */ Dates: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.Dates),
+                /* harmony export */ InfiniteLoopError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.InfiniteLoopError),
+                /* harmony export */ IntersectionOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.IntersectionOperator),
+                /* harmony export */ InvalidDateAdapterError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.InvalidDateAdapterError),
+                /* harmony export */ InvalidDateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.InvalidDateTime),
+                /* harmony export */ InvalidDateTimeError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.InvalidDateTimeError),
+                /* harmony export */ MergeDurationOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.MergeDurationOperator),
+                /* harmony export */ MergeDurationOperatorError: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.MergeDurationOperatorError),
+                /* harmony export */ OccurrenceGenerator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.OccurrenceGenerator),
+                /* harmony export */ OccurrenceIterator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.OccurrenceIterator),
+                /* harmony export */ Operator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.Operator),
+                /* harmony export */ RecurrenceRuleError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.RecurrenceRuleError),
+                /* harmony export */ RecurrenceRulesIterator: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.RecurrenceRulesIterator),
+                /* harmony export */ Rule: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.Rule),
+                /* harmony export */ RuleBase: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.RuleBase),
+                /* harmony export */ RuleOptionError: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.RuleOptionError),
+                /* harmony export */ Schedule: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.Schedule),
+                /* harmony export */ ScheduleBase: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.ScheduleBase),
+                /* harmony export */ SplitDurationOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.SplitDurationOperator),
+                /* harmony export */ SplitDurationOperatorError: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.SplitDurationOperatorError),
+                /* harmony export */ StandardDateAdapter: () => ( /* reexport safe */_rschedule_standard_date_adapter__WEBPACK_IMPORTED_MODULE_1__.StandardDateAdapter),
+                /* harmony export */ SubtractOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.SubtractOperator),
+                /* harmony export */ UniqueOperator: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.UniqueOperator),
+                /* harmony export */ ValidDateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.ValidDateTime),
+                /* harmony export */ add: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.add),
+                /* harmony export */ cloneJSON: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.cloneJSON),
+                /* harmony export */ cloneRuleOptions: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.cloneRuleOptions),
+                /* harmony export */ dateInputToDateAdapter: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.dateInputToDateAdapter),
+                /* harmony export */ dateInputToDateTime: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.dateInputToDateTime),
+                /* harmony export */ dateTimeSortComparer: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.dateTimeSortComparer),
+                /* harmony export */ freqToGranularity: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.freqToGranularity),
+                /* harmony export */ getDaysInYear: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.getDaysInYear),
+                /* harmony export */ getDifferenceBetweenWeekdays: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.getDifferenceBetweenWeekdays),
+                /* harmony export */ intersection: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.intersection),
+                /* harmony export */ isLeapYear: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.isLeapYear),
+                /* harmony export */ mergeDuration: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.mergeDuration),
+                /* harmony export */ normalizeDateTimeTimezone: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.normalizeDateTimeTimezone),
+                /* harmony export */ normalizeRuleOptions: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.normalizeRuleOptions),
+                /* harmony export */ numberSortComparer: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.numberSortComparer),
+                /* harmony export */ orderedWeekdays: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.orderedWeekdays),
+                /* harmony export */ recurrenceRulesReducer: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.recurrenceRulesReducer),
+                /* harmony export */ splitDuration: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.splitDuration),
+                /* harmony export */ subtract: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.subtract),
+                /* harmony export */ uniqDateTimes: () => ( /* reexport safe */_rschedule_core__WEBPACK_IMPORTED_MODULE_2__.uniqDateTimes),
+                /* harmony export */ unique: () => ( /* reexport safe */_rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__.unique)
                 /* harmony export */ 
             });
             /* harmony import */ var _rschedule_standard_date_adapter_setup__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @rschedule/standard-date-adapter/setup */ "./node_modules/@rschedule/standard-date-adapter/es2015/setup.js");
-            /* harmony import */ var _rschedule_json_tools_Schedule__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @rschedule/json-tools/Schedule */ "./node_modules/@rschedule/json-tools/es2015/Schedule.js");
-            /* harmony import */ var _rschedule_standard_date_adapter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @rschedule/standard-date-adapter */ "./node_modules/@rschedule/standard-date-adapter/es2015/main.js");
-            /* harmony import */ var _rschedule_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @rschedule/core */ "./node_modules/@rschedule/core/es2015/main.js");
-            /* harmony import */ var _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @rschedule/core/generators */ "./node_modules/@rschedule/core/es2015/generators.js");
+            /* harmony import */ var _rschedule_standard_date_adapter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @rschedule/standard-date-adapter */ "./node_modules/@rschedule/standard-date-adapter/es2015/main.js");
+            /* harmony import */ var _rschedule_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @rschedule/core */ "./node_modules/@rschedule/core/es2015/main.js");
+            /* harmony import */ var _rschedule_core_generators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @rschedule/core/generators */ "./node_modules/@rschedule/core/es2015/generators.js");
             /***/ 
         }),
         /***/ "./packages/loot-core/src/shared/async.ts": 
@@ -47091,13 +47420,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return error.message || 'We had an unknown problem syncing the account.';
             }
             class LazyLoadFailedError extends Error {
-                constructor(name) {
+                constructor(name, cause) {
                     super(`Error: failed loading lazy-loaded module ${name}`);
                     this.type = 'app-init-failure';
                     this.meta = {};
                     this.meta = {
                         name
                     };
+                    this.cause = cause;
                 }
             }
             /***/ 
@@ -47130,6 +47460,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ dayRangeInclusive: () => ( /* binding */dayRangeInclusive),
                 /* harmony export */ differenceInCalendarDays: () => ( /* binding */differenceInCalendarDays),
                 /* harmony export */ differenceInCalendarMonths: () => ( /* binding */differenceInCalendarMonths),
+                /* harmony export */ firstDayOfMonth: () => ( /* binding */firstDayOfMonth),
                 /* harmony export */ format: () => ( /* binding */format),
                 /* harmony export */ getDateFormatRegex: () => ( /* binding */getDateFormatRegex),
                 /* harmony export */ getDay: () => ( /* binding */getDay),
@@ -47150,6 +47481,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ isAfter: () => ( /* binding */isAfter),
                 /* harmony export */ isBefore: () => ( /* binding */isBefore),
                 /* harmony export */ isCurrentMonth: () => ( /* binding */isCurrentMonth),
+                /* harmony export */ lastDayOfMonth: () => ( /* binding */lastDayOfMonth),
                 /* harmony export */ monthFromDate: () => ( /* binding */monthFromDate),
                 /* harmony export */ nameForMonth: () => ( /* binding */nameForMonth),
                 /* harmony export */ nextMonth: () => ( /* binding */nextMonth),
@@ -47171,21 +47503,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/format/index.js");
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfWeek/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parse/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addMonths/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subMonths/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addYears/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addWeeks/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarMonths/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subWeeks/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subYears/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isBefore/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isAfter/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfMonth/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfMonth/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfMonth/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfMonth/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parse/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addYears/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addWeeks/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subWeeks/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subYears/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isBefore/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isAfter/index.js");
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfWeek/index.js");
             /* harmony import */ var memoize_one__WEBPACK_IMPORTED_MODULE_19__ = __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");
@@ -47274,6 +47606,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     weekStartsOn: converted
                 })), 'yyyy-MM-dd');
             }
+            function firstDayOfMonth(date) {
+                return dayFromDate(date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](_parse(date)));
+            }
+            function lastDayOfMonth(date) {
+                return dayFromDate(date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(date)));
+            }
             function dayFromDate(date) {
                 return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(date), 'yyyy-MM-dd');
             }
@@ -47306,7 +47644,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             function currentDate() {
                 if (global.IS_TESTING || _client_platform__WEBPACK_IMPORTED_MODULE_0__.isPlaywright) {
-                    return date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](currentDay(), 'yyyy-MM-dd', new Date());
+                    return date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](currentDay(), 'yyyy-MM-dd', new Date());
                 }
                 return new Date();
             }
@@ -47319,49 +47657,49 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             }
             function nextMonth(month) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), 1), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](_parse(month), 1), 'yyyy-MM');
             }
             function prevYear(month) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(month), 12), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](_parse(month), 12), 'yyyy-MM');
             }
             function prevMonth(month) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(month), 1), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](_parse(month), 1), 'yyyy-MM');
             }
             function addYears(year, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](_parse(year), n), 'yyyy');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](_parse(year), n), 'yyyy');
             }
             function addMonths(month, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), n), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](_parse(month), n), 'yyyy-MM');
             }
             function addWeeks(date, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](_parse(date), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](_parse(date), n), 'yyyy-MM-dd');
             }
             function differenceInCalendarMonths(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(month1), _parse(month2));
             }
             function differenceInCalendarDays(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](_parse(month1), _parse(month2));
             }
             function subMonths(month, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(month), n), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](_parse(month), n), 'yyyy-MM');
             }
             function subWeeks(date, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(date), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_12__["default"](_parse(date), n), 'yyyy-MM-dd');
             }
             function subYears(year, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](_parse(year), n), 'yyyy');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_13__["default"](_parse(year), n), 'yyyy');
             }
             function addDays(day, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_12__["default"](_parse(day), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(day), n), 'yyyy-MM-dd');
             }
             function subDays(day, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_13__["default"](_parse(day), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_parse(day), n), 'yyyy-MM-dd');
             }
             function isBefore(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(month1), _parse(month2));
             }
             function isAfter(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_17__["default"](_parse(month1), _parse(month2));
             }
             function isCurrentMonth(month) {
                 return month === currentMonth();
@@ -47370,15 +47708,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             // probably live elsewhere
             function bounds(month) {
                 return {
-                    start: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(month)), 'yyyyMMdd')),
-                    end: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_17__["default"](_parse(month)), 'yyyyMMdd'))
+                    start: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](_parse(month)), 'yyyyMMdd')),
+                    end: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month)), 'yyyyMMdd'))
                 };
             }
             function _yearRange(start, end, inclusive = false) {
                 const years = [];
                 let year = yearFromDate(start);
                 const endYear = yearFromDate(end);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(year), _parse(endYear))) {
+                while (date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(year), _parse(endYear))) {
                     years.push(year);
                     year = addYears(year, 1);
                 }
@@ -47394,7 +47732,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const weeks = [];
                 let week = weekFromDate(start, firstDayOfWeekIdx);
                 const endWeek = weekFromDate(end, firstDayOfWeekIdx);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(week), _parse(endWeek))) {
+                while (date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(week), _parse(endWeek))) {
                     weeks.push(week);
                     week = addWeeks(week, 1);
                 }
@@ -47410,7 +47748,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const months = [];
                 let month = monthFromDate(start);
                 const endMonth = monthFromDate(end);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month), _parse(endMonth))) {
+                while (date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(month), _parse(endMonth))) {
                     months.push(month);
                     month = addMonths(month, 1);
                 }
@@ -47428,7 +47766,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function _dayRange(start, end, inclusive = false) {
                 const days = [];
                 let day = start;
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(day), _parse(end))) {
+                while (date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(day), _parse(end))) {
                     days.push(dayFromDate(day));
                     day = addDays(day, 1);
                 }
@@ -47701,11 +48039,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ ALLOCATION_METHODS: () => ( /* binding */ALLOCATION_METHODS),
                 /* harmony export */ FIELD_TYPES: () => ( /* binding */FIELD_TYPES),
-                /* harmony export */ TYPE_INFO: () => ( /* binding */TYPE_INFO),
                 /* harmony export */ deserializeField: () => ( /* binding */deserializeField),
                 /* harmony export */ friendlyOp: () => ( /* binding */friendlyOp),
                 /* harmony export */ getApproxNumberThreshold: () => ( /* binding */getApproxNumberThreshold),
                 /* harmony export */ getFieldError: () => ( /* binding */getFieldError),
+                /* harmony export */ getValidOps: () => ( /* binding */getValidOps),
+                /* harmony export */ isValidOp: () => ( /* binding */isValidOp),
                 /* harmony export */ makeValue: () => ( /* binding */makeValue),
                 /* harmony export */ mapField: () => ( /* binding */mapField),
                 /* harmony export */ parse: () => ( /* binding */parse),
@@ -47759,18 +48098,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ],
                     nullable: true
                 },
-                imported_payee: {
-                    ops: [
-                        'is',
-                        'contains',
-                        'matches',
-                        'oneOf',
-                        'isNot',
-                        'doesNotContain',
-                        'notOneOf'
-                    ],
-                    nullable: true
-                },
                 number: {
                     ops: [
                         'is',
@@ -47790,20 +48117,60 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     nullable: false
                 }
             };
-            const FIELD_TYPES = new Map(Object.entries({
-                imported_payee: 'imported_payee',
-                payee: 'id',
-                date: 'date',
-                notes: 'string',
-                amount: 'number',
-                amountInflow: 'number',
-                amountOutfow: 'number',
-                category: 'id',
-                account: 'id',
-                cleared: 'boolean',
-                reconciled: 'boolean',
-                saved: 'saved'
-            }));
+            const FIELD_INFO = {
+                imported_payee: {
+                    type: 'string',
+                    disallowedOps: new Set([
+                        'hasTags'
+                    ])
+                },
+                payee: {
+                    type: 'id'
+                },
+                date: {
+                    type: 'date'
+                },
+                notes: {
+                    type: 'string'
+                },
+                amount: {
+                    type: 'number'
+                },
+                category: {
+                    type: 'id'
+                },
+                account: {
+                    type: 'id'
+                },
+                cleared: {
+                    type: 'boolean'
+                },
+                reconciled: {
+                    type: 'boolean'
+                },
+                saved: {
+                    type: 'saved'
+                }
+            };
+            const fieldInfo = FIELD_INFO;
+            const FIELD_TYPES = new Map(Object.entries(FIELD_INFO).map(([field, info]) => [
+                field,
+                info.type
+            ]));
+            function isValidOp(field, op) {
+                const type = FIELD_TYPES.get(field);
+                if (!type) {
+                    return false;
+                }
+                return TYPE_INFO[type].ops.includes(op) && !fieldInfo[field].disallowedOps?.has(op);
+            }
+            function getValidOps(field) {
+                const type = FIELD_TYPES.get(field);
+                if (!type) {
+                    return [];
+                }
+                return TYPE_INFO[type].ops.filter((op) => !fieldInfo[field].disallowedOps?.has(op));
+            }
             const ALLOCATION_METHODS = {
                 'fixed-amount': 'a fixed amount',
                 'fixed-percent': 'a fixed percent of the remainder',
@@ -47925,6 +48292,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     case 'no-empty-array':
                     case 'no-empty-string':
                         return 'Value cannot be empty';
+                    case 'not-string':
+                        return 'Value must be a string';
+                    case 'not-boolean':
+                        return 'Value must be a boolean';
                     case 'not-number':
                         return 'Value must be a number';
                     case 'invalid-field':
@@ -48722,6 +49093,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ hasFieldsChanged: () => ( /* binding */hasFieldsChanged),
                 /* harmony export */ integerToAmount: () => ( /* binding */integerToAmount),
                 /* harmony export */ integerToCurrency: () => ( /* binding */integerToCurrency),
+                /* harmony export */ isNumberFormat: () => ( /* binding */isNumberFormat),
                 /* harmony export */ last: () => ( /* binding */last),
                 /* harmony export */ looselyParseAmount: () => ( /* binding */looselyParseAmount),
                 /* harmony export */ numberFormats: () => ( /* binding */numberFormats),
@@ -48916,6 +49288,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return amountToCurrency(currencyToAmount(result));
             }
+            const NUMBER_FORMATS = [
+                'comma-dot',
+                'dot-comma',
+                'space-comma',
+                'apostrophe-dot',
+                'comma-dot',
+                'comma-dot-in'
+            ];
+            function isNumberFormat(input = '') {
+                return NUMBER_FORMATS.includes(input);
+            }
             const numberFormats = [
                 {
                     value: 'comma-dot',