Skip to content

A local-first personal finance app

Update budgetType preference in DB from rollover/report to be envelope/tracking (#4879)

Joel Jeremy Marquezab3088b6fa31
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
index 7d854961f3..f2fc6083b2 100644
--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -386,10 +386,10 @@ function CategoryItem({
borderTop: `1px solid ${theme.pillBorder}`,
}
: {};
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const balanceBinding =
- budgetType === 'rollover'
+ budgetType === 'envelope'
? envelopeBudget.catBalance(item.id)
: trackingBudget.catBalance(item.id);
const balance = useSheetValue<
diff --git a/packages/desktop-client/src/components/budget/BudgetTable.tsx b/packages/desktop-client/src/components/budget/BudgetTable.tsx
index de9ef0b721..dd74a7e7e5 100644
--- a/packages/desktop-client/src/components/budget/BudgetTable.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetTable.tsx
@@ -184,7 +184,7 @@ export function BudgetTable(props: BudgetTableProps) {
nextIdx += dir;
continue;
} else if (
- type === 'report' ||
+ type === 'tracking' ||
('is_income' in next && !next.is_income)
) {
onEditMonth(next.id, editing.cell);
diff --git a/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx b/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
index 27a58eaf8f..ce004e8204 100644
--- a/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
+++ b/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
@@ -106,7 +106,7 @@ const DynamicBudgetTableInner = ({
_onMonthSelect(
monthUtils.subMonths(
monthUtils.currentMonth(),
- type === 'rollover'
+ type === 'envelope'
? Math.floor((numMonths - 1) / 2)
: numMonths === 2
? 1
diff --git a/packages/desktop-client/src/components/budget/index.tsx b/packages/desktop-client/src/components/budget/index.tsx
index 30a0778691..491e80e8d5 100644
--- a/packages/desktop-client/src/components/budget/index.tsx
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -80,7 +80,7 @@ function BudgetInner(props: BudgetInnerProps) {
start: startMonth,
end: startMonth,
});
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const [maxMonthsPref] = useGlobalPref('maxMonths');
const maxMonths = maxMonthsPref || 1;
const [initialized, setInitialized] = useState(false);
@@ -332,7 +332,7 @@ function BudgetInner(props: BudgetInnerProps) {
}
let table;
- if (budgetType === 'report') {
+ if (budgetType === 'tracking') {
table = (
<TrackingBudgetProvider
summaryCollapsed={summaryCollapsed}
diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.ts
index deb6d54ed1..e68b214688 100644
--- a/packages/desktop-client/src/components/budget/util.ts
+++ b/packages/desktop-client/src/components/budget/util.ts
@@ -167,7 +167,9 @@ export async function prewarmMonth(
month: string,
) {
const method: keyof Handlers =
- budgetType === 'report' ? 'tracking-budget-month' : 'envelope-budget-month';
+ budgetType === 'tracking'
+ ? 'tracking-budget-month'
+ : 'envelope-budget-month';
const values = await send(method, { month });
diff --git a/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx b/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx
index 65d8b1a61d..1276729e85 100644
--- a/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/BalanceCell.tsx
@@ -39,7 +39,7 @@ export function BalanceCell({
'aria-label': ariaLabel,
}: BalanceCellProps) {
const { t } = useTranslation();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const columnWidth = getColumnWidth({
show3Columns,
});
diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx b/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx
index 4888d90e9b..dde40a0a3c 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetCell.tsx
@@ -50,11 +50,11 @@ export function BudgetCell<
const dispatch = useDispatch();
const format = useFormat();
const { showUndoNotification } = useUndo();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const categoryNotes = useNotes(category.id);
const onOpenCategoryBudgetMenu = useCallback(() => {
- const modalBudgetType = budgetType === 'rollover' ? 'envelope' : 'tracking';
+ const modalBudgetType = budgetType === 'envelope' ? 'envelope' : 'tracking';
const categoryBudgetMenuModal = `${modalBudgetType}-budget-menu` as const;
dispatch(
pushModal({
diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
index 83fa0e169f..6827ed68e4 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
@@ -338,7 +338,7 @@ export function BudgetTable({
'budget.showHiddenCategories',
);
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
return (
<Page
@@ -681,7 +681,7 @@ function OverspendingBanner({ month, onBudgetAction, ...props }) {
function Banners({ month, onBudgetAction }) {
const { t } = useTranslation();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
return (
<GridList
@@ -690,7 +690,7 @@ function Banners({ month, onBudgetAction }) {
>
<UncategorizedTransactionsBanner />
<OverspendingBanner month={month} onBudgetAction={onBudgetAction} />
- {budgetType === 'rollover' && (
+ {budgetType === 'envelope' && (
<OverbudgetedBanner month={month} onBudgetAction={onBudgetAction} />
)}
</GridList>
@@ -706,7 +706,7 @@ function BudgetTableHeader({
}) {
const { t } = useTranslation();
const format = useFormat();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const buttonStyle = {
padding: 0,
backgroundColor: 'transparent',
@@ -747,7 +747,7 @@ function BudgetTableHeader({
alignItems: 'center',
}}
>
- {budgetType === 'report' ? (
+ {budgetType === 'tracking' ? (
<Saved
projected={month >= monthUtils.currentMonth()}
onPress={onShowBudgetSummary}
@@ -771,7 +771,7 @@ function BudgetTableHeader({
{(show3Columns || !showSpentColumn) && (
<CellValue
binding={
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.totalBudgetedExpense
: envelopeBudget.totalBudgeted
}
@@ -819,7 +819,7 @@ function BudgetTableHeader({
}}
>
{format(
- budgetType === 'report' ? value : -value,
+ budgetType === 'tracking' ? value : -value,
formatType,
)}
</AutoTextSize>
@@ -833,7 +833,7 @@ function BudgetTableHeader({
{(show3Columns || showSpentColumn) && (
<CellValue
binding={
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.totalSpent
: envelopeBudget.totalSpent
}
@@ -891,7 +891,7 @@ function BudgetTableHeader({
)}
<CellValue
binding={
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.totalLeftover
: envelopeBudget.totalBalance
}
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
index 96a2c3e662..1ade1af9e5 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
@@ -11,6 +11,7 @@ import { View } from '@actual-app/components/view';
import { collapseModals, pushModal } from 'loot-core/client/modals/modalsSlice';
import { envelopeBudget, trackingBudget } from 'loot-core/client/queries';
+import { type BudgetType } from 'loot-core/server/prefs';
import * as monthUtils from 'loot-core/shared/months';
import { groupById, integerToCurrency } from 'loot-core/shared/util';
import { type CategoryEntity } from 'loot-core/types/models';
@@ -121,20 +122,20 @@ function ExpenseCategoryCells({
show3Columns,
isSidebar: false,
});
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const budgeted =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.catBudgeted(category.id)
: envelopeBudget.catBudgeted(category.id);
const spent =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.catSumAmount(category.id)
: envelopeBudget.catSumAmount(category.id);
const balance =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.catBalance(category.id)
: envelopeBudget.catBalance(category.id);
@@ -222,10 +223,10 @@ export function ExpenseCategoryListItem({
const { value: category } = props;
const { t } = useTranslation();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
- const modalBudgetType = budgetType === 'rollover' ? 'envelope' : 'tracking';
- const balanceMenuModalName = `${modalBudgetType}-balance-menu` as const;
+ const balanceMenuModalName =
+ `${budgetType as BudgetType}-balance-menu` as const;
const dispatch = useDispatch();
const { showUndoNotification } = useUndo();
const { list: categories } = useCategories();
@@ -249,7 +250,7 @@ export function ExpenseCategoryListItem({
'envelope-budget' | 'tracking-budget',
'leftover'
>(
- budgetType === 'rollover'
+ budgetType === 'envelope'
? envelopeBudget.catBalance(category?.id)
: trackingBudget.catBalance(category?.id),
);
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
index cc5c392af1..b790111a08 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
@@ -277,7 +277,7 @@ function ExpenseGroupCells({
show3Columns,
showBudgetedColumn,
}: ExpenseGroupCellsProps) {
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const format = useFormat();
const columnWidth = getColumnWidth({ show3Columns });
@@ -291,17 +291,17 @@ function ExpenseGroupCells({
};
const budgeted =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.groupBudgeted(group.id)
: envelopeBudget.groupBudgeted(group.id);
const spent =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.groupSumAmount(group.id)
: envelopeBudget.groupSumAmount(group.id);
const balance =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.groupBalance(group.id)
: envelopeBudget.groupBalance(group.id);
diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx
index 5ff142f5fd..942bfb7f84 100644
--- a/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx
@@ -101,15 +101,15 @@ function IncomeCategoryCells({
}: IncomeCategoryCellsProps) {
const { t } = useTranslation();
const columnWidth = getColumnWidth();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const budgeted =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.catBudgeted(category.id)
: envelopeBudget.catBudgeted(category.id);
const balance =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.catSumAmount(category.id)
: envelopeBudget.catSumAmount(category.id);
diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
index 3576d57668..21b5fa4a04 100644
--- a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
@@ -49,7 +49,7 @@ export function IncomeGroup({
}: IncomeGroupProps) {
const { t } = useTranslation();
const columnWidth = getColumnWidth();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const categories = useMemo(
() =>
@@ -78,7 +78,7 @@ export function IncomeGroup({
marginRight: 15,
}}
>
- {budgetType === 'report' && (
+ {budgetType === 'tracking' && (
<Label title={t('Budgeted')} style={{ width: columnWidth }} />
)}
<Label title={t('Received')} style={{ width: columnWidth }} />
@@ -239,14 +239,14 @@ type IncomeGroupCellsProps = {
};
function IncomeGroupCells({ group }: IncomeGroupCellsProps) {
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const format = useFormat();
const budgeted =
- budgetType === 'report' ? trackingBudget.groupBudgeted(group.id) : null;
+ budgetType === 'tracking' ? trackingBudget.groupBudgeted(group.id) : null;
const balance =
- budgetType === 'report'
+ budgetType === 'tracking'
? trackingBudget.groupSumAmount(group.id)
: envelopeBudget.groupSumAmount(group.id);
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index 44d5222a8e..e466e066af 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -32,15 +32,15 @@ import { useLocale } from '@desktop-client/hooks/useLocale';
import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
-function isBudgetType(input?: string): input is 'rollover' | 'report' {
- return ['rollover', 'report'].includes(input);
+function isBudgetType(input?: string): input is 'envelope' | 'tracking' {
+ return ['envelope', 'tracking'].includes(input);
}
export function Budget() {
const locale = useLocale();
const { list: categories, grouped: categoryGroups } = useCategories();
const [budgetTypePref] = useSyncedPref('budgetType');
- const budgetType = isBudgetType(budgetTypePref) ? budgetTypePref : 'rollover';
+ const budgetType = isBudgetType(budgetTypePref) ? budgetTypePref : 'envelope';
const spreadsheet = useSpreadsheet();
const currMonth = monthUtils.currentMonth();
@@ -78,7 +78,7 @@ export function Budget() {
);
const onShowBudgetSummary = useCallback(() => {
- if (budgetType === 'report') {
+ if (budgetType === 'tracking') {
dispatch(
pushModal({
modal: {
@@ -289,7 +289,7 @@ export function Budget() {
// 'Copy last month’s budget',
// 'Set budgets to zero',
// 'Set budgets to 3 month average',
- // budgetType === 'report' && 'Apply to all future budgets',
+ // budgetType === 'tracking' && 'Apply to all future budgets',
// ].filter(Boolean);
// props.showActionSheetWithOptions(
@@ -313,7 +313,7 @@ export function Budget() {
// onBudgetAction('set-3-avg');
// break;
// case 4:
- // if (budgetType === 'report') {
+ // if (budgetType === 'tracking') {
// onBudgetAction('set-all-future');
// }
// break;
@@ -459,7 +459,7 @@ export function Budget() {
dispatch(
pushModal({
modal: {
- name: `${budgetType === 'report' ? 'tracking' : 'envelope'}-budget-month-menu`,
+ name: `${budgetType}-budget-month-menu`,
options: {
month,
onBudgetAction,
diff --git a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
index da848545e9..4a184fd54c 100644
--- a/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
+++ b/packages/desktop-client/src/components/settings/BudgetTypeSettings.tsx
@@ -11,10 +11,10 @@ import { Setting } from './UI';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
export function BudgetTypeSettings() {
- const [budgetType = 'rollover', setBudgetType] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope', setBudgetType] = useSyncedPref('budgetType');
function onSwitchType() {
- const newBudgetType = budgetType === 'rollover' ? 'report' : 'rollover';
+ const newBudgetType = budgetType === 'envelope' ? 'tracking' : 'envelope';
setBudgetType(newBudgetType);
}
@@ -22,7 +22,7 @@ export function BudgetTypeSettings() {
<Setting
primaryAction={
<Button onPress={onSwitchType}>
- {budgetType === 'report' ? (
+ {budgetType === 'tracking' ? (
<Trans>Switch to envelope budgeting</Trans>
) : (
<Trans>Switch to tracking budgeting</Trans>
diff --git a/packages/desktop-client/src/hooks/useOverspentCategories.ts b/packages/desktop-client/src/hooks/useOverspentCategories.ts
index a1e9003243..9c1f38e09a 100644
--- a/packages/desktop-client/src/hooks/useOverspentCategories.ts
+++ b/packages/desktop-client/src/hooks/useOverspentCategories.ts
@@ -13,7 +13,7 @@ type UseOverspentCategoriesProps = {
export function useOverspentCategories({ month }: UseOverspentCategoriesProps) {
const spreadsheet = useSpreadsheet();
- const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+ const [budgetType = 'envelope'] = useSyncedPref('budgetType');
const { list: categories } = useCategories();
@@ -21,9 +21,9 @@ export function useOverspentCategories({ month }: UseOverspentCategoriesProps) {
() =>
categories.map(category => [
category.id,
- budgetType === 'rollover'
- ? envelopeBudget.catBalance(category.id)
- : trackingBudget.catBalance(category.id),
+ budgetType === 'tracking'
+ ? trackingBudget.catBalance(category.id)
+ : envelopeBudget.catBalance(category.id),
]),
[budgetType, categories],
);
@@ -32,9 +32,9 @@ export function useOverspentCategories({ month }: UseOverspentCategoriesProps) {
() =>
categories.map(category => [
category.id,
- budgetType === 'rollover'
- ? envelopeBudget.catCarryover(category.id)
- : trackingBudget.catCarryover(category.id),
+ budgetType === 'tracking'
+ ? trackingBudget.catCarryover(category.id)
+ : envelopeBudget.catCarryover(category.id),
]),
[budgetType, categories],
);
diff --git a/packages/loot-core/migrations/1745425408000_update_budgetType_pref.sql b/packages/loot-core/migrations/1745425408000_update_budgetType_pref.sql
new file mode 100644
index 0000000000..bc66021d88
--- /dev/null
+++ b/packages/loot-core/migrations/1745425408000_update_budgetType_pref.sql
@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+UPDATE preferences
+SET value = CASE WHEN id = 'budgetType' AND value = 'report' THEN 'tracking' ELSE 'envelope' END
+WHERE id = 'budgetType';
+
+COMMIT;
diff --git a/packages/loot-core/src/server/budget/actions.ts b/packages/loot-core/src/server/budget/actions.ts
index 108d45b900..d895e3e7c3 100644
--- a/packages/loot-core/src/server/budget/actions.ts
+++ b/packages/loot-core/src/server/budget/actions.ts
@@ -49,8 +49,8 @@ export function isReflectBudget(): boolean {
`SELECT value FROM preferences WHERE id = ?`,
['budgetType'],
);
- const val = budgetType ? budgetType.value : 'rollover';
- return val === 'report';
+ const val = budgetType ? budgetType.value : 'envelope';
+ return val === 'tracking';
}
function dbMonth(month: string): number {
diff --git a/packages/loot-core/src/server/budget/base.test.ts b/packages/loot-core/src/server/budget/base.test.ts
index b8b00747b8..882828871e 100644
--- a/packages/loot-core/src/server/budget/base.test.ts
+++ b/packages/loot-core/src/server/budget/base.test.ts
@@ -67,7 +67,7 @@ describe('Base budget', () => {
it('Excludes hidden categories from group totals in Report Budget', async () => {
await sheet.loadSpreadsheet(db);
- sheet.get().meta().budgetType = 'report';
+ sheet.get().meta().budgetType = 'tracking';
// Create a group with multiple categories
await db.insertCategoryGroup({ id: 'group1', name: 'Test Group' });
@@ -143,7 +143,7 @@ describe('Base budget', () => {
it('Excludes hidden category groups from budget totals in Report Budget', async () => {
await sheet.loadSpreadsheet(db);
- sheet.get().meta().budgetType = 'report';
+ sheet.get().meta().budgetType = 'tracking';
// Create two expense groups - one visible, one hidden
await db.insertCategoryGroup({
@@ -231,7 +231,7 @@ describe('Base budget', () => {
it('Includes hidden categories in group totals for Rollover Budget', async () => {
await sheet.loadSpreadsheet(db);
// Rollover is the default, but explicit for clarity
- sheet.get().meta().budgetType = 'rollover';
+ sheet.get().meta().budgetType = 'envelope';
// Create a group with multiple categories
await db.insertCategoryGroup({ id: 'group1', name: 'Test Group' });
@@ -283,7 +283,7 @@ describe('Base budget', () => {
it('Includes hidden category groups in budget totals for Rollover Budget', async () => {
await sheet.loadSpreadsheet(db);
// Rollover is the default, but explicit for clarity
- sheet.get().meta().budgetType = 'rollover';
+ sheet.get().meta().budgetType = 'envelope';
// Create two expense groups - one visible, one hidden
await db.insertCategoryGroup({
diff --git a/packages/loot-core/src/server/budget/base.ts b/packages/loot-core/src/server/budget/base.ts
index 93c44e3225..849db3dcbd 100644
--- a/packages/loot-core/src/server/budget/base.ts
+++ b/packages/loot-core/src/server/budget/base.ts
@@ -14,7 +14,7 @@ import * as report from './report';
export function getBudgetType() {
const meta = sheet.get().meta();
- return meta.budgetType || 'rollover';
+ return meta.budgetType || 'envelope';
}
export function getBudgetRange(start: string, end: string) {
@@ -57,7 +57,7 @@ export function createCategory(cat, sheetName, prevSheetName, start, end) {
},
});
- if (getBudgetType() === 'rollover') {
+ if (getBudgetType() === 'envelope') {
envelopeBudget.createCategory(cat, sheetName, prevSheetName);
} else {
report.createCategory(cat, sheetName, prevSheetName);
@@ -173,7 +173,7 @@ export function triggerBudgetChanges(oldValues, newValues) {
} else if (table === 'category_mapping') {
handleCategoryMappingChange(createdMonths, oldValue, newValue);
} else if (table === 'categories') {
- if (budgetType === 'rollover') {
+ if (budgetType === 'envelope') {
envelopeBudget.handleCategoryChange(
createdMonths,
oldValue,
@@ -183,7 +183,7 @@ export function triggerBudgetChanges(oldValues, newValues) {
report.handleCategoryChange(createdMonths, oldValue, newValue);
}
} else if (table === 'category_groups') {
- if (budgetType === 'rollover') {
+ if (budgetType === 'envelope') {
envelopeBudget.handleCategoryGroupChange(
createdMonths,
oldValue,
@@ -237,7 +237,7 @@ export async function createBudget(months) {
const budgetType = getBudgetType();
- if (budgetType === 'rollover') {
+ if (budgetType === 'envelope') {
envelopeBudget.createBudget(meta, categories, months);
}
@@ -252,14 +252,14 @@ export async function createBudget(months) {
createCategory(cat, sheetName, prevSheetName, start, end);
});
groups.forEach(group => {
- if (budgetType === 'rollover') {
+ if (budgetType === 'envelope') {
envelopeBudget.createCategoryGroup(group, sheetName);
} else {
report.createCategoryGroup(group, sheetName);
}
});
- if (budgetType === 'rollover') {
+ if (budgetType === 'envelope') {
envelopeBudget.createSummary(
groups,
categories,
diff --git a/packages/loot-core/src/server/budgetfiles/app.ts b/packages/loot-core/src/server/budgetfiles/app.ts
index bdf56bd914..6d726bffd0 100644
--- a/packages/loot-core/src/server/budgetfiles/app.ts
+++ b/packages/loot-core/src/server/budgetfiles/app.ts
@@ -595,7 +595,7 @@ async function _loadBudget(id: Budget['id']): Promise<{
}
// This is a bit leaky, but we need to set the initial budget type
- const { value: budgetType = 'rollover' } =
+ const { value: budgetType = 'envelope' } =
(await db.first<Pick<db.DbPreference, 'value'>>(
'SELECT value from preferences WHERE id = ?',
['budgetType'],
diff --git a/packages/loot-core/src/server/prefs.ts b/packages/loot-core/src/server/prefs.ts
index 84e27643a8..1fbca348b6 100644
--- a/packages/loot-core/src/server/prefs.ts
+++ b/packages/loot-core/src/server/prefs.ts
@@ -6,7 +6,7 @@ import type { MetadataPrefs } from '../types/prefs';
import { Message, sendMessages } from './sync';
-export const BUDGET_TYPES = ['report', 'rollover'] as const;
+export const BUDGET_TYPES = ['tracking', 'envelope'] as const;
export type BudgetType = (typeof BUDGET_TYPES)[number];
export const UPCOMING_SCHEDULED_TRANSACTION_LENGTHS = [
diff --git a/packages/loot-core/src/server/sheet.ts b/packages/loot-core/src/server/sheet.ts
index 8a3b2efa75..d4c98c67e9 100644
--- a/packages/loot-core/src/server/sheet.ts
+++ b/packages/loot-core/src/server/sheet.ts
@@ -203,13 +203,13 @@ export async function loadUserBudgets(
// TODO: Clear out the cache here so make sure future loads of the app
// don't load any extra values that aren't set here
- const { value: budgetType = 'rollover' } =
+ const { value: budgetType = 'envelope' } =
(await db.first<Pick<DbPreference, 'value'>>(
'SELECT value from preferences WHERE id = ?',
['budgetType'],
)) ?? {};
- const table = budgetType === 'report' ? 'reflect_budgets' : 'zero_budgets';
+ const table = budgetType === 'tracking' ? 'reflect_budgets' : 'zero_budgets';
const budgets = await db.all<DbReflectBudget | DbZeroBudget>(`
SELECT * FROM ${table} b
LEFT JOIN categories c ON c.id = b.category
@@ -233,7 +233,7 @@ export async function loadUserBudgets(
}
// For zero-based budgets, load the buffered amounts
- if (budgetType !== 'report') {
+ if (budgetType !== 'tracking') {
const budgetMonths = await db.all<DbZeroBudgetMonth>(
'SELECT * FROM zero_budget_months',
);
diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
index c85a4e7486..307bc06b9a 100644
--- a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
+++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
@@ -48,7 +48,7 @@ export class Spreadsheet {
this.events = mitt();
this._meta = {
createdMonths: new Set(),
- budgetType: 'rollover',
+ budgetType: 'envelope',
};
}
diff --git a/upcoming-release-notes/4879.md b/upcoming-release-notes/4879.md
new file mode 100644
index 0000000000..0ee63c305c
--- /dev/null
+++ b/upcoming-release-notes/4879.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Update budgetType preference from rollover/report to be envelope/tracking