@layerfi/components 0.1.88-alpha → 0.1.88-alpha.1

package/dist/cjs/index.cjs

@@ -119,7 +119,7 @@ var import_react16 = require("react");
 var import_react14 = require("react");
 
 // package.json
-var version = "0.1.88-alpha";
+var version = "0.1.88-alpha.1";
 
 // src/models/APIError.ts
 var APIError = class _APIError extends Error {
@@ -2467,10 +2467,13 @@ var import_jsx_runtime9 = require("react/jsx-runtime");
 function startOfNextDay(date) {
   return (0, import_date_fns2.startOfDay)((0, import_date_fns2.addDays)(date, 1));
 }
+function clampToPresentOrPast(date, cutoff = (0, import_date_fns2.endOfDay)(/* @__PURE__ */ new Date())) {
+  return (0, import_date_fns2.min)([date, cutoff]);
+}
 function withShiftedEnd(fn) {
   return ({ currentStart, currentEnd, newEnd }) => {
     const shiftedCurrentEnd = startOfNextDay(currentEnd);
-    const shiftedNewEnd = startOfNextDay(newEnd);
+    const shiftedNewEnd = clampToPresentOrPast(startOfNextDay(newEnd), startOfNextDay(/* @__PURE__ */ new Date()));
     return fn({ currentStart, shiftedCurrentEnd, shiftedNewEnd });
   };
 }
@@ -2481,14 +2484,14 @@ var RANGE_MODE_LOOKUP = {
       const fullDayCount = (0, import_date_fns2.differenceInDays)(shiftedCurrentEnd, currentStart);
       return (0, import_date_fns2.subDays)(shiftedNewEnd, fullDayCount);
     }),
-    getEnd: ({ end }) => end
+    getEnd: ({ end }) => clampToPresentOrPast((0, import_date_fns2.endOfDay)(end))
   },
   monthPicker: {
     getStart: ({ start }) => (0, import_date_fns2.startOfMonth)(start),
     getShiftedStart: withShiftedEnd(({ shiftedNewEnd }) => {
       return (0, import_date_fns2.subMonths)(shiftedNewEnd, 1);
     }),
-    getEnd: ({ end }) => (0, import_date_fns2.endOfMonth)(end)
+    getEnd: ({ end }) => clampToPresentOrPast((0, import_date_fns2.endOfMonth)(end))
   },
   monthRangePicker: {
     getStart: ({ start }) => (0, import_date_fns2.startOfMonth)(start),
@@ -2496,14 +2499,14 @@ var RANGE_MODE_LOOKUP = {
       const fullMonthCount = (0, import_date_fns2.differenceInMonths)(shiftedCurrentEnd, currentStart);
       return (0, import_date_fns2.subMonths)(shiftedNewEnd, fullMonthCount);
     }),
