@actual-app/api 6.5.0 → 6.7.0

package/dist/app/bundle.api.js

@@ -7544,10 +7544,11 @@
             "use strict";
             var bind = __webpack_require__(/*! function-bind */ "./node_modules/function-bind/index.js");
             var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
+            var setFunctionLength = __webpack_require__(/*! set-function-length */ "./node_modules/set-function-length/index.js");
+            var $TypeError = GetIntrinsic('%TypeError%');
             var $apply = GetIntrinsic('%Function.prototype.apply%');
             var $call = GetIntrinsic('%Function.prototype.call%');
             var $reflectApply = GetIntrinsic('%Reflect.apply%', true) || bind.call($call, $apply);
-            var $gOPD = GetIntrinsic('%Object.getOwnPropertyDescriptor%', true);
             var $defineProperty = GetIntrinsic('%Object.defineProperty%', true);
             var $max = GetIntrinsic('%Math.max%');
             if ($defineProperty) {
@@ -7560,15 +7561,11 @@
                 }
             }
             module.exports = function callBind(originalFunction) {
-                var func = $reflectApply(bind, $call, arguments);
-                if ($gOPD && $defineProperty) {
-                    var desc = $gOPD(func, 'length');
-                    if (desc.configurable) {
-                        // original length, plus the receiver, minus any additional arguments (after the receiver)
-                        $defineProperty(func, 'length', { value: 1 + $max(0, originalFunction.length - (arguments.length - 1)) });
-                    }
+                if (typeof originalFunction !== 'function') {
+                    throw new $TypeError('a function is required');
                 }
-                return func;
+                var func = $reflectApply(bind, $call, arguments);
+                return setFunctionLength(func, 1 + $max(0, originalFunction.length - (arguments.length - 1)), true);
             };
             var applyBind = function applyBind() {
                 return $reflectApply(bind, $apply, arguments);
@@ -12054,6 +12051,47 @@
             }
             /***/ 
         }),
+        /***/ "./node_modules/date-fns/esm/differenceInMilliseconds/index.js": 
+        /*!*********************************************************************!*\
+          !*** ./node_modules/date-fns/esm/differenceInMilliseconds/index.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 */differenceInMilliseconds)
+                /* harmony export */ 
+            });
+            /* harmony import */ var _toDate_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../toDate/index.js */ "./node_modules/date-fns/esm/toDate/index.js");
+            /* harmony import */ var _lib_requiredArgs_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../_lib/requiredArgs/index.js */ "./node_modules/date-fns/esm/_lib/requiredArgs/index.js");
+            /**
+             * @name differenceInMilliseconds
+             * @category Millisecond Helpers
+             * @summary Get the number of milliseconds between the given dates.
+             *
+             * @description
+             * Get the number of milliseconds between the given dates.
+             *
+             * @param {Date|Number} dateLeft - the later date
+             * @param {Date|Number} dateRight - the earlier date
+             * @returns {Number} the number of milliseconds
+             * @throws {TypeError} 2 arguments required
+             *
+             * @example
+             * // How many milliseconds are between
+             * // 2 July 2014 12:30:20.600 and 2 July 2014 12:30:21.700?
+             * const result = differenceInMilliseconds(
+             *   new Date(2014, 6, 2, 12, 30, 21, 700),
+             *   new Date(2014, 6, 2, 12, 30, 20, 600)
+             * )
+             * //=> 1100
+             */
+            function differenceInMilliseconds(dateLeft, dateRight) {
+                (0, _lib_requiredArgs_index_js__WEBPACK_IMPORTED_MODULE_0__["default"])(2, arguments);
+                return (0, _toDate_index_js__WEBPACK_IMPORTED_MODULE_1__["default"])(dateLeft).getTime() - (0, _toDate_index_js__WEBPACK_IMPORTED_MODULE_1__["default"])(dateRight).getTime();
+            }
+            /***/ 
+        }),
         /***/ "./node_modules/date-fns/esm/endOfMonth/index.js": 
         /*!*******************************************************!*\
           !*** ./node_modules/date-fns/esm/endOfMonth/index.js ***!
@@ -17903,9 +17941,20 @@
                 }
                 var aWhich = whichTypedArray(a);
                 var bWhich = whichTypedArray(b);
-                if ((aWhich || bWhich) && aWhich !== bWhich) {
+                if (aWhich !== bWhich) {
                     return false;
                 }
+                if (aWhich || bWhich) { // && would work too, because both are true or both false here
+                    if (a.length !== b.length) {
+                        return false;
+                    }
+                    for (i = 0; i < a.length; i++) {
+                        if (a[i] !== b[i]) {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
                 var aIsBuffer = isBuffer(a);
                 var bIsBuffer = isBuffer(b);
                 if (aIsBuffer !== bIsBuffer) {
@@ -17987,6 +18036,71 @@
             };
             /***/ 
         }),
+        /***/ "./node_modules/define-data-property/index.js": 
+        /*!****************************************************!*\
+          !*** ./node_modules/define-data-property/index.js ***!
+          \****************************************************/
+        /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+            "use strict";
+            var hasPropertyDescriptors = __webpack_require__(/*! has-property-descriptors */ "./node_modules/has-property-descriptors/index.js")();
+            var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
+            var $defineProperty = hasPropertyDescriptors && GetIntrinsic('%Object.defineProperty%', true);
+            if ($defineProperty) {
+                try {
+                    $defineProperty({}, 'a', { value: 1 });
+                }
+                catch (e) {
+                    // IE 8 has a broken defineProperty
+                    $defineProperty = false;
+                }
+            }
+            var $SyntaxError = GetIntrinsic('%SyntaxError%');
+            var $TypeError = GetIntrinsic('%TypeError%');
+            var gopd = __webpack_require__(/*! gopd */ "./node_modules/gopd/index.js");
+            /** @type {(obj: Record<PropertyKey, unknown>, property: PropertyKey, value: unknown, nonEnumerable?: boolean | null, nonWritable?: boolean | null, nonConfigurable?: boolean | null, loose?: boolean) => void} */
+            module.exports = function defineDataProperty(obj, property, value) {
+                if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) {
+                    throw new $TypeError('`obj` must be an object or a function`');
+                }
+                if (typeof property !== 'string' && typeof property !== 'symbol') {
+                    throw new $TypeError('`property` must be a string or a symbol`');
+                }
+                if (arguments.length > 3 && typeof arguments[3] !== 'boolean' && arguments[3] !== null) {
+                    throw new $TypeError('`nonEnumerable`, if provided, must be a boolean or null');
+                }
+                if (arguments.length > 4 && typeof arguments[4] !== 'boolean' && arguments[4] !== null) {
+                    throw new $TypeError('`nonWritable`, if provided, must be a boolean or null');
+                }
+                if (arguments.length > 5 && typeof arguments[5] !== 'boolean' && arguments[5] !== null) {
+                    throw new $TypeError('`nonConfigurable`, if provided, must be a boolean or null');
+                }
+                if (arguments.length > 6 && typeof arguments[6] !== 'boolean') {
+                    throw new $TypeError('`loose`, if provided, must be a boolean');
+                }
+                var nonEnumerable = arguments.length > 3 ? arguments[3] : null;
+                var nonWritable = arguments.length > 4 ? arguments[4] : null;
+                var nonConfigurable = arguments.length > 5 ? arguments[5] : null;
+                var loose = arguments.length > 6 ? arguments[6] : false;
+                /* @type {false | TypedPropertyDescriptor<unknown>} */
+                var desc = !!gopd && gopd(obj, property);
+                if ($defineProperty) {
+                    $defineProperty(obj, property, {
+                        configurable: nonConfigurable === null && desc ? desc.configurable : !nonConfigurable,
+                        enumerable: nonEnumerable === null && desc ? desc.enumerable : !nonEnumerable,
+                        value: value,
+                        writable: nonWritable === null && desc ? desc.writable : !nonWritable
+                    });
+                }
+                else if (loose || (!nonEnumerable && !nonWritable && !nonConfigurable)) {
+                    // must fall back to [[Set]], and was not explicitly asked to make non-enumerable, non-writable, or non-configurable
+                    obj[property] = value; // eslint-disable-line no-param-reassign
+                }
+                else {
+                    throw new $SyntaxError('This environment does not support defining a property as non-configurable, non-writable, or non-enumerable.');
+                }
+            };
+            /***/ 
+        }),
         /***/ "./node_modules/define-properties/index.js": 
         /*!*************************************************!*\
           !*** ./node_modules/define-properties/index.js ***!
@@ -18113,34 +18227,59 @@
             "use strict";
             /* eslint no-invalid-this: 1 */
             var ERROR_MESSAGE = 'Function.prototype.bind called on incompatible ';
-            var slice = Array.prototype.slice;
             var toStr = Object.prototype.toString;
+            var max = Math.max;
             var funcType = '[object Function]';
+            var concatty = function concatty(a, b) {
+                var arr = [];
+                for (var i = 0; i < a.length; i += 1) {
+                    arr[i] = a[i];
+                }
+                for (var j = 0; j < b.length; j += 1) {
+                    arr[j + a.length] = b[j];
+                }
+                return arr;
+            };
+            var slicy = function slicy(arrLike, offset) {
+                var arr = [];
+                for (var i = offset || 0, j = 0; i < arrLike.length; i += 1, j += 1) {
+                    arr[j] = arrLike[i];
+                }
+                return arr;
+            };
+            var joiny = function (arr, joiner) {
+                var str = '';
+                for (var i = 0; i < arr.length; i += 1) {
+                    str += arr[i];
+                    if (i + 1 < arr.length) {
+                        str += joiner;
+                    }
+                }
+                return str;
+            };
             module.exports = function bind(that) {
                 var target = this;
-                if (typeof target !== 'function' || toStr.call(target) !== funcType) {
+                if (typeof target !== 'function' || toStr.apply(target) !== funcType) {
                     throw new TypeError(ERROR_MESSAGE + target);
                 }
-                var args = slice.call(arguments, 1);
+                var args = slicy(arguments, 1);
                 var bound;
                 var binder = function () {
                     if (this instanceof bound) {
-                        var result = target.apply(this, args.concat(slice.call(arguments)));
+                        var result = target.apply(this, concatty(args, arguments));
                         if (Object(result) === result) {
                             return result;
                         }
                         return this;
                     }
-                    else {
-                        return target.apply(that, args.concat(slice.call(arguments)));
-                    }
+                    return target.apply(that, concatty(args, arguments));
                 };
-                var boundLength = Math.max(0, target.length - args.length);
+                var boundLength = max(0, target.length - args.length);
                 var boundArgs = [];
                 for (var i = 0; i < boundLength; i++) {
-                    boundArgs.push('$' + i);
+                    boundArgs[i] = '$' + i;
                 }
-                bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this,arguments); }')(binder);
+                bound = Function('binder', 'return function (' + joiny(boundArgs, ',') + '){ return binder.apply(this,arguments); }')(binder);
                 if (target.prototype) {
                     var Empty = function Empty() { };
                     Empty.prototype = target.prototype;
@@ -18406,7 +18545,7 @@
                 '%WeakSetPrototype%': ['WeakSet', 'prototype']
             };
             var bind = __webpack_require__(/*! function-bind */ "./node_modules/function-bind/index.js");
-            var hasOwn = __webpack_require__(/*! has */ "./node_modules/has/src/index.js");
+            var hasOwn = __webpack_require__(/*! hasown */ "./node_modules/hasown/index.js");
             var $concat = bind.call(Function.call, Array.prototype.concat);
             var $spliceApply = bind.call(Function.apply, Array.prototype.splice);
             var $replace = bind.call(Function.call, String.prototype.replace);
@@ -22285,14 +22424,17 @@
             };
             /***/ 
         }),
-        /***/ "./node_modules/has/src/index.js": 
-        /*!***************************************!*\
-          !*** ./node_modules/has/src/index.js ***!
-          \***************************************/
+        /***/ "./node_modules/hasown/index.js": 
+        /*!**************************************!*\
+          !*** ./node_modules/hasown/index.js ***!
+          \**************************************/
         /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
             "use strict";
+            var call = Function.prototype.call;
+            var $hasOwn = Object.prototype.hasOwnProperty;
             var bind = __webpack_require__(/*! function-bind */ "./node_modules/function-bind/index.js");
-            module.exports = bind.call(Function.call, Object.prototype.hasOwnProperty);
+            /** @type {(o: {}, p: PropertyKey) => p is keyof o} */
+            module.exports = bind.call(call, $hasOwn);
             /***/ 
         }),
         /***/ "./node_modules/is-arguments/index.js": 
@@ -22886,63 +23028,9 @@
           \**********************************************/
         /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
             "use strict";
-            var forEach = __webpack_require__(/*! for-each */ "./node_modules/for-each/index.js");
-            var availableTypedArrays = __webpack_require__(/*! available-typed-arrays */ "./node_modules/available-typed-arrays/index.js");
-            var callBound = __webpack_require__(/*! call-bind/callBound */ "./node_modules/call-bind/callBound.js");
-            var $toString = callBound('Object.prototype.toString');
-            var hasToStringTag = __webpack_require__(/*! has-tostringtag/shams */ "./node_modules/has-tostringtag/shams.js")();
-            var gOPD = __webpack_require__(/*! gopd */ "./node_modules/gopd/index.js");
-            var g = typeof globalThis === 'undefined' ? global : globalThis;
-            var typedArrays = availableTypedArrays();
-            var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(array, value) {
-                for (var i = 0; i < array.length; i += 1) {
-                    if (array[i] === value) {
-                        return i;
-                    }
-                }
-                return -1;
-            };
-            var $slice = callBound('String.prototype.slice');
-            var toStrTags = {};
-            var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
-            if (hasToStringTag && gOPD && getPrototypeOf) {
-                forEach(typedArrays, function (typedArray) {
-                    var arr = new g[typedArray]();
-                    if (Symbol.toStringTag in arr) {
-                        var proto = getPrototypeOf(arr);
-                        var descriptor = gOPD(proto, Symbol.toStringTag);
-                        if (!descriptor) {
-                            var superProto = getPrototypeOf(proto);
-                            descriptor = gOPD(superProto, Symbol.toStringTag);
-                        }
-                        toStrTags[typedArray] = descriptor.get;
-                    }
-                });
-            }
-            var tryTypedArrays = function tryAllTypedArrays(value) {
-                var anyTrue = false;
-                forEach(toStrTags, function (getter, typedArray) {
-                    if (!anyTrue) {
-                        try {
-                            anyTrue = getter.call(value) === typedArray;
-                        }
-                        catch (e) { /**/ }
-                    }
-                });
-                return anyTrue;
-            };
+            var whichTypedArray = __webpack_require__(/*! which-typed-array */ "./node_modules/which-typed-array/index.js");
             module.exports = function isTypedArray(value) {
-                if (!value || typeof value !== 'object') {
-                    return false;
-                }
-                if (!hasToStringTag || !(Symbol.toStringTag in value)) {
-                    var tag = $slice($toString(value), 8, -1);
-                    return $indexOf(typedArrays, tag) > -1;
-                }
-                if (!gOPD) {
-                    return false;
-                }
-                return tryTypedArrays(value);
+                return !!whichTypedArray(value);
             };
             /***/ 
         }),
@@ -25013,10 +25101,10 @@
           \***************************************************************/
         /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
             "use strict";
-            var functionsHaveConfigurableNames = (__webpack_require__(/*! functions-have-names */ "./node_modules/functions-have-names/index.js").functionsHaveConfigurableNames)();
+            var setFunctionName = __webpack_require__(/*! set-function-name */ "./node_modules/set-function-name/index.js");
             var $Object = Object;
             var $TypeError = TypeError;
-            module.exports = function flags() {
+            module.exports = setFunctionName(function flags() {
                 if (this != null && this !== $Object(this)) {
                     throw new $TypeError('RegExp.prototype.flags getter called on non-object');
                 }
@@ -25046,10 +25134,7 @@
                     result += 'y';
                 }
                 return result;
-            };
-            if (functionsHaveConfigurableNames && Object.defineProperty) {
-                Object.defineProperty(module.exports, "name", ({ value: 'get flags' }));
-            }
+            }, 'get flags', true);
             /***/ 
         }),
         /***/ "./node_modules/regexp.prototype.flags/index.js": 
@@ -26665,6 +26750,78 @@
             })(false ? 0 : exports);
             /***/ 
         }),
+        /***/ "./node_modules/set-function-length/index.js": 
+        /*!***************************************************!*\
+          !*** ./node_modules/set-function-length/index.js ***!
+          \***************************************************/
+        /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+            "use strict";
+            var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
+            var define = __webpack_require__(/*! define-data-property */ "./node_modules/define-data-property/index.js");
+            var hasDescriptors = __webpack_require__(/*! has-property-descriptors */ "./node_modules/has-property-descriptors/index.js")();
+            var gOPD = __webpack_require__(/*! gopd */ "./node_modules/gopd/index.js");
+            var $TypeError = GetIntrinsic('%TypeError%');
+            var $floor = GetIntrinsic('%Math.floor%');
+            /** @typedef {(...args: unknown[]) => unknown} Func */
+            /** @type {<T extends Func = Func>(fn: T, length: number, loose?: boolean) => T} */
+            module.exports = function setFunctionLength(fn, length) {
+                if (typeof fn !== 'function') {
+                    throw new $TypeError('`fn` is not a function');
+                }
+                if (typeof length !== 'number' || length < 0 || length > 0xFFFFFFFF || $floor(length) !== length) {
+                    throw new $TypeError('`length` must be a positive 32-bit integer');
+                }
+                var loose = arguments.length > 2 && !!arguments[2];
+                var functionLengthIsConfigurable = true;
+                var functionLengthIsWritable = true;
+                if ('length' in fn && gOPD) {
+                    var desc = gOPD(fn, 'length');
+                    if (desc && !desc.configurable) {
+                        functionLengthIsConfigurable = false;
+                    }
+                    if (desc && !desc.writable) {
+                        functionLengthIsWritable = false;
+                    }
+                }
+                if (functionLengthIsConfigurable || functionLengthIsWritable || !loose) {
+                    if (hasDescriptors) {
+                        define(/** @type {Parameters<define>[0]} */ (fn), 'length', length, true, true);
+                    }
+                    else {
+                        define(/** @type {Parameters<define>[0]} */ (fn), 'length', length);
+                    }
+                }
+                return fn;
+            };
+            /***/ 
+        }),
+        /***/ "./node_modules/set-function-name/index.js": 
+        /*!*************************************************!*\
+          !*** ./node_modules/set-function-name/index.js ***!
+          \*************************************************/
+        /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+            "use strict";
+            var define = __webpack_require__(/*! define-data-property */ "./node_modules/define-data-property/index.js");
+            var hasDescriptors = __webpack_require__(/*! has-property-descriptors */ "./node_modules/has-property-descriptors/index.js")();
+            var functionsHaveConfigurableNames = (__webpack_require__(/*! functions-have-names */ "./node_modules/functions-have-names/index.js").functionsHaveConfigurableNames)();
+            var $TypeError = TypeError;
+            module.exports = function setFunctionName(fn, name) {
+                if (typeof fn !== 'function') {
+                    throw new $TypeError('`fn` is not a function');
+                }
+                var loose = arguments.length > 2 && !!arguments[2];
+                if (!loose || functionsHaveConfigurableNames) {
+                    if (hasDescriptors) {
+                        define(fn, 'name', name, true, true);
+                    }
+                    else {
+                        define(fn, 'name', name);
+                    }
+                }
+                return fn;
+            };
+            /***/ 
+        }),
         /***/ "./node_modules/side-channel/index.js": 
         /*!********************************************!*\
           !*** ./node_modules/side-channel/index.js ***!
@@ -27133,6 +27290,7 @@
                 /* harmony export */ getBudgetMonth: () => ( /* binding */getBudgetMonth),
                 /* harmony export */ getBudgetMonths: () => ( /* binding */getBudgetMonths),
                 /* harmony export */ getCategories: () => ( /* binding */getCategories),
+                /* harmony export */ getCategoryGroups: () => ( /* binding */getCategoryGroups),
                 /* harmony export */ getPayees: () => ( /* binding */getPayees),
                 /* harmony export */ getTransactions: () => ( /* binding */getTransactions),
                 /* harmony export */ importTransactions: () => ( /* binding */importTransactions),
@@ -27544,6 +27702,9 @@
                     id: id
                 });
             }