-    getEnd: ({ end }) => (0, import_date_fns2.endOfMonth)(end)
+    getEnd: ({ end }) => clampToPresentOrPast((0, import_date_fns2.endOfMonth)(end))
   },
   yearPicker: {
     getStart: ({ start }) => (0, import_date_fns2.startOfYear)(start),
     getShiftedStart: withShiftedEnd(({ shiftedNewEnd }) => {
       return (0, import_date_fns2.subYears)(shiftedNewEnd, 1);
     }),
-    getEnd: ({ end }) => (0, import_date_fns2.endOfYear)(end)
+    getEnd: ({ end }) => clampToPresentOrPast((0, import_date_fns2.endOfYear)(end))
   }
 };
 function withCorrectedRange(fn) {
@@ -2520,29 +2523,29 @@ function buildStore() {
   return (0, import_zustand2.createStore)((set2, get2) => {
     const setRange = withCorrectedRange(({ start, end }) => {
       set2({
-        start: (0, import_date_fns2.startOfDay)(start),
-        end: (0, import_date_fns2.endOfDay)(end),
+        start: RANGE_MODE_LOOKUP.dayRangePicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.dayRangePicker.getEnd({ end }),
         rangeDisplayMode: "dayRangePicker"
       });
     });
     const setMonth = ({ start }) => {
       set2({
-        start: (0, import_date_fns2.startOfMonth)(start),
-        end: (0, import_date_fns2.endOfMonth)(start),
+        start: RANGE_MODE_LOOKUP.monthPicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.monthPicker.getEnd({ end: start }),
         rangeDisplayMode: "monthPicker"
       });
     };
     const setMonthRange = withCorrectedRange(({ start, end }) => {
       set2({
-        start: (0, import_date_fns2.startOfMonth)(start),
-        end: (0, import_date_fns2.endOfMonth)(end),
+        start: RANGE_MODE_LOOKUP.monthRangePicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.monthRangePicker.getEnd({ end }),
         rangeDisplayMode: "monthRangePicker"
       });
     });
     const setYear = ({ start }) => {
       set2({
-        start: (0, import_date_fns2.startOfMonth)(start),
-        end: (0, import_date_fns2.endOfMonth)(start),
+        start: RANGE_MODE_LOOKUP.yearPicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.yearPicker.getEnd({ end: start }),
         rangeDisplayMode: "yearPicker"
       });
     };
@@ -2570,7 +2573,7 @@ function buildStore() {
     };
     return {
       start: (0, import_date_fns2.startOfMonth)(now),
-      end: (0, import_date_fns2.endOfMonth)(now),
+      end: clampToPresentOrPast((0, import_date_fns2.endOfMonth)(now)),
       displayMode: "dayPicker",
       rangeDisplayMode: "monthPicker",
       actions: {
@@ -2580,7 +2583,7 @@ function buildStore() {
             end: currentEnd,
             rangeDisplayMode: currentRangeDisplayMode
           }) => {
-            const newEnd = (0, import_date_fns2.endOfDay)(date);
+            const newEnd = RANGE_MODE_LOOKUP.dayRangePicker.getEnd({ end: date });
             return {
               start: RANGE_MODE_LOOKUP[currentRangeDisplayMode].getShiftedStart({
                 currentStart,
@@ -7706,20 +7709,20 @@ var ActionableList = ({
 
 // src/components/BankTransactionMobileList/utils.ts
 var mapCategoryToOption = (category) => {
-  var _a, _b;
+  var _a, _b, _c;
   return {
     label: category.display_name,
-    id: category.id,
+    id: "id" in category ? category.id : category.stable_name,
     description: (_a = category.description) != null ? _a : void 0,
     value: {
       type: "CATEGORY",
       payload: {
-        id: category.id,
+        id: "id" in category ? category.id : "",
         option_type: "category" /* CATEGORY */,
         display_name: category.display_name,
         type: category.type,
         description: (_b = category.description) != null ? _b : void 0,
-        stable_name: category.stable_name,
+        stable_name: "stable_name" in category ? (_c = category.stable_name) != null ? _c : "" : "",
         entries: category.entries,
         subCategories: category.subCategories
       }
@@ -7734,7 +7737,7 @@ var flattenCategories = (categories) => {
         return [
           {
             label: category.display_name,
-            id: category.id,
+            id: "id" in category ? category.id : category.stable_name,
             value: {
               type: "GROUP",
               items: category.subCategories.map((x) => mapCategoryToOption(x))
@@ -7754,7 +7757,7 @@ var getAssignedValue = (bankTransaction) => {
   if (bankTransaction.categorization_status === "MATCHED" /* MATCHED */ || (bankTransaction == null ? void 0 : bankTransaction.categorization_status) === "SPLIT" /* SPLIT */) {
     return;
   }
-  if (bankTransaction.category && bankTransaction.category.type != "Exclusion") {
+  if (bankTransaction.category && bankTransaction.category.type != "ExclusionNested") {
     return mapCategoryToOption(bankTransaction.category);
   }
   if (hasSuggestions(bankTransaction.categorization_flow)) {
@@ -7877,16 +7880,16 @@ var import_classnames33 = __toESM(require("classnames"));
 var import_date_fns9 = require("date-fns");
 var import_jsx_runtime100 = require("react/jsx-runtime");
 var mapCategoryToOption2 = (category) => {
-  var _a;
+  var _a, _b;
   return {
     type: "category" /* CATEGORY */,
     payload: {
-      id: category.id,
+      id: "id" in category ? category.id : "",
       option_type: "category" /* CATEGORY */,
       display_name: category.display_name,
       type: category.type,
       description: (_a = category.description) != null ? _a : void 0,
-      stable_name: category.stable_name,
+      stable_name: "stable_name" in category ? (_b = category.stable_name) != null ? _b : "" : "",
       entries: category.entries,
       subCategories: category.subCategories
     }
@@ -7900,7 +7903,7 @@ var mapCategoryToExclusionOption = (category) => {
       option_type: "category" /* CATEGORY */,
       display_name: category.display_name,
       type: "ExclusionNested",
-      stable_name: category.stable_name,
+      stable_name: "",
       entries: category.entries,
       subCategories: category.subCategories
     }
@@ -7913,7 +7916,8 @@ var mapSuggestedMatchToOption = (record) => {
       id: record.id,
       option_type: "match" /* MATCH */,
       display_name: record.details.description,
-      amount: record.details.amount
+      amount: record.details.amount,
+      subCategories: null
     }
   };
 };
@@ -7987,7 +7991,8 @@ var allCategoriesDivider = [
         payload: {
           id: "all_categories",
           option_type: "hidden" /* HIDDEN */,
-          display_name: "ALL CATEGORIES"
+          display_name: "ALL CATEGORIES",
+          subCategories: null
         }
       }
     ]
@@ -8033,7 +8038,8 @@ var CategorySelect = ({
             option_type: "match" /* MATCH */,
             display_name: x.details.description,
             date: x.details.date,
-            amount: x.details.amount
+            amount: x.details.amount,
+            subCategories: null
           }
         };
       })
@@ -9191,7 +9197,7 @@ var ExpandedBankTransactionRow = (0, import_react59.forwardRef)(
     const defaultCategory = bankTransaction.category || hasSuggestions(bankTransaction.categorization_flow) && ((_e = (_d = bankTransaction.categorization_flow) == null ? void 0 : _d.suggestions) == null ? void 0 : _e[0]);
     const [rowState, updateRowState] = (0, import_react59.useState)({
       splits: ((_f = bankTransaction.category) == null ? void 0 : _f.entries) ? (_g = bankTransaction.category) == null ? void 0 : _g.entries.map((c) => {
-        return c.type === "ExclusionSplitEntry" ? {
+        return c.type === "ExclusionSplitEntry" && c.category.type === "ExclusionNested" ? {
           amount: c.amount || 0,
           inputValue: centsToDollars(c.amount),
           category: mapCategoryToExclusionOption(c.category)
@@ -10820,7 +10826,7 @@ var SplitForm = ({
   const defaultCategory = bankTransaction.category || hasSuggestions(bankTransaction.categorization_flow) && ((_b = (_a = bankTransaction.categorization_flow) == null ? void 0 : _a.suggestions) == null ? void 0 : _b[0]);
   const [rowState, updateRowState] = (0, import_react66.useState)({
     splits: ((_c = bankTransaction.category) == null ? void 0 : _c.entries) ? (_d = bankTransaction.category) == null ? void 0 : _d.entries.map((c) => {
-      return c.type === "ExclusionSplitEntry" ? {
+      return c.type === "ExclusionSplitEntry" && c.category.type === "ExclusionNested" ? {
         amount: c.amount || 0,
         inputValue: centsToDollars(c.amount),
         category: mapCategoryToExclusionOption(c.category)
@@ -11233,7 +11239,7 @@ var BankTransactionMobileListItem = ({
   const itemRef = (0, import_react69.useRef)(null);
   const [removeAnim, setRemoveAnim] = (0, import_react69.useState)(false);
   const [purpose, setPurpose] = (0, import_react69.useState)(
-    bankTransaction.category ? bankTransaction.category.type === "Exclusion" ? "personal" /* personal */ : bankTransaction.categorization_status === "SPLIT" /* SPLIT */ ? "more" /* more */ : "business" /* business */ : hasMatch(bankTransaction) ? "more" /* more */ : "business" /* business */
+    bankTransaction.category ? bankTransaction.category.type === "ExclusionNested" ? "personal" /* personal */ : bankTransaction.categorization_status === "SPLIT" /* SPLIT */ ? "more" /* more */ : "business" /* business */ : hasMatch(bankTransaction) ? "more" /* more */ : "business" /* business */
   );
   const [open, setOpen] = (0, import_react69.useState)(isFirstItem);
   const [showComponent, setShowComponent] = (0, import_react69.useState)(!initialLoad);
@@ -18404,18 +18410,18 @@ var import_react122 = require("react");
 
 // src/utils/journal.ts
 var getAccountIdentifierPayload = (journalLineItem) => {
-  if (journalLineItem.account_identifier.id) {
-    return {
-      type: "AccountId",
-      id: journalLineItem.account_identifier.id
-    };
-  }
   if (journalLineItem.account_identifier.stable_name) {
     return {
       type: "StableName",
       stable_name: journalLineItem.account_identifier.stable_name
     };
   }
+  if (journalLineItem.account_identifier.id) {
+    return {
+      type: "AccountId",
+      id: journalLineItem.account_identifier.id
+    };
+  }
   throw new Error("Invalid account identifier");
 };
 var entryNumber = (entry) => {
@@ -19231,7 +19237,7 @@ var useJournal = () => {
     setForm({
       action: "new",
       data: {
-        entry_at: "",
+        entry_at: (/* @__PURE__ */ new Date()).toISOString(),
         created_by: "Test API Integration",
         memo: "",
         line_items: [
@@ -19720,11 +19726,26 @@ var JournalFormEntryLines = ({
   const { form } = (0, import_react129.useContext)(JournalContext);
   const { flattenedCategories, parentOptions } = (0, import_react129.useMemo)(() => {
     const flattenedCategories2 = recursiveFlattenCategories(data != null ? data : []);
-    const parentOptions2 = flattenedCategories2.sort((a, b) => a.display_name.localeCompare(b.display_name)).map(({ display_name, id }) => {
-      return {
-        label: display_name,
-        value: id
-      };
+    const parentOptions2 = [...flattenedCategories2].sort((a, b) => a.display_name.localeCompare(b.display_name)).map((account) => {
+      switch (account.type) {
+        case "AccountNested":
+          return {
+            label: account.display_name,
+            value: account.id
+          };
+        case "OptionalAccountNested":
+          return {
+            label: account.display_name,
+            value: account.stable_name
+          };
+        case "ExclusionNested":
+          return {
+            label: account.display_name,
+            value: account.id
+          };
+        default:
+          safeAssertUnreachable(account, "Unexpected account type");
+      }
     });
     return { flattenedCategories: flattenedCategories2, parentOptions: parentOptions2 };
   }, [data]);
@@ -19733,27 +19754,47 @@ var JournalFormEntryLines = ({
     value
   }) => {
     var _a;
-    const relevantCategory = flattenedCategories.find((x) => x.id === value.value);
+    const relevantCategory = flattenedCategories.find((x) => {
+      switch (x.type) {
+        case "AccountNested":
+          return x.id === value.value;
+        case "OptionalAccountNested":
+          return x.stable_name === value.value;
+        case "ExclusionNested":
+          return x.id === value.value;
+        default:
+          safeAssertUnreachable(x, "Unexpected account type");
+      }
+    });
     if (!relevantCategory) {
       return;
     }
+    const baseFields = relevantCategory.type === "OptionalAccountNested" ? {
+      id: relevantCategory.stable_name,
+      stable_name: relevantCategory.stable_name,
+      account_type: {
+        value: relevantCategory.stable_name,
+        display_name: relevantCategory.display_name
+      }
+    } : {
+      id: relevantCategory.id,
+      stable_name: "stable_name" in relevantCategory ? (_a = relevantCategory.stable_name) != null ? _a : "" : "",
+      account_type: {
+        value: relevantCategory.id,
+        display_name: relevantCategory.display_name
+      }
+    };
     return changeFormData(
       "parent",
       value,
       lineItemIndex,
       [
-        {
-          id: relevantCategory.id,
+        __spreadProps(__spreadValues({}, baseFields), {
           name: relevantCategory.display_name,
-          stable_name: (_a = relevantCategory.stable_name) != null ? _a : "",
-          account_type: {
-            value: relevantCategory.id,
-            display_name: relevantCategory.display_name
-          },
           sub_accounts: [],
           balance: 0,
           normality: "DEBIT" /* DEBIT */
-        }
+        })
       ]
     );
   };

package/dist/esm/index.mjs

@@ -61,7 +61,7 @@ import { useState as useState8 } from "react";
 import { useReducer, useEffect as useEffect4 } from "react";
 
 // package.json
-var version = "0.1.88-alpha";
+var version = "0.1.88-alpha.1";
 
 // src/models/APIError.ts
 var APIError = class _APIError extends Error {
@@ -2392,6 +2392,7 @@ import {
   endOfDay,
   endOfMonth as endOfMonth2,
   endOfYear,
+  min,
   startOfDay,
   startOfMonth as startOfMonth2,
   startOfYear,
@@ -2422,10 +2423,13 @@ import { jsx as jsx9 } from "react/jsx-runtime";
 function startOfNextDay(date) {
   return startOfDay(addDays(date, 1));
 }
+function clampToPresentOrPast(date, cutoff = endOfDay(/* @__PURE__ */ new Date())) {
+  return min([date, cutoff]);
+}
 function withShiftedEnd(fn) {
   return ({ currentStart, currentEnd, newEnd }) => {
     const shiftedCurrentEnd = startOfNextDay(currentEnd);
-    const shiftedNewEnd = startOfNextDay(newEnd);
+    const shiftedNewEnd = clampToPresentOrPast(startOfNextDay(newEnd), startOfNextDay(/* @__PURE__ */ new Date()));
     return fn({ currentStart, shiftedCurrentEnd, shiftedNewEnd });
   };
 }
@@ -2436,14 +2440,14 @@ var RANGE_MODE_LOOKUP = {
       const fullDayCount = differenceInDays(shiftedCurrentEnd, currentStart);
       return subDays(shiftedNewEnd, fullDayCount);
     }),
-    getEnd: ({ end }) => end
+    getEnd: ({ end }) => clampToPresentOrPast(endOfDay(end))
   },
   monthPicker: {
     getStart: ({ start }) => startOfMonth2(start),
     getShiftedStart: withShiftedEnd(({ shiftedNewEnd }) => {
       return subMonths(shiftedNewEnd, 1);
     }),
-    getEnd: ({ end }) => endOfMonth2(end)
+    getEnd: ({ end }) => clampToPresentOrPast(endOfMonth2(end))
   },
   monthRangePicker: {
     getStart: ({ start }) => startOfMonth2(start),
@@ -2451,14 +2455,14 @@ var RANGE_MODE_LOOKUP = {
       const fullMonthCount = differenceInMonths(shiftedCurrentEnd, currentStart);
       return subMonths(shiftedNewEnd, fullMonthCount);
     }),
-    getEnd: ({ end }) => endOfMonth2(end)
+    getEnd: ({ end }) => clampToPresentOrPast(endOfMonth2(end))
   },
   yearPicker: {
     getStart: ({ start }) => startOfYear(start),
     getShiftedStart: withShiftedEnd(({ shiftedNewEnd }) => {
       return subYears(shiftedNewEnd, 1);
     }),
-    getEnd: ({ end }) => endOfYear(end)
+    getEnd: ({ end }) => clampToPresentOrPast(endOfYear(end))
   }
 };
 function withCorrectedRange(fn) {
@@ -2475,29 +2479,29 @@ function buildStore() {
   return createStore2((set2, get2) => {
     const setRange = withCorrectedRange(({ start, end }) => {
       set2({
-        start: startOfDay(start),
-        end: endOfDay(end),
+        start: RANGE_MODE_LOOKUP.dayRangePicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.dayRangePicker.getEnd({ end }),
         rangeDisplayMode: "dayRangePicker"
       });
     });
     const setMonth = ({ start }) => {
       set2({
-        start: startOfMonth2(start),
-        end: endOfMonth2(start),
+        start: RANGE_MODE_LOOKUP.monthPicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.monthPicker.getEnd({ end: start }),
         rangeDisplayMode: "monthPicker"
       });
     };
     const setMonthRange = withCorrectedRange(({ start, end }) => {
       set2({
-        start: startOfMonth2(start),
-        end: endOfMonth2(end),
+        start: RANGE_MODE_LOOKUP.monthRangePicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.monthRangePicker.getEnd({ end }),
         rangeDisplayMode: "monthRangePicker"
       });
     });
     const setYear = ({ start }) => {
       set2({
-        start: startOfMonth2(start),
-        end: endOfMonth2(start),
+        start: RANGE_MODE_LOOKUP.yearPicker.getStart({ start }),
+        end: RANGE_MODE_LOOKUP.yearPicker.getEnd({ end: start }),
         rangeDisplayMode: "yearPicker"
       });
     };
@@ -2525,7 +2529,7 @@ function buildStore() {
     };
     return {
       start: startOfMonth2(now),
-      end: endOfMonth2(now),
+      end: clampToPresentOrPast(endOfMonth2(now)),
       displayMode: "dayPicker",
       rangeDisplayMode: "monthPicker",
       actions: {
@@ -2535,7 +2539,7 @@ function buildStore() {
             end: currentEnd,
             rangeDisplayMode: currentRangeDisplayMode
           }) => {
-            const newEnd = endOfDay(date);
+            const newEnd = RANGE_MODE_LOOKUP.dayRangePicker.getEnd({ end: date });
             return {
               start: RANGE_MODE_LOOKUP[currentRangeDisplayMode].getShiftedStart({
                 currentStart,
@@ -7699,20 +7703,20 @@ var ActionableList = ({
 
 // src/components/BankTransactionMobileList/utils.ts
 var mapCategoryToOption = (category) => {
-  var _a, _b;
+  var _a, _b, _c;
   return {
     label: category.display_name,
-    id: category.id,
+    id: "id" in category ? category.id : category.stable_name,
     description: (_a = category.description) != null ? _a : void 0,
     value: {
       type: "CATEGORY",
       payload: {
-        id: category.id,
+        id: "id" in category ? category.id : "",
         option_type: "category" /* CATEGORY */,
         display_name: category.display_name,
         type: category.type,
         description: (_b = category.description) != null ? _b : void 0,
-        stable_name: category.stable_name,
+        stable_name: "stable_name" in category ? (_c = category.stable_name) != null ? _c : "" : "",
         entries: category.entries,
         subCategories: category.subCategories
       }
@@ -7727,7 +7731,7 @@ var flattenCategories = (categories) => {
         return [
           {
             label: category.display_name,
-            id: category.id,
+            id: "id" in category ? category.id : category.stable_name,
             value: {
               type: "GROUP",
               items: category.subCategories.map((x) => mapCategoryToOption(x))
@@ -7747,7 +7751,7 @@ var getAssignedValue = (bankTransaction) => {
   if (bankTransaction.categorization_status === "MATCHED" /* MATCHED */ || (bankTransaction == null ? void 0 : bankTransaction.categorization_status) === "SPLIT" /* SPLIT */) {
     return;
   }
-  if (bankTransaction.category && bankTransaction.category.type != "Exclusion") {
+  if (bankTransaction.category && bankTransaction.category.type != "ExclusionNested") {
     return mapCategoryToOption(bankTransaction.category);
   }
   if (hasSuggestions(bankTransaction.categorization_flow)) {
@@ -7870,16 +7874,16 @@ import classNames33 from "classnames";
 import { parseISO as parseISO3, format as formatTime } from "date-fns";
 import { jsx as jsx100, jsxs as jsxs59 } from "react/jsx-runtime";
 var mapCategoryToOption2 = (category) => {
-  var _a;
+  var _a, _b;
   return {
     type: "category" /* CATEGORY */,
     payload: {
-      id: category.id,
+      id: "id" in category ? category.id : "",
       option_type: "category" /* CATEGORY */,
       display_name: category.display_name,
       type: category.type,
       description: (_a = category.description) != null ? _a : void 0,
-      stable_name: category.stable_name,
+      stable_name: "stable_name" in category ? (_b = category.stable_name) != null ? _b : "" : "",
       entries: category.entries,
       subCategories: category.subCategories
     }
@@ -7893,7 +7897,7 @@ var mapCategoryToExclusionOption = (category) => {
       option_type: "category" /* CATEGORY */,
       display_name: category.display_name,
       type: "ExclusionNested",
-      stable_name: category.stable_name,
+      stable_name: "",
       entries: category.entries,
       subCategories: category.subCategories
     }
@@ -7906,7 +7910,8 @@ var mapSuggestedMatchToOption = (record) => {
       id: record.id,
       option_type: "match" /* MATCH */,
       display_name: record.details.description,
-      amount: record.details.amount
+      amount: record.details.amount,
+      subCategories: null
     }
   };
 };
@@ -7980,7 +7985,8 @@ var allCategoriesDivider = [
         payload: {
           id: "all_categories",
           option_type: "hidden" /* HIDDEN */,
-          display_name: "ALL CATEGORIES"
+          display_name: "ALL CATEGORIES",
+          subCategories: null
         }
       }
     ]
@@ -8026,7 +8032,8 @@ var CategorySelect = ({
             option_type: "match" /* MATCH */,
             display_name: x.details.description,
             date: x.details.date,
-            amount: x.details.amount
+            amount: x.details.amount,
+            subCategories: null
           }
         };
       })
@@ -9194,7 +9201,7 @@ var ExpandedBankTransactionRow = forwardRef10(
     const defaultCategory = bankTransaction.category || hasSuggestions(bankTransaction.categorization_flow) && ((_e = (_d = bankTransaction.categorization_flow) == null ? void 0 : _d.suggestions) == null ? void 0 : _e[0]);
     const [rowState, updateRowState] = useState22({
       splits: ((_f = bankTransaction.category) == null ? void 0 : _f.entries) ? (_g = bankTransaction.category) == null ? void 0 : _g.entries.map((c) => {
-        return c.type === "ExclusionSplitEntry" ? {
+        return c.type === "ExclusionSplitEntry" && c.category.type === "ExclusionNested" ? {
           amount: c.amount || 0,
           inputValue: centsToDollars(c.amount),
           category: mapCategoryToExclusionOption(c.category)
@@ -10828,7 +10835,7 @@ var SplitForm = ({
   const defaultCategory = bankTransaction.category || hasSuggestions(bankTransaction.categorization_flow) && ((_b = (_a = bankTransaction.categorization_flow) == null ? void 0 : _a.suggestions) == null ? void 0 : _b[0]);
   const [rowState, updateRowState] = useState29({
     splits: ((_c = bankTransaction.category) == null ? void 0 : _c.entries) ? (_d = bankTransaction.category) == null ? void 0 : _d.entries.map((c) => {
-      return c.type === "ExclusionSplitEntry" ? {
+      return c.type === "ExclusionSplitEntry" && c.category.type === "ExclusionNested" ? {
         amount: c.amount || 0,
         inputValue: centsToDollars(c.amount),
         category: mapCategoryToExclusionOption(c.category)
@@ -11241,7 +11248,7 @@ var BankTransactionMobileListItem = ({
   const itemRef = useRef16(null);
   const [removeAnim, setRemoveAnim] = useState32(false);
   const [purpose, setPurpose] = useState32(
-    bankTransaction.category ? bankTransaction.category.type === "Exclusion" ? "personal" /* personal */ : bankTransaction.categorization_status === "SPLIT" /* SPLIT */ ? "more" /* more */ : "business" /* business */ : hasMatch(bankTransaction) ? "more" /* more */ : "business" /* business */
+    bankTransaction.category ? bankTransaction.category.type === "ExclusionNested" ? "personal" /* personal */ : bankTransaction.categorization_status === "SPLIT" /* SPLIT */ ? "more" /* more */ : "business" /* business */ : hasMatch(bankTransaction) ? "more" /* more */ : "business" /* business */
   );
   const [open, setOpen] = useState32(isFirstItem);
   const [showComponent, setShowComponent] = useState32(!initialLoad);
@@ -18447,18 +18454,18 @@ import { useContext as useContext35, useMemo as useMemo33 } from "react";
 
 // src/utils/journal.ts
 var getAccountIdentifierPayload = (journalLineItem) => {
-  if (journalLineItem.account_identifier.id) {
-    return {
-      type: "AccountId",
-      id: journalLineItem.account_identifier.id
-    };
-  }
   if (journalLineItem.account_identifier.stable_name) {
     return {
       type: "StableName",
       stable_name: journalLineItem.account_identifier.stable_name
     };
   }
+  if (journalLineItem.account_identifier.id) {
+    return {
+      type: "AccountId",
+      id: journalLineItem.account_identifier.id
+    };
+  }
   throw new Error("Invalid account identifier");
 };
 var entryNumber = (entry) => {
@@ -19274,7 +19281,7 @@ var useJournal = () => {
     setForm({
       action: "new",
       data: {
-        entry_at: "",
+        entry_at: (/* @__PURE__ */ new Date()).toISOString(),
         created_by: "Test API Integration",
         memo: "",
         line_items: [
@@ -19763,11 +19770,26 @@ var JournalFormEntryLines = ({
   const { form } = useContext40(JournalContext);
   const { flattenedCategories, parentOptions } = useMemo36(() => {
     const flattenedCategories2 = recursiveFlattenCategories(data != null ? data : []);
-    const parentOptions2 = flattenedCategories2.sort((a, b) => a.display_name.localeCompare(b.display_name)).map(({ display_name, id }) => {
-      return {
-        label: display_name,
-        value: id
-      };
+    const parentOptions2 = [...flattenedCategories2].sort((a, b) => a.display_name.localeCompare(b.display_name)).map((account) => {
+      switch (account.type) {
+        case "AccountNested":
+          return {
+            label: account.display_name,
+            value: account.id
+          };
+        case "OptionalAccountNested":
+          return {
+            label: account.display_name,
+            value: account.stable_name
+          };
+        case "ExclusionNested":
+          return {
+            label: account.display_name,
+            value: account.id
+          };
+        default:
+          safeAssertUnreachable(account, "Unexpected account type");
+      }
     });
     return { flattenedCategories: flattenedCategories2, parentOptions: parentOptions2 };
   }, [data]);
@@ -19776,27 +19798,47 @@ var JournalFormEntryLines = ({
     value
   }) => {
     var _a;
-    const relevantCategory = flattenedCategories.find((x) => x.id === value.value);
+    const relevantCategory = flattenedCategories.find((x) => {
+      switch (x.type) {
+        case "AccountNested":
+          return x.id === value.value;
+        case "OptionalAccountNested":
+          return x.stable_name === value.value;
+        case "ExclusionNested":
+          return x.id === value.value;
+        default:
+          safeAssertUnreachable(x, "Unexpected account type");
+      }
+    });
     if (!relevantCategory) {
       return;
     }
+    const baseFields = relevantCategory.type === "OptionalAccountNested" ? {
+      id: relevantCategory.stable_name,
+      stable_name: relevantCategory.stable_name,
+      account_type: {
+        value: relevantCategory.stable_name,
+        display_name: relevantCategory.display_name
+      }
+    } : {
+      id: relevantCategory.id,
+      stable_name: "stable_name" in relevantCategory ? (_a = relevantCategory.stable_name) != null ? _a : "" : "",
+      account_type: {
+        value: relevantCategory.id,
+        display_name: relevantCategory.display_name
+      }
+    };
     return changeFormData(
       "parent",
       value,
       lineItemIndex,
       [
-        {
-          id: relevantCategory.id,
+        __spreadProps(__spreadValues({}, baseFields), {
           name: relevantCategory.display_name,
-          stable_name: (_a = relevantCategory.stable_name) != null ? _a : "",
-          account_type: {
-            value: relevantCategory.id,
-            display_name: relevantCategory.display_name
-          },
           sub_accounts: [],
           balance: 0,
           normality: "DEBIT" /* DEBIT */
-        }
+        })
       ]
     );
   };

package/dist/index.d.ts

@@ -1304,7 +1304,8 @@ declare module '@layerfi/components/components/BankTransactionMobileList/useMemo
 
 }
 declare module '@layerfi/components/components/BankTransactionMobileList/utils' {
-  import { BankTransaction, Category } from '@layerfi/components/types';
+  import { BankTransaction } from '@layerfi/components/types';
+  import type { CategoryWithEntries } from '@layerfi/components/types/bank_transactions';
   import { CategoryOptionPayload } from '@layerfi/components/components/CategorySelect/CategorySelect';
   export interface Option {
       label: string;
@@ -1318,8 +1319,8 @@ declare module '@layerfi/components/components/BankTransactionMobileList/utils'
       asLink?: boolean;
       secondary?: boolean;
   }
-  export const mapCategoryToOption: (category: Category) => Option;
-  export const flattenCategories: (categories: Category[]) => Option[];
+  export const mapCategoryToOption: (category: CategoryWithEntries) => Option;
+  export const flattenCategories: (categories: Array<CategoryWithEntries>) => Option[];
   export const getAssignedValue: (bankTransaction: BankTransaction) => Option | undefined;
 
 }
@@ -1358,8 +1359,9 @@ declare module '@layerfi/components/components/BankTransactionReceipts/index' {
 
 }
 declare module '@layerfi/components/components/BankTransactionRow/BankTransactionRow' {
-  import { BankTransaction, Category } from '@layerfi/components/types';
+  import { BankTransaction } from '@layerfi/components/types';
   import { BankTransactionCTAStringOverrides, BankTransactionsMode } from '@layerfi/components/components/BankTransactions/BankTransactions';
+  import type { CategoryWithEntries } from '@layerfi/components/types/bank_transactions';
   type Props = {
       index: number;
       editable: boolean;
@@ -1376,7 +1378,7 @@ declare module '@layerfi/components/components/BankTransactionRow/BankTransactio
       stringOverrides?: BankTransactionCTAStringOverrides;
   };
   export type LastSubmittedForm = 'simple' | 'match' | 'split' | undefined;
-  export const extractDescriptionForSplit: (category: Category) => string;
+  export const extractDescriptionForSplit: (category: CategoryWithEntries) => string;
   export const getDefaultSelectedCategory: (bankTransaction: BankTransaction) => import("@layerfi/components/components/CategorySelect/CategorySelect").CategoryOption | undefined;
   export const BankTransactionRow: ({ index, editable, dateFormat, bankTransaction, mode, removeTransaction, containerWidth, initialLoad, showDescriptions, showReceiptUploads, showReceiptUploadColumn, showTooltips, stringOverrides, }: Props) => import("react/jsx-runtime").JSX.Element;
   export {};
@@ -1394,10 +1396,10 @@ declare module '@layerfi/components/components/BankTransactionRow/MatchBadge' {
 
 }
 declare module '@layerfi/components/components/BankTransactionRow/SplitTooltipDetails' {
-  import { Category } from '@layerfi/components/types';
+  import type { CategoryWithEntries } from '@layerfi/components/types/bank_transactions';
   export const SplitTooltipDetails: ({ classNamePrefix, category, }: {
       classNamePrefix: string;
-      category: Category;
+      category: CategoryWithEntries;
   }) => import("react/jsx-runtime").JSX.Element | undefined;
 
 }
@@ -1737,8 +1739,7 @@ declare module '@layerfi/components/components/Card/index' {
 }
 declare module '@layerfi/components/components/CategorySelect/CategorySelect' {
   import { BankTransaction, Category } from '@layerfi/components/types';
-  import { SuggestedMatch } from '@layerfi/components/types/bank_transactions';
-  import { CategoryEntry } from '@layerfi/components/types/categories';
+  import { SuggestedMatch, type CategoryWithEntries } from '@layerfi/components/types/bank_transactions';
   type Props = {
       name?: string;
       bankTransaction: BankTransaction;
@@ -1764,16 +1765,18 @@ declare module '@layerfi/components/components/CategorySelect/CategorySelect' {
       amount?: number;
       type?: string;
       stable_name?: string;
-      entries?: CategoryEntry[];
-      subCategories?: Category[];
+      entries?: CategoryWithEntries['entries'];
+      subCategories: Category[] | null;
   }
   export interface CategoryOption {
       type: string;
       disabled?: boolean;
       payload: CategoryOptionPayload;
   }
-  export const mapCategoryToOption: (category: Category) => CategoryOption;
-  export const mapCategoryToExclusionOption: (category: Category) => CategoryOption;
+  export const mapCategoryToOption: (category: CategoryWithEntries) => CategoryOption;
+  export const mapCategoryToExclusionOption: (category: CategoryWithEntries & {
+      type: "ExclusionNested";
+  }) => CategoryOption;
   export const mapSuggestedMatchToOption: (record: SuggestedMatch) => CategoryOption;
   export const CategorySelect: ({ bankTransaction, name, value, onChange, disabled, className, showTooltips, excludeMatches, asDrawer, }: Props) => import("react/jsx-runtime").JSX.Element;
   export {};
@@ -4605,7 +4608,7 @@ declare module '@layerfi/components/contexts/JournalContext/JournalContext' {
       setSelectedEntryId: (id?: string) => void;
       closeSelectedEntry: () => void;
       create: (newJournalEntry: import("@layerfi/components/types/journal").NewApiJournalEntry) => void;
-      changeFormData: (name: string, value: string | import("@layerfi/components/types/general").BaseSelectOption | undefined | number, lineItemIndex?: number, accounts?: import("../../types/chart_of_accounts").LedgerAccountBalance[] | undefined) => void;
+      changeFormData: (name: string, value: string | import("@layerfi/components/types/general").BaseSelectOption | undefined | number, lineItemIndex?: number, accounts?: import("../../types/chart_of_accounts").LedgerAccountBalance[]) => void;
       submitForm: () => void;
       cancelForm: () => void;
       addEntry: () => void;
@@ -5056,7 +5059,7 @@ declare module '@layerfi/components/hooks/useJournal/useJournal' {
       setSelectedEntryId: (id?: string) => void;
       closeSelectedEntry: () => void;
       create: (newJournalEntry: NewApiJournalEntry) => void;
-      changeFormData: (name: string, value: string | BaseSelectOption | undefined | number, lineItemIndex?: number, accounts?: LedgerAccountBalance[] | undefined) => void;
+      changeFormData: (name: string, value: string | BaseSelectOption | undefined | number, lineItemIndex?: number, accounts?: LedgerAccountBalance[]) => void;
       submitForm: () => void;
       cancelForm: () => void;
       addEntry: () => void;
@@ -6143,6 +6146,14 @@ declare module '@layerfi/components/types/bank_transactions' {
       review = "review",
       categorized = "categorized"
   }
+  export type CategoryWithEntries = Category & {
+      entries?: Array<CategoryEntry>;
+  };
+  type CategoryEntry = {
+      type?: string;
+      amount?: number;
+      category: CategoryWithEntries;
+  };
   export interface BankTransaction extends Record<string, unknown> {
       type: 'Bank_Transaction';
       account_name?: string;
@@ -6158,7 +6169,7 @@ declare module '@layerfi/components/types/bank_transactions' {
       amount: number;
       direction: Direction;
       counterparty_name: string;
-      category: Category;
+      category: CategoryWithEntries;
       categorization_status: CategorizationStatus;
       categorization_flow: Categorization | null;
       categorization_method: string;
@@ -6198,6 +6209,7 @@ declare module '@layerfi/components/types/bank_transactions' {
       type: 'Document_S3_Urls';
       documentUrls: S3PresignedUrl[];
   }
+  export {};
 
 }
 declare module '@layerfi/components/types/business' {
@@ -6230,21 +6242,26 @@ declare module '@layerfi/components/types/categories' {
       JOURNALING = "JOURNALING",
       MATCHED = "MATCHED"
   }
-  export interface CategoryEntry {
-      type?: string;
-      amount?: number;
-      category: Category;
-  }
-  export interface Category {
-      id: string;
-      type: string;
+  type BaseCategory = {
       display_name: string;
       category: string;
-      description?: string;
-      stable_name?: string;
-      subCategories?: Category[];
-      entries?: CategoryEntry[];
-  }
+      subCategories: Array<Category> | null;
+      description: string | null;
+  };
+  type AccountNestedCategory = {
+      type: 'AccountNested';
+      id: string;
+      stable_name: string | null;
+  } & BaseCategory;
+  type OptionalAccountNestedCategory = {
+      type: 'OptionalAccountNested';
+      stable_name: string;
+  } & BaseCategory;
+  type ExclusionNestedCategory = {
+      type: 'ExclusionNested';
+      id: string;
+  } & BaseCategory;
+  export type Category = AccountNestedCategory | OptionalAccountNestedCategory | ExclusionNestedCategory;
   export enum CategorizationType {
       AUTO = "AUTO",
       ASK_FROM_SUGGESTIONS = "ASK_FROM_SUGGESTIONS",
@@ -6283,6 +6300,7 @@ declare module '@layerfi/components/types/categories' {
   };
   export type CategoryUpdate = SingleCategoryUpdate | SplitCategoryUpdate;
   export function hasSuggestions(categorization: Categorization | null): categorization is SuggestedCategorization;
+  export {};
 
 }
 declare module '@layerfi/components/types/chart_of_accounts' {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerfi/components",
-  "version": "0.1.88-alpha",
+  "version": "0.1.88-alpha.1",
   "description": "Layer React Components",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",