+            function getCategoryGroups() {
+                return send("api/category-groups-get");
+            }
             function createCategoryGroup(group) {
                 return send("api/category-group-create", {
                     group: group
@@ -31209,6 +31370,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     .replace(/<(\w+?)>([^<]+)/g, '<$1>$2</<added>$1>') // Add a new end-tags for the ofx elements
                     .replace(/<\/<added>(\w+?)>(<\/\1>)?/g, '</$1>'); // Remove duplicate end-tags
             }
+            function html2Plain(value) {
+                return value?.replace(/&amp;/g, '&') // ampersands
+                    .replace(/&#038;/g, '&') // other ampersands
+                    .replace(/&lt;/g, '<') // lessthan
+                    .replace(/&gt;/g, '>') // greaterthan
+                    .replace(/&#39;/g, "'") // eslint-disable-line rulesdir/typography
+                    .replace(/&quot;/g, '"'); // eslint-disable-line rulesdir/typography
+            }
             async function parseXml(content) {
                 return await (0, xml2js__WEBPACK_IMPORTED_MODULE_0__.parseStringPromise)(content, {
                     explicitArray: false
@@ -31266,7 +31435,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return result;
             }
             function getAsArray(value) {
-                return Array.isArray(value) ? value : [
+                return Array.isArray(value) ? value : value === undefined ? [] : [
                     value
                 ];
             }
@@ -31279,8 +31448,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     type: stmtTrn['TRNTYPE'],
                     fitId: stmtTrn['FITID'],
                     date: (0, _shared_months__WEBPACK_IMPORTED_MODULE_1__.dayFromDate)(transactionDate),
-                    name: stmtTrn['NAME'],
-                    memo: stmtTrn['MEMO']
+                    name: html2Plain(stmtTrn['NAME']),
+                    memo: html2Plain(stmtTrn['MEMO'])
                 };
             }
             async function ofx2json(ofx) {
@@ -31440,7 +31609,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     errors,
                     transactions: data.transactions.map((trans) => {
                         return {
-                            amount: trans.amount,
+                            amount: Number(trans.amount),
                             imported_id: trans.fitId,
                             date: trans.date,
                             payee_name: trans.name || (useMemoFallback ? trans.memo : null),
@@ -31603,26 +31772,29 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ Condition: () => ( /* binding */Condition),
                 /* harmony export */ Rule: () => ( /* binding */Rule),
                 /* harmony export */ RuleIndexer: () => ( /* binding */RuleIndexer),
+                /* harmony export */ execActions: () => ( /* binding */execActions),
                 /* harmony export */ iterateIds: () => ( /* binding */iterateIds),
                 /* harmony export */ migrateIds: () => ( /* binding */migrateIds),
                 /* harmony export */ parseDateString: () => ( /* binding */parseDateString),
                 /* harmony export */ rankRules: () => ( /* binding */rankRules)
                 /* harmony export */ 
             });
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_rules__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/rules */ "./packages/loot-core/src/shared/rules.ts");
             /* harmony import */ var _shared_schedules__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/schedules */ "./packages/loot-core/src/shared/schedules.ts");
-            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
-            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
-            /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
+            /* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/transactions */ "./packages/loot-core/src/shared/transactions.ts");
+            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
+            /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
             // @ts-strict-ignore
             function assert(test, type, msg) {
                 if (!test) {
-                    throw new _errors__WEBPACK_IMPORTED_MODULE_4__.RuleError(type, msg);
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_5__.RuleError(type, msg);
                 }
             }
             function parseRecurDate(desc) {
@@ -31630,7 +31802,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const rules = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_2__.recurConfigToRSchedule)(desc);
                     return {
                         type: 'recur',
-                        schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_5__.Schedule({
+                        schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_7__.Schedule({
                             rrules: rules,
                             data: {
                                 skipWeekend: desc.skipWeekend,
@@ -31640,7 +31812,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
                 catch (e) {
-                    throw new _errors__WEBPACK_IMPORTED_MODULE_4__.RuleError('parse-recur-date', e.message);
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_5__.RuleError('parse-recur-date', e.message);
                 }
             }
             function parseDateString(str) {
@@ -31649,7 +31821,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 10) {
                     // YYYY-MM-DD
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](str))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str))) {
                         return null;
                     }
                     return {
@@ -31659,7 +31831,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 7) {
                     // YYYY-MM
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](str + '-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01'))) {
                         return null;
                     }
                     return {
@@ -31669,7 +31841,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 4) {
                     // YYYY
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](str + '-01-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01-01'))) {
                         return null;
                     }
                     return {
@@ -31848,7 +32020,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     const { schedule } = this.value;
                                     if (this.op === 'isapprox') {
                                         const fieldDate = (0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.parseDate)(fieldValue);
-                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](fieldDate, 2));
+                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](fieldDate, 2));
                                     }
                                     else {
                                         return schedule.occursOn({
@@ -31968,6 +32140,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             const ACTION_OPS = [
                 'set',
+                'set-split-amount',
                 'link-schedule'
             ];
             class Action {
@@ -31979,6 +32152,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         this.field = field;
                         this.type = typeName;
                     }
+                    else if (op === 'set-split-amount') {
+                        this.field = null;
+                        this.type = 'number';
+                    }
                     else if (op === 'link-schedule') {
                         this.field = null;
                         this.type = 'id';
@@ -31993,6 +32170,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         case 'set':
                             object[this.field] = this.value;
                             break;
+                        case 'set-split-amount':
+                            switch (this.options.method) {
+                                case 'fixed-amount':
+                                    object.amount = this.value;
+                                    break;
+                                default:
+                            }
+                            break;
                         case 'link-schedule':
                             object.schedule = this.value;
                             break;
@@ -32011,6 +32196,99 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     };
                 }
             }
+            function execNonSplitActions(actions, transaction) {
+                const update = transaction;
+                actions.forEach((action) => action.exec(update));
+                return update;
+            }
+            function execActions(actions, transaction) {
+                const parentActions = actions.filter((action) => !action.options?.splitIndex);
+                const childActions = actions.filter((action) => action.options?.splitIndex);
+                const totalSplitCount = actions.reduce((prev, cur) => Math.max(prev, cur.options?.splitIndex ?? 0), 0) + 1;
+                let update = execNonSplitActions(parentActions, transaction);
+                if (!_prefs__WEBPACK_IMPORTED_MODULE_6__.getPrefs()?.['flags.splitsInRules'] || totalSplitCount === 1) {
+                    return update;
+                }
+                if (update.is_child) {
+                    // Rules with splits can't be applied to child transactions.
+                    return update;
+                }
+                const splitAmountActions = childActions.filter((action) => action.op === 'set-split-amount');
+                const fixedSplitAmountActions = splitAmountActions.filter((action) => action.options.method === 'fixed-amount');
+                const fixedAmountsBySplit = {};
+                fixedSplitAmountActions.forEach((action) => {
+                    const splitIndex = action.options.splitIndex ?? 0;
+                    fixedAmountsBySplit[splitIndex] = action.value;
+                });
+                const fixedAmountSplitCount = Object.keys(fixedAmountsBySplit).length;
+                const totalFixedAmount = Object.values(fixedAmountsBySplit).reduce((prev, cur) => prev + cur, 0);
+                if (fixedAmountSplitCount === totalSplitCount && totalFixedAmount !== (transaction.amount ?? totalFixedAmount)) {
+                    // Not all value would be distributed to a split.
+                    return transaction;
+                }
+                const { data, newTransaction } = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.splitTransaction)((0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.ungroupTransaction)(update), transaction.id);
+                update = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.recalculateSplit)(newTransaction);
+                data[0] = update;
+                let newTransactions = data;
+                for (const action of childActions) {
+                    const splitIndex = action.options?.splitIndex ?? 0;
+                    if (splitIndex >= update.subtransactions.length) {
+                        const { data, newTransaction } = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.addSplitTransaction)(newTransactions, transaction.id);
+                        update = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.recalculateSplit)(newTransaction);
+                        data[0] = update;
+                        newTransactions = data;
+                    }
+                    action.exec(update.subtransactions[splitIndex]);
+                }
+                // Make sure every transaction has an amount.
+                if (fixedAmountSplitCount !== totalSplitCount) {
+                    // This is the amount that will be distributed to the splits that
+                    // don't have a fixed amount. The last split will get the remainder.
+                    // The amount will be zero if the parent transaction has no amount.
+                    const amountToDistribute = (transaction.amount ?? totalFixedAmount) - totalFixedAmount;
+                    let remainingAmount = amountToDistribute;
+                    // First distribute the fixed percentages.
+                    splitAmountActions.filter((action) => action.options.method === 'fixed-percent').forEach((action) => {
+                        const splitIndex = action.options.splitIndex;
+                        const percent = action.value / 100;
+                        const amount = Math.round(amountToDistribute * percent);
+                        update.subtransactions[splitIndex].amount = amount;
+                        remainingAmount -= amount;
+                    });
+                    // Then distribute the remainder.
+                    const remainderSplitAmountActions = splitAmountActions.filter((action) => action.options.method === 'remainder');
+                    // Check if there is any value left to distribute after all fixed
+                    // (percentage and amount) splits have been distributed.
+                    if (remainingAmount !== 0) {
+                        // If there are no remainder splits explicitly added by the user,
+                        // distribute the remainder to a virtual split that will be
+                        // adjusted for the remainder.
+                        if (remainderSplitAmountActions.length === 0) {
+                            const splitIndex = totalSplitCount;
+                            const { newTransaction } = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.addSplitTransaction)(newTransactions, transaction.id);
+                            update = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.recalculateSplit)(newTransaction);
+                            update.subtransactions[splitIndex].amount = remainingAmount;
+                        }
+                        else {
+                            const amountPerRemainderSplit = Math.round(remainingAmount / remainderSplitAmountActions.length);
+                            let lastNonFixedIndex = -1;
+                            remainderSplitAmountActions.forEach((action) => {
+                                const splitIndex = action.options.splitIndex;
+                                update.subtransactions[splitIndex].amount = amountPerRemainderSplit;
+                                remainingAmount -= amountPerRemainderSplit;
+                                lastNonFixedIndex = Math.max(lastNonFixedIndex, splitIndex);
+                            });
+                            // The last non-fixed split will be adjusted for the remainder.
+                            update.subtransactions[lastNonFixedIndex].amount -= remainingAmount;
+                        }
+                        update = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.recalculateSplit)(update);
+                    }
+                }
+                // The split index 0 is reserved for "Before split" actions.
+                // Remove that entry from the subtransactions.
+                update.subtransactions = update.subtransactions.slice(1);
+                return update;
+            }
             class Rule {
                 constructor({ id, stage, conditionsOp, conditions, actions, fieldTypes }) {
                     this.id = id;
@@ -32028,14 +32306,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return condition.eval(object);
                     });
                 }
-                execActions() {
-                    const changes = {};
-                    this.actions.forEach((action) => action.exec(changes));
+                execActions(object) {
+                    const result = execActions(this.actions, {
+                        ...object,
+                        subtransactions: object.subtransactions
+                    });
+                    const changes = Object.keys(result).reduce((prev, cur) => {
+                        if (result[cur] !== object[cur]) {
+                            prev[cur] = result[cur];
+                        }
+                        return prev;
+                    }, {});
                     return changes;
                 }
                 exec(object) {
                     if (this.evalConditions(object)) {
-                        return this.execActions();
+                        return this.execActions(object);
                     }
                     return null;
                 }
@@ -32117,7 +32403,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             indexedRules = this.rules.get(key);
                         }
                     }
-                    return (0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.fastSetMerge)(indexedRules || new Set(), this.rules.get('*') || new Set());
+                    return (0, _shared_util__WEBPACK_IMPORTED_MODULE_4__.fastSetMerge)(indexedRules || new Set(), this.rules.get('*') || new Set());
                 }
             }
             const OP_SCORES = {
@@ -32312,15 +32598,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ fromPlaid: () => ( /* binding */fromPlaid),
                 /* harmony export */ getAccounts: () => ( /* binding */getAccounts),
                 /* harmony export */ getGoCardlessAccounts: () => ( /* binding */getGoCardlessAccounts),
-                /* harmony export */ reconcileGoCardlessTransactions: () => ( /* binding */reconcileGoCardlessTransactions),
+                /* harmony export */ reconcileExternalTransactions: () => ( /* binding */reconcileExternalTransactions),
                 /* harmony export */ reconcileTransactions: () => ( /* binding */reconcileTransactions),
                 /* harmony export */ syncAccount: () => ( /* binding */syncAccount),
                 /* harmony export */ syncExternalAccount: () => ( /* binding */syncExternalAccount)
                 /* harmony export */ 
             });
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/max/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/format/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInMilliseconds/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/max/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/format/index.js");
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
@@ -32458,6 +32745,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
                 if (!userToken)
                     return;
+                console.log('Pulling transactions from GoCardless');
                 const res = await (0, _post__WEBPACK_IMPORTED_MODULE_6__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_7__.getServer)().GOCARDLESS_SERVER + '/transactions', {
                     userId,
                     key: userKey,
@@ -32471,6 +32759,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     throw BankSyncError(res.error_type, res.error_code);
                 }
                 const { transactions: { all }, balances, startingBalance } = res;
+                console.log('Response:', res);
                 return {
                     transactions: all,
                     accountBalance: balances,
@@ -32481,6 +32770,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
                 if (!userToken)
                     return;
+                console.log('Pulling transactions from SimpleFin');
                 const res = await (0, _post__WEBPACK_IMPORTED_MODULE_6__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_7__.getServer)().SIMPLEFIN_SERVER + '/transactions', {
                     accountId: acctId,
                     startDate: since
@@ -32491,6 +32781,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     throw BankSyncError(res.error_type, res.error_code);
                 }
                 const { transactions: { all }, balances, startingBalance } = res;
+                console.log('Response:', res);
                 return {
                     transactions: all,
                     accountBalance: balances,
@@ -32563,7 +32854,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     payeesToCreate
                 };
             }
-            async function normalizeGoCardlessTransactions(transactions, acctId) {
+            async function normalizeExternalTransactions(transactions, acctId) {
                 const payeesToCreate = new Map();
                 const normalized = [];
                 for (const trans of transactions) {
@@ -32641,11 +32932,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            async function reconcileGoCardlessTransactions(acctId, transactions) {
+            async function reconcileExternalTransactions(acctId, transactions) {
+                console.log('Performing transaction reconciliation');
                 const hasMatched = new Set();
                 const updated = [];
                 const added = [];
-                const { normalized, payeesToCreate } = await normalizeGoCardlessTransactions(transactions, acctId);
+                const { normalized, payeesToCreate } = await normalizeExternalTransactions(transactions, acctId);
                 // The first pass runs the rules, and preps data for fuzzy matching
                 const transactionsStep1 = [];
                 for (const { payee_name, trans: originalTrans, subtransactions } of normalized) {
@@ -32667,22 +32959,31 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     // If it didn't match, query data needed for fuzzy matching
                     if (!match) {
-                        // Look 1 day ahead and 4 days back when fuzzy matching. This
+                        // Look 7 days ahead and 7 days back when fuzzy matching. This
                         // needs to select all fields that need to be read from the
                         // matched transaction. See the final pass below for the needed
                         // fields.
                         fuzzyDataset = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`SELECT id, is_parent, date, imported_id, payee, category, notes, reconciled FROM v_transactions
-           WHERE date >= ? AND date <= ? AND amount = ? AND account = ? AND is_child = 0`, [
-                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(trans.date, 4)),
-                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays(trans.date, 1)),
+           WHERE date >= ? AND date <= ? AND amount = ? AND account = ?`, [
+                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(trans.date, 7)),
+                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays(trans.date, 7)),
                             trans.amount || 0,
                             acctId
                         ]);
+                        // Sort the matched transactions according to the distance from the original
+                        // transactions date. i.e. if the original transaction is in 21-02-2024 and
+                        // the matched transactions are: 20-02-2024, 21-02-2024, 29-02-2024 then
+                        // the resulting data-set should be: 21-02-2024, 20-02-2024, 29-02-2024.
+                        fuzzyDataset = fuzzyDataset.sort((a, b) => {
+                            const aDistance = Math.abs(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](trans.date), date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(a.date))));
+                            const bDistance = Math.abs(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](trans.date), date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(b.date))));
+                            return aDistance > bDistance ? 1 : -1;
+                        });
                     }
                     transactionsStep1.push({
                         payee_name,
                         trans,
-                        subtransactions,
+                        subtransactions: trans.subtransactions || subtransactions,
                         match,
                         fuzzyDataset
                     });
@@ -32708,7 +33009,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 // The final fuzzy matching pass. This is the lowest fidelity
                 // matching: it just find the first transaction that hasn't been
-                // matched yet. Remember the the dataset only contains transactions
+                // matched yet. Remember the dataset only contains transactions
                 // around the same date with the same amount.
                 const transactionsStep3 = transactionsStep2.map((data) => {
                     if (!data.match && data.fuzzyDataset) {
@@ -32787,6 +33088,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     added,
                     updated
                 });
+                console.log('Debug data for the operations:', {
+                    transactionsStep1,
+                    transactionsStep2,
+                    transactionsStep3,
+                    added,
+                    updated
+                });
                 return {
                     added: added.map((trans) => trans.id),
                     updated: updated.map((trans) => trans.id)
@@ -32818,22 +33126,31 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     // If it didn't match, query data needed for fuzzy matching
                     if (!match) {
-                        // Look 1 day ahead and 4 days back when fuzzy matching. This
+                        // Look 7 days ahead and 7 days back when fuzzy matching. This
                         // needs to select all fields that need to be read from the
                         // matched transaction. See the final pass below for the needed
                         // fields.
                         fuzzyDataset = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`SELECT id, is_parent, date, imported_id, payee, category, notes, reconciled FROM v_transactions
-           WHERE date >= ? AND date <= ? AND amount = ? AND account = ? AND is_child = 0`, [
-                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(trans.date, 4)),
-                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays(trans.date, 1)),
+           WHERE date >= ? AND date <= ? AND amount = ? AND account = ?`, [
+                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(trans.date, 7)),
+                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays(trans.date, 7)),
                             trans.amount || 0,
                             acctId
                         ]);
+                        // Sort the matched transactions according to the distance from the original
+                        // transactions date. i.e. if the original transaction is in 21-02-2024 and
+                        // the matched transactions are: 20-02-2024, 21-02-2024, 29-02-2024 then
+                        // the resulting data-set should be: 21-02-2024, 20-02-2024, 29-02-2024.
+                        fuzzyDataset = fuzzyDataset.sort((a, b) => {
+                            const aDistance = Math.abs(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](trans.date), date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(a.date))));
+                            const bDistance = Math.abs(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](trans.date), date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(b.date))));
+                            return aDistance > bDistance ? 1 : -1;
+                        });
                     }
                     transactionsStep1.push({
                         payee_name,
                         trans,
-                        subtransactions,
+                        subtransactions: trans.subtransactions || subtransactions,
                         match,
                         fuzzyDataset
                     });
@@ -32859,7 +33176,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 // The final fuzzy matching pass. This is the lowest fidelity
                 // matching: it just find the first transaction that hasn't been
-                // matched yet. Remember the the dataset only contains transactions
+                // matched yet. Remember the dataset only contains transactions
                 // around the same date with the same amount.
                 const transactionsStep3 = transactionsStep2.map((data) => {
                     if (!data.match && data.fuzzyDataset) {
@@ -32961,8 +33278,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         cleared: trans.cleared != null ? trans.cleared : true
                     };
                     // Add split transactions if they are given
-                    if (subtransactions && subtransactions.length > 0) {
-                        added.push(...makeSplitTransaction(finalTransaction, subtransactions));
+                    const updatedSubtransactions = finalTransaction.subtransactions || subtransactions;
+                    if (updatedSubtransactions && updatedSubtransactions.length > 0) {
+                        added.push(...makeSplitTransaction(finalTransaction, updatedSubtransactions));
                     }
                     else {
                         added.push(finalTransaction);
@@ -32997,7 +33315,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         id
                     ]);
                     const startingDate = _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate(_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(startingTransaction.date));
-                    const startDate = _shared_months__WEBPACK_IMPORTED_MODULE_1__.dayFromDate(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"]([
+                    const startDate = _shared_months__WEBPACK_IMPORTED_MODULE_1__.dayFromDate(date_fns__WEBPACK_IMPORTED_MODULE_16__["default"]([
                         // Many GoCardless integrations do not support getting more than 90 days
                         // worth of data, so make that the earliest possible limit.
                         _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay(), 90)),
@@ -33023,7 +33341,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         account: id
                     }));
                     return (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
-                        const result = await reconcileGoCardlessTransactions(id, transactions);
+                        const result = await reconcileExternalTransactions(id, transactions);
                         await updateAccountBalance(id, accountBalance);
                         return result;
                     });
@@ -33060,7 +33378,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             cleared: true,
                             starting_balance_flag: true
                         });
-                        const result = await reconcileGoCardlessTransactions(id, transactions);
+                        const result = await reconcileExternalTransactions(id, transactions);
                         return {
                             ...result,
                             added: [
@@ -33117,7 +33435,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // Otherwise, download transaction for the last few days if it's an
                     // on-budget account, or for the past 30 days if off-budget
                     const startingDay = _shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay(), acctRow.offbudget === 0 ? 1 : 30);
-                    const { transactions } = await downloadTransactions(userId, userKey, acctId, bankId, date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](startingDay), 'yyyy-MM-dd'));
+                    const { transactions } = await downloadTransactions(userId, userKey, acctId, bankId, date_fns__WEBPACK_IMPORTED_MODULE_17__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](startingDay), 'yyyy-MM-dd'));
                     // We need to add a transaction that represents the starting
                     // balance for everything to balance out. In order to get balance
                     // before the first imported transaction, we need to get the
@@ -33367,7 +33685,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ getRules: () => ( /* binding */getRules),
                 /* harmony export */ getRulesForPayee: () => ( /* binding */getRulesForPayee),
                 /* harmony export */ insertRule: () => ( /* binding */insertRule),
-                /* harmony export */ iterateIds: () => ( /* reexport safe */_rules__WEBPACK_IMPORTED_MODULE_9__.iterateIds),
+                /* harmony export */ iterateIds: () => ( /* reexport safe */_rules__WEBPACK_IMPORTED_MODULE_10__.iterateIds),
                 /* harmony export */ loadRules: () => ( /* binding */loadRules),
                 /* harmony export */ makeRule: () => ( /* binding */makeRule),
                 /* harmony export */ parseConditionsOrActions: () => ( /* binding */parseConditionsOrActions),
@@ -33382,15 +33700,16 @@ 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_rules__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/rules */ "./packages/loot-core/src/shared/rules.ts");
-            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
-            /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../aql */ "./packages/loot-core/src/server/aql/index.ts");
-            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
-            /* harmony import */ var _db_mappings__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../db/mappings */ "./packages/loot-core/src/server/db/mappings.ts");
-            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
-            /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
-            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
-            /* harmony import */ var _rules__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./rules */ "./packages/loot-core/src/server/accounts/rules.ts");
-            /* harmony import */ var _transactions__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
+            /* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/transactions */ "./packages/loot-core/src/shared/transactions.ts");
+            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
+            /* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../aql */ "./packages/loot-core/src/server/aql/index.ts");
+            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
+            /* harmony import */ var _db_mappings__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../db/mappings */ "./packages/loot-core/src/server/db/mappings.ts");
+            /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
+            /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
+            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _rules__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./rules */ "./packages/loot-core/src/server/accounts/rules.ts");
+            /* harmony import */ var _transactions__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
             // @ts-strict-ignore
             // TODO: Detect if it looks like the user is creating a rename rule
             // and prompt to create it in the pre phase instead
@@ -33402,11 +33721,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             let payeeIndexer;
             function resetState() {
                 allRules = new Map();
-                firstcharIndexer = new _rules__WEBPACK_IMPORTED_MODULE_9__.RuleIndexer({
+                firstcharIndexer = new _rules__WEBPACK_IMPORTED_MODULE_10__.RuleIndexer({
                     field: 'imported_payee',
                     method: 'firstchar'
                 });
-                payeeIndexer = new _rules__WEBPACK_IMPORTED_MODULE_9__.RuleIndexer({
+                payeeIndexer = new _rules__WEBPACK_IMPORTED_MODULE_10__.RuleIndexer({
                     field: 'payee'
                 });
             }
@@ -33419,8 +33738,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ];
                 }));
             }
-            const internalFields = _aql__WEBPACK_IMPORTED_MODULE_3__.schemaConfig.views.transactions.fields;
-            const publicFields = invert(_aql__WEBPACK_IMPORTED_MODULE_3__.schemaConfig.views.transactions.fields);
+            const internalFields = _aql__WEBPACK_IMPORTED_MODULE_4__.schemaConfig.views.transactions.fields;
+            const publicFields = invert(_aql__WEBPACK_IMPORTED_MODULE_4__.schemaConfig.views.transactions.fields);
             function fromInternalField(obj) {
                 return {
                     ...obj,
@@ -33439,10 +33758,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     value = typeof str === 'string' ? JSON.parse(str) : str;
                 }
                 catch (e) {
-                    throw new _errors__WEBPACK_IMPORTED_MODULE_6__.RuleError('internal', 'Cannot parse rule json');
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_7__.RuleError('internal', 'Cannot parse rule json');
                 }
                 if (!Array.isArray(value)) {
-                    throw new _errors__WEBPACK_IMPORTED_MODULE_6__.RuleError('internal', 'Rule json must be an array');
+                    throw new _errors__WEBPACK_IMPORTED_MODULE_7__.RuleError('internal', 'Rule json must be an array');
                 }
                 return value;
             }
@@ -33454,7 +33773,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             const ruleModel = {
                 validate(rule, { update } = {}) {
-                    (0, _models__WEBPACK_IMPORTED_MODULE_7__.requiredFields)('rules', rule, [
+                    (0, _models__WEBPACK_IMPORTED_MODULE_8__.requiredFields)('rules', rule, [
                         'conditions',
                         'actions'
                     ], update);
@@ -33499,14 +33818,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function makeRule(data) {
                 let rule;
                 try {
-                    rule = new _rules__WEBPACK_IMPORTED_MODULE_9__.Rule({
+                    rule = new _rules__WEBPACK_IMPORTED_MODULE_10__.Rule({
                         ...ruleModel.toJS(data),
                         fieldTypes: _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES
                     });
                 }
                 catch (e) {
                     console.warn('Invalid rule', e);
-                    if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_6__.RuleError) {
+                    if (e instanceof _errors__WEBPACK_IMPORTED_MODULE_7__.RuleError) {
                         return null;
                     }
                     throw e;
@@ -33514,12 +33833,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 // This is needed because we map ids on the fly, and they might
                 // not be persisted into the db. Mappings allow items to
                 // transparently merge with other items
-                (0, _rules__WEBPACK_IMPORTED_MODULE_9__.migrateIds)(rule, (0, _db_mappings__WEBPACK_IMPORTED_MODULE_5__.getMappings)());
+                (0, _rules__WEBPACK_IMPORTED_MODULE_10__.migrateIds)(rule, (0, _db_mappings__WEBPACK_IMPORTED_MODULE_6__.getMappings)());
                 return rule;
             }
             async function loadRules() {
                 resetState();
-                const rules = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`
+                const rules = await _db__WEBPACK_IMPORTED_MODULE_5__.all(`
     SELECT * FROM rules
       WHERE conditions IS NOT NULL AND actions IS NOT NULL AND tombstone = 0
   `);
@@ -33539,7 +33858,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (unlistenSync) {
                     unlistenSync();
                 }
-                unlistenSync = (0, _sync__WEBPACK_IMPORTED_MODULE_8__.addSyncListener)(onApplySync);
+                unlistenSync = (0, _sync__WEBPACK_IMPORTED_MODULE_9__.addSyncListener)(onApplySync);
             }
             function getRules() {
                 // This can simply return the in-memory data
@@ -33549,22 +33868,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             async function insertRule(rule) {
                 rule = ruleModel.validate(rule);
-                return _db__WEBPACK_IMPORTED_MODULE_4__.insertWithUUID('rules', ruleModel.fromJS(rule));
+                return _db__WEBPACK_IMPORTED_MODULE_5__.insertWithUUID('rules', ruleModel.fromJS(rule));
             }
             async function updateRule(rule) {
                 rule = ruleModel.validate(rule, {
                     update: true
                 });
-                return _db__WEBPACK_IMPORTED_MODULE_4__.update('rules', ruleModel.fromJS(rule));
+                return _db__WEBPACK_IMPORTED_MODULE_5__.update('rules', ruleModel.fromJS(rule));
             }
             async function deleteRule(rule) {
-                const schedule = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT id FROM schedules WHERE rule = ?', [
+                const schedule = await _db__WEBPACK_IMPORTED_MODULE_5__.first('SELECT id FROM schedules WHERE rule = ?', [
                     rule.id
                 ]);
                 if (schedule) {
                     return false;
                 }
-                return _db__WEBPACK_IMPORTED_MODULE_4__.delete_('rules', rule.id);
+                return _db__WEBPACK_IMPORTED_MODULE_5__.delete_('rules', rule.id);
             }
             // Sync projections
             function onApplySync(oldValues, newValues) {
@@ -33604,7 +33923,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ];
                 if (tables.find((table) => table.indexOf('mapping') !== -1)) {
                     getRules().forEach((rule) => {
-                        (0, _rules__WEBPACK_IMPORTED_MODULE_9__.migrateIds)(rule, (0, _db_mappings__WEBPACK_IMPORTED_MODULE_5__.getMappings)());
+                        (0, _rules__WEBPACK_IMPORTED_MODULE_10__.migrateIds)(rule, (0, _db_mappings__WEBPACK_IMPORTED_MODULE_6__.getMappings)());
                     });
                 }
             }
@@ -33613,7 +33932,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 let finalTrans = {
                     ...trans
                 };
-                const rules = (0, _rules__WEBPACK_IMPORTED_MODULE_9__.rankRules)((0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.fastSetMerge)(firstcharIndexer.getApplicableRules(trans), payeeIndexer.getApplicableRules(trans)));
+                const rules = (0, _rules__WEBPACK_IMPORTED_MODULE_10__.rankRules)((0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.fastSetMerge)(firstcharIndexer.getApplicableRules(trans), payeeIndexer.getApplicableRules(trans)));
                 for (let i = 0; i < rules.length; i++) {
                     finalTrans = rules[i].apply(finalTrans);
                 }
@@ -33623,11 +33942,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function conditionsToAQL(conditions, { recurDateBounds = 100 } = {}) {
                 const errors = [];
                 conditions = conditions.map((cond) => {
-                    if (cond instanceof _rules__WEBPACK_IMPORTED_MODULE_9__.Condition) {
+                    if (cond instanceof _rules__WEBPACK_IMPORTED_MODULE_10__.Condition) {
                         return cond;
                     }
                     try {
-                        return new _rules__WEBPACK_IMPORTED_MODULE_9__.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, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
                     }
                     catch (e) {
                         errors.push(e.type || 'internal');
@@ -33900,16 +34219,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     errors
                 };
             }
-            function applyActions(transactionIds, actions) {
+            async function applyActions(transactions, actions) {
                 const parsedActions = actions.map((action) => {
-                    if (action instanceof _rules__WEBPACK_IMPORTED_MODULE_9__.Action) {
+                    if (action instanceof _rules__WEBPACK_IMPORTED_MODULE_10__.Action) {
                         return action;
                     }
                     try {
-                        if (action.op === 'link-schedule') {
-                            return new _rules__WEBPACK_IMPORTED_MODULE_9__.Action(action.op, null, action.value, null, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                        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_9__.Action(action.op, action.field, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
+                        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, action.field, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_1__.FIELD_TYPES);
                     }
                     catch (e) {
                         console.log('Action error', e);
@@ -33920,27 +34242,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // An error happened while parsing
                     return null;
                 }
-                const updated = transactionIds.map((id) => {
-                    const update = {
-                        id
-                    };
-                    for (const action of parsedActions) {
-                        action.exec(update);
-                    }
-                    return update;
+                const updated = transactions.flatMap((trans) => {
+                    return (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_2__.ungroupTransaction)((0, _rules__WEBPACK_IMPORTED_MODULE_10__.execActions)(parsedActions, trans));
                 });
-                return (0, _transactions__WEBPACK_IMPORTED_MODULE_10__.batchUpdateTransactions)({
+                return (0, _transactions__WEBPACK_IMPORTED_MODULE_11__.batchUpdateTransactions)({
                     updated
                 });
             }
             function getRulesForPayee(payeeId) {
                 const rules = new Set();
-                (0, _rules__WEBPACK_IMPORTED_MODULE_9__.iterateIds)(getRules(), 'payee', (rule, id) => {
+                (0, _rules__WEBPACK_IMPORTED_MODULE_10__.iterateIds)(getRules(), 'payee', (rule, id) => {
                     if (id === payeeId) {
                         rules.add(rule);
                     }
                 });
-                return (0, _rules__WEBPACK_IMPORTED_MODULE_9__.rankRules)([
+                return (0, _rules__WEBPACK_IMPORTED_MODULE_10__.rankRules)([
                     ...rules
                 ]);
             }
@@ -33976,7 +34292,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (renameRule) {
                     const condition = renameRule.conditions[0];
                     const newValue = [
-                        ...(0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.fastSetMerge)(new Set(condition.value), new Set(fromNames.filter((name) => name !== '')))
+                        ...(0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.fastSetMerge)(new Set(condition.value), new Set(fromNames.filter((name) => name !== '')))
                     ];
                     const rule = {
                         ...renameRule,
@@ -33991,7 +34307,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return renameRule.id;
                 }
                 else {
-                    const rule = new _rules__WEBPACK_IMPORTED_MODULE_9__.Rule({
+                    const rule = new _rules__WEBPACK_IMPORTED_MODULE_10__.Rule({
                         stage: 'pre',
                         conditionsOp: 'and',
                         conditions: [
@@ -34053,14 +34369,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 oldestDate = (0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.subDays)(oldestDate, 180);
                 // Also look 180 days in the future to get any future transactions
                 // (this might change when we think about scheduled transactions)
-                const register = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`SELECT t.* FROM v_transactions t
+                const register = await _db__WEBPACK_IMPORTED_MODULE_5__.all(`SELECT t.* FROM v_transactions t
      LEFT JOIN accounts a ON a.id = t.account
      WHERE date >= ? AND date <= ? AND is_parent = 0 AND a.closed = 0
      ORDER BY date DESC`, [
-                    (0, _models__WEBPACK_IMPORTED_MODULE_7__.toDateRepr)(oldestDate),
-                    (0, _models__WEBPACK_IMPORTED_MODULE_7__.toDateRepr)((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.addDays)((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.currentDay)(), 180))
+                    (0, _models__WEBPACK_IMPORTED_MODULE_8__.toDateRepr)(oldestDate),
+                    (0, _models__WEBPACK_IMPORTED_MODULE_8__.toDateRepr)((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.addDays)((0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.currentDay)(), 180))
                 ]);
-                const allTransactions = (0, _shared_util__WEBPACK_IMPORTED_MODULE_2__.partitionByField)(register, 'payee');
+                const allTransactions = (0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.partitionByField)(register, 'payee');
                 const categoriesToSet = new Map();
                 for (const payeeId of payeeIds) {
                     // Don't do anything if payee is null
@@ -34076,7 +34392,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     }
                 }
-                await (0, _sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                await (0, _sync__WEBPACK_IMPORTED_MODULE_9__.batchMessages)(async () => {
                     for (const [payeeId, category] of categoriesToSet.entries()) {
                         const ruleSetters = [
                             ...getIsSetterRules(null, 'payee', 'category', {
@@ -34107,7 +34423,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         else {
                             // No existing rules, so create one
-                            const newRule = new _rules__WEBPACK_IMPORTED_MODULE_9__.Rule({
+                            const newRule = new _rules__WEBPACK_IMPORTED_MODULE_10__.Rule({
                                 stage: null,
                                 conditionsOp: 'and',
                                 conditions: [
@@ -35012,6 +35328,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const result = await handlers['get-categories']();
                 return grouped ? result.grouped.map(_api_models__WEBPACK_IMPORTED_MODULE_8__.categoryGroupModel.toExternal) : result.list.map(_api_models__WEBPACK_IMPORTED_MODULE_8__.categoryModel.toExternal);
             };
+            handlers['api/category-groups-get'] = async function () {
+                checkFileOpen();
+                return handlers['get-category-groups']();
+            };
             handlers['api/category-group-create'] = withMutation(async function ({ group }) {
                 checkFileOpen();
                 return handlers['category-group-create']({
@@ -36945,6 +37265,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     end_date: f('string', {
                         default: '2023-09'
                     }),
+                    date_static: f('integer', {
+                        default: 0
+                    }),
+                    date_range: f('string'),
                     mode: f('string', {
                         default: 'total'
                     }),
@@ -36954,13 +37278,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     balance_type: f('string', {
                         default: 'Expense'
                     }),
-                    interval: f('string', {
-                        default: 'Monthly'
-                    }),
                     show_empty: f('integer', {
                         default: 0
                     }),
-                    show_offbudgethidden: f('integer', {
+                    show_offbudget: f('integer', {
+                        default: 0
+                    }),
+                    show_hidden: f('integer', {
                         default: 0
                     }),
                     show_uncategorized: f('integer', {
@@ -36973,6 +37297,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     conditions: f('json'),
                     conditions_op: f('string'),
                     metadata: f('json'),
+                    interval: f('string', {
+                        default: 'Monthly'
+                    }),
                     color_scheme: f('json'),
                     tombstone: f('boolean')
                 },
@@ -38267,7 +38594,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 let num_sinks = 0;
                 let total_weight = 0;
                 const errors = [];
+                const warnings = [];
                 const sinkCategory = [];
+                const sourceWithRollover = [];
+                const db_month = parseInt(month.replace('-', ''));
                 const category_templates = await getCategoryTemplates();
                 const categories = await _db__WEBPACK_IMPORTED_MODULE_1__.all('SELECT * FROM v_categories WHERE tombstone = 0');
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
@@ -38278,18 +38608,36 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (template.filter((t) => t.type === 'source').length > 0) {
                             const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `leftover-${category.id}`);
                             const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${category.id}`);
-                            const spent = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `sum-amount-${category.id}`);
-                            await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
-                                category: category.id,
-                                month,
-                                amount: budgeted - balance
-                            });
-                            await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setGoal)({
-                                category: category.id,
-                                month,
-                                goal: -spent
-                            });
-                            num_sources += 1;
+                            if (balance >= 0) {
+                                const spent = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `sum-amount-${category.id}`);
+                                await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
+                                    category: category.id,
+                                    month,
+                                    amount: budgeted - balance
+                                });
+                                await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setGoal)({
+                                    category: category.id,
+                                    month,
+                                    goal: -spent
+                                });
+                                num_sources += 1;
+                            }
+                            else {
+                                warnings.push(category.name + ' does not have available funds.');
+                            }
+                            const carryover = await _db__WEBPACK_IMPORTED_MODULE_1__.first(`SELECT carryover FROM zero_budgets WHERE month = ? and category = ?`, [
+                                db_month,
+                                category.id
+                            ]);
+                            if (carryover !== null) {
+                                //keep track of source categories with rollover enabled
+                                if (carryover.carryover === 1) {
+                                    sourceWithRollover.push({
+                                        cat: category,
+                                        temp: template
+                                    });
+                                }
+                            }
                         }
                         if (template.filter((t) => t.type === 'sink').length > 0) {
                             sinkCategory.push({
@@ -38302,7 +38650,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
                 //funds all underfunded categories first unless the overspending rollover is checked
-                const db_month = parseInt(month.replace('-', ''));
                 for (let c = 0; c < categories.length; c++) {
                     const category = categories[c];
                     const budgetAvailable = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `to-budget`);
@@ -38326,10 +38673,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             amount: to_budget
                         });
                     }
+                    else if (balance < 0 && !category.is_income && carryover.carryover === 0 && Math.abs(balance) > budgetAvailable) {
+                        await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
+                            category: category.id,
+                            month,
+                            amount: budgeted + budgetAvailable
+                        });
+                    }
                 }
                 const budgetAvailable = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `to-budget`);
                 if (budgetAvailable <= 0) {
-                    errors.push('No funds are available to reallocate.');
+                    warnings.push('No funds are available to reallocate.');
                 }
                 for (let c = 0; c < sinkCategory.length; c++) {
                     const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${sinkCategory[c].cat.id}`);
@@ -38357,6 +38711,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             pre: errors.join('\n\n')
                         };
                     }
+                    else if (warnings.length) {
+                        return {
+                            type: 'warning',
+                            message: 'Funds not available:',
+                            pre: warnings.join('\n\n')
+                        };
+                    }
                     else {
                         return {
                             type: 'message',
@@ -38706,8 +39067,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     //in the case of multiple templates per category, schedules may have wrong priority level
                     const t = await createScheduleList(template, current_month, category);
                     errors = errors.concat(t.errors);
-                    const t_payMonthOf = t.t.filter((c) => c.full || c.target_frequency === 'monthly' && c.target_interval === 1 && c.num_months === 0 || c.target_frequency === 'weekly' && c.target_interval >= 0 && c.num_months === 0 || c.target_frequency === 'daily' || (0, _actions__WEBPACK_IMPORTED_MODULE_4__.isReflectBudget)());
-                    const t_sinking = t.t.filter((c) => !c.full && c.target_frequency === 'monthly' && c.target_interval > 1 || !c.full && c.target_frequency === 'monthly' && c.num_months > 0 && c.target_interval === 1 || !c.full && c.target_frequency === 'yearly' || !c.full && c.target_frequency === undefined).sort((a, b) => a.next_date_string.localeCompare(b.next_date_string));
+                    const isPayMonthOf = (c) => c.full || c.target_frequency === 'monthly' && c.target_interval === 1 && c.num_months === 0 || c.target_frequency === 'weekly' && c.target_interval >= 0 && c.num_months === 0 || c.target_frequency === 'daily' || (0, _actions__WEBPACK_IMPORTED_MODULE_4__.isReflectBudget)();
+                    const t_payMonthOf = t.t.filter(isPayMonthOf);
+                    const t_sinking = t.t.filter((c) => !isPayMonthOf(c)).sort((a, b) => a.next_date_string.localeCompare(b.next_date_string));
                     const totalPayMonthOf = await getPayMonthOfTotal(t_payMonthOf);
                     const totalSinking = await getSinkingTotal(t_sinking);
                     const totalSinkingBaseContribution = await getSinkingBaseContributionTotal(t_sinking);
@@ -38716,7 +39078,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     else {
                         const totalSinkingContribution = await getSinkingContributionTotal(t_sinking, remainder, last_month_balance);
-                        to_budget += Math.round(totalPayMonthOf + totalSinkingContribution);
+                        if (t_sinking.length === 0) {
+                            to_budget += Math.round(totalPayMonthOf + totalSinkingContribution) - last_month_balance;
+                        }
+                        else {
+                            to_budget += Math.round(totalPayMonthOf + totalSinkingContribution);
+                        }
                     }
                 }
                 return {
@@ -40448,6 +40815,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             }
             async function insertCategoryGroup(group) {
+                // Don't allow duplicate group
+                const existingGroup = await first(`SELECT id, name, hidden FROM category_groups WHERE UPPER(name) = ? and tombstone = 0 LIMIT 1`, [
+                    group.name.toUpperCase()
+                ]);
+                if (existingGroup) {
+                    throw new Error(`A ${existingGroup.hidden ? 'hidden ' : ''}’${existingGroup.name}’ category group already exists.`);
+                }
                 const lastGroup = await first(`
     SELECT sort_order FROM category_groups WHERE tombstone = 0 ORDER BY sort_order DESC, id DESC LIMIT 1
   `);
@@ -41622,7 +41996,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             category: isOffBudget(entityIdMap.get(accountId)) ? null : getCategory(transaction.categoryId),
                             date: transaction.date,
                             notes: transaction.memo || null,
-                            cleared: transaction.cleared === 'Cleared',
+                            cleared: transaction.cleared === 'Cleared' || transaction.cleared === 'Reconciled',
+                            reconciled: transaction.cleared === 'Reconciled',
                             ...transferProperties(transaction),
                             subtransactions: transaction.subTransactions && transaction.subTransactions.map((t) => {
                                 return {
@@ -41951,6 +42326,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 'cleared',
                                 'reconciled'
                             ].includes(transaction.cleared),
+                            reconciled: transaction.cleared === 'reconciled',
                             notes: transaction.memo || null,
                             imported_id: transaction.import_id || null,
                             transfer_id: entityIdMap.get(transaction.transfer_transaction_id) || null,
@@ -42410,6 +42786,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return result;
                 });
             });
+            handlers['get-category-groups'] = async function () {
+                return await _db__WEBPACK_IMPORTED_MODULE_27__.getCategoriesGrouped();
+            };
             handlers['category-group-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ name, isIncome }) {
                 return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     return _db__WEBPACK_IMPORTED_MODULE_27__.insertCategoryGroup({
@@ -43154,12 +43533,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     'user-id',
                     'user-key'
                 ]);
-                let accounts = await _db__WEBPACK_IMPORTED_MODULE_27__.runQuery(`SELECT a.*, b.bank_id as bankId FROM accounts a
+                const accounts = await _db__WEBPACK_IMPORTED_MODULE_27__.runQuery(`SELECT a.*, b.bank_id as bankId FROM accounts a
          LEFT JOIN banks b ON a.bank = b.id
-         WHERE a.tombstone = 0 AND a.closed = 0`, [], true);
-                if (id) {
-                    accounts = accounts.filter((acct) => acct.id === id);
-                }
+         WHERE a.tombstone = 0 AND a.closed = 0 AND a.id = ?`, [
+                    id
+                ], true);
                 const errors = [];
                 let newTransactions = [];
                 let matchedTransactions = [];
@@ -43168,7 +43546,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const acct = accounts[i];
                     if (acct.bankId) {
                         try {
+                            console.group('Bank Sync operation');
                             const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(userId, userKey, acct.id, acct.account_id, acct.bankId);
+                            console.groupEnd();
                             const { added, updated } = res;
                             newTransactions = newTransactions.concat(added);
                             matchedTransactions = matchedTransactions.concat(updated);
@@ -43354,7 +43734,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     autoUpdate: autoUpdate == null || autoUpdate === 'true' ? true : false,
                     documentDir: documentDir || getDefaultDocumentDir(),
                     keyId: encryptKey && JSON.parse(encryptKey).id,
-                    theme: theme === 'light' || theme === 'dark' || theme === 'auto' ? theme : 'light'
+                    theme: theme === 'light' || theme === 'dark' || theme === 'auto' || theme === 'development' || theme === 'midnight' ? theme : 'light'
                 };
             };
             handlers['save-prefs'] = async function (prefsToSet) {
@@ -44154,19 +44534,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         throw new Error('load-key-error');
                     }
                 }
-                // if (isDev) {
-                // const lastBudget = await asyncStorage.getItem('lastBudget');
-                // if (lastBudget) {
-                //   loadBudget(lastBudget);
-                // }
-                // }
-                let url = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('server-url');
-                // TODO: remove this if statement after a few releases
-                if (url === 'https://not-configured/') {
-                    url = null;
-                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('server-url', null);
-                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('did-bootstrap', true);
-                }
+                const url = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('server-url');
                 if (!url) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.removeItem('user-token');
                 }
@@ -44179,10 +44547,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         flag: autoUpdate == null || autoUpdate === 'true'
                     });
                 }
+                // Allow running DB queries locally
+                global.$query = _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery;
+                global.$q = _shared_query__WEBPACK_IMPORTED_MODULE_12__.q;
                 if (isDev) {
                     global.$send = (name, args) => (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.runHandler)(_main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers[name], args);
-                    global.$query = _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery;
-                    global.$q = _shared_query__WEBPACK_IMPORTED_MODULE_12__.q;
                     global.$db = _db__WEBPACK_IMPORTED_MODULE_27__;
                     global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_45__.setSyncingMode;
                 }
@@ -44858,16 +45227,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ app: () => ( /* binding */app)
                 /* harmony export */ 
             });
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
-            /* harmony import */ var _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../accounts/transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
-            /* harmony import */ var _app__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../app */ "./packages/loot-core/src/server/app.ts");
-            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
-            /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
-            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
-            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* 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 _models__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../models */ "./packages/loot-core/src/server/models.ts");
+            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
+            /* harmony import */ var _undo__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../undo */ "./packages/loot-core/src/server/undo.ts");
             const reportModel = {
                 validate(report, { update } = {}) {
-                    (0, _models__WEBPACK_IMPORTED_MODULE_3__.requiredFields)('reports', report, [
+                    (0, _models__WEBPACK_IMPORTED_MODULE_2__.requiredFields)('Report', report, [
                         'conditionsOp'
                     ], update);
                     if (!update || 'conditionsOp' in report) {
@@ -44882,57 +45250,109 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 },
                 toJS(row) {
                     return {
-                        ...row,
+                        id: row.id,
+                        name: row.name,
+                        startDate: row.start_date,
+                        endDate: row.end_date,
+                        isDateStatic: row.date_static === 1,
+                        dateRange: row.date_range,
+                        mode: row.mode,
+                        groupBy: row.group_by,
+                        interval: row.interval,
+                        balanceType: row.balance_type,
+                        showEmpty: row.show_empty === 1,
+                        showOffBudget: row.show_offbudget === 1,
+                        showHiddenCategories: row.show_hidden === 1,
+                        showUncategorized: row.show_uncategorized === 1,
+                        selectedCategories: row.selected_categories,
+                        graphType: row.graph_type,
+                        conditions: row.conditions,
                         conditionsOp: row.conditions_op,
-                        filters: (0, _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_0__.parseConditionsOrActions)(row.conditions)
+                        data: row.metadata
                     };
                 },
                 fromJS(report) {
-                    const { filters, conditionsOp, ...row } = report;
-                    if (conditionsOp) {
-                        row.conditions_op = conditionsOp;
-                        row.conditions = filters;
-                    }
-                    return row;
+                    return {
+                        id: report.id,
+                        name: report.name,
+                        start_date: report.startDate,
+                        end_date: report.endDate,
+                        date_static: report.isDateStatic ? 1 : 0,
+                        date_range: report.dateRange,
+                        mode: report.mode,
+                        group_by: report.groupBy,
+                        interval: report.interval,
+                        balance_type: report.balanceType,
+                        show_empty: report.showEmpty ? 1 : 0,
+                        show_offbudget: report.showOffBudget ? 1 : 0,
+                        show_hidden: report.showHiddenCategories ? 1 : 0,
+                        show_uncategorized: report.showUncategorized ? 1 : 0,
+                        selected_categories: report.selectedCategories,
+                        graph_type: report.graphType,
+                        conditions: report.conditions,
+                        conditions_op: report.conditionsOp,
+                        metadata: report.data
+                    };
                 }
             };
             async function reportNameExists(name, reportId, newItem) {
-                if (!name) {
-                    throw new Error('Report name is required');
-                }
-                if (!reportId) {
-                    throw new Error('Report recall error');
-                }
-                const idForName = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT id from reports WHERE tombstone = 0 AND name = ?', [
+                const idForName = await _db__WEBPACK_IMPORTED_MODULE_1__.first('SELECT id from custom_reports WHERE tombstone = 0 AND name = ?', [
                     name
                 ]);
-                if (!newItem && idForName.id !== reportId) {
-                    throw new Error('There is already a report named ' + name);
+                //no existing name found
+                if (idForName === null) {
+                    return false;
                 }
+                //for update/rename
+                if (!newItem) {
+                    /*
+                -if the found item is the same as the existing item
+                then no name change was made.
+                -if they are not the same then there is another
+                item with that name already.
+                */ return idForName.id !== reportId;
+                }
+                //default return: item was found but does not match current name
+                return true;
             }
             async function createReport(report) {
-                const reportId = (0, uuid__WEBPACK_IMPORTED_MODULE_6__["default"])();
+                const reportId = (0, uuid__WEBPACK_IMPORTED_MODULE_5__["default"])();
                 const item = {
                     ...report,
                     id: reportId
                 };
-                reportNameExists(item.name, item.id, true);
+                if (!item.name) {
+                    throw new Error('Report name is required');
+                }
+                const nameExists = await reportNameExists(item.name, item.id ?? '', true);
+                if (nameExists) {
+                    throw new Error('There is already a filter named ' + item.name);
+                }
                 // Create the report here based on the info
-                await _db__WEBPACK_IMPORTED_MODULE_2__.insertWithSchema('reports', reportModel.fromJS(item));
+                await _db__WEBPACK_IMPORTED_MODULE_1__.insertWithSchema('custom_reports', reportModel.fromJS(item));
                 return reportId;
             }
             async function updateReport(item) {
-                reportNameExists(item.name, item.id, false);
-                await _db__WEBPACK_IMPORTED_MODULE_2__.insertWithSchema('reports', reportModel.fromJS(item));
+                if (!item.name) {
+                    throw new Error('Report name is required');
+                }
+                if (!item.id) {
+                    throw new Error('Report recall error');
+                }
+                const nameExists = await reportNameExists(item.name, item.id, false);
+                if (nameExists) {
+                    throw new Error('There is already a filter named ' + item.name);
+                }
+                await _db__WEBPACK_IMPORTED_MODULE_1__.insertWithSchema('custom_reports', reportModel.fromJS(item));
             }
             async function deleteReport(id) {
-                await _db__WEBPACK_IMPORTED_MODULE_2__.delete_('reports', id);
+                await _db__WEBPACK_IMPORTED_MODULE_1__.delete_('custom_reports', id);
             }
             // Expose functions to the client
-            const app = (0, _app__WEBPACK_IMPORTED_MODULE_1__.createApp)();
-            app.method('report/create', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(createReport)));
-            app.method('report/update', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(updateReport)));
-            app.method('report/delete', (0, _mutators__WEBPACK_IMPORTED_MODULE_4__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_5__.undoable)(deleteReport)));
+            const app = (0, _app__WEBPACK_IMPORTED_MODULE_0__.createApp)();
+            app.method('report/create', (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_4__.undoable)(createReport)));
+            app.method('report/update', (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_4__.undoable)(updateReport)));
+            app.method('report/delete', (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_4__.undoable)(deleteReport)));
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/rules/app.ts": 
@@ -44975,7 +45395,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return result.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 === 'link-schedule' ? 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 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) : new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, action.field, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES));
                 if (conditionErrors || actionErrors) {
                     return {
                         conditionErrors,
@@ -45033,8 +45453,8 @@ 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 ({ transactionIds, actions }) {
-                return _accounts_transaction_rules__WEBPACK_IMPORTED_MODULE_2__.applyActions(transactionIds, actions);
+            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-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);
@@ -48926,6 +49346,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ ALLOCATION_METHODS: () => ( /* binding */ALLOCATION_METHODS),
                 /* harmony export */ FIELD_TYPES: () => ( /* binding */FIELD_TYPES),
                 /* harmony export */ TYPE_INFO: () => ( /* binding */TYPE_INFO),
                 /* harmony export */ deserializeField: () => ( /* binding */deserializeField),
@@ -49014,6 +49435,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 reconciled: 'boolean',
                 saved: 'saved'
             }));
+            const ALLOCATION_METHODS = {
+                'fixed-amount': 'a fixed amount',
+                'fixed-percent': 'a fixed percent',
+                remainder: 'an equal portion of the remainder'
+            };
             function mapField(field, opts) {
                 opts = opts || {};
                 switch (field) {
@@ -49079,6 +49505,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return 'is false';
                     case 'set':
                         return 'set';
+                    case 'set-split-amount':
+                        return 'allocate';
                     case 'link-schedule':
                         return 'link schedule';
                     case 'and':
@@ -49141,6 +49569,15 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ];
             }
             function parse(item) {
+                if (item.op === 'set-split-amount') {
+                    if (item.options.method === 'fixed-amount') {
+                        return {
+                            ...item,
+                            value: item.value && (0, _util__WEBPACK_IMPORTED_MODULE_0__.integerToAmount)(item.value)
+                        };
+                    }
+                    return item;
+                }
                 switch (item.type) {
                     case 'number':
                         {
@@ -49177,6 +49614,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 };
             }
             function unparse({ error, inputKey, ...item }) {
+                if (item.op === 'set-split-amount') {
+                    if (item.options.method === 'fixed-amount') {
+                        return {
+                            ...item,
+                            value: item.value && (0, _util__WEBPACK_IMPORTED_MODULE_0__.amountToInteger)(item.value)
+                        };
+                    }
+                    if (item.options.method === 'fixed-percent') {
+                        return {
+                            ...item,
+                            value: item.value && parseFloat(item.value)
+                        };
+                    }
+                    return item;
+                }
                 switch (item.type) {
                     case 'number':
                         {
@@ -49288,11 +49740,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     };
                 });
-                return (0, _query__WEBPACK_IMPORTED_MODULE_1__.q)('transactions').filter({
+                return (0, _query__WEBPACK_IMPORTED_MODULE_1__.q)('transactions').options({
+                    splits: 'grouped'
+                }).filter({
                     $or: filters
                 }).orderBy({
                     date: 'desc'
-                }).groupBy('schedule').select([
+                }).select([
                     'schedule',
                     'date'
                 ]);
@@ -49522,7 +49976,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ addSplitTransaction: () => ( /* binding */addSplitTransaction),
                 /* harmony export */ applyTransactionDiff: () => ( /* binding */applyTransactionDiff),
                 /* harmony export */ deleteTransaction: () => ( /* binding */deleteTransaction),
+                /* harmony export */ groupTransaction: () => ( /* binding */groupTransaction),
                 /* harmony export */ isPreviewId: () => ( /* binding */isPreviewId),
+                /* harmony export */ isTemporaryId: () => ( /* binding */isTemporaryId),
                 /* harmony export */ makeChild: () => ( /* binding */makeChild),
                 /* harmony export */ realizeTempTransactions: () => ( /* binding */realizeTempTransactions),
                 /* harmony export */ recalculateSplit: () => ( /* binding */recalculateSplit),
@@ -49534,7 +49990,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./util */ "./packages/loot-core/src/shared/util.ts");
-            // @ts-strict-ignore
+            function isTemporaryId(id) {
+                return id.indexOf('temp') !== -1;
+            }
             function isPreviewId(id) {
                 return id.indexOf('preview/') !== -1;
             }
@@ -49555,8 +50013,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {
                     amount: 0,
                     ...data,
-                    payee: data.payee || parent.payee,
-                    id: data.id ? data.id : prefix + (0, uuid__WEBPACK_IMPORTED_MODULE_1__["default"])(),
+                    payee: 'payee' in data ? data.payee : parent.payee,
+                    id: 'id' in data ? data.id : prefix + (0, uuid__WEBPACK_IMPORTED_MODULE_1__["default"])(),
                     account: parent.account,
                     date: parent.date,
                     cleared: parent.cleared != null ? parent.cleared : null,
@@ -49569,7 +50027,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function recalculateSplit(trans) {
                 // Calculate the new total of split transactions and make sure
                 // that it equals the parent amount
-                const total = trans.subtransactions.reduce((acc, t) => acc + num(t.amount), 0);
+                const total = (trans.subtransactions || []).reduce((acc, t) => acc + num(t.amount), 0);
                 return {
                     ...trans,
                     error: total === num(trans.amount) ? null : SplitTransactionError(total, trans)
@@ -49664,7 +50122,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             updated: []
                         };
                         grouped = {
-                            id: split[0].id,
+                            ...split[0],
                             _deleted: true
                         };
                         transactionsCopy.splice(parentIndex, split.length);
@@ -49689,7 +50147,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return {
                         data: transactionsCopy,
                         newTransaction: grouped || {
-                            id: trans.id,
+                            ...trans,
                             _deleted: true
                         },
                         diff: (0, _util__WEBPACK_IMPORTED_MODULE_0__.diffItems)([
@@ -49749,7 +50207,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else if (trans.subtransactions?.length === 1) {
                             return {
                                 ...trans,
-                                subtransactions: null,
+                                subtransactions: undefined,
                                 is_parent: false,
                                 error: null
                             };
@@ -49786,9 +50244,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             }
             function realizeTempTransactions(transactions) {
-                let parent = transactions.find((t) => !t.is_child);
-                parent = {
-                    ...parent,
+                const parent = {
+                    ...transactions.find((t) => !t.is_child),
                     id: (0, uuid__WEBPACK_IMPORTED_MODULE_1__["default"])()
                 };
                 const children = transactions.filter((t) => t.is_child);
@@ -50140,7 +50597,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             // currencies. We extract out the numbers and just ignore separators.
             function looselyParseAmount(amount) {
                 function safeNumber(v) {
-                    return isNaN(v) ? null : v;
+                    if (isNaN(v)) {
+                        return null;
+                    }
+                    const value = v * 100;
+                    if (value > MAX_SAFE_NUMBER || value < MIN_SAFE_NUMBER) {
+                        return null;
+                    }
+                    return v;
                 }
                 function extractNumbers(v) {
                     return v.replace(/[^0-9-]/g, '');
@@ -50148,7 +50612,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (amount.startsWith('(') && amount.endsWith(')')) {
                     amount = amount.replace('(', '-').replace(')', '');
                 }
-                const m = amount.match(/[.,][^.,]*$/);
+                const m = amount.match(/[.,][^.,]{1,2}$/);
                 if (!m || m.index === undefined || m.index === 0) {
                     return safeNumber(parseFloat(extractNumbers(amount)));
                 }
@@ -50251,7 +50715,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function unsafeStringify(arr, offset = 0) {
                 // Note: Be careful editing this code!  It's been tuned for performance
                 // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
-                return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+                return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
             }
             function stringify(arr, offset = 0) {
                 const uuid = unsafeStringify(arr, offset); // Consistency check for valid UUID.  If this throws, it's likely due to one
@@ -50397,7 +50861,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             else {
                 forEach(typedArrays, function (typedArray) {
                     var arr = new g[typedArray]();
-                    cache['$' + typedArray] = callBind(arr.slice);
+                    var fn = arr.slice || arr.set;
+                    if (fn) {
+                        cache['$' + typedArray] = callBind(fn);
+                    }
                 });
             }
             var tryTypedArrays = function tryAllTypedArrays(value) {
@@ -57843,19 +58310,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ 
             });
             function _isNativeReflectConstruct() {
-                if (typeof Reflect === "undefined" || !Reflect.construct)
-                    return false;
-                if (Reflect.construct.sham)
-                    return false;
-                if (typeof Proxy === "function")
-                    return true;
                 try {
-                    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () { }));
-                    return true;
-                }
-                catch (e) {
-                    return false;
+                    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () { }));
                 }
+                catch (t) { }
+                return (_isNativeReflectConstruct = function _isNativeReflectConstruct() {
+                    return !!t;
+                })();
             }
             /***/ 
         }),
@@ -57911,21 +58372,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */_toPrimitive)
+                /* harmony export */ "default": () => ( /* binding */toPrimitive)
                 /* harmony export */ 
             });
             /* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
-            function _toPrimitive(input, hint) {
-                if ((0, _typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(input) !== "object" || input === null)
-                    return input;
-                var prim = input[Symbol.toPrimitive];
-                if (prim !== undefined) {
-                    var res = prim.call(input, hint || "default");
-                    if ((0, _typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(res) !== "object")
-                        return res;
+            function toPrimitive(t, r) {
+                if ("object" != (0, _typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(t) || !t)
+                    return t;
+                var e = t[Symbol.toPrimitive];
+                if (void 0 !== e) {
+                    var i = e.call(t, r || "default");
+                    if ("object" != (0, _typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(i))
+                        return i;
                     throw new TypeError("@@toPrimitive must return a primitive value.");
                 }
-                return (hint === "string" ? String : Number)(input);
+                return ("string" === r ? String : Number)(t);
             }
             /***/ 
         }),
@@ -57937,14 +58398,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ "default": () => ( /* binding */_toPropertyKey)
+                /* harmony export */ "default": () => ( /* binding */toPropertyKey)
                 /* harmony export */ 
             });
             /* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
             /* harmony import */ var _toPrimitive_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./toPrimitive.js */ "./node_modules/@babel/runtime/helpers/esm/toPrimitive.js");
-            function _toPropertyKey(arg) {
-                var key = (0, _toPrimitive_js__WEBPACK_IMPORTED_MODULE_1__["default"])(arg, "string");
-                return (0, _typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(key) === "symbol" ? key : String(key);
+            function toPropertyKey(t) {
+                var i = (0, _toPrimitive_js__WEBPACK_IMPORTED_MODULE_1__["default"])(t, "string");
+                return "symbol" == (0, _typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(i) ? i : String(i);
             }
             /***/ 
         }),